diff --git a/flake.lock b/flake.lock index b806d59..c6c0c55 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1748405006, - "narHash": "sha256-pmt0SFjACJJAI8g8QU5arg2c9BXNZG9/okVwRSDJkG8=", + "lastModified": 1748664200, + "narHash": "sha256-D8sWEVVvxDBJsr8h26AGDfYjp56iKUIHCWaOKucDT2c=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f9801a86d6603260940890c36650275090d1dceb", + "rev": "b7d07ac2748936643abe8192065a2156f1a46d6e", "type": "gitlab" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1748391243, - "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", + "lastModified": 1748668774, + "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f5b12be834874f7661db4ced969a621ab2d57971", + "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748318168, - "narHash": "sha256-pUDVxHarStrDYxd2tztz4SjNflzFxuMMEC3SK9WLUK8=", + "lastModified": 1748651104, + "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", "owner": "notashelf", "repo": "nvf", - "rev": "74ba4d955976af1422ea1f095968e547db70aa04", + "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "stable": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1748421225, + "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/philipp@bodenheizung/default.nix b/homes/x86_64-linux/philipp@bodenheizung/default.nix index 6035b0e..a0f09f9 100644 --- a/homes/x86_64-linux/philipp@bodenheizung/default.nix +++ b/homes/x86_64-linux/philipp@bodenheizung/default.nix @@ -6,14 +6,6 @@ }: 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; @@ -47,6 +39,7 @@ 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 new file mode 100644 index 0000000..6687681 --- /dev/null +++ b/modules/home/desktop/cursor/default.nix @@ -0,0 +1,29 @@ +{ + 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 c026274..3df24f2 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -4,6 +4,10 @@ ... }: { - home.stateVersion = lib.mkDefault (osConfig.system.stateVersion or "24.11"); + home = { + username = "philipp"; + homeDirectory = "/home/philipp"; + 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 81cf366..b6c1c2b 100644 --- a/modules/nixos/cli/neovim/default.nix +++ b/modules/nixos/cli/neovim/default.nix @@ -14,6 +14,7 @@ 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 c9ee23e..fac140f 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 = "/home/philipp/Documents/nix-config"; + flake = "${config.home-manager.users.philipp.home.homeDirectory}/Documents/nix-config"; }; }; diff --git a/modules/nixos/services/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix index a0b192e..10dc6ec 100644 --- a/modules/nixos/services/ente-auth/default.nix +++ b/modules/nixos/services/ente-auth/default.nix @@ -27,9 +27,8 @@ 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 310f234..1c59153 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 = "/home/philipp/.config/sops/age/keys.txt"; + sops.age.keyFile = "${config.users.users.philipp.home}/.config/sops/age/keys.txt"; }; } diff --git a/packages/linkwarden/default.nix b/packages/linkwarden/default.nix index 9b77a52..2389e4c 100644 --- a/packages/linkwarden/default.nix +++ b/packages/linkwarden/default.nix @@ -14,7 +14,8 @@ nodejs, openssl, playwright-driver, - prisma, prisma-engines, + prisma, + prisma-engines, }: let @@ -128,7 +129,6 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.tests = { inherit (nixosTests) linkwarden; };