From 28f72dee5b9a3f3e59e6e6d6599a989559fb313b Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Mon, 4 Dec 2023 20:22:56 -0500 Subject: [PATCH] there's no way this could go wrong! --- hosts/game-desktop/main.nix | 2 +- hosts/gerg-desktop/git.nix | 2 +- hosts/gerg-desktop/main.nix | 2 +- hosts/gerg-desktop/services/gitea.nix | 2 +- hosts/gerg-desktop/services/minecraft.nix | 2 +- hosts/gerg-desktop/services/nextcloud.nix | 2 +- hosts/gerg-desktop/services/nginx.nix | 2 +- hosts/gerg-desktop/services/parrot.nix | 2 +- hosts/gerg-desktop/services/postgresql.nix | 2 +- hosts/gerg-desktop/services/searxng.nix | 2 +- hosts/gerg-desktop/spicetify.nix | 2 +- hosts/gerg-desktop/vfio.nix | 2 +- hosts/gerg-desktop/zfs.nix | 2 +- hosts/iso/main.nix | 2 +- hosts/media-laptop/main.nix | 2 +- lib/default.nix | 8 ++++++-- modules/DE/dwm.nix | 2 +- modules/DE/gnome.nix | 2 +- modules/DE/xfce.nix | 2 +- modules/DM/autoLogin.nix | 2 +- modules/DM/lightDM.nix | 2 +- modules/X11.nix | 2 +- modules/boot.nix | 2 +- modules/builders.nix | 2 +- modules/hardware.nix | 2 +- modules/keys.nix | 2 +- modules/misc.nix | 2 +- modules/nix.nix | 2 +- modules/shell.nix | 2 +- modules/sops.nix | 2 +- modules/theming.nix | 2 +- 31 files changed, 36 insertions(+), 32 deletions(-) diff --git a/hosts/game-desktop/main.nix b/hosts/game-desktop/main.nix index 5cc46fc..6e36b02 100644 --- a/hosts/game-desktop/main.nix +++ b/hosts/game-desktop/main.nix @@ -121,5 +121,5 @@ _: ]; system.stateVersion = "23.05"; - _file = ./main.nix; + #_file } diff --git a/hosts/gerg-desktop/git.nix b/hosts/gerg-desktop/git.nix index 548a97f..fcd3939 100644 --- a/hosts/gerg-desktop/git.nix +++ b/hosts/gerg-desktop/git.nix @@ -23,5 +23,5 @@ _: commit.gpgsign = true; }; }; - _file = ./git.nix; + #_file } diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix index 2096151..befdc87 100644 --- a/hosts/gerg-desktop/main.nix +++ b/hosts/gerg-desktop/main.nix @@ -191,5 +191,5 @@ }; system.stateVersion = "23.05"; - _file = ./main.nix; + #_file } diff --git a/hosts/gerg-desktop/services/gitea.nix b/hosts/gerg-desktop/services/gitea.nix index 92cbb0a..5a90f21 100644 --- a/hosts/gerg-desktop/services/gitea.nix +++ b/hosts/gerg-desktop/services/gitea.nix @@ -30,5 +30,5 @@ _: createDatabase = true; }; }; - _file = ./gitea.nix; + #_file } diff --git a/hosts/gerg-desktop/services/minecraft.nix b/hosts/gerg-desktop/services/minecraft.nix index a884de0..129e817 100644 --- a/hosts/gerg-desktop/services/minecraft.nix +++ b/hosts/gerg-desktop/services/minecraft.nix @@ -100,5 +100,5 @@ ''; }; }; - _file = ./minecraft.nix; + #_file } diff --git a/hosts/gerg-desktop/services/nextcloud.nix b/hosts/gerg-desktop/services/nextcloud.nix index 6216b76..572913b 100644 --- a/hosts/gerg-desktop/services/nextcloud.nix +++ b/hosts/gerg-desktop/services/nextcloud.nix @@ -20,5 +20,5 @@ _: defaultPhoneRegion = "US"; }; }; - _file = ./nextcloud.nix; + #_file } diff --git a/hosts/gerg-desktop/services/nginx.nix b/hosts/gerg-desktop/services/nginx.nix index 4c75ea8..9e13755 100644 --- a/hosts/gerg-desktop/services/nginx.nix +++ b/hosts/gerg-desktop/services/nginx.nix @@ -67,5 +67,5 @@ _: 80 443 ]; - _file = ./nginx.nix; + #_file } diff --git a/hosts/gerg-desktop/services/parrot.nix b/hosts/gerg-desktop/services/parrot.nix index 3bafb60..b1a556e 100644 --- a/hosts/gerg-desktop/services/parrot.nix +++ b/hosts/gerg-desktop/services/parrot.nix @@ -19,5 +19,5 @@ _: RestartSec = "30s"; }; }; - _file = ./parrot.nix; + #_file } diff --git a/hosts/gerg-desktop/services/postgresql.nix b/hosts/gerg-desktop/services/postgresql.nix index 5c9367b..fdade54 100644 --- a/hosts/gerg-desktop/services/postgresql.nix +++ b/hosts/gerg-desktop/services/postgresql.nix @@ -19,5 +19,5 @@ _: settings.unix_socket_permissions = "0770"; }; - _file = ./postgresql.nix; + #_file } diff --git a/hosts/gerg-desktop/services/searxng.nix b/hosts/gerg-desktop/services/searxng.nix index 94c12c8..009212a 100644 --- a/hosts/gerg-desktop/services/searxng.nix +++ b/hosts/gerg-desktop/services/searxng.nix @@ -36,5 +36,5 @@ _: ui.theme_args.simple_style = "dark"; }; }; - _file = ./searxng.nix; + #_file } diff --git a/hosts/gerg-desktop/spicetify.nix b/hosts/gerg-desktop/spicetify.nix index 674381a..7c611df 100644 --- a/hosts/gerg-desktop/spicetify.nix +++ b/hosts/gerg-desktop/spicetify.nix @@ -31,5 +31,5 @@ in misc = "282a36"; }; }; - _file = ./spicetify.nix; + #_file } diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix index e0e877e..c68003e 100644 --- a/hosts/gerg-desktop/vfio.nix +++ b/hosts/gerg-desktop/vfio.nix @@ -193,5 +193,5 @@ in "L+ /var/lib/libvirt/hooks/qemu - - - - ${lib.getExe qemuHook}" "L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${./Windows.xml}" ]; - _file = ./vfio.nix; + #_file } diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix index a0a8d11..36de907 100644 --- a/hosts/gerg-desktop/zfs.nix +++ b/hosts/gerg-desktop/zfs.nix @@ -78,5 +78,5 @@ _: }; }; }; - _file = ./zfs.nix; + #_file } diff --git a/hosts/iso/main.nix b/hosts/iso/main.nix index a5e28b4..abafb28 100644 --- a/hosts/iso/main.nix +++ b/hosts/iso/main.nix @@ -42,5 +42,5 @@ }; sound.enable = false; - _file = ./default.nix; + #_file } diff --git a/hosts/media-laptop/main.nix b/hosts/media-laptop/main.nix index 5f80f3c..62267a5 100644 --- a/hosts/media-laptop/main.nix +++ b/hosts/media-laptop/main.nix @@ -87,5 +87,5 @@ _: size = 8 * 1024; } ]; - _file = ./main.nix; + #_file } diff --git a/lib/default.nix b/lib/default.nix index ccfd396..da7ba77 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -44,7 +44,11 @@ rec { (lib.removeSuffix ".nix") (lib.removePrefix "${toString path}/") ]; - value = name; + value = lib.pipe name [ + builtins.readFile + (builtins.replaceStrings (lib.singleton "#_f") (lib.singleton ''_file = "${name}";'')) + (builtins.toFile (builtins.baseNameOf path)) + ]; }) (listNixFilesRecursive path) ); @@ -149,5 +153,5 @@ rec { )) ]; - _file = ./default.nix; + #_file } diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index 9ee41f5..39095c0 100644 --- a/modules/DE/dwm.nix +++ b/modules/DE/dwm.nix @@ -110,5 +110,5 @@ ''; }; }; - _file = ./dwm.nix; + #_file } diff --git a/modules/DE/gnome.nix b/modules/DE/gnome.nix index 1347ba4..05bbeba 100644 --- a/modules/DE/gnome.nix +++ b/modules/DE/gnome.nix @@ -48,5 +48,5 @@ _: displayManager.defaultSession = "gnome"; }; }; - _file = ./gnome.nix; + #_file } diff --git a/modules/DE/xfce.nix b/modules/DE/xfce.nix index 1b2d5e2..701fda0 100644 --- a/modules/DE/xfce.nix +++ b/modules/DE/xfce.nix @@ -19,5 +19,5 @@ _: displayManager.defaultSession = "xfce"; }; }; - _file = ./xfce.nix; + #_file } diff --git a/modules/DM/autoLogin.nix b/modules/DM/autoLogin.nix index 370db70..d4c80e0 100644 --- a/modules/DM/autoLogin.nix +++ b/modules/DM/autoLogin.nix @@ -17,5 +17,5 @@ _: }; }; }; - _file = ./autoLogin.nix; + #_file } diff --git a/modules/DM/lightDM.nix b/modules/DM/lightDM.nix index b277d43..347cb66 100644 --- a/modules/DM/lightDM.nix +++ b/modules/DM/lightDM.nix @@ -43,5 +43,5 @@ }; }; }; - _file = ./lightDM.nix; + #_file } diff --git a/modules/X11.nix b/modules/X11.nix index bbd63fe..1a91b9f 100644 --- a/modules/X11.nix +++ b/modules/X11.nix @@ -10,5 +10,5 @@ _: excludePackages = [pkgs.xterm]; desktopManager.xterm.enable = false; }; - _file = ./X11.nix; + #_file } diff --git a/modules/boot.nix b/modules/boot.nix index bff425c..6531746 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -85,5 +85,5 @@ ''; }; }; - _file = ./misc.nix; + #_file } diff --git a/modules/builders.nix b/modules/builders.nix index dd4962a..e35fd5b 100644 --- a/modules/builders.nix +++ b/modules/builders.nix @@ -97,5 +97,5 @@ _: } ) ]; - _file = ./builders.nix; + #_file } diff --git a/modules/hardware.nix b/modules/hardware.nix index 1939ced..b5d6027 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -41,5 +41,5 @@ in }; } ]; - _file = ./hardware.nix; + #_file } diff --git a/modules/keys.nix b/modules/keys.nix index 5dcba98..550c7a7 100644 --- a/modules/keys.nix +++ b/modules/keys.nix @@ -12,5 +12,5 @@ _: gerg-desktop_fingerprint = "BQxvBOWsTw1gdNDR0KzrSRmbVhDrJdG05vYXkVmw8yA"; gerg_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8"; }; - _file = ./keys.nix; + #_file } diff --git a/modules/misc.nix b/modules/misc.nix index 555059a..b506600 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -59,5 +59,5 @@ _: # Useless with flakes (without configuring) programs.command-not-found.enable = false; }; - _file = ./misc.nix; + #_file } diff --git a/modules/nix.nix b/modules/nix.nix index 456edf2..a8b8c70 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -56,5 +56,5 @@ inputs: use-xdg-base-directories = true; auto-allocate-uids = true; }; - _file = ./nix.nix; + #_file } diff --git a/modules/shell.nix b/modules/shell.nix index 1fbc35e..da0bf16 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -159,5 +159,5 @@ }; }; }; - _file = ./shell.nix; + #_file } diff --git a/modules/sops.nix b/modules/sops.nix index 68ef3af..07dd08f 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -15,5 +15,5 @@ age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; }; }; - _file = ./sops.nix; + #_file } diff --git a/modules/theming.nix b/modules/theming.nix index e4ece35..e00fad5 100644 --- a/modules/theming.nix +++ b/modules/theming.nix @@ -98,5 +98,5 @@ in }; }) ]; - _file = ./theming.nix; + #_file }