diff --git a/build.sh b/build.sh
index 483b3e8..4b4cfa5 100755
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,7 @@ CONFIG=$2
DERIVATION=".#nixosConfigurations.${CONFIG}.config.system.build.toplevel"
EXTRA_NIX_FLAGS="-L --accept-flake-config --keep-going"
-EXTRA_NIXOS_REBUILD_FLAGS="--use-remote-sudo --offline --fast"
+EXTRA_NIXOS_REBUILD_FLAGS="--sudo --no-reexec --offline" # legacy: --use-remote-sudo --fast
if [ "${ROOT}" = "/" ]; then
[ -f "host/${CONFIG}/hooks/pre-rebuild.sh" ] && host/${CONFIG}/hooks/pre-rebuild.sh
diff --git a/flake.lock b/flake.lock
index 2d8bc9e..8866b73 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,11 +132,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1757899718,
- "narHash": "sha256-34+Aedcg8h3Km1Ne6HpKDb8lxj100VP/dDLt7O08eOM=",
+ "lastModified": 1759670270,
+ "narHash": "sha256-DP9O5xUf/S9oglhbDWlREEuWPcw05fPLFcOaKd5Xg9M=",
"owner": "famedly",
"repo": "conduit",
- "rev": "2f1f2bea29a4e1ec8f1b17e710c6a42e997ed446",
+ "rev": "29aca1748844aa00161bc20553d091bd748bd46b",
"type": "gitlab"
},
"original": {
@@ -222,11 +222,11 @@
]
},
"locked": {
- "lastModified": 1756665676,
- "narHash": "sha256-/xJqYSiimmYhtqToNBIkjHVhJLKFRuZ7Hqi8o+tdhZY=",
+ "lastModified": 1758843686,
+ "narHash": "sha256-lFV92hOV9jXv+v8GQGtfcUbBT9FuUmEmyXaYQX4vpGw=",
"owner": "unmojang",
"repo": "drasl",
- "rev": "a365c936edaf24521d2c745bdb0767fd0126026d",
+ "rev": "0034c4174ac13caa66188e496c6bfc0ceb8ccd3b",
"type": "github"
},
"original": {
@@ -238,11 +238,11 @@
"draupnirSrc": {
"flake": false,
"locked": {
- "lastModified": 1755195606,
- "narHash": "sha256-KO2jm9yD/LnJSY1dAbPQ2fJZhmrxWJHU+TIaZzK97bg=",
+ "lastModified": 1759183312,
+ "narHash": "sha256-8zv+QJu1hNp+qXrCRcy47pZff3/QK3oZYqCCRVKn4vo=",
"owner": "the-draupnir-project",
"repo": "Draupnir",
- "rev": "f1dad52288ff32a096cbd3ff5be110648574c51f",
+ "rev": "fb14cea361541f32e724ef0269ab5c72fa519592",
"type": "github"
},
"original": {
@@ -582,11 +582,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1758184248,
- "narHash": "sha256-TOazVsj8D1LTGQ6q8xdtfoPs9Z+PiqUS952WvZPssR0=",
+ "lastModified": 1759573136,
+ "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "bf7056c6a2d893d80db18d06d7e730d6515aaae8",
+ "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43",
"type": "github"
},
"original": {
@@ -882,11 +882,11 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1758126409,
- "narHash": "sha256-RkqywRKSg1Dq0fgtiMCiMjfbCBiqfXsLSVMLKhCiL80=",
- "rev": "0018b988597f7e5fa482e3a77e3d6b539c146ed4",
+ "lastModified": 1759624822,
+ "narHash": "sha256-cf40qfsfpxJU/BnQ9PEj027LdPINNSsJqm+C6Ug93BA=",
+ "rev": "57333a0e600c5e096a609410a2f1059b97194b1e",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0018b988597f7e5fa482e3a77e3d6b539c146ed4.tar.gz?rev=0018b988597f7e5fa482e3a77e3d6b539c146ed4"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/57333a0e600c5e096a609410a2f1059b97194b1e.tar.gz?rev=57333a0e600c5e096a609410a2f1059b97194b1e"
},
"original": {
"type": "tarball",
@@ -919,11 +919,11 @@
"matrixSpecSrc": {
"flake": false,
"locked": {
- "lastModified": 1758127728,
- "narHash": "sha256-VsrElexdC6J5fGBM2oznq3mA1gZCE+PEnGHFHOnHPZ8=",
+ "lastModified": 1759537721,
+ "narHash": "sha256-PBs79mZ4WS0UuEG9p4LZHQXsFBk+6Ce/b18GR3DRuZQ=",
"owner": "matrix-org",
"repo": "matrix-spec",
- "rev": "2a8c0bc7b8c4f0fe5615ddfda9153643b6a164f3",
+ "rev": "b6a127b5cb893ef76e09dc02ddd2a53b467f857a",
"type": "github"
},
"original": {
@@ -936,11 +936,11 @@
"mtxclientSrc": {
"flake": false,
"locked": {
- "lastModified": 1754164950,
- "narHash": "sha256-v/TaaGrCO3M86pF1P0O25iN0+s2t84iPKhgOtxZT0wQ=",
+ "lastModified": 1758395358,
+ "narHash": "sha256-zxpvRDKpp8sWSmf/xLgoHDWMzmdkQenZepXg+CoGtcg=",
"owner": "Nheko-reborn",
"repo": "mtxclient",
- "rev": "fa181521c2300d57ac4d3a833a059317b1ea6dc3",
+ "rev": "d6f10427d1c5e5b1a45f426274f8d2e8dd0b64be",
"type": "github"
},
"original": {
@@ -1060,11 +1060,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1758185284,
- "narHash": "sha256-KjAH4h2OeFvBlhjcGpdmMYwfuwko4e+/DeYCIpeoFZ0=",
+ "lastModified": 1759680666,
+ "narHash": "sha256-EcZymrFbZPobJ9+dTyn/ni1HNXvdVfYobpe+CYJEB6I=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "931efcfc04da058ddc4a8d9fa17d30708f1b2573",
+ "rev": "9bea8d594d489c2909e7f00bb5aef9e9c31dd241",
"type": "github"
},
"original": {
@@ -1076,11 +1076,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1758185284,
- "narHash": "sha256-KjAH4h2OeFvBlhjcGpdmMYwfuwko4e+/DeYCIpeoFZ0=",
+ "lastModified": 1759680666,
+ "narHash": "sha256-EcZymrFbZPobJ9+dTyn/ni1HNXvdVfYobpe+CYJEB6I=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "931efcfc04da058ddc4a8d9fa17d30708f1b2573",
+ "rev": "9bea8d594d489c2909e7f00bb5aef9e9c31dd241",
"type": "github"
},
"original": {
@@ -1092,11 +1092,11 @@
},
"nixpkgs-override-draupnir": {
"locked": {
- "lastModified": 1758185284,
- "narHash": "sha256-KjAH4h2OeFvBlhjcGpdmMYwfuwko4e+/DeYCIpeoFZ0=",
+ "lastModified": 1759680666,
+ "narHash": "sha256-EcZymrFbZPobJ9+dTyn/ni1HNXvdVfYobpe+CYJEB6I=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "931efcfc04da058ddc4a8d9fa17d30708f1b2573",
+ "rev": "9bea8d594d489c2909e7f00bb5aef9e9c31dd241",
"type": "github"
},
"original": {
@@ -1156,11 +1156,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1758070117,
- "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
+ "lastModified": 1759580034,
+ "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
+ "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
"type": "github"
},
"original": {
@@ -1172,11 +1172,11 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1757746433,
- "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
+ "lastModified": 1759570798,
+ "narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d",
+ "rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26",
"type": "github"
},
"original": {
@@ -1252,11 +1252,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1757745802,
- "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+ "lastModified": 1759036355,
+ "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+ "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github"
},
"original": {
@@ -1284,11 +1284,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1758035966,
- "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
+ "lastModified": 1759381078,
+ "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
+ "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
"type": "github"
},
"original": {
@@ -1300,11 +1300,11 @@
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1749285348,
- "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
+ "lastModified": 1758277210,
+ "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
+ "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
"type": "github"
},
"original": {
@@ -1319,11 +1319,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
- "lastModified": 1750514805,
- "narHash": "sha256-BcHbwm7cVfxb0ocicnn21PNE7ijyLlUZk1utzrR06Ys=",
+ "lastModified": 1758564854,
+ "narHash": "sha256-L4PAVBG994fWuN0ORTSffMGWTF0qYpZQ+Gy66TmkRmM=",
"ref": "refs/heads/master",
- "rev": "1bf1950bdea07f72b699ac105800f5bb437a70fd",
- "revCount": 15,
+ "rev": "86b52a9ff6ac404d841f900d1ab4d4471ff6ca7d",
+ "revCount": 19,
"type": "git",
"url": "https://cgit.rory.gay/nix/OOYE-module.git"
},
@@ -1439,11 +1439,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1758007585,
- "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
+ "lastModified": 1759635238,
+ "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
+ "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
"type": "github"
},
"original": {
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index d758710..054f03f 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -16,8 +16,9 @@ args@{
# ../../modules/environments/home.nix
../../modules/users/cb.nix
../../modules/software-templates/profilers.nix
- ../../modules/software-templates/dotnet.client.nix
- #../../modules/hardware/google-stadia-controller.nix
+ ../../modules/software-templates/eid-mw.nix
+ ../../modules/software-templates/devenv/dotnet.nix
+ ../../modules/software-templates/devenv/javascript.nix
./services/nginx.nix
./services/postgres.nix
@@ -25,16 +26,18 @@ args@{
# hardware-specific imports
./optional/hardware-specific/amd.nix
- #./services/edu/mongodb.nix
./optional/gui/hyprland.nix
- #./optional/gui/x11.nix
./services/libvirt.nix
- #./services/printing.nix
./services/rabbitmq.nix
+ #./services/edu/mongodb.nix
+ #./optional/gui/x11.nix
+ #./services/printing.nix
#./services/ollama.nix
#./services/waydroid.nix
];
+ #services.flatpak.enable = true;
+
boot = {
kernelPackages = pkgs.linuxPackages_latest;
loader = {
@@ -86,7 +89,7 @@ args@{
i18n.defaultLocale = "en_US.UTF-8";
services = {
- displayManager.gdm.enable = true;
+ displayManager.sddm.enable = true;
xserver = {
displayManager.lightdm.enable = false;
enable = true;
@@ -116,6 +119,7 @@ args@{
services.desktopManager.gnome.enable = false;
environment.systemPackages = with pkgs; [
+ adwaita-icon-theme
eog
mpv
libreoffice
@@ -126,29 +130,6 @@ args@{
kitty
youtube-music
- # - IDEs
- #jetbrains-toolbox
- (jetbrains.plugins.addPlugins jetbrains.webstorm [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
- ])
- (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
- "nixidea"
- "visual-studio-keymap"
- ]) # "string-manipulation"
- (jetbrains.plugins.addPlugins jetbrains.clion [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
- "nixidea"
- "visual-studio-keymap"
- ]) # "string-manipulation"
- #jetbrains.rider
- #jetbrains.clion
- #github-copilot-intellij-agent
- openjdk17
-
dbeaver-bin
#insomnia
vscode
@@ -157,11 +138,8 @@ args@{
inkscape-with-extensions
gimp
- # - Languages
- dotnetCorePackages.sdk_9_0
-
#games
- osu-lazer-bin
+ #osu-lazer-bin
# extra packages
dmenu
@@ -195,15 +173,9 @@ args@{
thunderbird
- p11-kit
- opensc
- eid-mw
jitsi-meet-electron
#nixd
];
- environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
- module: ${pkgs.opensc}/lib/opensc-pkcs11.so
- '';
xdg = {
portal = {
@@ -289,7 +261,6 @@ args@{
enable = true;
memoryPercent = 200;
};
- services.pcscd.enable = true;
virtualisation.vmVariant = {
users = {
diff --git a/host/Rory-desktop/optional/gui/hyprland.nix b/host/Rory-desktop/optional/gui/hyprland.nix
index 0932f37..22fca5b 100644
--- a/host/Rory-desktop/optional/gui/hyprland.nix
+++ b/host/Rory-desktop/optional/gui/hyprland.nix
@@ -22,11 +22,11 @@
keepassxc
];
- environment.etc."hyprPlugins" = {
- text = ''
- plugin = ${hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3}/lib/libhy3.so
- '';
- };
+ #environment.etc."hyprPlugins" = {
+ # text = ''
+ # plugin = ${hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3}/lib/libhy3.so
+ # '';
+ #};
xdg.portal.wlr.enable = true;
}
diff --git a/host/Rory-desktop/optional/gui/i3.nix b/host/Rory-desktop/optional/gui/i3.nix
index 9070298..7ed5264 100644
--- a/host/Rory-desktop/optional/gui/i3.nix
+++ b/host/Rory-desktop/optional/gui/i3.nix
@@ -2,8 +2,6 @@
config,
pkgs,
lib,
- nhekoSrc,
- mtxclientSrc,
...
}:
diff --git a/host/Rory-desktop/optional/hardware-specific/amd.nix b/host/Rory-desktop/optional/hardware-specific/amd.nix
index e4758a6..225442f 100644
--- a/host/Rory-desktop/optional/hardware-specific/amd.nix
+++ b/host/Rory-desktop/optional/hardware-specific/amd.nix
@@ -2,8 +2,6 @@
config,
pkgs,
lib,
- nhekoSrc,
- mtxclientSrc,
...
}:
diff --git a/host/Rory-desktop/optional/hardware-specific/nvidia.nix b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
index c146c3a..c896e1c 100644
--- a/host/Rory-desktop/optional/hardware-specific/nvidia.nix
+++ b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
@@ -2,8 +2,6 @@
config,
pkgs,
lib,
- nhekoSrc,
- mtxclientSrc,
...
}:
diff --git a/modules/software-templates/devenv/c-cpp.nix b/modules/software-templates/devenv/c-cpp.nix
new file mode 100644
index 0000000..d07191b
--- /dev/null
+++ b/modules/software-templates/devenv/c-cpp.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+ environment.systemPackages = with pkgs; [
+ (jetbrains.plugins.addPlugins jetbrains.clion [
+ jetbrains.plugins.github-copilot-fixed
+ #"github-copilot"
+ "nixidea"
+ "visual-studio-keymap"
+ ]) # "string-manipulation"
+ ];
+}
\ No newline at end of file
diff --git a/modules/software-templates/dotnet.client.nix b/modules/software-templates/devenv/dotnet.nix
index f855aa3..bb052d8 100644
--- a/modules/software-templates/dotnet.client.nix
+++ b/modules/software-templates/devenv/dotnet.nix
@@ -22,5 +22,6 @@ in
#"github-copilot"
"nixidea"
])
+ dotnetCorePackages.sdk_9_0
];
}
diff --git a/modules/software-templates/devenv/java.nix b/modules/software-templates/devenv/java.nix
new file mode 100644
index 0000000..48613e1
--- /dev/null
+++ b/modules/software-templates/devenv/java.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+ environment.systemPackages = with pkgs; [
+ (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [
+ jetbrains.plugins.github-copilot-fixed
+ #"github-copilot"
+ "nixidea"
+ "visual-studio-keymap"
+ ]) # "string-manipulation"
+ openjdk17
+ ];
+}
\ No newline at end of file
diff --git a/modules/software-templates/devenv/javascript.nix b/modules/software-templates/devenv/javascript.nix
new file mode 100644
index 0000000..1d272fb
--- /dev/null
+++ b/modules/software-templates/devenv/javascript.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+ environment.systemPackages = with pkgs; [
+ (jetbrains.plugins.addPlugins jetbrains.webstorm [
+ jetbrains.plugins.github-copilot-fixed
+ #"github-copilot"
+ ])
+ nodejs
+ ];
+}
\ No newline at end of file
diff --git a/modules/software-templates/eid-mw.nix b/modules/software-templates/eid-mw.nix
new file mode 100644
index 0000000..b74d060
--- /dev/null
+++ b/modules/software-templates/eid-mw.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+ services.pcscd.enable = true;
+ environment.systemPackages = with pkgs; [
+ p11-kit
+ opensc
+ eid-mw
+ ];
+ environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
+ module: ${pkgs.opensc}/lib/opensc-pkcs11.so
+ '';
+}
\ No newline at end of file
diff --git a/modules/software-templates/profilers.nix b/modules/software-templates/profilers.nix
index c90f81e..8c67b4f 100644
--- a/modules/software-templates/profilers.nix
+++ b/modules/software-templates/profilers.nix
@@ -3,7 +3,7 @@
{
environment.systemPackages = with pkgs; [
kdePackages.kcachegrind
- config.boot.kernelPackages.perf
+ perf
hotspot
valgrind
];
|
