Compare commits
10 Commits
c4a9a60112
...
cdd8ed60e9
Author | SHA1 | Date | |
---|---|---|---|
cdd8ed60e9 | |||
fd033ba72c | |||
9aae7c0c16 | |||
aa9be16abf | |||
342fc4f4c6 | |||
d62d538562 | |||
ffb55c157b | |||
cd7698bebf | |||
700cccfd60 | |||
814966b172 |
@ -1517,6 +1517,7 @@ https://github.com/alpaker/Fill-Column-Indicator/issues/21 for more details
|
||||
** indent-bars
|
||||
#+begin_src emacs-lisp
|
||||
(use-package indent-bars
|
||||
:disabled t
|
||||
:straight (indent-bars :type git :host github :repo "jdtsmith/indent-bars")
|
||||
:config
|
||||
(require 'indent-bars-ts) ; not needed with straight
|
||||
|
@ -36,7 +36,7 @@ makeEnable config "myModules.base" true {
|
||||
};
|
||||
|
||||
# Audio
|
||||
hardware.pulseaudio.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
|
||||
# Bluetooth
|
||||
hardware.bluetooth.enable = true;
|
||||
@ -59,9 +59,6 @@ makeEnable config "myModules.base" true {
|
||||
services.locate.enable = true;
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.enableNvidia = true;
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
hardware.nvidia.open = false;
|
||||
|
||||
hardware.keyboard.zsa.enable = true;
|
||||
|
||||
|
@ -21,8 +21,10 @@
|
||||
./internet-computer.nix
|
||||
./kat.nix
|
||||
./keybase.nix
|
||||
./kubelet.nix
|
||||
./nix.nix
|
||||
./nixified.ai.nix
|
||||
./nvidia.nix
|
||||
./options.nix
|
||||
./plasma.nix
|
||||
./postgres.nix
|
||||
|
@ -71,7 +71,7 @@ makeEnable config "myModules.desktop" true {
|
||||
notify-osd-customizable
|
||||
okular
|
||||
pinentry
|
||||
psensor
|
||||
mission-center
|
||||
quassel
|
||||
remmina
|
||||
rofi
|
||||
|
245
nixos/flake.lock
245
nixos/flake.lock
@ -217,6 +217,45 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"flake-parts_4": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701473968,
|
||||
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_5": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixtheplanet",
|
||||
"hercules-ci-effects",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696343447,
|
||||
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "flake-parts",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
@ -224,11 +263,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -242,11 +281,11 @@
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -594,7 +633,7 @@
|
||||
"lsp": "lsp",
|
||||
"lsp-test": "lsp-test",
|
||||
"lsp-types": "lsp-types",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"ormolu-052": "ormolu-052",
|
||||
"ormolu-07": "ormolu-07",
|
||||
"stylish-haskell-0145": "stylish-haskell-0145"
|
||||
@ -629,7 +668,7 @@
|
||||
"lsp": "lsp_2",
|
||||
"lsp-test": "lsp-test_2",
|
||||
"lsp-types": "lsp-types_2",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"ormolu-052": "ormolu-052_2",
|
||||
"ormolu-07": "ormolu-07_2",
|
||||
"stylish-haskell-0145": "stylish-haskell-0145_2"
|
||||
@ -671,6 +710,25 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hercules-ci-effects_2": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_5",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701009247,
|
||||
"narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hiedb": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@ -781,11 +839,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724435763,
|
||||
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
|
||||
"lastModified": 1727381010,
|
||||
"narHash": "sha256-2PqUwnZXjYiPUm5A4d8Z31mvLS4lvUeV/9gUhSMmNR4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
|
||||
"rev": "853e7bd24f875bac2e3a0cf72f993e917d0f8cf5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -959,11 +1017,11 @@
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724874960,
|
||||
"narHash": "sha256-cmmNq/tFU4MZYU5RAuUVt1NGt5e6RMaMsvJtU5ybEJI=",
|
||||
"lastModified": 1727380702,
|
||||
"narHash": "sha256-1YUAqvZc9YOUERyPiaOGYEg2fIf20+yIWGhzB0Ke6j8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nix",
|
||||
"rev": "b89eca9aecc69d4dfc0f0afd9353c126eb7b5858",
|
||||
"rev": "0ed67e5b7ee9ad8fae162e1b10b25d22ada2b1f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1016,11 +1074,11 @@
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724664098,
|
||||
"narHash": "sha256-4SgV4jCoN5RffR1Mtn3HI1cjgHmARh+rZrpVlBclj9U=",
|
||||
"lastModified": 1727091786,
|
||||
"narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "345dfa06658a37873ca18aa205f409e4aaf1caa6",
|
||||
"rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1061,6 +1119,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1701253981,
|
||||
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "lib",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-regression": {
|
||||
"locked": {
|
||||
"lastModified": 1643052045,
|
||||
@ -1077,21 +1153,36 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-regression_2": {
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1725042541,
|
||||
"narHash": "sha256-2ItfpRi49hr3LrHnWLBqEFrnKbREHnWjgyrJzaPnjkI=",
|
||||
"lastModified": 1686874404,
|
||||
"narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "963ea288f4a82f4945813037d4e8d1bfd149c3e5",
|
||||
"rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "haskell-updates",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1682134069,
|
||||
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1723688146,
|
||||
@ -1126,11 +1217,11 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1724316499,
|
||||
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
|
||||
"lastModified": 1726838390,
|
||||
"narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
|
||||
"rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1142,47 +1233,47 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1725043766,
|
||||
"narHash": "sha256-iNXaq3XJkLDc9Fhs1dWi9Fj/pmMbVZ2PV33ME3JhcUI=",
|
||||
"owner": "colonelpanic8",
|
||||
"lastModified": 1727122398,
|
||||
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f53b146e86208b06645bfabf5527d47f0b0c6c5e",
|
||||
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "colonelpanic8",
|
||||
"ref": "with-cursor",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1686874404,
|
||||
"narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
|
||||
"lastModified": 1697723726,
|
||||
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
|
||||
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "haskell-updates",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1709703039,
|
||||
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1703255338,
|
||||
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
|
||||
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
@ -1206,16 +1297,39 @@
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1682134069,
|
||||
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
||||
"lastModified": 1709703039,
|
||||
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
|
||||
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixtheplanet": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_4",
|
||||
"hercules-ci-effects": "hercules-ci-effects_2",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"osx-kvm": "osx-kvm"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727105240,
|
||||
"narHash": "sha256-FEuqbcZ4TDUMwCpTA/E3J5L7pLD4U+zXPnZbmXSmaJo=",
|
||||
"owner": "matthewcroughan",
|
||||
"repo": "nixtheplanet",
|
||||
"rev": "2f622af217807da78e44a5a15f620743dac57f46",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "matthewcroughan",
|
||||
"repo": "nixtheplanet",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"notifications-tray-icon": {
|
||||
@ -1293,18 +1407,34 @@
|
||||
"url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"osx-kvm": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1701316418,
|
||||
"narHash": "sha256-Sk8LYhFovoMX1ln7DWYArJQphW2a4h8Xg7/ZEZXwZv4=",
|
||||
"owner": "kholia",
|
||||
"repo": "OSX-KVM",
|
||||
"rev": "09daff670a7eb9ff616073df329586c5995623a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kholia",
|
||||
"repo": "OSX-KVM",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"railbird-secrets": {
|
||||
"inputs": {
|
||||
"agenix": "agenix_2",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723672467,
|
||||
"narHash": "sha256-6GbCvAboNKot15sHrYJqONIyu9T5OUokEubghgPHLUw=",
|
||||
"lastModified": 1726075726,
|
||||
"narHash": "sha256-eQPDAzUJg8fwqiCyWsKxtHV+G1LGJKs9X3ZtOzytuDE=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "e067ec9b790bbe76d8bff667c072e2e19cd68fa7",
|
||||
"revCount": 76,
|
||||
"rev": "70d8ffd3f3b79b97477ae0655524273bb098b6c5",
|
||||
"revCount": 86,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
|
||||
},
|
||||
@ -1327,7 +1457,7 @@
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-regression": "nixpkgs-regression_2",
|
||||
"nixtheplanet": "nixtheplanet",
|
||||
"notifications-tray-icon": "notifications-tray-icon",
|
||||
"railbird-secrets": "railbird-secrets",
|
||||
"status-notifier-item": "status-notifier-item",
|
||||
@ -1570,6 +1700,7 @@
|
||||
},
|
||||
"original": {
|
||||
"owner": "taffybar",
|
||||
"ref": "old-master",
|
||||
"repo": "taffybar",
|
||||
"type": "github"
|
||||
}
|
||||
@ -1593,11 +1724,11 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1724819573,
|
||||
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
|
||||
"lastModified": 1727122398,
|
||||
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
|
||||
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1610,7 +1741,7 @@
|
||||
"vscode-server": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713958148,
|
||||
@ -1640,11 +1771,11 @@
|
||||
"unstable": "unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722277235,
|
||||
"narHash": "sha256-fuEgR51OPzwff+ygFhBqJm51oA17rR0KtPfuDLv0Fp0=",
|
||||
"lastModified": 1726451364,
|
||||
"narHash": "sha256-6WKgYq0+IzPSXxVl1MfODIVwEbd3Sw0zc5sMSOyzA8I=",
|
||||
"owner": "xmonad",
|
||||
"repo": "xmonad",
|
||||
"rev": "a58ccac7ba46414915de6c7f2b4da08b37784016",
|
||||
"rev": "a4140b93497333ec7f3127ee4dabcb8ae8a721b6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1,12 +1,13 @@
|
||||
{
|
||||
inputs = {
|
||||
nixtheplanet.url = "github:matthewcroughan/nixtheplanet";
|
||||
railbird-secrets = {
|
||||
url = "git+ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git";
|
||||
};
|
||||
nixos-hardware = { url = "github:colonelpanic8/nixos-hardware/add-g834jzr"; };
|
||||
|
||||
nixpkgs = {
|
||||
url = "github:colonelpanic8/nixpkgs/with-cursor";
|
||||
url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
@ -34,7 +35,7 @@
|
||||
};
|
||||
|
||||
taffybar = {
|
||||
url = "github:taffybar/taffybar";
|
||||
url = "github:taffybar/taffybar/old-master";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
@ -104,8 +105,6 @@
|
||||
|
||||
vscode-server.url = "github:nix-community/nixos-vscode-server";
|
||||
|
||||
nixpkgs-regression = { url = "github:NixOS/nixpkgs"; };
|
||||
|
||||
nixified-ai = { url = "github:nixified-ai/flake"; };
|
||||
|
||||
nixos-wsl = { url = "github:nix-community/NixOS-WSL"; };
|
||||
@ -114,7 +113,7 @@
|
||||
};
|
||||
|
||||
outputs = inputs@{
|
||||
self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad,
|
||||
self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, nixtheplanet,
|
||||
xmonad-contrib, notifications-tray-icon, nix, agenix, imalison-taffybar, ...
|
||||
}:
|
||||
let
|
||||
@ -126,7 +125,7 @@
|
||||
name = machineNameFromFilename filename;
|
||||
value = {
|
||||
modules = [
|
||||
(machinesFilepath + ("/" + filename)) agenix.nixosModules.default
|
||||
(machinesFilepath + ("/" + filename)) agenix.nixosModules.default nixtheplanet.nixosModules.macos-ventura
|
||||
];
|
||||
};
|
||||
};
|
||||
|
@ -56,6 +56,5 @@ rec {
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ6lD0c+frh2vzQjvsrsmJpwM1ovaY59m5NNPml5G+E benjamin.j.corner@gmail.com"
|
||||
];
|
||||
interviewKeys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDr3Rim92K0aNWh2wCZjZMj927H6NZMvw+Jg5giVEklv/eeXlJn81xm9kFsqWOmN0IyS4X+2V2G/43t4C+REmzMKjkzTu9u6SJi+pC3jdJRm80sJCz2LBdRjPaY3CEubiUdxWvjisE8wUI1YuxxdegJpcemvhZXBfDU+DOqNEtF9KiPhXFMOoGU18k5AqFatdmE4z0H158cc6rCxdEiM8s+H6AJDA+xZSn9BPSx2I/ySRapoN0qJDloV19795ggnegBOjNuGejnKI0RZ8CyTcf1945Yi8/O/i/IChRlxiArjgAbC2DItkQig8YyQYz6WlKE9bwruMqe+8mgBAfuQXH8yTADwD1156VCRGoYAorAz4CLm73oGKtx4pa6WFsklWAIK1UEAhuLT6FKaJ/mmfKxcqdHxj+29FNo3d2Pam/ecFd0aERi5TExH5GKZr+LI7yKQmgk6laiR0n1wZuDwlNN7+69GH+ScxRngGCkc3RdTToqXzEaN3B6EyiAN/sAUgs= finn@LAPTOP-JI7BSSRJ"
|
||||
];
|
||||
}
|
||||
|
21
nixos/kubelet.nix
Normal file
21
nixos/kubelet.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ config, pkgs, makeEnable, ... }:
|
||||
makeEnable config "myModules.kubelet" false {
|
||||
age.secrets."api_service_account_key.json.age".file = ./secrets/api_service_account_key.json.age;
|
||||
services.kubernetes.kubelet = {
|
||||
enable = true;
|
||||
kubeconfig = {
|
||||
server = "https://34.31.205.230";
|
||||
caFile = ./railbird-kubernetes.crt;
|
||||
keyFile = config.age.secrets."api_service_account_key.json.age".path;
|
||||
};
|
||||
registerNode = true;
|
||||
cni = {
|
||||
packages = [ pkgs.cni-plugins ];
|
||||
};
|
||||
extraOpts = ''
|
||||
--fail-swap-on=false
|
||||
--container-runtime=remote
|
||||
--container-runtime-endpoint=unix:///run/containerd/containerd.sock
|
||||
'';
|
||||
};
|
||||
}
|
@ -4,6 +4,12 @@
|
||||
../configuration.nix
|
||||
];
|
||||
|
||||
services.macos-ventura = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
vncListenAddr = "0.0.0.0";
|
||||
};
|
||||
|
||||
features.full.enable = true;
|
||||
myModules.cache-server = {
|
||||
enable = true;
|
||||
@ -12,6 +18,7 @@
|
||||
myModules.gitea-runner.enable = true;
|
||||
myModules.vscode.enable = true;
|
||||
myModules.kat.enable = true;
|
||||
myModules.nvidia.enable = true;
|
||||
|
||||
networking.hostName = "nixquick";
|
||||
|
||||
@ -22,15 +29,6 @@
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
# install nvidia drivers in addition to intel one
|
||||
hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
|
||||
hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
|
||||
services.xserver = {
|
||||
videoDrivers = [ "nvidia" ];
|
||||
};
|
||||
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
||||
hardware.nvidia.modesetting.enable = true;
|
||||
|
||||
# This also enables v4l2loopback
|
||||
|
@ -6,6 +6,8 @@
|
||||
];
|
||||
|
||||
features.full.enable = true;
|
||||
myModules.kubelet.enable = true;
|
||||
myModules.nvidia.enable = true;
|
||||
# Needed for now because monitors have different refresh rates
|
||||
myModules.xmonad.picom.vSync.enable = false;
|
||||
myModules.cache-server = {
|
||||
|
15
nixos/nvidia.nix
Normal file
15
nixos/nvidia.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ config, pkgs, makeEnable, ... }:
|
||||
|
||||
makeEnable config "myModules.nvidia" false {
|
||||
environment.systemPackages = with pkgs; [
|
||||
nvidia-container-toolkit
|
||||
];
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
hardware.nvidia.open = false;
|
||||
hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
|
||||
hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
|
||||
hardware.graphics.enable32Bit = true;
|
||||
services.xserver = {
|
||||
videoDrivers = [ "nvidia" ];
|
||||
};
|
||||
}
|
@ -17,15 +17,16 @@ final: prev: {
|
||||
};
|
||||
});
|
||||
|
||||
picom = prev.picom.overrideAttrs (old: {
|
||||
src = prev.fetchFromGitHub {
|
||||
repo = "picom";
|
||||
owner = "dccsillag";
|
||||
rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5";
|
||||
sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8==";
|
||||
};
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [final.pcre];
|
||||
});
|
||||
# picom = prev.picom.overrideAttrs (old: {
|
||||
# src = prev.fetchFromGitHub {
|
||||
# repo = "picom";
|
||||
# owner = "dccsillag";
|
||||
# rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5";
|
||||
# sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8==";
|
||||
# };
|
||||
# nativeBuildInputs = old.nativeBuildInputs ++ [final.pcre final.gnugrep.pcre2 final.libpcre];
|
||||
# buildInputs = old.buildInputs ++ [final.pcre];
|
||||
# });
|
||||
|
||||
expressvpn = prev.expressvpn.overrideAttrs (_: {
|
||||
src = prev.fetchurl {
|
||||
|
25
nixos/railbird-kubernetes.crt
Normal file
25
nixos/railbird-kubernetes.crt
Normal file
@ -0,0 +1,25 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIELTCCApWgAwIBAgIRALNxOT7J7N/eK6edp9LbKAIwDQYJKoZIhvcNAQELBQAw
|
||||
LzEtMCsGA1UEAxMkM2I2N2M2NzgtNzI5My00YTIzLTg3ZWItY2NiMTZjYWFkMzFm
|
||||
MCAXDTIzMTIyOTE5NTQ0MloYDzIwNTMxMjIxMjA1NDQyWjAvMS0wKwYDVQQDEyQz
|
||||
YjY3YzY3OC03MjkzLTRhMjMtODdlYi1jY2IxNmNhYWQzMWYwggGiMA0GCSqGSIb3
|
||||
DQEBAQUAA4IBjwAwggGKAoIBgQCUYUuTrpDbwUS2B3SYUoa7LI5mi8NNr0lDe1w4
|
||||
3yPpVnu6ubvnTNm2j/v88HYwEjlppEg4HjhP7YEJ8gsGdgUCpIaPWTpifVmA7E4o
|
||||
2DbJDiePkkUGkNL0whCClOOcO0hyxdk9Pol5wRzci0l6zSalE6DB4rJrmB5Ppl/A
|
||||
t2KAVVqpwbynmbijr4yZh7Bp7LfaIrFthlv2ZPEjLfPLz7YthBw9/iUt94mLMyWZ
|
||||
BpygA5y/CocQQnnFMnU1o0eUd37YL7zErfIxx/AmL10Sq0qdFXiYOJJqubURbdS8
|
||||
DZ6dyHdX+UlxPls2Rlx9nDaiNGFJdzqHJzDdOlzN3kkdDQoO8xUdH9ekFU7rOwkP
|
||||
5NpubSwrd1FOGHh+EknugnEQD4Oip/YQ7IUj3Afm5Ag2la9k4WJRgjACbkQ2+k9I
|
||||
sFmPmmMVHn9nepCMiYQMjX7ApZw0isDPeVK5EuQeImgu7uNoV8R5VwG0XoBCXz4S
|
||||
UqYv11uEsMqFu07Zwlznsxnm0uECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgIEMA8G
|
||||
A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI73GznmeECJOdxJAEzmjhYgGVKtMA0G
|
||||
CSqGSIb3DQEBCwUAA4IBgQAm19zlm3WVePflA6Zh/FxvE8MirrJF6jmJzRrBCEM5
|
||||
DwkSmY3dvONqCYeeNb4+xWXWQ8eVKVlPdkoW3V7H5xnJ63dXRNN2lQ3JpSTG3+yP
|
||||
Omp6XGY9mmatdHwyV7N4h10aKEWAuRhy148sdJZLYj0LbR42pCVYhEP4D3Qj7KjN
|
||||
PJe+cR8NSpiYmDH5y88Jqubztj5NVcDj/iN9h/7/GajbU6lCgN/SxZgi9cNGjxSb
|
||||
JHFHE2Mp3z9sjsieTXMplLqK045TQ2IBqnJyMdKkvSNkRUCbz2yXdiIOKtvU4ly0
|
||||
h884z9P5JQ9bxe+6cwYC4ky3G5WYMn++RUsuCk4ScsrbZtM9jpKnz/TygMdVTC5w
|
||||
Siq6OHKtAnh8Ax1LEKicg9FLd6ODxR3OVKu+fUPV4XHAWJnmvElGlivjneHiE+OL
|
||||
dzgb/CfBEGHYBVc2PDIhwBmUdoEZ/t3UjvmSI46ZblYpWodJvLFwge2HxSivRlLW
|
||||
Uh/oPWX5N/CH9I34HTAhI48=
|
||||
-----END CERTIFICATE-----
|
BIN
nixos/secrets/api_service_account_key.json.age
Normal file
BIN
nixos/secrets/api_service_account_key.json.age
Normal file
Binary file not shown.
@ -13,4 +13,5 @@ in
|
||||
"gitea-runner-token.mac-demarco-mini.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
|
||||
"nextcloud-admin.age".publicKeys = keys.agenixKeys;
|
||||
"ryzen-shine-kubernetes-token.age".publicKeys = keys.agenixKeys;
|
||||
"api_service_account_key.json.age".publicKeys = keys.agenixKeys;
|
||||
}
|
||||
|
@ -18,6 +18,7 @@ let
|
||||
strixi-minaj-wsl = { id = "DOAEFFI-W6EZY3K-GDUHDLX-6DQPVFC-XU3G65X-5KX6RKK-EMF7ZT7-YKKKOAM"; };
|
||||
strixi-minaj = { id = "IF76WOS-WVYFAQG-ZZMIT3R-ZR6EQQH-YQP3FGZ-BJ3LJKO-56FK2XA-UREADQM"; };
|
||||
dean-zephyrus = { id = "UVIQVZQ-WFWVUQT-OTXPK7V-RXFKAVV-RY5DV2Z-XZEH3Q2-JQZIQLW-XMSB6AT"; };
|
||||
bencbox = { id = "FZFDBDG-J56RKLU-JZUHEAB-SAGB6CM-LRR6QFC-ZLNQG22-R2DEXAC-MY4BXQN"; };
|
||||
};
|
||||
allDevices = builtins.attrNames devices;
|
||||
in
|
||||
|
@ -92,12 +92,12 @@ in
|
||||
railbird = userDefaults // {
|
||||
inherit extraGroups;
|
||||
name = "railbird";
|
||||
openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdDevKeys;
|
||||
openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdFullstackDevKeys;
|
||||
};
|
||||
interview = userDefaults // {
|
||||
inherit extraGroups;
|
||||
name = "interview";
|
||||
openssh.authorizedKeys.keys = interviewKeys ++ inputs.railbird-secrets.keys.railbirdDevKeys;
|
||||
openssh.authorizedKeys.keys = interviewKeys ++ inputs.railbird-secrets.keys.railbirdFullstackDevKeys;
|
||||
};
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user