Kabbone/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to 25.05

Browse Source
This commit is contained in:
Kabbone 2025-05-26 17:26:33 +02:00
parent 77dbece69a
commit c0e0174e21
Signed by: Kabbone
SSH Key Fingerprint: SHA256:A5zPB5I6u5V78V51c362BBdCwhDhfDUVbt7NfKdjWBY
5 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
flake.lock generated
View File

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1745630506, "lastModified": 1747575206,
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "96e078c646b711aee04b82ba01aefbff87004ded", "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,11 +165,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747439237, "lastModified": 1748227609,
"narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -185,16 +185,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747331121, "lastModified": 1748226808,
"narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
"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"
} }
@ -222,11 +222,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747382851, "lastModified": 1747990026,
"narHash": "sha256-zG8t3TGO1xtpLyVjifTfWjuJk/FeEG8SxdlS6KcrMww=", "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "d5b45fe76efba6c9d4f728f0010a08026fd00f76", "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1747417232, "lastModified": 1748260747,
"narHash": "sha256-7Ii0POxd3S/q9iOoZdYJORINP6yQYu/GO0d7emNvr+I=", "narHash": "sha256-V3ONd70wm55JxcUa1rE0JU3zD+Cz7KK/iSVhRD7lq68=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "5beafebf8bcee75aebf23ca6ec46d13d471b0146", "rev": "b6c5dfc2a1c7614c94fd2c5d2e8578fd52396f3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +307,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1747129300, "lastModified": 1747900541,
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e81fd167b33121269149c57806599045fd33eeed", "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,27 +323,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747209494, "lastModified": 1748162331,
"narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d736263df906c5da72ab0f372427814de2f52f8", "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
"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"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1747327360, "lastModified": 1748026106,
"narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -12,7 +12,7 @@
inputs = # All flake references used to build my NixOS setup. These are dependencies. inputs = # All flake references used to build my NixOS setup. These are dependencies.
{ {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
microvm = { microvm = {
@ -23,7 +23,7 @@
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
home-manager = { # User Package Management home-manager = { # User Package Management
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

2
modules/services/printer/klipper.nix
View File

@ -14,7 +14,7 @@
group = "moonraker"; group = "moonraker";
configFile = ./printer.cfg; configFile = ./printer.cfg;
mutableConfig = true; mutableConfig = true;
mutableConfigFolder = "/var/lib/moonraker/config"; ConfigDir = "/var/lib/moonraker/config";
firmwares."sovol06" = { firmwares."sovol06" = {
serial = "/dev/serial/by-id/usb-1a86_USB_Serial-if00-port0"; serial = "/dev/serial/by-id/usb-1a86_USB_Serial-if00-port0";
enableKlipperFlash = true; enableKlipperFlash = true;

11
modules/services/server/matrix.nix
View File

@ -19,7 +19,6 @@ let
in { in {
environment.systemPackages = [ environment.systemPackages = [
pkgs.mautrix-whatsapp pkgs.mautrix-whatsapp
pkgs.signald
pkgs.mautrix-signal pkgs.mautrix-signal
]; ];
@ -127,15 +126,14 @@ in {
mautrix-signal = { mautrix-signal = {
description = "Matrix <-> Signal bridge"; description = "Matrix <-> Signal bridge";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" "postgresql.service" "matrix-synapse.service" "signald.service" ]; after = [ "network.target" "postgresql.service" "matrix-synapse.service" ];
requires = [ "postgresql.service" "matrix-synapse.service" "signald.service"]; requires = [ "postgresql.service" "matrix-synapse.service" ];
script = "${pkgs.mautrix-signal}/bin/mautrix-signal -n --config ${config.age.secrets."services/matrix/mautrix-signal.yml".path}"; script = "${pkgs.mautrix-signal}/bin/mautrix-signal -n --config ${config.age.secrets."services/matrix/mautrix-signal.yml".path}";
serviceConfig = { serviceConfig = {
User = "mautrix-signal"; User = "mautrix-signal";
Group = "mautrix-signal"; Group = "mautrix-signal";
Environment = "HOME=/var/lib/mautrix-signal"; Environment = "HOME=/var/lib/mautrix-signal";
ReadWritePaths= [ ReadWritePaths= [
"/var/run/signald/signald.sock"
"/var/log/mautrix-signal" "/var/log/mautrix-signal"
]; ];
NoNewPrivileges=true; NoNewPrivileges=true;
@ -254,11 +252,6 @@ in {
}; };
}; };
}; };
signald = {
enable = true;
user = "mautrix-signal";
group = "mautrix-signal";
};
}; };
age.secrets."services/matrix/synapse.yml" = { age.secrets."services/matrix/synapse.yml" = {

4
modules/shell/zsh.nix
View File

@ -19,14 +19,12 @@
custom = "$HOME/.config/zsh_nix/custom"; custom = "$HOME/.config/zsh_nix/custom";
}; };
initExtraFirst = '' # very first inits in zshrc initContent = ''
if [[ $DISPLAY ]]; then if [[ $DISPLAY ]]; then
[[ $- != *i* ]] && return [[ $- != *i* ]] && return
[[ -z "$TMUX" ]] && (tmux attach || tmux new-session) [[ -z "$TMUX" ]] && (tmux attach || tmux new-session)
fi fi
'';
initExtra = '' # Zsh theme
# Spaceship # Spaceship
source ${pkgs.spaceship-prompt}/share/zsh/site-functions/prompt_spaceship_setup source ${pkgs.spaceship-prompt}/share/zsh/site-functions/prompt_spaceship_setup
autoload -U promptinit; promptinit autoload -U promptinit; promptinit