commit 7a834400775561badc56492687c5ac453e3be293
parent e7e12647b9065c19b31b24ba89f0f5df40cb1324
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Thu, 21 Aug 2025 21:27:46 +0200
parent e7e12647b9065c19b31b24ba89f0f5df40cb1324
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Thu, 21 Aug 2025 21:27:46 +0200
cleanup
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/config/home-manager/zaphyra/programs/shellUtilities.nix b/config/home-manager/zaphyra/programs/shellUtilities.nix @@ -61,9 +61,12 @@ dosfstools ] ++ lib.optionals pkgs.stdenv.isLinux [ - (pkgs.writeShellScriptBin "open" '' - ${pkgs.coreutils}/bin/nohup ${pkgs.xdg-utils}/bin/xdg-open "$@" > /dev/null 2>&1 - '') + (pkgs.writeShellScriptBin "open" (lib.concatStringsSep " " [ + (lib.getExe' pkgs.coreutils "nohup") + (lib.getExe' pkgs.xdg-utils "xdg-open") + "$@" + "> /dev/null 2>&1" + ])) usbutils pciutils
diff --git a/config/nixos/modules/presets/graphical/typeNiri.nix b/config/nixos/modules/presets/graphical/typeNiri.nix @@ -31,7 +31,7 @@ in greetd = { enable = true; greeter = lib.mkDefault "tuigreet"; - autoLogin.command = lib.mkDefault "niri-session"; + autoLogin.command = lib.mkDefault "niri-session -l"; }; }; };
diff --git a/config/nixos/modules/websites/grapevine.zaphyra.eu.nix b/config/nixos/modules/websites/grapevine.zaphyra.eu.nix @@ -1,7 +1,6 @@ { name, povSelf, - hostConfig, config, pkgs, lib, @@ -32,6 +31,7 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ { assertion = cfgWebsites."zaphyra.eu".enable == true;
diff --git a/flake.nix b/flake.nix @@ -26,7 +26,6 @@ pathLoader = inputs.haumea.lib.loaders.path; importLoader = inputs.haumea.lib.loaders.verbatim; - pkgsLoader = pkgs: (path: path: pkgs.callPackage path { }); loadDir = loader: src: inputs.haumea.lib.load { inherit src loader transformer; }; @@ -47,18 +46,11 @@ (inputs.haumea.lib.matchers.always pathLoader) ] ./secrets; - packages = tgcLib.forAllSystems { body = pkgs: loadDir (pkgsLoader pkgs) ./packages; }; - nixosModules.default = ./config/nixosModules.nix; homeManagerModules = loadDir pathLoader ./config/home-manager; - overlays = { - packages = final: prev: loadDir (path: path: final.callPackage path { }) ./packages; - }; - nixpkgsOverlays = [ - inputs.self.overlays.packages inputs.zaphyraWebsite.overlays.default inputs.stagit.overlays.default inputs.flauschehornSexy.overlays.default @@ -125,6 +117,7 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.sopsNix.nixosModules.sops inputs.grapevine.nixosModules.default + inputs.tgcNUR.nixosModules.default inputs.things.nixosModules.default