Fix NixOS switch

This commit is contained in:
2026-07-05 16:48:25 -07:00
parent 5c7007912c
commit 607cdb6fa3
5 changed files with 25 additions and 20 deletions

View File

@@ -136,14 +136,17 @@
"xmonad-contrib": "xmonad-contrib"
},
"locked": {
"lastModified": 1783282407,
"narHash": "sha256-lZyk0oe0Pr5ifzdq1G0N6DVKh1IO6EJlgKRvAx+bwxo=",
"path": "/srv/dotfiles/dotfiles/config/taffybar/taffybar",
"type": "path"
"lastModified": 1783024750,
"narHash": "sha256-8RtBxjot68u3P1VXwwPnlUWKBAy/pJzDmKHxoack34g=",
"ref": "refs/heads/master",
"rev": "f0302a788290651c710a5bba138bd5dd0f89baa9",
"revCount": 2364,
"type": "git",
"url": "file:///srv/dotfiles/dotfiles/config/taffybar/taffybar"
},
"original": {
"path": "/srv/dotfiles/dotfiles/config/taffybar/taffybar",
"type": "path"
"type": "git",
"url": "file:///srv/dotfiles/dotfiles/config/taffybar/taffybar"
}
},
"weeder-nix": {

View File

@@ -3,7 +3,7 @@
taffybar = {
# Use the vendored checkout so normal NixOS rebuilds consume the same
# taffybar tree used for local development.
url = "path:/srv/dotfiles/dotfiles/config/taffybar/taffybar";
url = "git+file:///srv/dotfiles/dotfiles/config/taffybar/taffybar";
inputs.weeder-nix = {
url = "github:NorfairKing/weeder-nix";
inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -20,8 +20,8 @@ in {
type = lib.types.nullOr lib.types.str;
description = ''
Filesystem UUID of the Windows EFI system partition. When set, GRUB
gets an explicit Windows Boot Manager chainload entry in addition to
entries discovered by os-prober.
gets an explicit Windows Boot Manager chainload entry and skips
os-prober autodetection.
'';
};
@@ -64,7 +64,7 @@ in {
enable = true;
efiSupport = true;
device = "nodev";
useOSProber = true;
useOSProber = cfg.windowsEfiUuid == null;
configurationLimit = cfg.configurationLimit;
timeoutStyle = "menu";
theme = lib.mkIf (cfg.theme != null) (lib.mkDefault cfg.theme);

21
nixos/flake.lock generated
View File

@@ -182,11 +182,11 @@
]
},
"locked": {
"lastModified": 1783226248,
"narHash": "sha256-Fl9NbFtLQ+u+o54Oxc2jfdMwy2c7j1qVYE/jMTzCUew=",
"lastModified": 1783264933,
"narHash": "sha256-KMa1I47xLI805zgiVHAOgtqZvHb9BATAbBf8pN1dovg=",
"owner": "ilysenko",
"repo": "codex-desktop-linux",
"rev": "cdd159cc65cfbbdaae4f226dfd17fc99f7dbf4ad",
"rev": "177ce2d64b6426d7dc1b2dd42226528523454f6e",
"type": "github"
},
"original": {
@@ -2194,14 +2194,17 @@
"xmonad-contrib": "xmonad-contrib"
},
"locked": {
"lastModified": 1783282407,
"narHash": "sha256-lZyk0oe0Pr5ifzdq1G0N6DVKh1IO6EJlgKRvAx+bwxo=",
"path": "/srv/dotfiles/dotfiles/config/taffybar/taffybar",
"type": "path"
"lastModified": 1783024750,
"narHash": "sha256-8RtBxjot68u3P1VXwwPnlUWKBAy/pJzDmKHxoack34g=",
"ref": "refs/heads/master",
"rev": "f0302a788290651c710a5bba138bd5dd0f89baa9",
"revCount": 2364,
"type": "git",
"url": "file:///srv/dotfiles/dotfiles/config/taffybar/taffybar"
},
"original": {
"path": "/srv/dotfiles/dotfiles/config/taffybar/taffybar",
"type": "path"
"type": "git",
"url": "file:///srv/dotfiles/dotfiles/config/taffybar/taffybar"
}
},
"utils": {

View File

@@ -108,7 +108,6 @@
nixpkgs.overlays =
[
# (import ./nvidia-container-toolkit-overlay.nix)
(import ./runc-overlay.nix)
(import ./emacs-overlay.nix)
(import ../nix-shared/overlays)
# Use codex and claude-code from dedicated flakes with cachix