diff --git a/curacao/co2meter/default.nix b/curacao/co2meter/default.nix index 8f8357b..7b4fb19 100644 --- a/curacao/co2meter/default.nix +++ b/curacao/co2meter/default.nix @@ -19,6 +19,8 @@ let paho-mqtt pyaml ]; + pyproject = true; + build-system = [ pkgs.python3Packages.setuptools ]; }; usb_zytemp_udev = pkgs.stdenv.mkDerivation { pname = "usb-zytemp-udev-rules"; diff --git a/flake.lock b/flake.lock index 325ae26..bdc7bb7 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1761899396, - "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", + "lastModified": 1764627417, + "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", "owner": "nix-community", "repo": "disko", - "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", + "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -221,18 +221,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -242,16 +244,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "id": "home-manager", - "ref": "release-25.05", + "ref": "release-25.11", "type": "indirect" } }, @@ -338,11 +340,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -352,16 +354,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "type": "indirect" } }, @@ -399,11 +401,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -423,16 +425,16 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1762083835, - "narHash": "sha256-O5cqRhOiKDCHBZze4VJBZqRjX4B+DttSkAJcTEhDv1k=", + "lastModified": 1764755396, + "narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=", "owner": "nix-community", "repo": "nixvim", - "rev": "87abad151f662238ce9946895850609c1ca42a68", + "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -481,11 +483,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1762168729, - "narHash": "sha256-dChBf7402mBrjuNaARy23QAS+9WPK7I023jPmZTeDiI=", + "lastModified": 1764924152, + "narHash": "sha256-+4mV/0gqpxB3n5VMnQKbs0Lgwr5gm/eeMQNYKmQsHu0=", "owner": "nix-community", "repo": "NUR", - "rev": "e2cdcbcb30d44aa77fbf8a92e01f4ce668b9e642", + "rev": "4d4437b23ce717811abf782a6f64a9f6e7a7a9bd", "type": "github" }, "original": { @@ -503,15 +505,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1751320053, - "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -545,16 +546,16 @@ }, "onixpkgs": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "type": "indirect" } }, @@ -611,16 +612,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1761668239, - "narHash": "sha256-b0+7/5hBUsLjd/gMY9/LSEsvuWFFolHdpUAOlG73zmw=", + "lastModified": 1764836393, + "narHash": "sha256-J2jgYyXiXctr91MSuBQ6dwB1YaC7DpzKp+Rkj6pqS8o=", "owner": "danth", "repo": "stylix", - "rev": "a149a557dc306e76d53e7dd488826e61ef9c6289", + "rev": "6f3b50c8fa9c468fc787e211b700e46592bf9d56", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -721,11 +722,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -737,11 +738,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -753,11 +754,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -766,35 +767,13 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "unixpkgs": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 458204e..7e1c19b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { # Packages - onixpkgs.url = "nixpkgs/nixos-24.11"; - nixpkgs.url = "nixpkgs/nixos-25.05"; + onixpkgs.url = "nixpkgs/nixos-25.05"; + nixpkgs.url = "nixpkgs/nixos-25.11"; unixpkgs.url = "nixpkgs/nixos-unstable"; zelbarnixpkgs.url = "github:wlcx/nixpkgs/zelbar"; # OS @@ -15,21 +15,21 @@ nixos-hardware.url = "nixos-hardware"; # NOD nix-on-droid = { - url = "github:nix-community/nix-on-droid"; # No 25.05 yet + url = "github:nix-community/nix-on-droid"; # Doesn't have release branches anymore, unsure of project sttaus inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; # HM home-manager = { - url = "home-manager/release-25.05"; + url = "home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-25.05"; + url = "github:danth/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { - url = "github:nix-community/nixvim/nixos-25.05"; + url = "github:nix-community/nixvim/nixos-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; @@ -41,6 +41,7 @@ { self, nixpkgs, + onixpkgs, unixpkgs, zelbarnixpkgs, disko, @@ -64,12 +65,16 @@ self: super: let upkgs = import unixpkgs { inherit (super) system; }; + opkgs = import onixpkgs { inherit (super) system; }; in { - # hello = upkgs.hello; # Take package and dependencies: heavier + # inherit (upkgs) hello; # Take package and dependencies: heavier # hello = super.callPackage "${unixpkgs}/pkgs/by-name/he/hello/package.nix" { }; # Take package only: not always possible - zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { }; - fluffychat = upkgs.fluffychat; # unstable so we have 2.0 which doesn't have security warnings + zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { + zig = super.zig_0_14; + }; + inherit (opkgs) ansible-language-server; # Removed before 25.11 for annoying upstream reasons + # https://github.com/NixOS/nixpkgs/pull/445884/commits/713e8c57f16b0785bb4cdd88662078a742188f13 } ) ]; @@ -88,9 +93,9 @@ inherit system; specialArgs = attrs // { # Cherry-pick packages from other places without overlays. - upkgs = import unixpkgs { - inherit system; - }; + # Will not propagate to hm + upkgs = import unixpkgs { inherit system; }; + opkgs = import onixpkgs { inherit system; }; }; modules = modules ++ [ self.nixosModules.dotfiles diff --git a/hm/common.nix b/hm/common.nix index 2b636db..f30cd5f 100644 --- a/hm/common.nix +++ b/hm/common.nix @@ -63,12 +63,6 @@ oldestFile = ''${pkgs.findutils}/bin/find -type f -printf '%T+ %p\n' | sort | head''; }; tealdeer.enable = true; - thefuck = { - enable = true; - enableBashIntegration = true; - enableZshIntegration = true; - # TODO enableXIntegration options might not be needed anymore - }; lsd = { enable = true; # Don't want the default aliases diff --git a/hm/desktop/default.nix b/hm/desktop/default.nix index 9501400..9995730 100644 --- a/hm/desktop/default.nix +++ b/hm/desktop/default.nix @@ -161,7 +161,9 @@ gimp inkscape libreoffice - jellyfin-media-player # Does not prevent the screen from sleeping + # jellyfin-media-player # Does not prevent the screen from sleeping + # Commented out for 25.11 since qt5 webengine is insecure. + # 26.05 See if this changed. jellyfin-mpv-shim # No UI, needs remote # data management diff --git a/hm/desktop/frobar/default.nix b/hm/desktop/frobar/default.nix index 5110be4..8b98690 100644 --- a/hm/desktop/frobar/default.nix +++ b/hm/desktop/frobar/default.nix @@ -1,10 +1,13 @@ { zelbarnixpkgs ? builtins.getFlake "github:wlcx/nixpkgs/zelbar", - nixpkgs ? , + # nixpkgs ? , + nixpkgs ? builtins.getFlake "nixpkgs/nixos-25.11", pkgs ? import nixpkgs { overlays = [ (self: super: { - zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { }; + zelbar = super.callPackage "${zelbarnixpkgs}/pkgs/by-name/ze/zelbar/package.nix" { + zig = super.zig_0_14; + }; }) ]; }, diff --git a/hm/desktop/mpd/default.nix b/hm/desktop/mpd/default.nix index 7476de0..88eec3b 100644 --- a/hm/desktop/mpd/default.nix +++ b/hm/desktop/mpd/default.nix @@ -9,7 +9,7 @@ home = { packages = with pkgs; [ ashuffle - mpc-cli + mpc vimpc playerctl ]; diff --git a/hm/dev/common.nix b/hm/dev/common.nix index 9a07df6..f3e705b 100644 --- a/hm/dev/common.nix +++ b/hm/dev/common.nix @@ -1,4 +1,8 @@ -{ pkgs, config, ... }: +{ + pkgs, + config, + ... +}: { # TODO Maybe should be per-directory dotenv # Or not, for neovim @@ -50,7 +54,10 @@ ]; programs.nixvim.plugins.lsp.servers = { - ansiblels.enable = config.frogeye.dev.ansible; # Ansible + ansiblels = { + enable = config.frogeye.dev.ansible; # Ansible + package = pkgs.ansible-language-server; + }; bashls.enable = true; # Bash jsonls.enable = true; # JSON lua_ls.enable = true; # Lua (for Neovim debugging) diff --git a/hm/gaming/default.nix b/hm/gaming/default.nix index 8718b2d..27ce0c7 100644 --- a/hm/gaming/default.nix +++ b/hm/gaming/default.nix @@ -12,7 +12,7 @@ packages = with pkgs; [ # gaming # dolphin-emu # 25.11 Put back? Removed because mbedtls 2 is insecure - ryujinx + ryubing prismlauncher # TODO factorio diff --git a/hm/git/default.nix b/hm/git/default.nix index c97b27f..90841ac 100644 --- a/hm/git/default.nix +++ b/hm/git/default.nix @@ -43,11 +43,16 @@ in }) ]; programs = { + delta = { + enable = true; + options = { + line-numbers = true; + syntax-theme = "base16"; + }; + enableGitIntegration = true; + }; git = { package = pkgs.gitFull; - aliases = { - "git" = "!exec git"; # In case I write one too many git - }; ignores = [ "*.swp" "*.swo" @@ -55,20 +60,18 @@ in "tags" ".mypy_cache" ]; - delta = { - enable = true; - options = { - line-numbers = true; - syntax-theme = "base16"; - }; - }; # Also tried difftastic, and while I like the default theme it's a bit # less configurable lfs.enable = true; - userEmail = lib.mkDefault "geoffrey@frogeye.fr"; - userName = lib.mkDefault "Geoffrey Frogeye"; - extraConfig = - { + settings = { + aliases = { + "git" = "!exec git"; # In case I write one too many git + }; + user = { + email = lib.mkDefault "geoffrey@frogeye.fr"; + name = lib.mkDefault "Geoffrey Frogeye"; + }; + options = { core = { editor = "nvim"; }; @@ -78,6 +81,7 @@ in pull = { ff = "only"; }; + } // lib.optionalAttrs config.frogeye.desktop.xorg { diff.tool = "meld"; @@ -85,14 +89,14 @@ in "difftool \"meld\"".cmd = "${pkgs.meld}/bin/meld \"$LOCAL\" \"$REMOTE\""; # This escapes quotes, which isn't the case in the original, hoping this isn't an issue. }; + }; }; jujutsu = { enable = true; settings = { git.auto-local-bookmark = true; user = { - email = cfg.userEmail; - name = cfg.userName; + inherit (cfg.settings.user) email name; }; ui = { pager = "delta"; diff --git a/hm/ssh.nix b/hm/ssh.nix index d2b28cf..f93cea7 100644 --- a/hm/ssh.nix +++ b/hm/ssh.nix @@ -9,11 +9,13 @@ ''; programs.ssh = { enable = true; - controlMaster = "auto"; - controlPersist = "60s"; # Enough to cache Ansible stuff, not too long so I don't have remember which shenanigans I did with my last connection - # Ping the server frequently enough so it doesn't think we left (non-spoofable) - serverAliveInterval = 30; + enableDefaultConfig = false; # 26.05 I suppose this will be deprecated matchBlocks."*" = { + # Ping the server frequently enough so it doesn't think we left (non-spoofable) + serverAliveInterval = 30; + # Keep the connection alive for future connections, making further connections quicker + controlMaster = "auto"; + controlPersist = "300s"; # I have the reflex to rm ~/.ssh/master-* for shenanigans # Do not forward the agent (-A) to a machine by default, # as it is kinda a security concern forwardAgent = false; @@ -23,6 +25,15 @@ # Check SSHFP records VerifyHostKeyDNS = "yes"; }; + + # Previously default config Home-Manager config + # TODO See which is already SSH config, which we want to keep + addKeysToAgent = "no"; + compression = false; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlPath = "~/.ssh/master-%r@%n:%p"; }; }; }; diff --git a/hm/vim/default.nix b/hm/vim/default.nix index 22c7b67..519252c 100644 --- a/hm/vim/default.nix +++ b/hm/vim/default.nix @@ -185,7 +185,7 @@ }; imports = [ - nixvim.homeManagerModules.nixvim + nixvim.homeModules.nixvim ./code.nix ./completion.nix ./decoration.nix diff --git a/hm/vim/git.nix b/hm/vim/git.nix index 483ca38..e8a72e2 100644 --- a/hm/vim/git.nix +++ b/hm/vim/git.nix @@ -21,11 +21,13 @@ gitsigns.enable = true; # Show changed lines in the gutter gitlinker = { enable = true; # Copy URL of forge corresponding to cursor - callbacks = { - "code.techinc.nl" = "get_gitea_type_url"; - "git.frogeye.fr" = "get_gitea_type_url"; + settings = { + callbacks = { + "code.techinc.nl".__raw = "require('gitlinker.hosts').get_gitea_type_url"; + "git.frogeye.fr".__raw = "require('gitlinker.hosts').get_gitea_type_url"; + }; + opts.mappings = null; # This option doesn't work, hence manual mappings }; - mappings = null; # This option doesn't work, hence manual mappings }; }; }; diff --git a/os/common.nix b/os/common.nix index 5f0d29d..6a50057 100644 --- a/os/common.nix +++ b/os/common.nix @@ -51,6 +51,7 @@ nix = { gc = { + # TODO This does not actually collect user profiles, so shit accumulates automatic = true; persistent = true; options = "--delete-older-than 14d"; @@ -89,8 +90,7 @@ # Prevent power button from shutting down the computer. # On Pinebook it's too easy to hit, # on others I sometimes turn it off when unsuspending. - # FIXME 25.11 now services.logind.settings.Login - logind.extraConfig = "HandlePowerKey=ignore"; + logind.settings.Login.HandlePowerKey = "ignore"; udev.extraRules = '' # DYMO LabelPOINT 350 diff --git a/os/geoffrey.nix b/os/geoffrey.nix index b93a1cb..b1cdf66 100644 --- a/os/geoffrey.nix +++ b/os/geoffrey.nix @@ -5,6 +5,7 @@ home-manager, ... }: +# 25.11 Consider using home-manager.minimal to reduce evaluation { config = { users.users.root.initialHashedPassword = "$y$j9T$e64bjL7iyVlniEKwKbM9g0$cCn74za0r6L9QMO20Fdxz3/SX0yvhz3Xd6.2BhtbRL1"; # Not a real password diff --git a/os/password/default.nix b/os/password/default.nix index f2dcac5..08c0365 100644 --- a/os/password/default.nix +++ b/os/password/default.nix @@ -63,7 +63,7 @@ in ${lib.strings.concatLines (builtins.map installPasswordFileSandboxed passwordFiles)} ''; }; - extraSystemBuilderCmds = + systemBuilderCommands = let passwords = builtins.attrValues config.vivarium.passwords; readPasswordClear = @@ -167,7 +167,7 @@ in # TODO Find a better mechanism, maybe à la bootspec, or something compatible with cross-arch } ) - } $out/bin/ + } $out ''; }; vivarium.passwords = diff --git a/os/rebuild.sh b/os/rebuild.sh index e86b1a2..7a0d632 100644 --- a/os/rebuild.sh +++ b/os/rebuild.sh @@ -76,7 +76,7 @@ fi if [ "$verb" = "test" ] || [ "$verb" = "switch" ] || [ "$confirm" = "y" ] then info "Applying" - "$toplevel/bin/update-password-store" + "$toplevel/update-password-store" sudo nixos-rebuild --flake "$self#$HOSTNAME" test "${specialisationArgs[@]}" "$@" fi