diff --git a/hosts/Anton/default.nix b/hosts/Anton/default.nix index e1f152b..e4cd83a 100644 --- a/hosts/Anton/default.nix +++ b/hosts/Anton/default.nix @@ -15,9 +15,9 @@ ./nfs.nix ./radicale.nix - ../../modules/DEFAULT/COMMON - ../../modules/DEFAULT/SERVER - ../../modules/HOME-MANAGER/COMMON + ../../modules/common + ../../modules/server + ../../modules/home-manager ]; diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix index 516ecd9..ba9ef7b 100644 --- a/hosts/Lenni/default.nix +++ b/hosts/Lenni/default.nix @@ -4,9 +4,9 @@ ./hardware-configuration.nix #./disko.nix - ../../modules/DEFAULT/COMMON - ../../modules/DEFAULT/DESKTOP - ../../modules/HOME-MANAGER/COMMON + ../../modules/common + ../../modules/desktop + ../../modules/home-manager ]; common.syncthing = { diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix index d2a665e..be8e2ef 100644 --- a/hosts/Lillie/default.nix +++ b/hosts/Lillie/default.nix @@ -4,9 +4,9 @@ ./hardware-configuration.nix ./disko.nix - ../../modules/DEFAULT/COMMON - ../../modules/DEFAULT/DESKTOP - ../../modules/HOME-MANAGER/COMMON + ../../modules/common + ../../modules/desktop + ../../modules/home-manager ]; } diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix index a146a78..27a5fbb 100644 --- a/hosts/Puenktchen/default.nix +++ b/hosts/Puenktchen/default.nix @@ -4,9 +4,9 @@ ./hardware-configuration.nix ./disko.nix - ../../modules/DEFAULT/COMMON - ../../modules/DEFAULT/DESKTOP - ../../modules/HOME-MANAGER/COMMON + ../../modules/common + ../../modules/desktop + ../../modules/home-manager ]; diff --git a/modules/DEFAULT/COMMON/autoupdate.nix b/modules/common/autoupdate.nix similarity index 100% rename from modules/DEFAULT/COMMON/autoupdate.nix rename to modules/common/autoupdate.nix diff --git a/modules/DEFAULT/COMMON/default.nix b/modules/common/default.nix similarity index 100% rename from modules/DEFAULT/COMMON/default.nix rename to modules/common/default.nix diff --git a/modules/DEFAULT/COMMON/envvar.nix b/modules/common/envvar.nix similarity index 100% rename from modules/DEFAULT/COMMON/envvar.nix rename to modules/common/envvar.nix diff --git a/modules/DEFAULT/COMMON/garbage-collect.nix b/modules/common/garbage-collect.nix similarity index 100% rename from modules/DEFAULT/COMMON/garbage-collect.nix rename to modules/common/garbage-collect.nix diff --git a/modules/DEFAULT/COMMON/keyd.nix b/modules/common/keyd.nix similarity index 100% rename from modules/DEFAULT/COMMON/keyd.nix rename to modules/common/keyd.nix diff --git a/modules/DEFAULT/COMMON/locales.nix b/modules/common/locales.nix similarity index 100% rename from modules/DEFAULT/COMMON/locales.nix rename to modules/common/locales.nix diff --git a/modules/DEFAULT/COMMON/mimetype.nix b/modules/common/mimetype.nix similarity index 100% rename from modules/DEFAULT/COMMON/mimetype.nix rename to modules/common/mimetype.nix diff --git a/modules/DEFAULT/COMMON/nixvim/TODO.md b/modules/common/nixvim/TODO.md similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/TODO.md rename to modules/common/nixvim/TODO.md diff --git a/modules/DEFAULT/COMMON/nixvim/autopairs.nix b/modules/common/nixvim/autopairs.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/autopairs.nix rename to modules/common/nixvim/autopairs.nix diff --git a/modules/DEFAULT/COMMON/nixvim/cmp.nix b/modules/common/nixvim/cmp.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/cmp.nix rename to modules/common/nixvim/cmp.nix diff --git a/modules/DEFAULT/COMMON/nixvim/default.nix b/modules/common/nixvim/default.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/default.nix rename to modules/common/nixvim/default.nix diff --git a/modules/DEFAULT/COMMON/nixvim/filetype.nix b/modules/common/nixvim/filetype.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/filetype.nix rename to modules/common/nixvim/filetype.nix diff --git a/modules/DEFAULT/COMMON/nixvim/gitsigns.nix b/modules/common/nixvim/gitsigns.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/gitsigns.nix rename to modules/common/nixvim/gitsigns.nix diff --git a/modules/DEFAULT/COMMON/nixvim/illuminate.nix b/modules/common/nixvim/illuminate.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/illuminate.nix rename to modules/common/nixvim/illuminate.nix diff --git a/modules/DEFAULT/COMMON/nixvim/lsp.nix b/modules/common/nixvim/lsp.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/lsp.nix rename to modules/common/nixvim/lsp.nix diff --git a/modules/DEFAULT/COMMON/nixvim/navic.nix b/modules/common/nixvim/navic.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/navic.nix rename to modules/common/nixvim/navic.nix diff --git a/modules/DEFAULT/COMMON/nixvim/neotree.nix b/modules/common/nixvim/neotree.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/neotree.nix rename to modules/common/nixvim/neotree.nix diff --git a/modules/DEFAULT/COMMON/nixvim/settings.nix b/modules/common/nixvim/settings.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/settings.nix rename to modules/common/nixvim/settings.nix diff --git a/modules/DEFAULT/COMMON/nixvim/treesitter.nix b/modules/common/nixvim/treesitter.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/treesitter.nix rename to modules/common/nixvim/treesitter.nix diff --git a/modules/DEFAULT/COMMON/nixvim/whichkey.nix b/modules/common/nixvim/whichkey.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/whichkey.nix rename to modules/common/nixvim/whichkey.nix diff --git a/modules/DEFAULT/COMMON/nixvim/yazi.nix b/modules/common/nixvim/yazi.nix similarity index 100% rename from modules/DEFAULT/COMMON/nixvim/yazi.nix rename to modules/common/nixvim/yazi.nix diff --git a/modules/DEFAULT/COMMON/optimise.nix b/modules/common/optimise.nix similarity index 100% rename from modules/DEFAULT/COMMON/optimise.nix rename to modules/common/optimise.nix diff --git a/modules/DEFAULT/COMMON/packages.nix b/modules/common/packages.nix similarity index 100% rename from modules/DEFAULT/COMMON/packages.nix rename to modules/common/packages.nix diff --git a/modules/DEFAULT/COMMON/sops.nix b/modules/common/sops.nix similarity index 84% rename from modules/DEFAULT/COMMON/sops.nix rename to modules/common/sops.nix index 03094f9..a51f189 100644 --- a/modules/DEFAULT/COMMON/sops.nix +++ b/modules/common/sops.nix @@ -2,7 +2,7 @@ { - sops.defaultSopsFile = ../../../secrets/secrets.yaml; + sops.defaultSopsFile = ../../secrets/secrets.yaml; sops.defaultSopsFormat = "yaml"; sops.age.keyFile = "/home/willifan/.config/sops/age/keys.txt"; diff --git a/modules/DEFAULT/COMMON/stylix.nix b/modules/common/stylix.nix similarity index 100% rename from modules/DEFAULT/COMMON/stylix.nix rename to modules/common/stylix.nix diff --git a/modules/DEFAULT/COMMON/syncthing.nix b/modules/common/syncthing.nix similarity index 100% rename from modules/DEFAULT/COMMON/syncthing.nix rename to modules/common/syncthing.nix diff --git a/modules/DEFAULT/COMMON/users.nix b/modules/common/users.nix similarity index 100% rename from modules/DEFAULT/COMMON/users.nix rename to modules/common/users.nix diff --git a/modules/DEFAULT/DESKTOP/boot.nix b/modules/desktop/boot.nix similarity index 100% rename from modules/DEFAULT/DESKTOP/boot.nix rename to modules/desktop/boot.nix diff --git a/modules/DEFAULT/DESKTOP/default.nix b/modules/desktop/default.nix similarity index 100% rename from modules/DEFAULT/DESKTOP/default.nix rename to modules/desktop/default.nix diff --git a/modules/DEFAULT/DESKTOP/nfs-client.nix b/modules/desktop/nfs-client.nix similarity index 100% rename from modules/DEFAULT/DESKTOP/nfs-client.nix rename to modules/desktop/nfs-client.nix diff --git a/modules/DEFAULT/DESKTOP/nix-ld.nix b/modules/desktop/nix-ld.nix similarity index 100% rename from modules/DEFAULT/DESKTOP/nix-ld.nix rename to modules/desktop/nix-ld.nix diff --git a/modules/DEFAULT/DESKTOP/printers.nix b/modules/desktop/printers.nix similarity index 100% rename from modules/DEFAULT/DESKTOP/printers.nix rename to modules/desktop/printers.nix diff --git a/modules/DEFAULT/DESKTOP/remoteBuilder.nix b/modules/desktop/remoteBuilder.nix similarity index 100% rename from modules/DEFAULT/DESKTOP/remoteBuilder.nix rename to modules/desktop/remoteBuilder.nix diff --git a/modules/DEFAULT/DESKTOP/ssh-server.nix b/modules/desktop/ssh-server.nix similarity index 100% rename from modules/DEFAULT/DESKTOP/ssh-server.nix rename to modules/desktop/ssh-server.nix diff --git a/modules/HOME-MANAGER/COMMON/default.nix b/modules/home-manager/default.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/default.nix rename to modules/home-manager/default.nix diff --git a/modules/HOME-MANAGER/COMMON/git.nix b/modules/home-manager/git.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/git.nix rename to modules/home-manager/git.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/bash.nix b/modules/home-manager/shell/bash.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/bash.nix rename to modules/home-manager/shell/bash.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/default.nix b/modules/home-manager/shell/default.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/default.nix rename to modules/home-manager/shell/default.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/eza.nix b/modules/home-manager/shell/eza.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/eza.nix rename to modules/home-manager/shell/eza.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/hyfetch.nix b/modules/home-manager/shell/hyfetch.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/hyfetch.nix rename to modules/home-manager/shell/hyfetch.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/nushell.nix b/modules/home-manager/shell/nushell.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/nushell.nix rename to modules/home-manager/shell/nushell.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/ssh.nix b/modules/home-manager/shell/ssh.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/ssh.nix rename to modules/home-manager/shell/ssh.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/starship.nix b/modules/home-manager/shell/starship.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/starship.nix rename to modules/home-manager/shell/starship.nix diff --git a/modules/HOME-MANAGER/COMMON/shell/zoxide.nix b/modules/home-manager/shell/zoxide.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/shell/zoxide.nix rename to modules/home-manager/shell/zoxide.nix diff --git a/modules/HOME-MANAGER/COMMON/stylix.nix b/modules/home-manager/stylix.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/stylix.nix rename to modules/home-manager/stylix.nix diff --git a/modules/HOME-MANAGER/COMMON/tmux/default.nix b/modules/home-manager/tmux/default.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/tmux/default.nix rename to modules/home-manager/tmux/default.nix diff --git a/modules/HOME-MANAGER/COMMON/utils/default.nix b/modules/home-manager/utils/default.nix similarity index 100% rename from modules/HOME-MANAGER/COMMON/utils/default.nix rename to modules/home-manager/utils/default.nix diff --git a/modules/DEFAULT/SERVER/boot.nix b/modules/server/boot.nix similarity index 100% rename from modules/DEFAULT/SERVER/boot.nix rename to modules/server/boot.nix diff --git a/modules/DEFAULT/SERVER/builder.nix b/modules/server/builder.nix similarity index 100% rename from modules/DEFAULT/SERVER/builder.nix rename to modules/server/builder.nix diff --git a/modules/DEFAULT/SERVER/default.nix b/modules/server/default.nix similarity index 100% rename from modules/DEFAULT/SERVER/default.nix rename to modules/server/default.nix diff --git a/modules/DEFAULT/SERVER/ssh-server.nix b/modules/server/ssh-server.nix similarity index 100% rename from modules/DEFAULT/SERVER/ssh-server.nix rename to modules/server/ssh-server.nix diff --git a/users/willifan/desktop/dev/default.nix b/users/willifan/desktop/dev/default.nix index 345ec38..d42d664 100644 --- a/users/willifan/desktop/dev/default.nix +++ b/users/willifan/desktop/dev/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, ... }: { imports = [ @@ -7,8 +7,6 @@ ./vscodium.nix ]; - - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; } diff --git a/users/willifan/desktop/dev/logic-analyzer.nix b/users/willifan/desktop/dev/logic-analyzer.nix index 081d099..e19a529 100644 --- a/users/willifan/desktop/dev/logic-analyzer.nix +++ b/users/willifan/desktop/dev/logic-analyzer.nix @@ -7,7 +7,6 @@ hardware.saleae-logic.enable = true; services.udev.packages = [ - pkgs.android-udev-rules (pkgs.writeTextFile { name = "sigrok"; text = '' @@ -430,4 +429,4 @@ }) ]; -} +} \ No newline at end of file