From 14726d5c6d43f3af0955651d6ba4af484af05033 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Wed, 26 Jul 2023 12:32:10 -0400 Subject: [PATCH] host/default.nix -> host//main.nix add _file in all modules --- hosts/game-laptop/disko.nix | 1 + hosts/game-laptop/{default.nix => main.nix} | 2 ++ hosts/game-laptop/prime.nix | 1 + hosts/gerg-desktop/containers/minecraft.nix_ | 1 + hosts/gerg-desktop/containers/website.nix_ | 1 + hosts/gerg-desktop/disko.nix | 1 + hosts/gerg-desktop/{default.nix => main.nix} | 1 + hosts/gerg-desktop/parrot.nix | 1 + hosts/gerg-desktop/spicetify.nix | 1 + hosts/gerg-desktop/vfio.nix | 1 + hosts/gerg-desktop/zfs.nix | 1 + hosts/moms-laptop/disko.nix | 1 + hosts/moms-laptop/{default.nix => main.nix} | 3 +++ hosts/moms-laptop/printing.nix | 1 + installer/default.nix | 1 + lib/default.nix | 1 + modules/DE/dwm.nix | 1 + modules/DE/gnome.nix | 1 + modules/DE/xfce.nix | 1 + modules/DM/autoLogin.nix | 1 + modules/DM/lightDM.nix | 1 + modules/X11.nix | 1 + modules/boot/misc.nix | 1 + modules/boot/stage2patch.nix | 1 + modules/builders.nix | 1 + modules/git.nix | 1 + modules/hardware.nix | 1 + modules/keys.nix | 1 + modules/misc.nix | 1 + modules/nix.nix | 1 + modules/shell.nix | 1 + modules/sops.nix | 1 + modules/theming.nix | 1 + 33 files changed, 36 insertions(+) rename hosts/game-laptop/{default.nix => main.nix} (94%) rename hosts/gerg-desktop/{default.nix => main.nix} (99%) rename hosts/moms-laptop/{default.nix => main.nix} (95%) diff --git a/hosts/game-laptop/disko.nix b/hosts/game-laptop/disko.nix index 0874fd8..1653061 100644 --- a/hosts/game-laptop/disko.nix +++ b/hosts/game-laptop/disko.nix @@ -34,5 +34,6 @@ ]; }; }; + _file = ./disko.nix; }; } diff --git a/hosts/game-laptop/default.nix b/hosts/game-laptop/main.nix similarity index 94% rename from hosts/game-laptop/default.nix rename to hosts/game-laptop/main.nix index 73f1b9e..27e607f 100644 --- a/hosts/game-laptop/default.nix +++ b/hosts/game-laptop/main.nix @@ -47,6 +47,7 @@ _: { hostName = "game-laptop"; networkmanager.enable = true; }; + services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password"; #user managment sops.secrets.root.neededForUsers = true; users = { @@ -86,4 +87,5 @@ _: { ]; system.stateVersion = "23.05"; + _file = ./main.nix; } diff --git a/hosts/game-laptop/prime.nix b/hosts/game-laptop/prime.nix index 1bec23e..db8c704 100644 --- a/hosts/game-laptop/prime.nix +++ b/hosts/game-laptop/prime.nix @@ -23,5 +23,6 @@ _: {config, ...}: { Option "OffTime" "0" Option "BlankTime" "0" ''; + _file = ./prime.nix; }; } diff --git a/hosts/gerg-desktop/containers/minecraft.nix_ b/hosts/gerg-desktop/containers/minecraft.nix_ index 3a24b23..7926583 100644 --- a/hosts/gerg-desktop/containers/minecraft.nix_ +++ b/hosts/gerg-desktop/containers/minecraft.nix_ @@ -97,4 +97,5 @@ _: { }; }; }; + _file = ./minecraft.nix; } diff --git a/hosts/gerg-desktop/containers/website.nix_ b/hosts/gerg-desktop/containers/website.nix_ index 4d2eac0..507c15e 100644 --- a/hosts/gerg-desktop/containers/website.nix_ +++ b/hosts/gerg-desktop/containers/website.nix_ @@ -152,4 +152,5 @@ _: { }; }; }; + _file = ./website.nix; } diff --git a/hosts/gerg-desktop/disko.nix b/hosts/gerg-desktop/disko.nix index 8227fed..6cd3909 100644 --- a/hosts/gerg-desktop/disko.nix +++ b/hosts/gerg-desktop/disko.nix @@ -153,4 +153,5 @@ in { }; }; }; + _file = ./disko.nix; } diff --git a/hosts/gerg-desktop/default.nix b/hosts/gerg-desktop/main.nix similarity index 99% rename from hosts/gerg-desktop/default.nix rename to hosts/gerg-desktop/main.nix index b2580c9..97f661b 100644 --- a/hosts/gerg-desktop/default.nix +++ b/hosts/gerg-desktop/main.nix @@ -141,4 +141,5 @@ }; system.stateVersion = "23.05"; + _file = ./main.nix; } diff --git a/hosts/gerg-desktop/parrot.nix b/hosts/gerg-desktop/parrot.nix index 4df98e0..7374497 100644 --- a/hosts/gerg-desktop/parrot.nix +++ b/hosts/gerg-desktop/parrot.nix @@ -18,4 +18,5 @@ }; }; sops.secrets.discordenv = {}; + _file = ./sops.nix; } diff --git a/hosts/gerg-desktop/spicetify.nix b/hosts/gerg-desktop/spicetify.nix index 09a439b..04956e7 100644 --- a/hosts/gerg-desktop/spicetify.nix +++ b/hosts/gerg-desktop/spicetify.nix @@ -32,4 +32,5 @@ in { misc = "282a36"; }; }; + _file = ./spicetify.nix; } diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix index 22394a7..3e3be02 100644 --- a/hosts/gerg-desktop/vfio.nix +++ b/hosts/gerg-desktop/vfio.nix @@ -161,4 +161,5 @@ in { "L+ /var/lib/libvirt/hooks/qemu - - - - ${qemuHook}" "L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${./Windows.xml}" ]; + _file = ./vfio.nix; } diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix index d86e25d..92f5ceb 100644 --- a/hosts/gerg-desktop/zfs.nix +++ b/hosts/gerg-desktop/zfs.nix @@ -74,4 +74,5 @@ _: { autoScrub.enable = true; trim.enable = true; }; + _file = ./zfs.nix; } diff --git a/hosts/moms-laptop/disko.nix b/hosts/moms-laptop/disko.nix index cded87c..7e578fa 100644 --- a/hosts/moms-laptop/disko.nix +++ b/hosts/moms-laptop/disko.nix @@ -35,4 +35,5 @@ }; }; }; + _file = ./disko.nix; } diff --git a/hosts/moms-laptop/default.nix b/hosts/moms-laptop/main.nix similarity index 95% rename from hosts/moms-laptop/default.nix rename to hosts/moms-laptop/main.nix index 2c33831..aa27042 100644 --- a/hosts/moms-laptop/default.nix +++ b/hosts/moms-laptop/main.nix @@ -1,4 +1,5 @@ _: { + lib, pkgs, config, ... @@ -58,6 +59,7 @@ _: { }; }; }; + services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password"; boot = { initrd.availableKernelModules = ["xhci-pci" "ehci-pci" "ahci" "usbhid" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"]; kernelModules = ["kvm-intel"]; @@ -82,4 +84,5 @@ _: { size = 8 * 1024; } ]; + _file = ./main.nix; } diff --git a/hosts/moms-laptop/printing.nix b/hosts/moms-laptop/printing.nix index db3084b..2989920 100644 --- a/hosts/moms-laptop/printing.nix +++ b/hosts/moms-laptop/printing.nix @@ -17,4 +17,5 @@ _: {pkgs, ...}: { drivers = [pkgs.hplipWithPlugin]; }; }; + _file = ./printing.nix; } diff --git a/installer/default.nix b/installer/default.nix index 2f625e4..63c1e65 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -39,4 +39,5 @@ }; }; sound.enable = false; + _file = ./default.nix; } diff --git a/lib/default.nix b/lib/default.nix index df59597..a67cdda 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -59,4 +59,5 @@ in { }) (listNixFilesRecursive path) ); + _file = ./default.nix; } diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index 8151271..268c820 100644 --- a/modules/DE/dwm.nix +++ b/modules/DE/dwm.nix @@ -54,4 +54,5 @@ ; }; }; + _file = ./dwm.nix; } diff --git a/modules/DE/gnome.nix b/modules/DE/gnome.nix index 991b27a..300aff1 100644 --- a/modules/DE/gnome.nix +++ b/modules/DE/gnome.nix @@ -49,4 +49,5 @@ _: { displayManager.defaultSession = "gnome"; }; }; + _file = ./gnome.nix; } diff --git a/modules/DE/xfce.nix b/modules/DE/xfce.nix index eb30152..ccaafe8 100644 --- a/modules/DE/xfce.nix +++ b/modules/DE/xfce.nix @@ -17,4 +17,5 @@ _: { displayManager.defaultSession = "xfce"; }; }; + _file = ./xfce.nix; } diff --git a/modules/DM/autoLogin.nix b/modules/DM/autoLogin.nix index a1d949a..4180f7b 100644 --- a/modules/DM/autoLogin.nix +++ b/modules/DM/autoLogin.nix @@ -19,4 +19,5 @@ _: { }; }; }; + _file = ./autoLogin.nix; } diff --git a/modules/DM/lightDM.nix b/modules/DM/lightDM.nix index 8c88fec..da814c4 100644 --- a/modules/DM/lightDM.nix +++ b/modules/DM/lightDM.nix @@ -46,4 +46,5 @@ }; }; }; + _file = ./lightDM.nix; } diff --git a/modules/X11.nix b/modules/X11.nix index 57abd2b..66f4e04 100644 --- a/modules/X11.nix +++ b/modules/X11.nix @@ -67,4 +67,5 @@ in { } ) ]; + _file = ./X11.nix; } diff --git a/modules/boot/misc.nix b/modules/boot/misc.nix index 45eb58a..7dcd416 100644 --- a/modules/boot/misc.nix +++ b/modules/boot/misc.nix @@ -68,4 +68,5 @@ efibootmgr -t 0 ''; }; + _file = ./misc.nix; } diff --git a/modules/boot/stage2patch.nix b/modules/boot/stage2patch.nix index 99dd3ae..21799cc 100644 --- a/modules/boot/stage2patch.nix +++ b/modules/boot/stage2patch.nix @@ -31,4 +31,5 @@ let }; in { system.build.bootStage2 = lib.mkForce bootStage2; + _file = ./stage2patch.nix; } diff --git a/modules/builders.nix b/modules/builders.nix index 0abafbc..5d08426 100644 --- a/modules/builders.nix +++ b/modules/builders.nix @@ -95,4 +95,5 @@ _: { } ) ]; + _file = ./builders.nix; } diff --git a/modules/git.nix b/modules/git.nix index 59f5979..2b7c7e9 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -28,4 +28,5 @@ _: { }; }; }; + _file = ./git.nix; } diff --git a/modules/hardware.nix b/modules/hardware.nix index 6d0c3c1..940400e 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -54,4 +54,5 @@ in { }; } ]; + _file = ./hardware.nix; } diff --git a/modules/keys.nix b/modules/keys.nix index 9550ecb..93a604c 100644 --- a/modules/keys.nix +++ b/modules/keys.nix @@ -15,4 +15,5 @@ _: {lib, ...}: { gerg_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8"; }; }; + _file = ./keys.nix; } diff --git a/modules/misc.nix b/modules/misc.nix index b3def3d..9925027 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -40,4 +40,5 @@ _: { #time settings time.timeZone = "America/New_York"; }; + _file = ./misc.nix; } diff --git a/modules/nix.nix b/modules/nix.nix index c690677..09e6bc6 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -26,4 +26,5 @@ inputs: {pkgs, ...}: { environment.profiles = [ "\${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile" ]; + _file = ./nix.nix; } diff --git a/modules/shell.nix b/modules/shell.nix index e9c63bc..51ec81a 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -158,4 +158,5 @@ }; }; }; + _file = ./shell.nix; } diff --git a/modules/sops.nix b/modules/sops.nix index 81a547d..0ebe918 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -17,4 +17,5 @@ defaultSopsFile = "${self}/hosts/${config.networking.hostName}/secrets.yaml"; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; }; + _file = ./sops.nix; } diff --git a/modules/theming.nix b/modules/theming.nix index 8ecf7c5..6eb413e 100644 --- a/modules/theming.nix +++ b/modules/theming.nix @@ -98,4 +98,5 @@ in { }; }) ]; + _file = ./theming.nix; }