colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NixOS] A ton of stuff

Browse Source
This commit is contained in:
Ivan Malison
2025-12-19 15:03:12 -08:00
parent b2230c993a
commit f79e7a527c
6 changed files with 142 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/code.nix
View File

@@ -16,7 +16,6 @@ makeEnable config "myModules.code" true {
github-mcp-server github-mcp-server
gitea-mcp-server gitea-mcp-server
playwright-mcp playwright-mcp
mcp-language-server
# C # C
clang clang

104
nixos/flake.lock generated
View File

@@ -125,11 +125,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1765121682,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1102,11 +1102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764304195, "lastModified": 1765980955,
"narHash": "sha256-bO7FN/bF6gG7TlZpKAZjO3VvfsLaPFkefeUfJJ7F/7w=", "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "86ff0ef506c209bb397849706e85cc3a913cb577", "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1237,11 +1237,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1764297209, "lastModified": 1766109967,
"narHash": "sha256-Cw6wMDlFXOZp8mjaJ8wDh1ZAwCMC8n7nrV3cPyggbAc=", "narHash": "sha256-+g7NKESoxqTSMu0JS+Jqswe0/Wb1SfWPGJQ/WimXV1Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "048a58d331184cc399a00c5f2135e63fa5751c3f", "rev": "f1f99b65982b319b13e653e1eadb9adcbeed08b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1256,11 +1256,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1761469061, "lastModified": 1765760526,
"narHash": "sha256-JeYQuRLnMJkO+i1J2Zx80r+zjA1C59vJvuRlBUjAIqM=", "narHash": "sha256-568coDEa/sXmxeXR5FWNpCnLUcAofJL7tjjrnVsKu3I=",
"owner": "nixified-ai", "owner": "nixified-ai",
"repo": "flake", "repo": "flake",
"rev": "b35ad969edb807534c22e428044b30762aa0dc08", "rev": "13a6cdbec0dd778685282b469e39669db85ce140",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1291,11 +1291,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1764072830, "lastModified": 1765841014,
"narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=", "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "c7832dd786175e20f2697179e0e03efadffe4201", "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1526,18 +1526,15 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1761597516, "lastModified": 1763948260,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "narHash": "sha256-zZk7fn2ARAqmLwaYTpxBJmj81KIdz11NiWt7ydHHD/M=",
"owner": "NixOS", "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c",
"repo": "nixpkgs", "type": "tarball",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.813095.1c8ba8d3f763/nixexprs.tar.xz"
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "type": "tarball",
"ref": "nixos-25.05", "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
@@ -1558,11 +1555,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1763678758, "lastModified": 1765472234,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1574,11 +1571,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1765779637,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1596,11 +1593,11 @@
"osx-kvm": "osx-kvm" "osx-kvm": "osx-kvm"
}, },
"locked": { "locked": {
"lastModified": 1763116921, "lastModified": 1764686341,
"narHash": "sha256-3VVTu6U8/VWXbjI9yYkQsDF5593qxQptJu6p43mSfYM=", "narHash": "sha256-CnvesUXyktZygnHURa4bk9eCxNAI/Am9Y/b6vBNhS/A=",
"owner": "matthewcroughan", "owner": "matthewcroughan",
"repo": "nixtheplanet", "repo": "nixtheplanet",
"rev": "34afe2e9964181c9342095dbbdb330f92243786d", "rev": "0c0e433fa01789d33a191adb0533a6bca817383f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1727,11 +1724,11 @@
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1760979580, "lastModified": 1765249330,
"narHash": "sha256-WkBoaVS+QyzkmtLsW8QDHyJ5ibYq9pFocM6p/o9ewPY=", "narHash": "sha256-6805Vrau1Kl04DiMnwczAS+soq9he7/CHMojs5wF9k8=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ad681a129e7e133c2a6d0e6acc217bc9df009840", "rev": "de0d81084b486c6d1bd8a61adaabb42bfe9ba997",
"revCount": 134, "revCount": 137,
"type": "git", "type": "git",
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git" "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
}, },
@@ -2042,17 +2039,18 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764319014, "lastModified": 1760591109,
"narHash": "sha256-OM69cuN5IIIkEy7UUDSsgkwzIvOnWvzYm/F1+ptpMjA=", "narHash": "sha256-O21ayp5v2eccXdcwNjTK5ZB99ruK0Zt9CUaw5Rye42g=",
"ref": "refs/heads/bump-flake-dependencies", "owner": "taffybar",
"rev": "a7a7e620da2d9b51a6b841bbaf763ac1313e7d4e", "repo": "taffybar",
"revCount": 1617, "rev": "b256a711416036ca124fc9b3f89e7c957535e465",
"type": "git", "type": "github"
"url": "file:./taffybar"
}, },
"original": { "original": {
"type": "git", "owner": "taffybar",
"url": "file:./taffybar" "ref": "master",
"repo": "taffybar",
"type": "github"
} }
}, },
"taffybar_2": { "taffybar_2": {
@@ -2117,11 +2115,11 @@
}, },
"unstable_3": { "unstable_3": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1765779637,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2270,11 +2268,11 @@
"unstable": "unstable_3" "unstable": "unstable_3"
}, },
"locked": { "locked": {
"lastModified": 1763949843, "lastModified": 1765612933,
"narHash": "sha256-aJXmGPWKjXs7cagVzUE3fd2Fpc+sXnknM446AxHgvH0=", "narHash": "sha256-JWI46deXUQhyUF8pfeJuLZS2PUF5yXnwKg5J3nQJ3ag=",
"owner": "xmonad", "owner": "xmonad",
"repo": "xmonad", "repo": "xmonad",
"rev": "97edef37a3ae10012272d692b5e1bc9b7013fc14", "rev": "dd4145d84151c22d8f0a7cf1dbf3508efe1b27b2",
"type": "github" "type": "github"
}, },
"original": { "original": {

90
nixos/flake.nix
View File

@@ -129,18 +129,20 @@
}: let }: let
# Nixpkgs PR patches - just specify PR number and hash # Nixpkgs PR patches - just specify PR number and hash
nixpkgsPRPatches = [ nixpkgsPRPatches = [
# codex
{ {
pr = 433540; # Rumno service PR pr = 471196;
hash = "sha256-CC1fyR2hjEgKjtsm6t9ZrYFG+ebYs5vjapZ3g5IaPvg="; hash = "sha256-ga72k+HHFWBh32E5TyUgXgAQNaIlT6gTunHJtlLT8bM=";
} }
{
pr = 472157;
hash = "sha256-UU6TtoNXb2UpRPXrW4jLhfcNyvf4yCR0bvf9O/1j7gY=";
}
## end codex
{ {
pr = 434160; # git-sync-rs package pr = 434160; # git-sync-rs package
hash = "sha256-zjzjmC1XJmwfHr/YXFyYsqUFR5MHSoxWWyxIR35YNbM="; hash = "sha256-zjzjmC1XJmwfHr/YXFyYsqUFR5MHSoxWWyxIR35YNbM=";
} }
{
pr = 436061;
hash = "sha256-HZquaNBB+w5Hm5kdzvaGg7QAOgAf/EPBO7o7pKkIrMY=";
}
# claude-code # claude-code
# { # {
# pr = 464698; # pr = 464698;
@@ -153,23 +155,51 @@
]; ];
# Custom patches that don't fit the PR template # Custom patches that don't fit the PR template
customPatches = [ nixpkgsCustomPatches = [
{ {
url = "https://github.com/colonelpanic8/nixpkgs/commit/e1fc6c25b91d3d49dd02a156237721f12dbd86b2.patch"; url = "https://github.com/colonelpanic8/nixpkgs/commit/e1fc6c25b91d3d49dd02a156237721f12dbd86b2.patch";
hash = "sha256-cKXudynZcZno5xGo7M0J9jl7ABUjZgDyhNhXrn8nBPY="; hash = "sha256-cKXudynZcZno5xGo7M0J9jl7ABUjZgDyhNhXrn8nBPY=";
} }
]; ];
# Convert PR patches to full patch format # Home-manager PR patches - just specify PR number and hash
prPatchesToPatches = prPatches: homeManagerPRPatches = [
# Example:
# {
# pr = 1234;
# hash = "sha256-...";
# }
];
# Custom home-manager patches that don't fit the PR template
homeManagerCustomPatches = [
{
url = "https://github.com/colonelpanic8/home-manager/commit/92f4b7aa5254f8bcddc9ef86e04ea5314410d10b.patch";
hash = "sha256-RQl5daVpCqQi05l9QfTEz2PpQxmsv/HYnXrgXbqbwWk=";
}
];
# Convert PR patches to full patch format for nixpkgs
nixpkgsPrPatchesToPatches = prPatches:
map (p: { map (p: {
url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/${toString p.pr}.patch"; url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/${toString p.pr}.patch";
hash = p.hash; hash = p.hash;
}) })
prPatches; prPatches;
# Combine all patches # Convert PR patches to full patch format for home-manager
allPatches = (prPatchesToPatches nixpkgsPRPatches) ++ customPatches; homeManagerPrPatchesToPatches = prPatches:
map (p: {
url = "https://patch-diff.githubusercontent.com/raw/nix-community/home-manager/pull/${toString p.pr}.patch";
hash = p.hash;
})
prPatches;
# Combine all nixpkgs patches
allNixpkgsPatches = (nixpkgsPrPatchesToPatches nixpkgsPRPatches) ++ nixpkgsCustomPatches;
# Combine all home-manager patches
allHomeManagerPatches = (homeManagerPrPatchesToPatches homeManagerPRPatches) ++ homeManagerCustomPatches;
machinesFilepath = ./machines; machinesFilepath = ./machines;
machineFilenames = builtins.attrNames (builtins.readDir machinesFilepath); machineFilenames = builtins.attrNames (builtins.readDir machinesFilepath);
@@ -212,25 +242,57 @@
patchedSource = bootstrapPkgs.applyPatches { patchedSource = bootstrapPkgs.applyPatches {
name = "nixpkgs-patched"; name = "nixpkgs-patched";
src = nixpkgs; src = nixpkgs;
patches = map bootstrapPkgs.fetchpatch allPatches; patches = map bootstrapPkgs.fetchpatch allNixpkgsPatches;
prePatch = '' prePatch = ''
mkdir -p pkgs/by-name/an/antigravity mkdir -p pkgs/by-name/an/antigravity
''; '';
}; };
# Get eval-config from patched source # Get eval-config from patched source
evalConfig = import "${patchedSource}/nixos/lib/eval-config.nix"; evalConfig = import "${patchedSource}/nixos/lib/eval-config.nix";
# Apply patches to home-manager source (only if there are patches)
patchedHomeManagerSource =
if allHomeManagerPatches == []
then home-manager
else
bootstrapPkgs.applyPatches {
name = "home-manager-patched";
src = home-manager;
patches = map bootstrapPkgs.fetchpatch allHomeManagerPatches;
};
# Import the patched home-manager flake
patchedHomeManager =
if allHomeManagerPatches == []
then home-manager
else import "${patchedHomeManagerSource}/flake.nix";
# Get the NixOS module from the patched source
patchedHomeManagerModule =
if allHomeManagerPatches == []
then home-manager.nixosModules.home-manager
else import "${patchedHomeManagerSource}/nixos";
# Create a modified inputs with patched home-manager
patchedInputs = inputs // {
home-manager = inputs.home-manager // {
nixosModules = inputs.home-manager.nixosModules // {
home-manager = patchedHomeManagerModule;
};
# Also provide the patched source path for any direct imports
outPath = patchedHomeManagerSource.outPath or "${patchedHomeManagerSource}";
};
};
in in
evalConfig { evalConfig {
inherit system; inherit system;
modules = baseModules ++ modules; modules = baseModules ++ modules;
specialArgs = specialArgs =
rec { rec {
inherit inputs machineNames; inputs = patchedInputs;
inherit machineNames;
makeEnable = (import ./make-enable.nix) nixpkgs.lib; makeEnable = (import ./make-enable.nix) nixpkgs.lib;
keys = import ./keys.nix; keys = import ./keys.nix;
usersInfo = (import ./users.nix) { usersInfo = (import ./users.nix) {
pkgs = {zsh = "zsh";}; pkgs = {zsh = "zsh";};
inherit keys inputs system; inherit keys system;
inputs = patchedInputs;
}; };
realUsers = ( realUsers = (
builtins.attrNames builtins.attrNames

3
nixos/machines/strixi-minaj.nix
View File

@@ -6,7 +6,6 @@
inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr
]; ];
hardware.nvidia.open = true;
myModules.base.enable = true; myModules.base.enable = true;
myModules.desktop.enable = true; myModules.desktop.enable = true;
myModules.xmonad.enable = true; myModules.xmonad.enable = true;
@@ -49,6 +48,8 @@
services.xserver.dpi = 96; services.xserver.dpi = 96;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
# See https://github.com/NixOS/nixpkgs/issues/467814 for why this was needed
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" "nvidia_modeset" ]; boot.initrd.kernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" "nvidia_modeset" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];

4
nixos/nvidia.nix
View File

@@ -16,8 +16,8 @@ makeEnable config "myModules.nvidia" false {
}; };
hardware.nvidia.open = true; hardware.nvidia.open = true;
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = true;
hardware.graphics.extraPackages = [ config.boot.kernelPackages.nvidia_x11.out ]; hardware.graphics.extraPackages = [ config.hardware.nvidia.package.out ];
hardware.graphics.extraPackages32 = [ config.boot.kernelPackages.nvidia_x11.lib32 ]; hardware.graphics.extraPackages32 = [ config.hardware.nvidia.package.lib32 ];
services.xserver = { services.xserver = {
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
}; };

12
nixos/xmonad.nix
View File

@@ -53,12 +53,22 @@ makeEnable config "myModules.xmonad" true {
services.network-manager-applet.enable = true; services.network-manager-applet.enable = true;
# Disable the XDG autostart for nm-applet since we're managing it via systemd.
# The XDG autostart races with the systemd service and doesn't use --indicator.
xdg.configFile."autostart/nm-applet.desktop".text = ''
[Desktop Entry]
Hidden=true
'';
services.udiskie = { services.udiskie = {
enable = true; enable = true;
tray = "always"; tray = "always";
}; };
services.status-notifier-watcher.enable = true; services.status-notifier-watcher = {
enable = true;
flags = ["--log-level" "DEBUG"];
};
services.autorandr.enable = true; services.autorandr.enable = true;