diff --git a/flake.lock b/flake.lock index c6c0c55..b806d59 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1748664200, - "narHash": "sha256-D8sWEVVvxDBJsr8h26AGDfYjp56iKUIHCWaOKucDT2c=", + "lastModified": 1748405006, + "narHash": "sha256-pmt0SFjACJJAI8g8QU5arg2c9BXNZG9/okVwRSDJkG8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b7d07ac2748936643abe8192065a2156f1a46d6e", + "rev": "f9801a86d6603260940890c36650275090d1dceb", "type": "gitlab" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1748668774, - "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", + "lastModified": 1748391243, + "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", "owner": "nix-community", "repo": "home-manager", - "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", + "rev": "f5b12be834874f7661db4ced969a621ab2d57971", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748651104, - "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", + "lastModified": 1748318168, + "narHash": "sha256-pUDVxHarStrDYxd2tztz4SjNflzFxuMMEC3SK9WLUK8=", "owner": "notashelf", "repo": "nvf", - "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", + "rev": "74ba4d955976af1422ea1f095968e547db70aa04", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "stable": { "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/philipp@bodenheizung/default.nix b/homes/x86_64-linux/philipp@bodenheizung/default.nix index a0f09f9..6035b0e 100644 --- a/homes/x86_64-linux/philipp@bodenheizung/default.nix +++ b/homes/x86_64-linux/philipp@bodenheizung/default.nix @@ -6,6 +6,14 @@ }: with lib.${namespace}; { + home.pointerCursor = { + gtk.enable = true; + x11.enable = true; + package = pkgs.rose-pine-cursor; + name = "BreezeX-RosePine-Linux"; + size = 32; + }; + awesome-flake = { cli-apps = { fish = enabled; @@ -39,7 +47,6 @@ with lib.${namespace}; hotkeys = enabled; panel = enabled; spectacle = enabled; - cursor = enabled; }; }; } diff --git a/modules/home/desktop/cursor/default.nix b/modules/home/desktop/cursor/default.nix deleted file mode 100644 index 6687681..0000000 --- a/modules/home/desktop/cursor/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - pkgs, - lib, - namespace, - ... -}: -with lib; -with lib.${namespace}; -let - cfg = config.${namespace}.desktop.cursor; -in -{ - options.${namespace}.desktop.cursor = with types; { - enable = mkBoolOpt false "Whether or not to enable custom cursor settings."; - }; - - config = mkIf cfg.enable { - home.pointerCursor = { - gtk.enable = true; - x11.enable = true; - package = pkgs.rose-pine-cursor; - name = "BreezeX-RosePine-Linux"; - size = 32; - }; - - }; - -} diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index 3df24f2..c026274 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -4,10 +4,6 @@ ... }: { - home = { - username = "philipp"; - homeDirectory = "/home/philipp"; - stateVersion = lib.mkDefault (osConfig.system.stateVersion or "24.11"); - }; + home.stateVersion = lib.mkDefault (osConfig.system.stateVersion or "24.11"); } diff --git a/modules/nixos/cli/neovim/default.nix b/modules/nixos/cli/neovim/default.nix index b6c1c2b..81cf366 100644 --- a/modules/nixos/cli/neovim/default.nix +++ b/modules/nixos/cli/neovim/default.nix @@ -14,7 +14,6 @@ in enable = mkBoolOpt false "Whether or not to enable neovim."; }; config = mkIf cfg.enable { - environment.variables.EDITOR = "nvim"; programs.nvf = { enable = true; settings = { diff --git a/modules/nixos/cli/nh/default.nix b/modules/nixos/cli/nh/default.nix index fac140f..c9ee23e 100644 --- a/modules/nixos/cli/nh/default.nix +++ b/modules/nixos/cli/nh/default.nix @@ -19,7 +19,7 @@ in enable = true; clean.enable = true; clean.extraArgs = "--keep-since 4d --keep 3"; - flake = "${config.home-manager.users.philipp.home.homeDirectory}/Documents/nix-config"; + flake = "/home/philipp/Documents/nix-config"; }; }; diff --git a/modules/nixos/services/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix index 10dc6ec..a0b192e 100644 --- a/modules/nixos/services/ente-auth/default.nix +++ b/modules/nixos/services/ente-auth/default.nix @@ -27,8 +27,9 @@ in }; nginx = { - enable = mkEnableOption "Enable nginx for this service." // { - default = true; + enable = mkEnableOption "Enable nginx for this service." + // { + default = true; }; }; diff --git a/modules/nixos/system/sops/default.nix b/modules/nixos/system/sops/default.nix index 1c59153..310f234 100644 --- a/modules/nixos/system/sops/default.nix +++ b/modules/nixos/system/sops/default.nix @@ -18,7 +18,7 @@ in }; config = mkIf cfg.enable { - sops.age.keyFile = "${config.users.users.philipp.home}/.config/sops/age/keys.txt"; + sops.age.keyFile = "/home/philipp/.config/sops/age/keys.txt"; }; } diff --git a/packages/linkwarden/default.nix b/packages/linkwarden/default.nix index 2389e4c..9b77a52 100644 --- a/packages/linkwarden/default.nix +++ b/packages/linkwarden/default.nix @@ -14,8 +14,7 @@ nodejs, openssl, playwright-driver, - prisma, - prisma-engines, + prisma, prisma-engines, }: let @@ -129,6 +128,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru.tests = { inherit (nixosTests) linkwarden; };