samw/home
1
Fork 0
mirror of https://github.com/wlcx/home.git synced 2026-09-15 12:38:22 +01:00
Code Issues Projects Releases Wiki Activity

25.11 -> 26.05

Browse Source
This commit is contained in:
samw
2026-09-13 04:29:30 +01:00
parent b9365a827d
commit 89328c7160
6 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+8 -8
View File
@@ -45,32 +45,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764866045, "lastModified": 1789267039,
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11", "ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764831616, "lastModified": 1789114715,
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "rev": "21a67dc470149f337cecafbe965d8d252a390518",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
flake.nix
+2 -2
View File
@@ -5,14 +5,14 @@
nixpkgs = { nixpkgs = {
# N.B. we use the nixos-x branch as this is updated *after* successful hydra builds # N.B. we use the nixos-x branch as this is updated *after* successful hydra builds
# rather than release-x. See https://wiki.nixos.org/wiki/Channel_branches # rather than release-x. See https://wiki.nixos.org/wiki/Channel_branches
url = "github:nixos/nixpkgs/nixos-25.11"; url = "github:nixos/nixpkgs/nixos-26.05";
}; };
nixpkgs-unstable = { nixpkgs-unstable = {
url = "github:nixos/nixpkgs"; url = "github:nixos/nixpkgs";
}; };
# Other modules # Other modules
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
home/default.nix
+1 -1
View File
@@ -110,7 +110,7 @@ in
enableDefaultConfig = false; enableDefaultConfig = false;
package = pkgs.openssh; # Use modern ssh package = pkgs.openssh; # Use modern ssh
includes = [ "~/.ssh/config.local" ]; includes = [ "~/.ssh/config.local" ];
matchBlocks."*" = { settings."Host *" = {
user = "samw"; user = "samw";
serverAliveInterval = 30; serverAliveInterval = 30;
serverAliveCountMax = 10; serverAliveCountMax = 10;
home/macs.nix
+1 -6
View File
@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
lib,
... ...
}: }:
{ {
@@ -14,11 +13,7 @@
"/Applications/Sublime Merge.app/Contents/SharedSupport/bin" "/Applications/Sublime Merge.app/Contents/SharedSupport/bin"
]; ];
# Use secretive for SSH agent # Use secretive for SSH agent
programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin { programs.ssh.settings."Host *".IdentityAgent = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
host = "*";
extraOptions."IdentityAgent" =
"~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
};
programs.zsh.sessionVariables = { programs.zsh.sessionVariables = {
SSH_AUTH_SOCK = "$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh"; SSH_AUTH_SOCK = "$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
# Make connection muxing permission work. # Make connection muxing permission work.
home/vim.nix
+7 -2
View File
@@ -12,18 +12,23 @@
enable = true; enable = true;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
# defaults changed from true in 26.05
withRuby = false;
withPython3 = false;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
# Basic stuff # Basic stuff
vim-sensible vim-sensible
vim-noctu # 16color colorscheme vim-noctu # 16color colorscheme
gruvbox-nvim gruvbox-nvim
fzfWrapper # The basic "built in" fzf stuff fzf-wrapper # The basic "built in" fzf stuff
fzf-vim # The fancier opt in fzf stuff fzf-vim # The fancier opt in fzf stuff
# The only language plugin you always need... because if it's running nixos you # The only language plugin you always need... because if it's running nixos you
# *will* be editing nix files! # *will* be editing nix files!
vim-nix vim-nix
# Git stuff # Git stuff
fugitive vim-fugitive
vim-gitgutter vim-gitgutter
# More stuff idk # More stuff idk
emmet-vim emmet-vim
home/vscode.nix
+1 -2
View File
@@ -1,8 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.vscode = { programs.vscodium = {
enable = true; enable = true;
package = pkgs.vscodium;
mutableExtensionsDir = false; mutableExtensionsDir = false;
profiles.default.extensions = with pkgs.vscode-extensions; [ profiles.default.extensions = with pkgs.vscode-extensions; [
rust-lang.rust-analyzer rust-lang.rust-analyzer