Go to nixOS 25.05, fix breakage with custom configs

This commit is contained in:
Eli Ribble 2025-07-11 22:31:23 +00:00
parent 152327bd85
commit 2fc0223e06
4 changed files with 9 additions and 7 deletions

View file

@ -0,0 +1,22 @@
set-option -g default-command /run/current-system/sw/bin/fish
bind-key h select-pane -L
bind-key j select-pane -D
bind-key k select-pane -U
bind-key l select-pane -R
# nested tmux, obey me
bind-key a send-prefix
# Avoid the annoying bit of delay when using the control character
set -g escape-time 0
set -g renumber-windows on
# Show a visual bell, even on other windows
#set-window-option -g visual-bell both
#set-window-option -g bell-action any
#set-hook -g alert-bell "run-shell '~/.config/tmux/bell.sh \"#S\" \"#W\"'"
# Set up the window visuals
set -g window-status-style bg=yellow
set -g window-status-current-style bg=red,fg=white

View file

@ -58,16 +58,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1751949589,
"narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
"lastModified": 1751943650,
"narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9b008d60392981ad674e04016d25619281550a9d",
"rev": "88983d4b665fb491861005137ce2b11a9f89f203",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -9,7 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
};
outputs =
@ -34,7 +34,6 @@
in {
# tested with 2GB/2CPU droplet, 1GB droplets do not have enough RAM for kexec
nixosConfigurations.digitalocean = nixpkgs.lib.nixosSystem {
system = "${system}";
modules = [
./configuration.nix
./digitalocean.nix
@ -49,6 +48,10 @@
./modules
./users
];
specialArgs = {
inherit configFiles;
};
system = "${system}";
};
};
}

View file

@ -1,5 +1,4 @@
{
imports = [
./system
];
}