repomaa/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 25.05

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock generated
View File

@@ -441,16 +441,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747688870, "lastModified": 1749154018,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863", "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -728,16 +728,16 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1749173751, "lastModified": 1749494155,
"narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", "rev": "88331c17ba434359491e8d5889cce872464052c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View File

@@ -2,7 +2,7 @@
inputs = { inputs = {
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; 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 = { nextcloud = {
url = "github:onny/nixos-nextcloud-testumgebung"; url = "github:onny/nixos-nextcloud-testumgebung";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -18,7 +18,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-25.05";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };

5
home/common/default.nix
View File

@@ -7,7 +7,6 @@
... ...
}: }:
{ {
nixpkgs.config.allowUnfree = true;
imports = [ imports = [
../gnome ../gnome
../custom-programs ../custom-programs
@@ -206,7 +205,7 @@
save = 100000; save = 100000;
size = 100000; size = 100000;
}; };
initExtra = '' initContent = ''
. "${config.xdg.configHome}/zsh/init" . "${config.xdg.configHome}/zsh/init"
''; '';
}; };
@@ -552,7 +551,7 @@
services.gpg-agent = with pkgs; { services.gpg-agent = with pkgs; {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentryPackage = pinentry-gnome3; pinentry.package = pinentry-gnome3;
}; };
programs.gpg.scdaemonSettings = { programs.gpg.scdaemonSettings = {

2
home/common/dnote.nix
View File

@@ -37,7 +37,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = [ client ]; home.packages = [ client ];
home.shellAliases.dn = "dnote"; home.shellAliases.dn = "dnote";
programs.zsh.initExtra = '' programs.zsh.initContent = ''
fpath=(${completion}/lib/dnote/zsh-completion/completions $fpath) fpath=(${completion}/lib/dnote/zsh-completion/completions $fpath)
''; '';
}; };

8
home/jokke/default.nix
View File

@@ -83,14 +83,6 @@
package = deno; package = deno;
rootPattern = [ "deno.json" ]; rootPattern = [ "deno.json" ];
} }
{
name = "prismals";
package = nodePackages."@prisma/language-server";
rootPattern = [
"package.json"
"deno.json"
];
}
{ {
name = "graphql"; name = "graphql";
package = nodePackages.graphql-language-service-cli; package = nodePackages.graphql-language-service-cli;

2
hosts/radish/desktop.nix
View File

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

1
hosts/radish/packages.nix
View File

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

8
modules/services/readeck.nix
View File

@@ -1,6 +1,5 @@
{ {
lib, lib,
inputs,
config, config,
pkgs, pkgs,
... ...
@@ -9,13 +8,8 @@ let
cfg = config.services.readeck; cfg = config.services.readeck;
secrets = config.age.secrets; secrets = config.age.secrets;
fqdn = "${cfg.subdomain}.${config.networking.domain}"; fqdn = "${cfg.subdomain}.${config.networking.domain}";
pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
in in
{ {
imports = [
"${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/readeck.nix"
];
options.services.readeck = { options.services.readeck = {
subdomain = lib.mkOption { subdomain = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@@ -25,7 +19,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services = { services = {
readeck = { readeck = {
package = pkgsUnstable.readeck; package = pkgs.readeck;
environmentFile = secrets.readeck.path; environmentFile = secrets.readeck.path;
settings = { settings = {
server.port = lib.mkDefault 8090; server.port = lib.mkDefault 8090;