diff --git a/home/common/default.nix b/home/common/default.nix deleted file mode 100644 index 2c63c085..00000000 --- a/home/common/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/home/opdavies/default.nix b/home/opdavies/default.nix index 6b64526f..dce140ca 100644 --- a/home/opdavies/default.nix +++ b/home/opdavies/default.nix @@ -30,7 +30,6 @@ in { imports = [ - ../common ./home.nix ./modules ] diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix index b3de6491..8e34b2d5 100644 --- a/hosts/PW05CH3L/configuration.nix +++ b/hosts/PW05CH3L/configuration.nix @@ -3,6 +3,7 @@ { imports = [ ../../modules/editor/nvim.nix + ../../modules/mixins/common ../../modules/mixins/direnv.nix ../../modules/mixins/docker.nix ../../modules/mixins/fzf.nix @@ -15,7 +16,6 @@ ./modules/notes.nix ./modules/wiki.nix - ../common ../../users/opdavies ]; diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix index 45553941..6af2a7c6 100644 --- a/hosts/lemp11/configuration.nix +++ b/hosts/lemp11/configuration.nix @@ -7,9 +7,9 @@ ./programs.nix ./services.nix + ../../modules/mixins/common ../../modules/mixins/zsh - ../common ../../users/opdavies ../../users/eric ../../users/luke diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix index 1a7a9efc..d3de3a07 100644 --- a/hosts/nixedo/configuration.nix +++ b/hosts/nixedo/configuration.nix @@ -10,6 +10,7 @@ ./secrets.nix ./services.nix + ../../modules/mixins/common ../../modules/mixins/docker.nix ../../modules/mixins/zsh @@ -21,7 +22,6 @@ ./modules/jellyfin.nix ./modules/paperless.nix - ../common ../../users/opdavies ]; diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index 27d42ed5..8e1021a5 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -9,6 +9,7 @@ ../../modules/editor/nvim.nix ../../modules/mixins/bluetooth.nix + ../../modules/mixins/common ../../modules/mixins/direnv.nix ../../modules/mixins/docker.nix ../../modules/mixins/flameshot.nix @@ -27,7 +28,6 @@ ../../modules/profiles/dwm ../../modules/profiles/xbanish.nix - ../common ../../users/opdavies ./modules/neomutt.nix diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix index 697a21ff..9b947f7a 100644 --- a/hosts/t490/configuration.nix +++ b/hosts/t490/configuration.nix @@ -9,7 +9,8 @@ ./services ./users.nix - ../common + ../../modules/mixins/common + ../../users/opdavies ]; diff --git a/hosts/common/default.nix b/modules/mixins/common/default.nix similarity index 100% rename from hosts/common/default.nix rename to modules/mixins/common/default.nix diff --git a/hosts/common/programs.nix b/modules/mixins/common/programs.nix similarity index 100% rename from hosts/common/programs.nix rename to modules/mixins/common/programs.nix