Organise modules into folders
40 files changed, 67 insertions(+), 67 deletions(-)
jump to
- marvin.nix
- modules/programs/accounting.nix
- modules/hardware/adb.nix
- modules/hardware/audio.nix
- modules/hardware/bare-metal.nix
- modules/configuration/berlin.nix
- modules/configuration/british-english.nix
- modules/hardware/colemak.nix
- modules/hardware/connman.nix
- modules/development/base.nix
- modules/programs/dotfiles.nix
- modules/programs/gnome.nix
- modules/hardware/grub2.nix
- modules/hardware/printing.nix
- modules/hardware/hidpi.nix
- modules/programs/i3.nix
- modules/programs/infrastructure.nix
- modules/hardware/intel-gpu.nix
- modules/development/javascript.nix
- modules/hardware/laptop.nix
- modules/development/lisp.nix
- modules/hardware/network-manager.nix
- modules/hardware/nitrokey.nix
- modules/configuration/nix.nix
- modules/programs/passwords.nix
- modules/programs/shell.nix
- modules/hardware/synaptics.nix
- modules/services/syncthing.nix
- modules/hardware/systemd-boot.nix
- modules/machines/t470s.nix
- modules/hardware/thinkpad.nix
- modules/hardware/trackball.nix
- modules/user-interface.nix
- modules/configuration/user.nix
- modules/programs/window-manager.nix
- modules/machines/x250.nix
- modules/services/xserver.nix
- modules/services/zeroconf.nix
- satoshipad.nix
M marvin.nix → marvin.nix
@@ -2,28 +2,29 @@ { config, pkgs, ... }: { imports = [ ./hardware-configuration.nix - ./modules/systemd-boot.nix - ./modules/audio.nix - ./modules/adb.nix - ./modules/syncthing.nix - ./modules/nitrokey.nix - ./modules/shell.nix - ./modules/dotfiles.nix - ./modules/berlin.nix - ./modules/colemak.nix - ./modules/trackball.nix - ./modules/british-english.nix - ./modules/x250.nix - ./modules/user.nix - ./modules/dev.nix - ./modules/lisp.nix - ./modules/javascript.nix - ./modules/infrastructure.nix - ./modules/accounting.nix - ./modules/passwords.nix - ./modules/network-manager.nix - ./modules/nix.nix - ./modules/i3.nix + + ./modules/configuration/berlin.nix + ./modules/configuration/british-english.nix + ./modules/configuration/nix.nix + ./modules/configuration/user.nix + ./modules/development/base.nix + ./modules/development/javascript.nix + ./modules/development/lisp.nix + ./modules/hardware/adb.nix + ./modules/hardware/audio.nix + ./modules/hardware/colemak.nix + ./modules/hardware/network-manager.nix + ./modules/hardware/nitrokey.nix + ./modules/hardware/systemd-boot.nix + ./modules/hardware/trackball.nix + ./modules/machines/x250.nix + ./modules/programs/accounting.nix + ./modules/programs/dotfiles.nix + ./modules/programs/i3.nix + ./modules/programs/infrastructure.nix + ./modules/programs/passwords.nix + ./modules/programs/shell.nix + ./modules/services/syncthing.nix ]; environment.systemPackages = with pkgs; [
A modules/hardware/printing.nix
@@ -0,0 +1,8 @@ +{ config, pkgs, lib, ... }: + +{ services.printing.enable = true; + + imports = [ + ../services/zeroconf.nix + ]; +}
M modules/laptop.nix → modules/hardware/laptop.nix
@@ -72,6 +72,6 @@ systemd.services.nixos-upgrade.unitConfig.ConditionACPower = true; systemd.services.nix-gc.unitConfig.ConditionACPower = true; imports = [ - ./user-interface.nix + ../user-interface.nix ]; }
D modules/printing.nix
@@ -1,8 +0,0 @@ -{ config, pkgs, ... }: - -{ services.printing.enable = true; - - imports = [ - ./zeroconf.nix - ]; -}
M modules/t470s.nix → modules/machines/t470s.nix
@@ -18,7 +18,8 @@ nvme-cli ]; imports = [ - ./intel-gpu.nix - ./thinkpad.nix + ../hardware/intel-gpu.nix + ../hardware/hidpi.nix + ../hardware/thinkpad.nix ]; }
M modules/thinkpad.nix → modules/hardware/thinkpad.nix
@@ -31,5 +31,6 @@ }; imports = [ ./bare-metal.nix + ./laptop.nix ]; }
M modules/user-interface.nix → modules/user-interface.nix
@@ -78,6 +78,6 @@ enable = true; }; imports = [ - ./xserver.nix + ./services/xserver.nix ]; }
M modules/x250.nix → modules/machines/x250.nix
@@ -1,9 +1,6 @@ { config, pkgs, ... }: -{ imports = [ - ./synaptics.nix - ]; - boot.extraModulePackages = with config.boot.kernelPackages; [ +{ boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];@@ -33,7 +30,8 @@ SATA_LINKPWR_BLACKLIST="host1" ''; imports = [ - ./intel-gpu.nix - ./thinkpad.nix + ../hardware/synaptics.nix + ../hardware/intel-gpu.nix + ../hardware/thinkpad.nix ]; }
M satoshipad.nix → satoshipad.nix
@@ -3,35 +3,34 @@ { imports = [ ./hardware-configuration.nix + ./private/default.nix + ./modules/base.nix - ./modules/grub2.nix - ./modules/audio.nix - ./modules/adb.nix - ./modules/syncthing.nix - ./modules/hidpi.nix - ./modules/nitrokey.nix - ./modules/shell.nix - ./modules/dotfiles.nix - ./modules/berlin.nix - ./modules/colemak.nix - ./modules/trackball.nix - ./modules/british-english.nix - ./modules/printing.nix - ./modules/t470s.nix - ./modules/user.nix - ./modules/dev.nix - ./modules/lisp.nix - ./modules/javascript.nix + ./modules/configuration/berlin.nix + ./modules/configuration/british-english.nix + ./modules/configuration/nix.nix + ./modules/configuration/user.nix + ./modules/development/base.nix + ./modules/development/javascript.nix + ./modules/development/lisp.nix + ./modules/hardware/adb.nix + ./modules/hardware/audio.nix + ./modules/hardware/colemak.nix + ./modules/hardware/grub2.nix + ./modules/hardware/network-manager.nix + ./modules/hardware/nitrokey.nix + ./modules/hardware/printing.nix + ./modules/hardware/trackball.nix + ./modules/machines/t470s.nix + ./modules/programs/accounting.nix + ./modules/programs/dotfiles.nix + ./modules/programs/gnome.nix + ./modules/programs/i3.nix + ./modules/programs/infrastructure.nix + ./modules/programs/passwords.nix + ./modules/programs/shell.nix ./modules/satoshipay.nix - ./modules/infrastructure.nix - ./modules/accounting.nix - ./modules/passwords.nix - ./modules/network-manager.nix - ./modules/zeroconf.nix - ./modules/nix.nix - ./modules/i3.nix - ./modules/gnome.nix - ./private/default.nix + ./modules/services/syncthing.nix ]; boot.initrd.luks.devices = [