all repos — nixfiles @ 0a50d682ec85bf023bebd68a3ca388001f0c0677

System and user configuration, managed by nix and home-manager

mv modules settings
Alan Pearce alan@alanpearce.eu
Tue, 08 Oct 2019 21:44:57 +0200
commit

0a50d682ec85bf023bebd68a3ca388001f0c0677

parent

40fd4964068d0b7628b6f699dab4aec200eadb0a

81 files changed, 117 insertions(+), 117 deletions(-)

jump to
M system/marvin.nixsystem/marvin.nix
@@ -3,25 +3,25 @@ { imports = [
     ./hardware-configuration.nix
 
-    ./modules/base.nix
-    ./modules/configuration/berlin.nix
-    ./modules/configuration/british-english.nix
-    ./modules/configuration/nix.nix
-    ./modules/configuration/user.nix
-    ./modules/hardware/adb.nix
-    ./modules/hardware/audio.nix
-    ./modules/hardware/qwerty.nix
-    ./modules/hardware/network-manager.nix
-    ./modules/hardware/nitrokey.nix
-    ./modules/hardware/systemd-boot.nix
-    ./modules/hardware/trackball.nix
-    ./modules/hardware/trezor.nix
-    ./modules/machines/x250.nix
-    ./modules/programs/accounting.nix
-    ./modules/programs/i3.nix
-    ./modules/programs/infrastructure.nix
-    ./modules/programs/shell.nix
-    ./modules/services/syncthing.nix
+    ./settings/base.nix
+    ./settings/configuration/berlin.nix
+    ./settings/configuration/british-english.nix
+    ./settings/configuration/nix.nix
+    ./settings/configuration/user.nix
+    ./settings/hardware/adb.nix
+    ./settings/hardware/audio.nix
+    ./settings/hardware/qwerty.nix
+    ./settings/hardware/network-manager.nix
+    ./settings/hardware/nitrokey.nix
+    ./settings/hardware/systemd-boot.nix
+    ./settings/hardware/trackball.nix
+    ./settings/hardware/trezor.nix
+    ./settings/machines/x250.nix
+    ./settings/programs/accounting.nix
+    ./settings/programs/i3.nix
+    ./settings/programs/infrastructure.nix
+    ./settings/programs/shell.nix
+    ./settings/services/syncthing.nix
   ];
 
   networking = {
M system/prefect.nixsystem/prefect.nix
@@ -3,30 +3,30 @@ { imports = [
     ./hardware-configuration.nix
 
-    ./modules/satoshipay.nix
-    ./modules/base.nix
-    ./modules/configuration/berlin.nix
-    ./modules/configuration/british-english.nix
-    ./modules/configuration/nix.nix
-    ./modules/configuration/user.nix
-    ./modules/hardware/audio.nix
-    ./modules/hardware/bare-metal.nix
-    ./modules/hardware/mouse.nix
-    ./modules/hardware/systemd-boot.nix
-    ./modules/hardware/nvidia-gpu.nix
-    ./modules/hardware/trezor.nix
-    ./modules/services/zeroconf.nix
-    ./modules/user-interface.nix
-    ./modules/programs/accounting.nix
-    ./modules/programs/gnupg.nix
-    ./modules/programs/keybase.nix
-    ./modules/programs/i3.nix
-    ./modules/programs/infrastructure.nix
-    ./modules/programs/shell.nix
-    ./modules/gaming.nix
-    ./modules/programs/tor.nix
-    ./modules/programs/barrier.nix
-    ./modules/services/syncthing.nix
+    ./settings/satoshipay.nix
+    ./settings/base.nix
+    ./settings/configuration/berlin.nix
+    ./settings/configuration/british-english.nix
+    ./settings/configuration/nix.nix
+    ./settings/configuration/user.nix
+    ./settings/hardware/audio.nix
+    ./settings/hardware/bare-metal.nix
+    ./settings/hardware/mouse.nix
+    ./settings/hardware/systemd-boot.nix
+    ./settings/hardware/nvidia-gpu.nix
+    ./settings/hardware/trezor.nix
+    ./settings/services/zeroconf.nix
+    ./settings/user-interface.nix
+    ./settings/programs/accounting.nix
+    ./settings/programs/gnupg.nix
+    ./settings/programs/keybase.nix
+    ./settings/programs/i3.nix
+    ./settings/programs/infrastructure.nix
+    ./settings/programs/shell.nix
+    ./settings/gaming.nix
+    ./settings/programs/tor.nix
+    ./settings/programs/barrier.nix
+    ./settings/services/syncthing.nix
   ];
   boot.loader.efi.canTouchEfiVariables = pkgs.lib.mkForce false;
   services.xserver.screenSection = ''
M system/satoshipad.nixsystem/satoshipad.nix
@@ -5,26 +5,26 @@ imports = [     ./hardware-configuration.nix
     ./private/default.nix
 
-    ./modules/base.nix
-    ./modules/configuration/berlin.nix
-    ./modules/configuration/british-english.nix
-    ./modules/configuration/nix.nix
-    ./modules/configuration/user.nix
-    ./modules/hardware/audio.nix
-    ./modules/hardware/systemd-boot.nix
-    ./modules/hardware/keyboardio-model01.nix
-    ./modules/hardware/network-manager.nix
-    ./modules/hardware/qwerty.nix
-    ./modules/hardware/trackball.nix
-    ./modules/hardware/trezor.nix
-    ./modules/machines/t470s.nix
-    ./modules/programs/gnupg.nix
-    ./modules/programs/keybase.nix
-    ./modules/programs/tor.nix
-    ./modules/programs/i3.nix
-    ./modules/programs/infrastructure.nix
-    ./modules/programs/shell.nix
-    ./modules/satoshipay.nix
+    ./settings/base.nix
+    ./settings/configuration/berlin.nix
+    ./settings/configuration/british-english.nix
+    ./settings/configuration/nix.nix
+    ./settings/configuration/user.nix
+    ./settings/hardware/audio.nix
+    ./settings/hardware/systemd-boot.nix
+    ./settings/hardware/keyboardio-model01.nix
+    ./settings/hardware/network-manager.nix
+    ./settings/hardware/qwerty.nix
+    ./settings/hardware/trackball.nix
+    ./settings/hardware/trezor.nix
+    ./settings/machines/t470s.nix
+    ./settings/programs/gnupg.nix
+    ./settings/programs/keybase.nix
+    ./settings/programs/tor.nix
+    ./settings/programs/i3.nix
+    ./settings/programs/infrastructure.nix
+    ./settings/programs/shell.nix
+    ./settings/satoshipay.nix
   ];
 
   boot.initrd.luks.devices = [
M system/trillian.nixsystem/trillian.nix
@@ -4,8 +4,8 @@ {   imports = [
     ./private/default.nix
 
-    ./modules/programs/accounting.nix
-    ./modules/programs/shell.nix
+    ./settings/programs/accounting.nix
+    ./settings/programs/shell.nix
   ];
 
   nixpkgs.config = {
M user/prefect.nixuser/prefect.nix
@@ -2,24 +2,24 @@ { config, pkgs, ... }: 
 {
   imports = [
-    ./modules/base.nix
-    ./modules/dunst.nix
-    ./modules/emacs.nix
-    ./modules/development/base.nix
-    ./modules/development/lisp.nix
-    ./modules/gaming.nix
-    ./modules/git.nix
-    ./modules/gnupg.nix
-    ./modules/i3.nix
-    ./modules/javascript.nix
-    ./modules/nixos.nix
-    ./modules/rofi.nix
-    ./modules/passwords.nix
-    ./modules/satoshipay.nix
-    ./modules/sxhkd.nix
-    ./modules/tabnine.nix
-    ./modules/user-interface.nix
-    ./modules/xresources.nix
-    ./modules/zsh.nix
+    ./settings/base.nix
+    ./settings/dunst.nix
+    ./settings/emacs.nix
+    ./settings/development/base.nix
+    ./settings/development/lisp.nix
+    ./settings/gaming.nix
+    ./settings/git.nix
+    ./settings/gnupg.nix
+    ./settings/i3.nix
+    ./settings/javascript.nix
+    ./settings/nixos.nix
+    ./settings/rofi.nix
+    ./settings/passwords.nix
+    ./settings/satoshipay.nix
+    ./settings/sxhkd.nix
+    ./settings/tabnine.nix
+    ./settings/user-interface.nix
+    ./settings/xresources.nix
+    ./settings/zsh.nix
   ];
 }
M user/satoshipad.nixuser/satoshipad.nix
@@ -2,27 +2,27 @@ { config, pkgs, ... }: 
 {
   imports = [
-    ./modules/autorandr.nix
-    ./modules/base.nix
-    ./modules/development/base.nix
-    ./modules/dunst.nix
-    ./modules/emacs.nix
-    ./modules/git.nix
-    ./modules/gnupg.nix
-    ./modules/i3.nix
-    ./modules/isync.nix
-    ./modules/javascript.nix
-    ./modules/msmtp.nix
-    ./modules/nixos.nix
-    ./modules/rofi.nix
-    ./modules/passwords.nix
-    ./modules/satoshipay.nix
-    ./modules/sxhkd.nix
-    ./modules/tabnine.nix
-    ./modules/trezor.nix
-    ./modules/user-interface.nix
-    ./modules/xresources.nix
-    ./modules/zsh.nix
+    ./settings/autorandr.nix
+    ./settings/base.nix
+    ./settings/development/base.nix
+    ./settings/dunst.nix
+    ./settings/emacs.nix
+    ./settings/git.nix
+    ./settings/gnupg.nix
+    ./settings/i3.nix
+    ./settings/isync.nix
+    ./settings/javascript.nix
+    ./settings/msmtp.nix
+    ./settings/nixos.nix
+    ./settings/rofi.nix
+    ./settings/passwords.nix
+    ./settings/satoshipay.nix
+    ./settings/sxhkd.nix
+    ./settings/tabnine.nix
+    ./settings/trezor.nix
+    ./settings/user-interface.nix
+    ./settings/xresources.nix
+    ./settings/zsh.nix
   ];
 
   xsession.windowManager.i3 = {
M user/trillian.nixuser/trillian.nix
@@ -2,17 +2,17 @@ { config, pkgs, ... }: 
 {
   imports = [
-    ./modules/base.nix
-    ./modules/development/base.nix
-    ./modules/darwin.nix
-    ./modules/emacs.nix
-    ./modules/git.nix
-    ./modules/gnupg.nix
-    ./modules/javascript.nix
-    ./modules/nixpkgs.nix
-    ./modules/satoshipay.nix
-    ./modules/tabnine.nix
-    ./modules/trezor.nix
-    ./modules/zsh.nix
+    ./settings/base.nix
+    ./settings/development/base.nix
+    ./settings/darwin.nix
+    ./settings/emacs.nix
+    ./settings/git.nix
+    ./settings/gnupg.nix
+    ./settings/javascript.nix
+    ./settings/nixpkgs.nix
+    ./settings/satoshipay.nix
+    ./settings/tabnine.nix
+    ./settings/trezor.nix
+    ./settings/zsh.nix
   ];
 }