Create nested module hierarchy
8 files changed, 27 insertions(+), 15 deletions(-)
M marvin.nix → marvin.nix
@@ -3,8 +3,6 @@ { imports = [ ./hardware-configuration.nix ./modules/systemd-boot.nix - ./modules/laptop.nix - ./modules/thinkpad.nix ./modules/audio.nix ./modules/adb.nix ./modules/syncthing.nix@@ -14,13 +12,9 @@ ./modules/dotfiles.nix ./modules/berlin.nix ./modules/colemak.nix ./modules/trackball.nix - ./modules/xserver.nix ./modules/british-english.nix - ./modules/bare-metal.nix - ./modules/intel-gpu.nix ./modules/x250.nix ./modules/user.nix - ./modules/user-interface.nix ./modules/dev.nix ./modules/lisp.nix ./modules/javascript.nix@@ -28,8 +22,7 @@ ./modules/infrastructure.nix ./modules/accounting.nix ./modules/passwords.nix ./modules/network-manager.nix - ./modules/nix.nix - ./modules/window-manager.nix + ./modules/nix.nix ./modules/i3.nix ];
M modules/i3.nix → modules/i3.nix
@@ -9,4 +9,8 @@ environment.systemPackages = with pkgs; [ i3status i3lock-color ]; + + imports = [ + ./window-manager.nix + ]; }
M modules/laptop.nix → modules/laptop.nix
@@ -70,4 +70,8 @@ }; systemd.services.nixos-upgrade.unitConfig.ConditionACPower = true; systemd.services.nix-gc.unitConfig.ConditionACPower = true; + + imports = [ + ./user-interface.nix + ]; }
M modules/t470s.nix → modules/t470s.nix
@@ -16,4 +16,9 @@ environment.systemPackages = with pkgs; [ nvme-cli ]; + + imports = [ + ./intel-gpu.nix + ./thinkpad.nix + ]; }
M modules/thinkpad.nix → modules/thinkpad.nix
@@ -28,4 +28,8 @@ START_CHARGE_THRESH_BAT1=70 STOP_CHARGE_THRESH_BAT1=80 ''; }; + + imports = [ + ./bare-metal.nix + ]; }
M modules/user-interface.nix → modules/user-interface.nix
@@ -76,4 +76,8 @@ services.urxvtd = { enable = true; }; + + imports = [ + ./xserver.nix + ]; }
M modules/x250.nix → modules/x250.nix
@@ -31,4 +31,9 @@ # when re-attaching to AC whilst on. SATA_LINKPWR_ON_BAT=medium_power SATA_LINKPWR_BLACKLIST="host1" ''; + + imports = [ + ./intel-gpu.nix + ./thinkpad.nix + ]; }
M satoshipad.nix → satoshipad.nix
@@ -5,8 +5,6 @@ imports = [ ./hardware-configuration.nix ./modules/base.nix ./modules/grub2.nix - ./modules/laptop.nix - ./modules/thinkpad.nix ./modules/audio.nix ./modules/adb.nix ./modules/syncthing.nix@@ -17,14 +15,10 @@ ./modules/dotfiles.nix ./modules/berlin.nix ./modules/colemak.nix ./modules/trackball.nix - ./modules/xserver.nix ./modules/british-english.nix - ./modules/bare-metal.nix ./modules/printing.nix - ./modules/intel-gpu.nix ./modules/t470s.nix ./modules/user.nix - ./modules/user-interface.nix ./modules/dev.nix ./modules/lisp.nix ./modules/javascript.nix@@ -36,7 +30,6 @@ ./modules/network-manager.nix ./modules/zeroconf.nix ./modules/nix.nix ./modules/i3.nix - ./modules/window-manager.nix ./modules/gnome.nix ./private/default.nix ];