diff options
Diffstat (limited to '')
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | module-list.nix | 15 | ||||
| -rw-r--r-- | nixos/modules/keyboard.nix (renamed from modules/keyboard.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/linode.nix (renamed from modules/linode.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 15 | ||||
| -rw-r--r-- | nixos/modules/overlays.nix (renamed from modules/overlays.nix) | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/dwm.nix (renamed from modules/programs/dwm.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/services/catbus-bridge-snapcast.nix (renamed from modules/services/catbus-bridge-snapcast.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/services/dlnatoad.nix (renamed from modules/services/dlnatoad.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/services/helix-player.nix (renamed from modules/services/helix-player.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/services/mosquitto.nix (renamed from modules/services/mosquitto.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/services/snapclient.nix (renamed from modules/services/snapclient.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/services/ssh.nix (renamed from modules/services/ssh.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/services/upmpdcli.nix (renamed from modules/services/upmpdcli.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/users.nix (renamed from modules/users.nix) | 0 | ||||
| -rw-r--r-- | nixos/modules/yubikey.nix (renamed from modules/yubikey.nix) | 0 |
16 files changed, 17 insertions, 17 deletions
diff --git a/default.nix b/default.nix index eaa207e..c49b17d 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ { modules = { - require = import ./module-list.nix; + require = import ./nixos/modules/module-list.nix; }; overlays = import ./pkgs; diff --git a/module-list.nix b/module-list.nix deleted file mode 100644 index adcf014..0000000 --- a/module-list.nix +++ /dev/null @@ -1,15 +0,0 @@ -[ - ./modules/keyboard.nix - ./modules/linode.nix - ./modules/overlays.nix - ./modules/programs/dwm.nix - ./modules/services/catbus-bridge-snapcast.nix - ./modules/services/dlnatoad.nix - ./modules/services/helix-player.nix - ./modules/services/mosquitto.nix - ./modules/services/snapclient.nix - ./modules/services/ssh.nix - ./modules/services/upmpdcli.nix - ./modules/users.nix - ./modules/yubikey.nix -] diff --git a/modules/keyboard.nix b/nixos/modules/keyboard.nix index 69ab14a..69ab14a 100644 --- a/modules/keyboard.nix +++ b/nixos/modules/keyboard.nix diff --git a/modules/linode.nix b/nixos/modules/linode.nix index d70c929..d70c929 100644 --- a/modules/linode.nix +++ b/nixos/modules/linode.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix new file mode 100644 index 0000000..3985e25 --- /dev/null +++ b/nixos/modules/module-list.nix @@ -0,0 +1,15 @@ +[ + ./keyboard.nix + ./linode.nix + ./overlays.nix + ./programs/dwm.nix + ./services/catbus-bridge-snapcast.nix + ./services/dlnatoad.nix + ./services/helix-player.nix + ./services/mosquitto.nix + ./services/snapclient.nix + ./services/ssh.nix + ./services/upmpdcli.nix + ./users.nix + ./yubikey.nix +] diff --git a/modules/overlays.nix b/nixos/modules/overlays.nix index 423275c..7820e96 100644 --- a/modules/overlays.nix +++ b/nixos/modules/overlays.nix @@ -7,7 +7,7 @@ let mozilla = import (builtins.fetchTarball "https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz"); - eth = import ../pkgs; + eth = import ../../pkgs; in { options.eth.overlays = { diff --git a/modules/programs/dwm.nix b/nixos/modules/programs/dwm.nix index c158a5e..c158a5e 100644 --- a/modules/programs/dwm.nix +++ b/nixos/modules/programs/dwm.nix diff --git a/modules/services/catbus-bridge-snapcast.nix b/nixos/modules/services/catbus-bridge-snapcast.nix index 6e7badf..6e7badf 100644 --- a/modules/services/catbus-bridge-snapcast.nix +++ b/nixos/modules/services/catbus-bridge-snapcast.nix diff --git a/modules/services/dlnatoad.nix b/nixos/modules/services/dlnatoad.nix index 8f50c72..8f50c72 100644 --- a/modules/services/dlnatoad.nix +++ b/nixos/modules/services/dlnatoad.nix diff --git a/modules/services/helix-player.nix b/nixos/modules/services/helix-player.nix index 977e263..977e263 100644 --- a/modules/services/helix-player.nix +++ b/nixos/modules/services/helix-player.nix diff --git a/modules/services/mosquitto.nix b/nixos/modules/services/mosquitto.nix index fecf8a4..fecf8a4 100644 --- a/modules/services/mosquitto.nix +++ b/nixos/modules/services/mosquitto.nix diff --git a/modules/services/snapclient.nix b/nixos/modules/services/snapclient.nix index 9f93131..9f93131 100644 --- a/modules/services/snapclient.nix +++ b/nixos/modules/services/snapclient.nix diff --git a/modules/services/ssh.nix b/nixos/modules/services/ssh.nix index d965472..d965472 100644 --- a/modules/services/ssh.nix +++ b/nixos/modules/services/ssh.nix diff --git a/modules/services/upmpdcli.nix b/nixos/modules/services/upmpdcli.nix index d301a49..d301a49 100644 --- a/modules/services/upmpdcli.nix +++ b/nixos/modules/services/upmpdcli.nix diff --git a/modules/users.nix b/nixos/modules/users.nix index ea08cf5..ea08cf5 100644 --- a/modules/users.nix +++ b/nixos/modules/users.nix diff --git a/modules/yubikey.nix b/nixos/modules/yubikey.nix index 0c16807..0c16807 100644 --- a/modules/yubikey.nix +++ b/nixos/modules/yubikey.nix |