diff --git a/base/gui-programs.nix b/base/gui-programs.nix index 7057c85..a3d86ab 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -47,7 +47,7 @@ in { }; }; - logind.lidSwitch = "suspend"; + logind.settings.Login.HandleLidSwitch = "suspend"; printing = { enable = true; @@ -71,7 +71,7 @@ in { obs-studio pavucontrol spotify - tdesktop + telegram-desktop thunderbird virt-manager xcolor diff --git a/flake.lock b/flake.lock index 1f387d7..0b5e66e 100644 --- a/flake.lock +++ b/flake.lock @@ -81,24 +81,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -127,50 +109,27 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, - "jujutsu": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1762395739, - "narHash": "sha256-YUrjP2tzABdy4eAV1hPmgYWU8ChcJ5B4IlmQUGm95ro=", - "owner": "jj-vcs", - "repo": "jj", - "rev": "aa2b76978c4a23cb01c61629a11b1254af3ad0d9", - "type": "github" - }, - "original": { - "owner": "jj-vcs", - "ref": "v0.35.0", - "repo": "jj", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -230,16 +189,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -250,33 +209,11 @@ "disko": "disko", "flake-utils": "flake-utils", "home-manager": "home-manager_2", - "jujutsu": "jujutsu", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable-small": "nixpkgs-unstable-small" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "jujutsu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755139244, - "narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -306,21 +243,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9a1ee4d..06a71ce 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-25.05"; + ref = "nixos-25.11"; }; nixpkgs-unstable-small = { @@ -25,7 +25,7 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-25.05"; + ref = "release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -49,14 +49,6 @@ repo = "disko"; ref = "master"; }; - - jujutsu = { - type = "github"; - owner = "jj-vcs"; - repo = "jj"; - ref = "v0.35.0"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -99,7 +91,6 @@ }) agenix.overlays.default - inputs.jujutsu.overlays.default ] ++ builtins.attrValues self.overlays; sharedModules = diff --git a/home/git.nix b/home/git.nix index 11a57ae..a70301c 100644 --- a/home/git.nix +++ b/home/git.nix @@ -17,19 +17,18 @@ in { config = mkIf cfg.enable { programs.git = { enable = true; - - delta = { - enable = true; - options = { - syntax-theme = "Solarized (light)"; - }; - }; lfs.enable = true; - userEmail = "antoine@alarsyo.net"; - userName = "Antoine Martin"; - - extraConfig = { + settings = { + user = { + name = "Antoine Martin"; + email = "antoine@alarsyo.net"; + }; + alias = { + push-wip = "push -o ci.skip"; + push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch"; + push-mr = "push -o merge_request.create -o merge_request.remove_source_branch"; + }; commit = {verbose = true;}; core = {editor = "vim";}; init = {defaultBranch = "main";}; @@ -38,12 +37,6 @@ in { maintenance.prefetch.enabled = false; }; - aliases = { - push-wip = "push -o ci.skip"; - push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch"; - push-mr = "push -o merge_request.create -o merge_request.remove_source_branch"; - }; - includes = [ { condition = "gitdir:~/work/lrde/"; @@ -64,5 +57,13 @@ in { "/.envrc" ]; }; + + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + syntax-theme = "Solarized (light)"; + }; + }; }; } diff --git a/home/ssh.nix b/home/ssh.nix index 12e11a2..5182bbf 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -18,6 +18,7 @@ in { config = mkIf cfg.enable { programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = let addGPGAgentForwarding = hostConf: diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index 5f5355b..111d188 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -24,6 +24,13 @@ in { devices = ["/dev/sda" "/dev/sdb"]; }; + # TODO: I've setup the address to avoid a spurious failure of the `mdmonitor` + # systemd unit, but sending email is not actually setup on this server. Might + # need to setup Postfix or msmtp + boot.swraid.mdadmConf = '' + MAILADDR=antoine@alarsyo.net + ''; + boot.tmp.useTmpfs = true; networking.hostName = "hades"; # Define your hostname. diff --git a/hosts/hades/secrets.nix b/hosts/hades/secrets.nix index eb0fa3b..9b78412 100644 --- a/hosts/hades/secrets.nix +++ b/hosts/hades/secrets.nix @@ -36,10 +36,6 @@ "paperless/admin-password" = {}; "paperless/secret-key" = {}; - "pleroma/pleroma-config" = { - owner = "pleroma"; - }; - "restic-backup/hades-credentials" = {}; "restic-backup/hades-password" = {}; diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 8a189d3..2d46892 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -95,7 +95,7 @@ in { }; }; fonts = { - names = ["Iosevka Fixed" "FontAwesome6Free"]; + names = ["Iosevka Fixed" "FontAwesome7FreeSolid"]; size = 9.0; }; bars = []; @@ -207,12 +207,12 @@ in { # FIXME: belongs elsewhere services = { logind = { - lidSwitch = "suspend"; - lidSwitchExternalPower = "ignore"; - extraConfig = '' - IdleAction=suspend - IdleActionSec=10min - ''; + settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchExternalPower = "ignore"; + IdleAction = "suspend"; + IdleActionSec = "10min"; + }; }; upower.enable = true; }; diff --git a/services/nextcloud.nix b/services/nextcloud.nix index b46ab7a..9bd8bb5 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -62,7 +62,7 @@ in { hostName = "cloud.${domain}"; https = true; - package = pkgs.nextcloud31; + package = pkgs.nextcloud32; maxUploadSize = "1G"; diff --git a/services/transmission.nix b/services/transmission.nix index 8f29018..05d8821 100644 --- a/services/transmission.nix +++ b/services/transmission.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let inherit @@ -47,6 +48,7 @@ in { services.transmission = { enable = true; + package = pkgs.transmission_4; group = "media"; settings = {