From bf3bb961f3e07f93a1d6494e09af90dc849596fa Mon Sep 17 00:00:00 2001 From: willifan Date: Fri, 30 May 2025 14:22:14 +0200 Subject: [PATCH] restructured flake --- hosts/Anton/default.nix | 6 +++- hosts/Lenni/default.nix | 9 +++-- hosts/Lillie/default.nix | 6 +++- hosts/Puenktchen/default.nix | 6 +++- modules/common/default.nix | 14 ++++++++ modules/default/default.nix | 7 ---- modules/default/home-manager/direnv.nix | 11 ------- modules/default/home-manager/options.nix | 2 -- modules/default/nixos/stylix.nix | 33 ------------------- .../{default => }/home-manager/default.nix | 11 +++---- .../desktop/compositors/default.nix | 0 .../home-manager/desktop/compositors/niri.nix | 2 +- .../desktop/compositors/river.nix | 0 .../desktop/compositors/waybar.nix | 0 .../home-manager/desktop/default.nix | 5 --- .../home-manager/desktop/hyprland/default.nix | 0 .../home-manager/desktop/hyprland/fuzzel.nix | 0 .../desktop/hyprland/hyprexit.nix | 0 .../desktop/hyprland/hypridle.nix | 0 .../desktop/hyprland/hyprland.nix | 0 .../desktop/hyprland/hyprlock.nix | 0 .../desktop/hyprland/hyprpaper.nix | 0 .../home-manager/desktop/hyprland/mako.nix | 0 .../home-manager/desktop/hyprland/options.nix | 0 .../home-manager/desktop/hyprland/utils.nix | 0 .../home-manager/desktop/hyprland/wlogout.nix | 0 .../home-manager/desktop/kitty.nix | 0 .../home-manager/desktop/options.nix | 0 .../home-manager/desktop/vscodium.nix | 0 .../home-manager/desktop/zed.nix | 0 modules/{default => }/home-manager/git.nix | 0 .../{default => }/home-manager/shell/bash.nix | 0 .../home-manager/shell/default.nix | 0 .../{default => }/home-manager/shell/eza.nix | 0 .../home-manager/shell/hyfetch.nix | 0 .../home-manager/shell/nushell.nix | 0 .../{default => }/home-manager/shell/ssh.nix | 0 .../home-manager/shell/starship.nix | 0 .../home-manager/shell/zoxide.nix | 0 .../nixos => home-manager}/syncthing.nix | 0 .../home-manager/tmux/default.nix | 0 .../home-manager/utils/default.nix | 0 modules/{default => }/nixos/autoupdate.nix | 0 modules/{default => }/nixos/boot.nix | 0 modules/{default => }/nixos/builder.nix | 0 modules/{default => }/nixos/default.nix | 5 +-- .../nixos/desktop/applications.nix | 0 .../{default => }/nixos/desktop/autostart.nix | 0 modules/{default => }/nixos/desktop/boot.nix | 0 .../{default => }/nixos/desktop/default.nix | 0 modules/{default => }/nixos/desktop/dev.nix | 5 +++ .../{default => }/nixos/desktop/firefox.nix | 0 .../desktop/games/ROG_Pugio_II_fixes.nix | 0 .../nixos/desktop/games/default.nix | 0 .../nixos/desktop/games/emulation.nix | 0 .../nixos/desktop/games/mangohud.nix | 0 .../nixos/desktop/games/minecraft.nix | 0 .../nixos/desktop/games/moonlight.nix | 0 .../nixos/desktop/games/steam.nix | 0 .../nixos/desktop/games/tetrio.nix | 0 modules/{default => }/nixos/desktop/k40.nix | 0 .../{default => }/nixos/desktop/keyboard.nix | 0 .../nixos/desktop/nfs-client.nix | 0 .../{default => }/nixos/desktop/nix-ld.nix | 0 .../{default => }/nixos/desktop/pipewire.nix | 0 .../{default => }/nixos/desktop/plasma6.nix | 0 .../{default => }/nixos/desktop/polkit.nix | 0 .../{default => }/nixos/desktop/printers.nix | 0 .../nixos/desktop/remoteBuilder.nix | 0 .../nixos/desktop/ssh-server.nix | 0 .../{default => }/nixos/desktop/thunar.nix | 0 modules/{default => }/nixos/desktop/udev.nix | 0 modules/{default => }/nixos/envvar.nix | 0 .../{default => }/nixos/garbage-collect.nix | 0 modules/{default => }/nixos/keyd.nix | 0 modules/{default => }/nixos/locales.nix | 0 modules/{default => }/nixos/mimetype.nix | 0 modules/{default => }/nixos/networking.nix | 0 modules/{default => }/nixos/nixvim/TODO.md | 0 .../{default => }/nixos/nixvim/autopairs.nix | 0 modules/{default => }/nixos/nixvim/cmp.nix | 0 .../{default => }/nixos/nixvim/default.nix | 0 .../{default => }/nixos/nixvim/filetype.nix | 0 .../{default => }/nixos/nixvim/gitsigns.nix | 0 .../{default => }/nixos/nixvim/illuminate.nix | 0 modules/{default => }/nixos/nixvim/lsp.nix | 0 modules/{default => }/nixos/nixvim/navic.nix | 0 .../{default => }/nixos/nixvim/neotree.nix | 0 .../{default => }/nixos/nixvim/settings.nix | 0 .../{default => }/nixos/nixvim/treesitter.nix | 0 .../{default => }/nixos/nixvim/whichkey.nix | 0 modules/{default => }/nixos/nixvim/yazi.nix | 0 modules/{default => }/nixos/optimise.nix | 0 modules/{default => }/nixos/options.nix | 0 modules/{default => }/nixos/packages.nix | 0 .../{default => }/nixos/server/default.nix | 0 .../{default => }/nixos/server/ssh-server.nix | 0 modules/{default => }/nixos/users.nix | 0 .../nixos/sops.nix => sops/default.nix} | 2 +- .../stylix.nix => stylix/default.nix} | 30 +++++++++++++++-- 100 files changed, 76 insertions(+), 78 deletions(-) create mode 100644 modules/common/default.nix delete mode 100644 modules/default/default.nix delete mode 100644 modules/default/home-manager/direnv.nix delete mode 100644 modules/default/home-manager/options.nix delete mode 100644 modules/default/nixos/stylix.nix rename modules/{default => }/home-manager/default.nix (71%) rename modules/{default => }/home-manager/desktop/compositors/default.nix (100%) rename modules/{default => }/home-manager/desktop/compositors/niri.nix (97%) rename modules/{default => }/home-manager/desktop/compositors/river.nix (100%) rename modules/{default => }/home-manager/desktop/compositors/waybar.nix (100%) rename modules/{default => }/home-manager/desktop/default.nix (68%) rename modules/{default => }/home-manager/desktop/hyprland/default.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/fuzzel.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/hyprexit.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/hypridle.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/hyprland.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/hyprlock.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/hyprpaper.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/mako.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/options.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/utils.nix (100%) rename modules/{default => }/home-manager/desktop/hyprland/wlogout.nix (100%) rename modules/{default => }/home-manager/desktop/kitty.nix (100%) rename modules/{default => }/home-manager/desktop/options.nix (100%) rename modules/{default => }/home-manager/desktop/vscodium.nix (100%) rename modules/{default => }/home-manager/desktop/zed.nix (100%) rename modules/{default => }/home-manager/git.nix (100%) rename modules/{default => }/home-manager/shell/bash.nix (100%) rename modules/{default => }/home-manager/shell/default.nix (100%) rename modules/{default => }/home-manager/shell/eza.nix (100%) rename modules/{default => }/home-manager/shell/hyfetch.nix (100%) rename modules/{default => }/home-manager/shell/nushell.nix (100%) rename modules/{default => }/home-manager/shell/ssh.nix (100%) rename modules/{default => }/home-manager/shell/starship.nix (100%) rename modules/{default => }/home-manager/shell/zoxide.nix (100%) rename modules/{default/nixos => home-manager}/syncthing.nix (100%) rename modules/{default => }/home-manager/tmux/default.nix (100%) rename modules/{default => }/home-manager/utils/default.nix (100%) rename modules/{default => }/nixos/autoupdate.nix (100%) rename modules/{default => }/nixos/boot.nix (100%) rename modules/{default => }/nixos/builder.nix (100%) rename modules/{default => }/nixos/default.nix (91%) rename modules/{default => }/nixos/desktop/applications.nix (100%) rename modules/{default => }/nixos/desktop/autostart.nix (100%) rename modules/{default => }/nixos/desktop/boot.nix (100%) rename modules/{default => }/nixos/desktop/default.nix (100%) rename modules/{default => }/nixos/desktop/dev.nix (73%) rename modules/{default => }/nixos/desktop/firefox.nix (100%) rename modules/{default => }/nixos/desktop/games/ROG_Pugio_II_fixes.nix (100%) rename modules/{default => }/nixos/desktop/games/default.nix (100%) rename modules/{default => }/nixos/desktop/games/emulation.nix (100%) rename modules/{default => }/nixos/desktop/games/mangohud.nix (100%) rename modules/{default => }/nixos/desktop/games/minecraft.nix (100%) rename modules/{default => }/nixos/desktop/games/moonlight.nix (100%) rename modules/{default => }/nixos/desktop/games/steam.nix (100%) rename modules/{default => }/nixos/desktop/games/tetrio.nix (100%) rename modules/{default => }/nixos/desktop/k40.nix (100%) rename modules/{default => }/nixos/desktop/keyboard.nix (100%) rename modules/{default => }/nixos/desktop/nfs-client.nix (100%) rename modules/{default => }/nixos/desktop/nix-ld.nix (100%) rename modules/{default => }/nixos/desktop/pipewire.nix (100%) rename modules/{default => }/nixos/desktop/plasma6.nix (100%) rename modules/{default => }/nixos/desktop/polkit.nix (100%) rename modules/{default => }/nixos/desktop/printers.nix (100%) rename modules/{default => }/nixos/desktop/remoteBuilder.nix (100%) rename modules/{default => }/nixos/desktop/ssh-server.nix (100%) rename modules/{default => }/nixos/desktop/thunar.nix (100%) rename modules/{default => }/nixos/desktop/udev.nix (100%) rename modules/{default => }/nixos/envvar.nix (100%) rename modules/{default => }/nixos/garbage-collect.nix (100%) rename modules/{default => }/nixos/keyd.nix (100%) rename modules/{default => }/nixos/locales.nix (100%) rename modules/{default => }/nixos/mimetype.nix (100%) rename modules/{default => }/nixos/networking.nix (100%) rename modules/{default => }/nixos/nixvim/TODO.md (100%) rename modules/{default => }/nixos/nixvim/autopairs.nix (100%) rename modules/{default => }/nixos/nixvim/cmp.nix (100%) rename modules/{default => }/nixos/nixvim/default.nix (100%) rename modules/{default => }/nixos/nixvim/filetype.nix (100%) rename modules/{default => }/nixos/nixvim/gitsigns.nix (100%) rename modules/{default => }/nixos/nixvim/illuminate.nix (100%) rename modules/{default => }/nixos/nixvim/lsp.nix (100%) rename modules/{default => }/nixos/nixvim/navic.nix (100%) rename modules/{default => }/nixos/nixvim/neotree.nix (100%) rename modules/{default => }/nixos/nixvim/settings.nix (100%) rename modules/{default => }/nixos/nixvim/treesitter.nix (100%) rename modules/{default => }/nixos/nixvim/whichkey.nix (100%) rename modules/{default => }/nixos/nixvim/yazi.nix (100%) rename modules/{default => }/nixos/optimise.nix (100%) rename modules/{default => }/nixos/options.nix (100%) rename modules/{default => }/nixos/packages.nix (100%) rename modules/{default => }/nixos/server/default.nix (100%) rename modules/{default => }/nixos/server/ssh-server.nix (100%) rename modules/{default => }/nixos/users.nix (100%) rename modules/{default/nixos/sops.nix => sops/default.nix} (82%) rename modules/{default/home-manager/stylix.nix => stylix/default.nix} (74%) diff --git a/hosts/Anton/default.nix b/hosts/Anton/default.nix index 4fa4010..e139ddc 100644 --- a/hosts/Anton/default.nix +++ b/hosts/Anton/default.nix @@ -16,7 +16,11 @@ ./radicale.nix ./synapse.nix - ../../modules/default + ../../modules/common + ../../modules/nixos + ../../modules/home-manager + ../../modules/sops + ../../modules/stylix ]; diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix index 9f702a8..7ac3221 100644 --- a/hosts/Lenni/default.nix +++ b/hosts/Lenni/default.nix @@ -4,8 +4,11 @@ ./hardware-configuration.nix ./disko.nix - ../../modules/default - + ../../modules/common + ../../modules/nixos + ../../modules/home-manager + ../../modules/sops + ../../modules/stylix ]; desktop = { @@ -24,7 +27,7 @@ }; }; -services.auto-epp.enable = true; + services.auto-epp.enable = true; services.fwupd.enable = true; hardware.bluetooth.enable = true; services.hardware.bolt.enable = true; diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix index 7b65eab..70403a7 100644 --- a/hosts/Lillie/default.nix +++ b/hosts/Lillie/default.nix @@ -5,7 +5,11 @@ ./disko.nix ./jovian.nix - ../../modules/default + ../../modules/common + ../../modules/nixos + ../../modules/home-manager + ../../modules/sops + ../../modules/stylix ]; diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix index 3d75539..b86d861 100644 --- a/hosts/Puenktchen/default.nix +++ b/hosts/Puenktchen/default.nix @@ -4,7 +4,11 @@ ./hardware-configuration.nix ./disko.nix - ../../modules/default + ../../modules/common + ../../modules/nixos + ../../modules/home-manager + ../../modules/sops + ../../modules/stylix ]; diff --git a/modules/common/default.nix b/modules/common/default.nix new file mode 100644 index 0000000..f660b3c --- /dev/null +++ b/modules/common/default.nix @@ -0,0 +1,14 @@ +{ lib, config, ... }: +{ + options = { + nixos.enable = lib.mkOption { + default = false; + type = lib.types.bool; + }; + home.enable = lib.mkOption { + default = false; + type = lib.types.bool; + }; + + }; +} diff --git a/modules/default/default.nix b/modules/default/default.nix deleted file mode 100644 index eab877c..0000000 --- a/modules/default/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - imports = [ - ./nixos - ./home-manager - ]; -} diff --git a/modules/default/home-manager/direnv.nix b/modules/default/home-manager/direnv.nix deleted file mode 100644 index 957ac88..0000000 --- a/modules/default/home-manager/direnv.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: -{ - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - }; - - }; -} diff --git a/modules/default/home-manager/options.nix b/modules/default/home-manager/options.nix deleted file mode 100644 index a43cd67..0000000 --- a/modules/default/home-manager/options.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ lib, ... }: -{ } diff --git a/modules/default/nixos/stylix.nix b/modules/default/nixos/stylix.nix deleted file mode 100644 index 6c013df..0000000 --- a/modules/default/nixos/stylix.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, ... }: -let - wallpaper = pkgs.fetchurl { - url = "https://files.huwe.mooo.com/Oneshot.png"; - hash = "sha256-LaIzLCW86sbldE9lk7psbYKaTCjwaPLcoD3il6FalTw="; - }; - plymouth_logo = pkgs.fetchurl { - url = "https://files.huwe.mooo.com/outlinenobackground.png"; - hash = "sha256-HdErySgSwNSPEHyBywLyZCAss4vUhsY8BvCPe5hST6Q="; - }; -in -{ - - stylix = { - enable = true; - - autoEnable = true; - - base16Scheme = "${pkgs.base16-schemes}/share/themes/pasque.yaml"; - override = { - base0D = "F3196E"; - base0F = "CFAACF"; - }; - - image = wallpaper; - - polarity = "dark"; - - targets.plymouth.logo = plymouth_logo; - - }; - -} diff --git a/modules/default/home-manager/default.nix b/modules/home-manager/default.nix similarity index 71% rename from modules/default/home-manager/default.nix rename to modules/home-manager/default.nix index 4d85d70..5843912 100644 --- a/modules/default/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,20 +1,19 @@ -{ ... }: +{ lib, config, ... }: { + home.enable = true; + imports = [ ./desktop ./shell ./tmux ./utils - ./direnv.nix + ./git.nix - ./stylix.nix + ./syncthing.nix ]; home-manager.users.willifan = { - imports = [ - ]; - home.stateVersion = "23.11"; }; diff --git a/modules/default/home-manager/desktop/compositors/default.nix b/modules/home-manager/desktop/compositors/default.nix similarity index 100% rename from modules/default/home-manager/desktop/compositors/default.nix rename to modules/home-manager/desktop/compositors/default.nix diff --git a/modules/default/home-manager/desktop/compositors/niri.nix b/modules/home-manager/desktop/compositors/niri.nix similarity index 97% rename from modules/default/home-manager/desktop/compositors/niri.nix rename to modules/home-manager/desktop/compositors/niri.nix index 827577c..ee14934 100644 --- a/modules/default/home-manager/desktop/compositors/niri.nix +++ b/modules/home-manager/desktop/compositors/niri.nix @@ -6,7 +6,7 @@ let sha256 = "1andyln5vmm934nl1lsid2gpc88h9il83b84yd9dmqr7pninwk37"; }; in -lib.mkIf config.desktop.wm.niri.enable { +lib.mkIf (config.desktop.wm.niri.enable && config.nixos.enable) { nixpkgs.overlays = [ inputs.niri.overlays.niri ]; diff --git a/modules/default/home-manager/desktop/compositors/river.nix b/modules/home-manager/desktop/compositors/river.nix similarity index 100% rename from modules/default/home-manager/desktop/compositors/river.nix rename to modules/home-manager/desktop/compositors/river.nix diff --git a/modules/default/home-manager/desktop/compositors/waybar.nix b/modules/home-manager/desktop/compositors/waybar.nix similarity index 100% rename from modules/default/home-manager/desktop/compositors/waybar.nix rename to modules/home-manager/desktop/compositors/waybar.nix diff --git a/modules/default/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix similarity index 68% rename from modules/default/home-manager/desktop/default.nix rename to modules/home-manager/desktop/default.nix index e04d1d3..097cbb3 100644 --- a/modules/default/home-manager/desktop/default.nix +++ b/modules/home-manager/desktop/default.nix @@ -11,9 +11,4 @@ ./zed.nix ]; - home-manager.users.willifan = { - imports = [ - ]; - }; - } diff --git a/modules/default/home-manager/desktop/hyprland/default.nix b/modules/home-manager/desktop/hyprland/default.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/default.nix rename to modules/home-manager/desktop/hyprland/default.nix diff --git a/modules/default/home-manager/desktop/hyprland/fuzzel.nix b/modules/home-manager/desktop/hyprland/fuzzel.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/fuzzel.nix rename to modules/home-manager/desktop/hyprland/fuzzel.nix diff --git a/modules/default/home-manager/desktop/hyprland/hyprexit.nix b/modules/home-manager/desktop/hyprland/hyprexit.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/hyprexit.nix rename to modules/home-manager/desktop/hyprland/hyprexit.nix diff --git a/modules/default/home-manager/desktop/hyprland/hypridle.nix b/modules/home-manager/desktop/hyprland/hypridle.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/hypridle.nix rename to modules/home-manager/desktop/hyprland/hypridle.nix diff --git a/modules/default/home-manager/desktop/hyprland/hyprland.nix b/modules/home-manager/desktop/hyprland/hyprland.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/hyprland.nix rename to modules/home-manager/desktop/hyprland/hyprland.nix diff --git a/modules/default/home-manager/desktop/hyprland/hyprlock.nix b/modules/home-manager/desktop/hyprland/hyprlock.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/hyprlock.nix rename to modules/home-manager/desktop/hyprland/hyprlock.nix diff --git a/modules/default/home-manager/desktop/hyprland/hyprpaper.nix b/modules/home-manager/desktop/hyprland/hyprpaper.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/hyprpaper.nix rename to modules/home-manager/desktop/hyprland/hyprpaper.nix diff --git a/modules/default/home-manager/desktop/hyprland/mako.nix b/modules/home-manager/desktop/hyprland/mako.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/mako.nix rename to modules/home-manager/desktop/hyprland/mako.nix diff --git a/modules/default/home-manager/desktop/hyprland/options.nix b/modules/home-manager/desktop/hyprland/options.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/options.nix rename to modules/home-manager/desktop/hyprland/options.nix diff --git a/modules/default/home-manager/desktop/hyprland/utils.nix b/modules/home-manager/desktop/hyprland/utils.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/utils.nix rename to modules/home-manager/desktop/hyprland/utils.nix diff --git a/modules/default/home-manager/desktop/hyprland/wlogout.nix b/modules/home-manager/desktop/hyprland/wlogout.nix similarity index 100% rename from modules/default/home-manager/desktop/hyprland/wlogout.nix rename to modules/home-manager/desktop/hyprland/wlogout.nix diff --git a/modules/default/home-manager/desktop/kitty.nix b/modules/home-manager/desktop/kitty.nix similarity index 100% rename from modules/default/home-manager/desktop/kitty.nix rename to modules/home-manager/desktop/kitty.nix diff --git a/modules/default/home-manager/desktop/options.nix b/modules/home-manager/desktop/options.nix similarity index 100% rename from modules/default/home-manager/desktop/options.nix rename to modules/home-manager/desktop/options.nix diff --git a/modules/default/home-manager/desktop/vscodium.nix b/modules/home-manager/desktop/vscodium.nix similarity index 100% rename from modules/default/home-manager/desktop/vscodium.nix rename to modules/home-manager/desktop/vscodium.nix diff --git a/modules/default/home-manager/desktop/zed.nix b/modules/home-manager/desktop/zed.nix similarity index 100% rename from modules/default/home-manager/desktop/zed.nix rename to modules/home-manager/desktop/zed.nix diff --git a/modules/default/home-manager/git.nix b/modules/home-manager/git.nix similarity index 100% rename from modules/default/home-manager/git.nix rename to modules/home-manager/git.nix diff --git a/modules/default/home-manager/shell/bash.nix b/modules/home-manager/shell/bash.nix similarity index 100% rename from modules/default/home-manager/shell/bash.nix rename to modules/home-manager/shell/bash.nix diff --git a/modules/default/home-manager/shell/default.nix b/modules/home-manager/shell/default.nix similarity index 100% rename from modules/default/home-manager/shell/default.nix rename to modules/home-manager/shell/default.nix diff --git a/modules/default/home-manager/shell/eza.nix b/modules/home-manager/shell/eza.nix similarity index 100% rename from modules/default/home-manager/shell/eza.nix rename to modules/home-manager/shell/eza.nix diff --git a/modules/default/home-manager/shell/hyfetch.nix b/modules/home-manager/shell/hyfetch.nix similarity index 100% rename from modules/default/home-manager/shell/hyfetch.nix rename to modules/home-manager/shell/hyfetch.nix diff --git a/modules/default/home-manager/shell/nushell.nix b/modules/home-manager/shell/nushell.nix similarity index 100% rename from modules/default/home-manager/shell/nushell.nix rename to modules/home-manager/shell/nushell.nix diff --git a/modules/default/home-manager/shell/ssh.nix b/modules/home-manager/shell/ssh.nix similarity index 100% rename from modules/default/home-manager/shell/ssh.nix rename to modules/home-manager/shell/ssh.nix diff --git a/modules/default/home-manager/shell/starship.nix b/modules/home-manager/shell/starship.nix similarity index 100% rename from modules/default/home-manager/shell/starship.nix rename to modules/home-manager/shell/starship.nix diff --git a/modules/default/home-manager/shell/zoxide.nix b/modules/home-manager/shell/zoxide.nix similarity index 100% rename from modules/default/home-manager/shell/zoxide.nix rename to modules/home-manager/shell/zoxide.nix diff --git a/modules/default/nixos/syncthing.nix b/modules/home-manager/syncthing.nix similarity index 100% rename from modules/default/nixos/syncthing.nix rename to modules/home-manager/syncthing.nix diff --git a/modules/default/home-manager/tmux/default.nix b/modules/home-manager/tmux/default.nix similarity index 100% rename from modules/default/home-manager/tmux/default.nix rename to modules/home-manager/tmux/default.nix diff --git a/modules/default/home-manager/utils/default.nix b/modules/home-manager/utils/default.nix similarity index 100% rename from modules/default/home-manager/utils/default.nix rename to modules/home-manager/utils/default.nix diff --git a/modules/default/nixos/autoupdate.nix b/modules/nixos/autoupdate.nix similarity index 100% rename from modules/default/nixos/autoupdate.nix rename to modules/nixos/autoupdate.nix diff --git a/modules/default/nixos/boot.nix b/modules/nixos/boot.nix similarity index 100% rename from modules/default/nixos/boot.nix rename to modules/nixos/boot.nix diff --git a/modules/default/nixos/builder.nix b/modules/nixos/builder.nix similarity index 100% rename from modules/default/nixos/builder.nix rename to modules/nixos/builder.nix diff --git a/modules/default/nixos/default.nix b/modules/nixos/default.nix similarity index 91% rename from modules/default/nixos/default.nix rename to modules/nixos/default.nix index 82e1d35..9e2426d 100644 --- a/modules/default/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,7 +1,7 @@ { lib, config, inputs, hostname, ... }: { - + nixos.enable = true; imports = [ ./desktop @@ -20,9 +20,6 @@ ./optimise.nix ./options.nix ./packages.nix - ./sops.nix - ./stylix.nix - ./syncthing.nix ./users.nix ]; diff --git a/modules/default/nixos/desktop/applications.nix b/modules/nixos/desktop/applications.nix similarity index 100% rename from modules/default/nixos/desktop/applications.nix rename to modules/nixos/desktop/applications.nix diff --git a/modules/default/nixos/desktop/autostart.nix b/modules/nixos/desktop/autostart.nix similarity index 100% rename from modules/default/nixos/desktop/autostart.nix rename to modules/nixos/desktop/autostart.nix diff --git a/modules/default/nixos/desktop/boot.nix b/modules/nixos/desktop/boot.nix similarity index 100% rename from modules/default/nixos/desktop/boot.nix rename to modules/nixos/desktop/boot.nix diff --git a/modules/default/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix similarity index 100% rename from modules/default/nixos/desktop/default.nix rename to modules/nixos/desktop/default.nix diff --git a/modules/default/nixos/desktop/dev.nix b/modules/nixos/desktop/dev.nix similarity index 73% rename from modules/default/nixos/desktop/dev.nix rename to modules/nixos/desktop/dev.nix index e1eed14..028d3fe 100644 --- a/modules/default/nixos/desktop/dev.nix +++ b/modules/nixos/desktop/dev.nix @@ -8,4 +8,9 @@ lib.mkIf config.desktop.dev.enable { clang-tools gcc ]; + + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; } diff --git a/modules/default/nixos/desktop/firefox.nix b/modules/nixos/desktop/firefox.nix similarity index 100% rename from modules/default/nixos/desktop/firefox.nix rename to modules/nixos/desktop/firefox.nix diff --git a/modules/default/nixos/desktop/games/ROG_Pugio_II_fixes.nix b/modules/nixos/desktop/games/ROG_Pugio_II_fixes.nix similarity index 100% rename from modules/default/nixos/desktop/games/ROG_Pugio_II_fixes.nix rename to modules/nixos/desktop/games/ROG_Pugio_II_fixes.nix diff --git a/modules/default/nixos/desktop/games/default.nix b/modules/nixos/desktop/games/default.nix similarity index 100% rename from modules/default/nixos/desktop/games/default.nix rename to modules/nixos/desktop/games/default.nix diff --git a/modules/default/nixos/desktop/games/emulation.nix b/modules/nixos/desktop/games/emulation.nix similarity index 100% rename from modules/default/nixos/desktop/games/emulation.nix rename to modules/nixos/desktop/games/emulation.nix diff --git a/modules/default/nixos/desktop/games/mangohud.nix b/modules/nixos/desktop/games/mangohud.nix similarity index 100% rename from modules/default/nixos/desktop/games/mangohud.nix rename to modules/nixos/desktop/games/mangohud.nix diff --git a/modules/default/nixos/desktop/games/minecraft.nix b/modules/nixos/desktop/games/minecraft.nix similarity index 100% rename from modules/default/nixos/desktop/games/minecraft.nix rename to modules/nixos/desktop/games/minecraft.nix diff --git a/modules/default/nixos/desktop/games/moonlight.nix b/modules/nixos/desktop/games/moonlight.nix similarity index 100% rename from modules/default/nixos/desktop/games/moonlight.nix rename to modules/nixos/desktop/games/moonlight.nix diff --git a/modules/default/nixos/desktop/games/steam.nix b/modules/nixos/desktop/games/steam.nix similarity index 100% rename from modules/default/nixos/desktop/games/steam.nix rename to modules/nixos/desktop/games/steam.nix diff --git a/modules/default/nixos/desktop/games/tetrio.nix b/modules/nixos/desktop/games/tetrio.nix similarity index 100% rename from modules/default/nixos/desktop/games/tetrio.nix rename to modules/nixos/desktop/games/tetrio.nix diff --git a/modules/default/nixos/desktop/k40.nix b/modules/nixos/desktop/k40.nix similarity index 100% rename from modules/default/nixos/desktop/k40.nix rename to modules/nixos/desktop/k40.nix diff --git a/modules/default/nixos/desktop/keyboard.nix b/modules/nixos/desktop/keyboard.nix similarity index 100% rename from modules/default/nixos/desktop/keyboard.nix rename to modules/nixos/desktop/keyboard.nix diff --git a/modules/default/nixos/desktop/nfs-client.nix b/modules/nixos/desktop/nfs-client.nix similarity index 100% rename from modules/default/nixos/desktop/nfs-client.nix rename to modules/nixos/desktop/nfs-client.nix diff --git a/modules/default/nixos/desktop/nix-ld.nix b/modules/nixos/desktop/nix-ld.nix similarity index 100% rename from modules/default/nixos/desktop/nix-ld.nix rename to modules/nixos/desktop/nix-ld.nix diff --git a/modules/default/nixos/desktop/pipewire.nix b/modules/nixos/desktop/pipewire.nix similarity index 100% rename from modules/default/nixos/desktop/pipewire.nix rename to modules/nixos/desktop/pipewire.nix diff --git a/modules/default/nixos/desktop/plasma6.nix b/modules/nixos/desktop/plasma6.nix similarity index 100% rename from modules/default/nixos/desktop/plasma6.nix rename to modules/nixos/desktop/plasma6.nix diff --git a/modules/default/nixos/desktop/polkit.nix b/modules/nixos/desktop/polkit.nix similarity index 100% rename from modules/default/nixos/desktop/polkit.nix rename to modules/nixos/desktop/polkit.nix diff --git a/modules/default/nixos/desktop/printers.nix b/modules/nixos/desktop/printers.nix similarity index 100% rename from modules/default/nixos/desktop/printers.nix rename to modules/nixos/desktop/printers.nix diff --git a/modules/default/nixos/desktop/remoteBuilder.nix b/modules/nixos/desktop/remoteBuilder.nix similarity index 100% rename from modules/default/nixos/desktop/remoteBuilder.nix rename to modules/nixos/desktop/remoteBuilder.nix diff --git a/modules/default/nixos/desktop/ssh-server.nix b/modules/nixos/desktop/ssh-server.nix similarity index 100% rename from modules/default/nixos/desktop/ssh-server.nix rename to modules/nixos/desktop/ssh-server.nix diff --git a/modules/default/nixos/desktop/thunar.nix b/modules/nixos/desktop/thunar.nix similarity index 100% rename from modules/default/nixos/desktop/thunar.nix rename to modules/nixos/desktop/thunar.nix diff --git a/modules/default/nixos/desktop/udev.nix b/modules/nixos/desktop/udev.nix similarity index 100% rename from modules/default/nixos/desktop/udev.nix rename to modules/nixos/desktop/udev.nix diff --git a/modules/default/nixos/envvar.nix b/modules/nixos/envvar.nix similarity index 100% rename from modules/default/nixos/envvar.nix rename to modules/nixos/envvar.nix diff --git a/modules/default/nixos/garbage-collect.nix b/modules/nixos/garbage-collect.nix similarity index 100% rename from modules/default/nixos/garbage-collect.nix rename to modules/nixos/garbage-collect.nix diff --git a/modules/default/nixos/keyd.nix b/modules/nixos/keyd.nix similarity index 100% rename from modules/default/nixos/keyd.nix rename to modules/nixos/keyd.nix diff --git a/modules/default/nixos/locales.nix b/modules/nixos/locales.nix similarity index 100% rename from modules/default/nixos/locales.nix rename to modules/nixos/locales.nix diff --git a/modules/default/nixos/mimetype.nix b/modules/nixos/mimetype.nix similarity index 100% rename from modules/default/nixos/mimetype.nix rename to modules/nixos/mimetype.nix diff --git a/modules/default/nixos/networking.nix b/modules/nixos/networking.nix similarity index 100% rename from modules/default/nixos/networking.nix rename to modules/nixos/networking.nix diff --git a/modules/default/nixos/nixvim/TODO.md b/modules/nixos/nixvim/TODO.md similarity index 100% rename from modules/default/nixos/nixvim/TODO.md rename to modules/nixos/nixvim/TODO.md diff --git a/modules/default/nixos/nixvim/autopairs.nix b/modules/nixos/nixvim/autopairs.nix similarity index 100% rename from modules/default/nixos/nixvim/autopairs.nix rename to modules/nixos/nixvim/autopairs.nix diff --git a/modules/default/nixos/nixvim/cmp.nix b/modules/nixos/nixvim/cmp.nix similarity index 100% rename from modules/default/nixos/nixvim/cmp.nix rename to modules/nixos/nixvim/cmp.nix diff --git a/modules/default/nixos/nixvim/default.nix b/modules/nixos/nixvim/default.nix similarity index 100% rename from modules/default/nixos/nixvim/default.nix rename to modules/nixos/nixvim/default.nix diff --git a/modules/default/nixos/nixvim/filetype.nix b/modules/nixos/nixvim/filetype.nix similarity index 100% rename from modules/default/nixos/nixvim/filetype.nix rename to modules/nixos/nixvim/filetype.nix diff --git a/modules/default/nixos/nixvim/gitsigns.nix b/modules/nixos/nixvim/gitsigns.nix similarity index 100% rename from modules/default/nixos/nixvim/gitsigns.nix rename to modules/nixos/nixvim/gitsigns.nix diff --git a/modules/default/nixos/nixvim/illuminate.nix b/modules/nixos/nixvim/illuminate.nix similarity index 100% rename from modules/default/nixos/nixvim/illuminate.nix rename to modules/nixos/nixvim/illuminate.nix diff --git a/modules/default/nixos/nixvim/lsp.nix b/modules/nixos/nixvim/lsp.nix similarity index 100% rename from modules/default/nixos/nixvim/lsp.nix rename to modules/nixos/nixvim/lsp.nix diff --git a/modules/default/nixos/nixvim/navic.nix b/modules/nixos/nixvim/navic.nix similarity index 100% rename from modules/default/nixos/nixvim/navic.nix rename to modules/nixos/nixvim/navic.nix diff --git a/modules/default/nixos/nixvim/neotree.nix b/modules/nixos/nixvim/neotree.nix similarity index 100% rename from modules/default/nixos/nixvim/neotree.nix rename to modules/nixos/nixvim/neotree.nix diff --git a/modules/default/nixos/nixvim/settings.nix b/modules/nixos/nixvim/settings.nix similarity index 100% rename from modules/default/nixos/nixvim/settings.nix rename to modules/nixos/nixvim/settings.nix diff --git a/modules/default/nixos/nixvim/treesitter.nix b/modules/nixos/nixvim/treesitter.nix similarity index 100% rename from modules/default/nixos/nixvim/treesitter.nix rename to modules/nixos/nixvim/treesitter.nix diff --git a/modules/default/nixos/nixvim/whichkey.nix b/modules/nixos/nixvim/whichkey.nix similarity index 100% rename from modules/default/nixos/nixvim/whichkey.nix rename to modules/nixos/nixvim/whichkey.nix diff --git a/modules/default/nixos/nixvim/yazi.nix b/modules/nixos/nixvim/yazi.nix similarity index 100% rename from modules/default/nixos/nixvim/yazi.nix rename to modules/nixos/nixvim/yazi.nix diff --git a/modules/default/nixos/optimise.nix b/modules/nixos/optimise.nix similarity index 100% rename from modules/default/nixos/optimise.nix rename to modules/nixos/optimise.nix diff --git a/modules/default/nixos/options.nix b/modules/nixos/options.nix similarity index 100% rename from modules/default/nixos/options.nix rename to modules/nixos/options.nix diff --git a/modules/default/nixos/packages.nix b/modules/nixos/packages.nix similarity index 100% rename from modules/default/nixos/packages.nix rename to modules/nixos/packages.nix diff --git a/modules/default/nixos/server/default.nix b/modules/nixos/server/default.nix similarity index 100% rename from modules/default/nixos/server/default.nix rename to modules/nixos/server/default.nix diff --git a/modules/default/nixos/server/ssh-server.nix b/modules/nixos/server/ssh-server.nix similarity index 100% rename from modules/default/nixos/server/ssh-server.nix rename to modules/nixos/server/ssh-server.nix diff --git a/modules/default/nixos/users.nix b/modules/nixos/users.nix similarity index 100% rename from modules/default/nixos/users.nix rename to modules/nixos/users.nix diff --git a/modules/default/nixos/sops.nix b/modules/sops/default.nix similarity index 82% rename from modules/default/nixos/sops.nix rename to modules/sops/default.nix index 38b315f..7a9aef7 100644 --- a/modules/default/nixos/sops.nix +++ b/modules/sops/default.nix @@ -2,7 +2,7 @@ { - sops.defaultSopsFile = ../../../secrets/secrets.yaml; + sops.defaultSopsFile = ../../secrets/secrets.yaml; sops.defaultSopsFormat = "yaml"; sops.age.keyFile = "/etc/sops/keys.txt"; diff --git a/modules/default/home-manager/stylix.nix b/modules/stylix/default.nix similarity index 74% rename from modules/default/home-manager/stylix.nix rename to modules/stylix/default.nix index 755c4fc..5a072c1 100644 --- a/modules/default/home-manager/stylix.nix +++ b/modules/stylix/default.nix @@ -1,11 +1,35 @@ -{ pkgs, ... }: +{ pkgs, lib, config, ... }: let wallpaper = pkgs.fetchurl { url = "https://files.huwe.mooo.com/Oneshot.png"; hash = "sha256-LaIzLCW86sbldE9lk7psbYKaTCjwaPLcoD3il6FalTw="; }; + plymouth_logo = pkgs.fetchurl { + url = "https://files.huwe.mooo.com/outlinenobackground.png"; + hash = "sha256-HdErySgSwNSPEHyBywLyZCAss4vUhsY8BvCPe5hST6Q="; + }; in -{ + +lib.mkIf config.home.enable { + + stylix = { + enable = true; + + autoEnable = true; + + base16Scheme = "${pkgs.base16-schemes}/share/themes/pasque.yaml"; + override = { + base0D = "F3196E"; + base0F = "CFAACF"; + }; + + image = wallpaper; + + polarity = "dark"; + + targets.plymouth.logo = plymouth_logo; + + }; home-manager.users.willifan = { stylix = { @@ -72,3 +96,5 @@ in }; } + +