diff --git a/flake.lock b/flake.lock index 1cd5907..042fcb6 100644 --- a/flake.lock +++ b/flake.lock @@ -441,16 +441,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -728,16 +728,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1749173751, - "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", + "lastModified": 1749494155, + "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", + "rev": "88331c17ba434359491e8d5889cce872464052c2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b6e3c63..9075c4f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nextcloud = { url = "github:onny/nixos-nextcloud-testumgebung"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,7 +18,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs = { nixpkgs.follows = "nixpkgs"; }; diff --git a/home/common/default.nix b/home/common/default.nix index 885c097..958f01e 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -7,7 +7,6 @@ ... }: { - nixpkgs.config.allowUnfree = true; imports = [ ../gnome ../custom-programs @@ -206,7 +205,7 @@ save = 100000; size = 100000; }; - initExtra = '' + initContent = '' . "${config.xdg.configHome}/zsh/init" ''; }; @@ -552,7 +551,7 @@ services.gpg-agent = with pkgs; { enable = true; enableSshSupport = true; - pinentryPackage = pinentry-gnome3; + pinentry.package = pinentry-gnome3; }; programs.gpg.scdaemonSettings = { diff --git a/home/common/dnote.nix b/home/common/dnote.nix index 9a83fb2..56dd197 100644 --- a/home/common/dnote.nix +++ b/home/common/dnote.nix @@ -37,7 +37,7 @@ in config = lib.mkIf cfg.enable { home.packages = [ client ]; home.shellAliases.dn = "dnote"; - programs.zsh.initExtra = '' + programs.zsh.initContent = '' fpath=(${completion}/lib/dnote/zsh-completion/completions $fpath) ''; }; diff --git a/home/jokke/default.nix b/home/jokke/default.nix index 8dae73b..ac4b230 100644 --- a/home/jokke/default.nix +++ b/home/jokke/default.nix @@ -83,14 +83,6 @@ package = deno; rootPattern = [ "deno.json" ]; } - { - name = "prismals"; - package = nodePackages."@prisma/language-server"; - rootPattern = [ - "package.json" - "deno.json" - ]; - } { name = "graphql"; package = nodePackages.graphql-language-service-cli; diff --git a/hosts/radish/desktop.nix b/hosts/radish/desktop.nix index 9501ff8..3d4c56c 100644 --- a/hosts/radish/desktop.nix +++ b/hosts/radish/desktop.nix @@ -16,7 +16,7 @@ pulse.enable = true; jack.enable = true; }; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; programs.steam = { enable = true; diff --git a/hosts/radish/packages.nix b/hosts/radish/packages.nix index 3fed1d0..8e79471 100644 --- a/hosts/radish/packages.nix +++ b/hosts/radish/packages.nix @@ -113,7 +113,6 @@ in locate = { enable = true; package = pkgs.plocate; - localuser = null; }; }; diff --git a/modules/services/readeck.nix b/modules/services/readeck.nix index 6e5814d..806407b 100644 --- a/modules/services/readeck.nix +++ b/modules/services/readeck.nix @@ -1,6 +1,5 @@ { lib, - inputs, config, pkgs, ... @@ -9,13 +8,8 @@ let cfg = config.services.readeck; secrets = config.age.secrets; fqdn = "${cfg.subdomain}.${config.networking.domain}"; - pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; in { - imports = [ - "${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/readeck.nix" - ]; - options.services.readeck = { subdomain = lib.mkOption { type = lib.types.str; @@ -25,7 +19,7 @@ in config = lib.mkIf cfg.enable { services = { readeck = { - package = pkgsUnstable.readeck; + package = pkgs.readeck; environmentFile = secrets.readeck.path; settings = { server.port = lib.mkDefault 8090;