diff --git a/flake.lock b/flake.lock index 153f609..8bcb3c8 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776979072, - "narHash": "sha256-1BUQDAMWGVcUhPuI5JFQmCTYlBmN/Fmon6MGmaKXrCk=", + "lastModified": 1781842085, + "narHash": "sha256-uGt5HQ+hm0EeIjWoJUq7HefgkSc1h7kf1vFKvOl0tcs=", "owner": "utensils", "repo": "comfyui-nix", - "rev": "8a90889efc8fae81a8e03b8d9a8406c9f8ff425b", + "rev": "308a863c136ffc35fce293a81eac5d229b31d56d", "type": "github" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1781319724, - "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=", + "lastModified": 1781981105, + "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae", + "rev": "7bfff44b465909f69a442701293bc0badcf476dc", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1781365335, - "narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=", + "lastModified": 1782423922, + "narHash": "sha256-qPNd6lUohHP5gcJhqQ7rLV87RwIx0xYR2A4Frb9Zjc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c", + "rev": "5d320ab301cfaaca7d32514f13815d19d109f5f4", "type": "github" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1781190061, - "narHash": "sha256-QRMpLbsmlciMGv4yx75FUoIl54K02JbIX1tgdPHPw1s=", + "lastModified": 1781772065, + "narHash": "sha256-xIbRSwDB1GBAUsWsQZUjudGfAGQt3BOpsWaO/ugVa4w=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "f2b3fdb347f91dfd344ad196666a0b0fe8aad05c", + "rev": "adda04f0bf4819575b1978c2f8d78401b3c2be12", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1781168557, - "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=", + "lastModified": 1782379505, + "narHash": "sha256-zPvPiU+a7pqtH47xrtZLNRABJKpOjfZQclDbcvNtH+I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6358ff76821101c178e3ab4919a62799bfe3652e", + "rev": "603d3afd1b6145bd66e97ae38a34d91c95df70cf", "type": "github" }, "original": { @@ -260,11 +260,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -304,11 +304,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1780902259, - "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", + "lastModified": 1782233679, + "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", + "rev": "667d5cf1c59585031d743c78b394b0a647537c35", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1780453794, - "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", + "lastModified": 1781216227, + "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", + "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1781287895, - "narHash": "sha256-980eQ7c4HeblAy/gUxrYw9GmZHerC9qsjG/2NsbT0Xo=", + "lastModified": 1781971008, + "narHash": "sha256-T2u2RQZWKvD1J+TgcxjiJr8IymBr/PrUNeAGhMZFZU4=", "owner": "nix-community", "repo": "nixvim", - "rev": "d5a4ff853474e0459402ff307545c6df70b267e6", + "rev": "7afca458f064f166d3a9c98db3b41a984fe46492", "type": "github" }, "original": { diff --git a/home-manager/commands/tmux.nix b/home-manager/commands/tmux.nix index dbeb014..7057915 100644 --- a/home-manager/commands/tmux.nix +++ b/home-manager/commands/tmux.nix @@ -7,7 +7,9 @@ keyMode = "vi"; historyLimit = 5000; prefix = "C-a"; - terminal = "xterm-ghostty"; + + terminal = "tmux-256color"; + disableConfirmationPrompt = true; plugins = with pkgs; [ tmuxPlugins.vim-tmux-navigator @@ -17,7 +19,11 @@ tmuxPlugins.continuum tmuxPlugins.prefix-highlight ]; - extraConfig = "bind C-l send-keys 'C-l'"; + + extraConfig = '' + set -ag terminal-overrides ",xterm-ghostty:RGB" + bind C-l send-keys 'C-l' + ''; }; }; } diff --git a/hosts/ender-ml/configuration.nix b/hosts/ender-ml/configuration.nix index 5acb324..5915e8e 100644 --- a/hosts/ender-ml/configuration.nix +++ b/hosts/ender-ml/configuration.nix @@ -177,7 +177,7 @@ enable = true; host = "0.0.0.0"; openFirewall = true; - package = pkgs-unstable.ollama-cuda; + package = pkgs.ollama-cuda; environmentVariables = { CUDA_VISIBLE_DEVICES = "0,1"; }; diff --git a/hosts/ender-ml/hardware-configuration.nix b/hosts/ender-ml/hardware-configuration.nix index 432bfaa..f151c0e 100644 --- a/hosts/ender-ml/hardware-configuration.nix +++ b/hosts/ender-ml/hardware-configuration.nix @@ -1,10 +1,6 @@ -# Hardware profile for ender-ml (QEMU/KVM VM). -# -# Filesystems, swap, and boot-related disk config are intentionally NOT -# declared here — they are owned by disko via ./disko-config.nix, which -# sets config.fileSystems / config.swapDevices / config.boot when -# disko.enableConfig = true (the default). Keep this file limited to -# kernel modules and platform settings that disko does not manage. +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. { config, lib, @@ -16,7 +12,7 @@ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = []; boot.extraModulePackages = [];