update to 25.05

This commit is contained in:
Joakim Repomaa
2025-06-11 00:26:49 +03:00
parent 584380ef7f
commit e2c8ba9c3a
8 changed files with 15 additions and 31 deletions

16
flake.lock generated
View File

@@ -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"
}

View File

@@ -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";
};

View File

@@ -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 = {

View File

@@ -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)
'';
};

View File

@@ -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;

View File

@@ -16,7 +16,7 @@
pulse.enable = true;
jack.enable = true;
};
hardware.pulseaudio.enable = false;
services.pulseaudio.enable = false;
programs.steam = {
enable = true;

View File

@@ -113,7 +113,6 @@ in
locate = {
enable = true;
package = pkgs.plocate;
localuser = null;
};
};

View File

@@ -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;