greg/nixos
1
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of src:greg/nixos-config

Browse Source
This commit is contained in:
Greg Hellings
2025-10-08 08:22:21 -05:00
parent 46e290042a a14121563e
commit 85c6e2a4cd
12 changed files with 113 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+42 -42
View File
@@ -54,11 +54,11 @@
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
"lastModified": 1757985998, "lastModified": 1759023284,
"narHash": "sha256-9wxH9I7BJflSBXxXQJwqqWLC/lGr96MNI++Ci70HBF0=", "narHash": "sha256-yYVUjuExr0v0bmM9qTGt0Chhw5eLHJLAFlqQOwVWVVM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixhelm", "repo": "nixhelm",
"rev": "0b9e8a1e3ed75731507d1055a75343a616dda286", "rev": "b69e7f1e2dbdd67707f60ad02bf436325ce0b160",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -96,11 +96,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757430124, "lastModified": 1758805352,
"narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -382,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757997814, "lastModified": 1759043321,
"narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", "narHash": "sha256-Efi3THvsIS6Qd97s52/PSSHWybDlSbtUZXP8l3AR9Ps=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5820376beb804de9acf07debaaff1ac84728b708", "rev": "c75fd8e300b79502b8eecdacd8a426b12fadb460",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -424,11 +424,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1757974173, "lastModified": 1758108966,
"narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "302af509428169db34f268324162712d10559f74", "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -489,11 +489,11 @@
}, },
"nix-hardware": { "nix-hardware": {
"locked": { "locked": {
"lastModified": 1757943327, "lastModified": 1758663926,
"narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -648,11 +648,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1754340878, "lastModified": 1758029226,
"narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cab778239e705082fe97bb4990e0d24c50924c04", "rev": "08b8f92ac6354983f5382124fef6006cade4a1c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -664,11 +664,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1758690382,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -696,11 +696,11 @@
}, },
"nixunstable": { "nixunstable": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1758690382,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -720,11 +720,11 @@
"systems": "systems_7" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1758032055, "lastModified": 1759016999,
"narHash": "sha256-quoLrTtC8JVG0HEv3VzJSXiQnL40K5CX9yvYqd7OKpc=", "narHash": "sha256-UhQmUPSWYpKJQutTzy9TKiRBMg/qVJn6AoNsFR+5Zmc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "796d662401c420ba11d34901185718059aa3bfb5", "rev": "4cec67651a6dfdab9a79e68741282e3be8231a61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -740,11 +740,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1758030607, "lastModified": 1759077554,
"narHash": "sha256-ph7zS5GkgIh0fvaSNbIstJEVDgkskdRIwNyfXccSTSo=", "narHash": "sha256-W4ZnOzeVSbokayX7Hz+aIOemXXm/lUZRB4S/Bptn6XM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f534dee3dc628ceb5b036b174363c1196df5a529", "rev": "669ab83f6fe35cae4bee00e9a66e79b1936612cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -763,11 +763,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757885130, "lastModified": 1758662783,
"narHash": "sha256-56CMb5W/pgjKLh0bx2ekhn5rde/YmgR63HAqrY9/BCw=", "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "fae3c59a646e00c4b1d359c50b27458a0713d2fd", "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -809,11 +809,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1754428470, "lastModified": 1758650077,
"narHash": "sha256-Sxf8gf+vfGeFaJMW3D+8pwH/+WwYTQOg47Lrm42+kTc=", "narHash": "sha256-ZeRtJimtk0Faiq7DPZEQNGipda3TaR4QXp0TAzu934Q=",
"owner": "SaumonNet", "owner": "SaumonNet",
"repo": "proxmox-nixos", "repo": "proxmox-nixos",
"rev": "6faed2845ef5f0bb05c9519b75097bbe7fb39327", "rev": "ce8768f43b4374287cd8b88d8fa9c0061e749d9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1022,11 +1022,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1757987448, "lastModified": 1759024939,
"narHash": "sha256-ltDT7EIfLHV42p99HnDfDviC8jN7tcOed1qsLEFypl8=", "narHash": "sha256-4HEtZ+hVr8c/rbr1xXb9yq7YA/Ued5KrixAvhuIAg/4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "e496568b0e69d9d54c8cfef96ed1370952ad9786", "rev": "6db4b0a9395b1002b6d18c6967d4cd2566e8bd16",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1043,11 +1043,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757937573, "lastModified": 1758785683,
"narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", "narHash": "sha256-mRn51IeEBXeNh5a6xNLylk4PKBX0s/QQxgkEbYoPq/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", "rev": "1bfb978f2f6261b6086e04af17f9418e1fe36d70",
"type": "github" "type": "github"
}, },
"original": { "original": {
home/baseline/nushell/functions.nu
+1 -1
View File
@@ -17,7 +17,7 @@ def rebuild [] {
sudo darwin-rebuild switch sudo darwin-rebuild switch
} else { } else {
let hostname = uname | get nodename let hostname = uname | get nodename
let build = ^nom build $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel" let build = ^nom build --keep-going $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel"
if $env.LAST_EXIT_CODE == 0 { if $env.LAST_EXIT_CODE == 0 {
nvd diff /run/current-system result nvd diff /run/current-system result
run0 nixos-rebuild switch run0 nixos-rebuild switch
home/baseline/vim/config.nix
-1
View File
@@ -115,7 +115,6 @@
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
ansiblels.enable = true;
cmake.enable = true; cmake.enable = true;
gopls.enable = true; gopls.enable = true;
html.enable = true; html.enable = true;
home/baseline/vim/init.lua
+1 -1
View File
@@ -59,7 +59,7 @@ local lspconfig = require('lspconfig')
-- capabilities = capabilities -- capabilities = capabilities
--} --}
--lspconfig.pyright.setup { capabilities = capabilities } --lspconfig.pyright.setup { capabilities = capabilities }
lspconfig.ansiblels.setup { capabilities = capabilities } --lspconfig.ansiblels.setup { capabilities = capabilities }
--lspconfig.jedi_language_server.setup { capabilities } --lspconfig.jedi_language_server.setup { capabilities }
-- ====================================================================== -- ======================================================================
home/baseline/vim/vimrc
+1 -1
View File
@@ -88,7 +88,7 @@ lua <<EOF
-- capabilities = capabilities -- capabilities = capabilities
--} --}
--lspconfig.pyright.setup { capabilities = capabilities } --lspconfig.pyright.setup { capabilities = capabilities }
lspconfig.ansiblels.setup { capabilities = capabilities } --lspconfig.ansiblels.setup { capabilities = capabilities }
lspconfig.jedi_language_server.setup { capabilities = capabilities } lspconfig.jedi_language_server.setup { capabilities = capabilities }
EOF EOF
" Set filetype to the way I want it " Set filetype to the way I want it
home/default.nix
+1
View File
@@ -40,4 +40,5 @@ in
jeremiah = greg "jeremiah"; jeremiah = greg "jeremiah";
linode = greg "linode"; linode = greg "linode";
vm-gitlab = greg "vm-gitlab"; vm-gitlab = greg "vm-gitlab";
vm-jellyfin = greg "vm-jellyfin";
} }
home/hosts/exodus/default.nix
+2
View File
@@ -13,12 +13,14 @@
cargo cargo
freeciv freeciv
gimp gimp
gnucash
k9s k9s
kdePackages.kdenlive kdePackages.kdenlive
kubernetes-helm kubernetes-helm
kubectl kubectl
kubectl-cnpg kubectl-cnpg
mumble mumble
pre-commit
wineWowPackages.stable wineWowPackages.stable
]; ];
} }
hosts/baseline.nix
+1
View File
@@ -36,6 +36,7 @@ in
efibootmgr efibootmgr
findutils findutils
file file
gcc-tune
git git
gnupatch gnupatch
hms # My own home manager switcher hms # My own home manager switcher
hosts/exodus/default.nix
+4 -1
View File
@@ -35,7 +35,10 @@
}; };
}; };
nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; nix.settings = {
extra-platforms = config.boot.binfmt.emulatedSystems;
system-features = [ "gccarch-x86-64-v3" ];
};
networking = { networking = {
hostName = "exodus"; hostName = "exodus";
hosts/vm-gitlab/default.nix
+43 -17
View File
@@ -72,14 +72,6 @@ in
}; };
services = { services = {
# Fetch the SSL certificates for nginx to use
cron = {
enable = true;
systemCronJobs = [
"0 0 1 */2 * cd /etc/certs && tailscale cert vm-gitlab.shire-zebra.ts.net && chown nginx * && systemctl reload nginx"
];
};
gitlab = { gitlab = {
enable = true; enable = true;
backup = { backup = {
@@ -228,17 +220,51 @@ in
# Do not start nginx until we have tailscaled up and running, so it can bind # Do not start nginx until we have tailscaled up and running, so it can bind
# to the 100.* addresses # to the 100.* addresses
systemd.services = { systemd = {
nginx = rec { services = {
after = [ "network-online.target" ]; certRefresh =
requires = [ "network-online.target" ]; let
wants = after; script = pkgs.writeShellApplication {
serviceConfig = { name = "cert-refresh";
RestartMaxDelaySec = "30s"; runtimeInputs = [ pkgs.tailscale ];
RestartSteps = "5";
text = ''
cd /etc/certs
tailscale cert vm-gitlab.shire-zebra.ts.net
chown nginx ./*
systemctl reload nginx
'';
};
in
{
script = lib.getExe script;
serviceConfig = {
Type = "oneshot";
User = "root";
};
};
nginx = rec {
after = [ "network-online.target" ];
requires = [ "network-online.target" ];
wants = after;
serviceConfig = {
RestartMaxDelaySec = "30s";
RestartSteps = "5";
};
};
tailscaled.partOf = [ "network-online.target" ];
};
timers = {
"cert-refresh" = {
wantedBy = [ "cert-refresh.service" ];
timerConfig = {
OnCalendar = "monthly";
Persistent = true;
};
}; };
}; };
tailscaled.partOf = [ "network-online.target" ];
}; };
system.stateVersion = lib.mkForce "24.11"; system.stateVersion = lib.mkForce "24.11";
} }
pkgs/default.nix
+1
View File
@@ -10,6 +10,7 @@ in
aacs = c ./aacs.nix { }; aacs = c ./aacs.nix { };
brew = c ./homebrew.nix { }; brew = c ./homebrew.nix { };
create_ssl = c ./create_ssl.nix { }; create_ssl = c ./create_ssl.nix { };
gcc-tune = c ./gcc-tune.nix { };
gen-build = c ./gen-build { }; gen-build = c ./gen-build { };
hms = c ./hms { }; hms = c ./hms { };
inject-darwin = c ./inject-darwin.nix { }; inject-darwin = c ./inject-darwin.nix { };
pkgs/gcc-tune.nix
+16
View File
@@ -0,0 +1,16 @@
{
writeShellApplication,
gcc,
gnugrep,
}:
writeShellApplication {
name = "gcc-tune";
runtimeInputs = [
gcc
gnugrep
];
text = ''
gcc -march=native -Q --help=target | grep 'mtune='
'';
}