diff --git a/common/desktop.nix b/common/desktop.nix
index cf16871..b8a467e 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -66,6 +66,7 @@ in
];
};
+ programs.ssh.enableAskPassword = true;
programs.ssh.askPassword = "${pkgs.gnome-ssh-askpass4}/bin/gnome-ssh-askpass4";
programs.ssh.startAgent = true;
diff --git a/flake.lock b/flake.lock
index d48527d..30757ec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "lastModified": 1747046372,
+ "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
@@ -84,11 +84,11 @@
]
},
"locked": {
- "lastModified": 1742649964,
- "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+ "lastModified": 1747372754,
+ "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+ "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
"type": "github"
},
"original": {
@@ -128,11 +128,11 @@
]
},
"locked": {
- "lastModified": 1744693102,
- "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
+ "lastModified": 1748000383,
+ "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
- "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
+ "rev": "231726642197817d20310b9d39dd4afb9e899489",
"type": "github"
},
"original": {
@@ -148,11 +148,11 @@
]
},
"locked": {
- "lastModified": 1746169624,
- "narHash": "sha256-oIAZDng5FYQXnmGJrK4WZX2tsQ1nmxHd9OrcySm/Jf4=",
+ "lastModified": 1748134483,
+ "narHash": "sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1298a3418be1a875e9ae6643770b0939814cd441",
+ "rev": "c1e671036224089937e111e32ea899f59181c383",
"type": "github"
},
"original": {
@@ -172,11 +172,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1746168726,
- "narHash": "sha256-ZkgW3U37lTwzqUo2rfko+utld5ChnYWDunJ2hAcJOQo=",
+ "lastModified": 1748070814,
+ "narHash": "sha256-UENoloiY25w0GmPsni8aswhks13qD1sT7XPQgmBd4tU=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "d4e6959d82e9e9dc609dcbf7a29fd293fad9c912",
+ "rev": "1654f815b79267a32c0eb9feb5962089d855d287",
"type": "github"
},
"original": {
@@ -188,11 +188,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1746141998,
- "narHash": "sha256-CYxer9cRvlMySr76epuh5Ub3ryyDV94yVwDC1M/MPvw=",
+ "lastModified": 1748041342,
+ "narHash": "sha256-gYkZbws7QEZ6o5Kh8IPotFAk1thbzzm3C8+vs/M32E4=",
"owner": "neovim",
"repo": "neovim",
- "rev": "ce8b755a86c10496a81675c49b3bc9a42c79d80f",
+ "rev": "9784bc134624ff6dcf2e59e3c3998e206d2adad7",
"type": "github"
},
"original": {
@@ -208,11 +208,11 @@
]
},
"locked": {
- "lastModified": 1746054057,
- "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=",
+ "lastModified": 1748145500,
+ "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8",
+ "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927",
"type": "github"
},
"original": {
@@ -223,11 +223,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1746061036,
- "narHash": "sha256-OxYwCGJf9VJ2KnUO+w/hVJVTjOgscdDg/lPv8Eus07Y=",
+ "lastModified": 1747958103,
+ "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3afd19146cac33ed242fc0fc87481c67c758a59e",
+ "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1",
"type": "github"
},
"original": {
@@ -239,27 +239,27 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1746055187,
- "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=",
+ "lastModified": 1748162331,
+ "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5",
+ "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-24.11",
+ "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1746123514,
- "narHash": "sha256-UNO+MbVHLl4AkVWYqekk72/gqFNSLYNkBgto7h+7P3U=",
+ "lastModified": 1747958103,
+ "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "b5dd9efc912ecabeafa4f082d31e19cb1c74266c",
+ "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1",
"type": "github"
},
"original": {
@@ -271,11 +271,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1746141548,
- "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
+ "lastModified": 1748026106,
+ "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
+ "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github"
},
"original": {
@@ -303,11 +303,11 @@
]
},
"locked": {
- "lastModified": 1745929750,
- "narHash": "sha256-k5ELLpTwRP/OElcLpNaFWLNf8GRDq4/eHBmFy06gGko=",
+ "lastModified": 1747912973,
+ "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "82bf32e541b30080d94e46af13d46da0708609ea",
+ "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 0918288..7ae9e86 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
inputs = {
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
- nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
diff --git a/home/dln/dinky.nix b/home/dln/dinky.nix
index 9b9e955..b0b76b0 100644
--- a/home/dln/dinky.nix
+++ b/home/dln/dinky.nix
@@ -10,17 +10,11 @@
oled.enable = true;
};
- dconf.settings = {
- "org/gnome/shell" = {
- enabled-extensions = [ "Battery-Health-Charging@maniacx.github.com" ];
- };
- };
-
home.packages = with pkgs; [ ];
programs.gpg.enable = true;
services.gpg-agent = {
enable = true;
- pinentryPackage = pkgs.pinentry-curses;
+ pinentry.package = pkgs.pinentry-curses;
};
}
diff --git a/home/dln/home.nix b/home/dln/home.nix
index ae8681e..26216e7 100644
--- a/home/dln/home.nix
+++ b/home/dln/home.nix
@@ -14,8 +14,8 @@ in
homeDirectory = "/home/dln";
packages = with pkgs; [
asciinema
- openconnect
ouch
+ toolbox
];
};
@@ -61,7 +61,6 @@ in
git = {
push-bookmark-prefix = "dln/push-";
- subprocess = true;
};
ui = {
diff --git a/home/dln/nemo.nix b/home/dln/nemo.nix
index 504e5cd..cffb9ca 100644
--- a/home/dln/nemo.nix
+++ b/home/dln/nemo.nix
@@ -35,6 +35,6 @@
services.gpg-agent = {
enable = true;
enableScDaemon = false;
- pinentryPackage = pkgs.pinentry-curses;
+ pinentry.package = pkgs.pinentry-curses;
};
}
diff --git a/hosts/dinky/default.nix b/hosts/dinky/default.nix
index 5a5806a..058294d 100644
--- a/hosts/dinky/default.nix
+++ b/hosts/dinky/default.nix
@@ -141,5 +141,5 @@
"ssh-ng://nemo.aarn.patagia.net"
];
- system.stateVersion = "24.05"; # Did you read the comment?
+ system.stateVersion = "25.05"; # Did you read the comment?
}
diff --git a/overlays/default.nix b/overlays/default.nix
index 9dd6924..61457f5 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -7,7 +7,9 @@
# https://discourse.nixos.org/t/disable-ssh-agent-from-gnome-keyring-on-gnome/28176/5
gnome-keyring = prev.gnome-keyring.overrideAttrs (oldAttrs: {
- configureFlags = oldAttrs.configureFlags or [ ] ++ [ "--disable-ssh-agent" ];
+ mesonFlags = (builtins.filter (flag: flag != "-Dssh-agent=true") oldAttrs.mesonFlags) ++ [
+ "-Dssh-agent=false"
+ ];
});
};