From 3ffd596afcca0f2902d2f301bb64726c442d144a Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 23 Jun 2025 22:46:51 +0200 Subject: [PATCH 01/29] fix: typo --- system_profiles/components/qemu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_profiles/components/qemu.nix b/system_profiles/components/qemu.nix index 39b817d..4a14da3 100644 --- a/system_profiles/components/qemu.nix +++ b/system_profiles/components/qemu.nix @@ -1,4 +1,4 @@ -{modulesPath, ...}; { +{modulesPath, ...}: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; From 075f98232b9c9b572cb1bc7d05e18662a415e75d Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 23 Jun 2025 22:47:16 +0200 Subject: [PATCH 02/29] chore: update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7a8ac69..4a5262d 100644 --- a/flake.lock +++ b/flake.lock @@ -296,11 +296,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749832440, - "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "db030f62a449568345372bd62ed8c5be4824fa49", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749908208, - "narHash": "sha256-0nf9P4kRAzsBvf5jbY7M3NlnGSwBzU50kJAYGZH5Ez4=", + "lastModified": 1750246804, + "narHash": "sha256-PpfLVyPk1fS67g2RI/gkR9eeo1gExae/29xxXf7GhIU=", "owner": "danth", "repo": "stylix", - "rev": "67c8eca32f1baf158ffb9a56f28a2fc8e9852fb0", + "rev": "614f53d3d0e97ade9cffe8b7475dd90dce365821", "type": "github" }, "original": { From c6a4d91a864972b5220ee10ec9f788324d95e76f Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 28 Jun 2025 01:34:11 +0200 Subject: [PATCH 03/29] fix: only mono for better performance --- modules/software/audio_video/noise_cancel.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/software/audio_video/noise_cancel.nix b/modules/software/audio_video/noise_cancel.nix index 4dd4386..d0bbd2b 100644 --- a/modules/software/audio_video/noise_cancel.nix +++ b/modules/software/audio_video/noise_cancel.nix @@ -12,7 +12,8 @@ "type" = "ladspa"; "name" = "rnnoise"; "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; - "label" = "noise_suppressor_stereo"; + # mono can be replaced with stereo for double the performance as cost + "label" = "noise_suppressor_mono"; "control" = { "VAD Threshold (%)" = 75.0; }; From f5bb572e56fcc043263118dc32fafb1f04938de3 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 28 Jun 2025 01:34:36 +0200 Subject: [PATCH 04/29] fix: add all the options --- modules/software/audio_video/noise_cancel.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/software/audio_video/noise_cancel.nix b/modules/software/audio_video/noise_cancel.nix index d0bbd2b..b8d1abf 100644 --- a/modules/software/audio_video/noise_cancel.nix +++ b/modules/software/audio_video/noise_cancel.nix @@ -15,7 +15,12 @@ # mono can be replaced with stereo for double the performance as cost "label" = "noise_suppressor_mono"; "control" = { + # if probability of sound being a voice is lower than this threshold - it will be silenced. In most cases the threshold between 85% - 95% would be fine. Without the VAD some loud noises may still be a bit audible when there is no voice. "VAD Threshold (%)" = 75.0; + # for how long after the last voice detection the output won't be silenced. This helps when ends of words/sentences are being cut off. + "VAD Grace Period (ms)" = 200; + # similar to VAD Grace Period (ms) but for starts of words/sentences. This introduces latency! + "Retroactive VAD Grace Period (ms)" = 0; }; } ]; @@ -27,10 +32,12 @@ "capture.props" = { "node.name" = "effect_input.rnnoise"; "node.passive" = true; + "audio.rate" = 48000; }; "playback.props" = { "node.name" = "effect_output.rnnoise"; "media.class" = "Audio/Source"; + "audio.rate" = 48000; }; }; } From 1c3310ef85f306dd40112331bb4f29dd9ca70ebd Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 28 Jun 2025 16:01:36 +0200 Subject: [PATCH 05/29] chore: update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 4a5262d..ca46464 100644 --- a/flake.lock +++ b/flake.lock @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "lastModified": 1750969886, + "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750246804, - "narHash": "sha256-PpfLVyPk1fS67g2RI/gkR9eeo1gExae/29xxXf7GhIU=", + "lastModified": 1750964616, + "narHash": "sha256-C4Ze08bSadL/3Xba88wrxcmlzn/kPM2Bj3lBX501htk=", "owner": "danth", "repo": "stylix", - "rev": "614f53d3d0e97ade9cffe8b7475dd90dce365821", + "rev": "d25e22b5c559651da55c0f46106e44fc88069ae1", "type": "github" }, "original": { From 91c411f17c1d3d46441b74426bd4175d1d8fb0bf Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 28 Jun 2025 16:07:25 +0200 Subject: [PATCH 06/29] feat: add lact (gpu performance tool) --- modules/hardware/default.nix | 3 ++- modules/hardware/{gpu.nix => gpu-backend.nix} | 0 modules/hardware/gpu-frontend.nix | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) rename modules/hardware/{gpu.nix => gpu-backend.nix} (100%) create mode 100644 modules/hardware/gpu-frontend.nix diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index c6ebe66..2c2b12f 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -2,7 +2,8 @@ imports = [ ./bluetooth.nix ./fwupd.nix - ./gpu.nix + ./gpu-backend.nix + ./gpu-frontend.nix ./print.nix ./scan.nix #./trackpoint.nix diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu-backend.nix similarity index 100% rename from modules/hardware/gpu.nix rename to modules/hardware/gpu-backend.nix diff --git a/modules/hardware/gpu-frontend.nix b/modules/hardware/gpu-frontend.nix new file mode 100644 index 0000000..fd59eaa --- /dev/null +++ b/modules/hardware/gpu-frontend.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + environment.systemPackages = [ pkgs.lact ]; + + systemd = { + packages = [ pkgs.lact ]; + services.lactd.wantedBy = ["multi-user.target"]; + }; +} From 0b6177320ff8cb7237b94d2388ec2ec6ae56d311 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 28 Jun 2025 18:03:42 +0200 Subject: [PATCH 07/29] chore: update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ca46464..0479253 100644 --- a/flake.lock +++ b/flake.lock @@ -312,11 +312,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { From ab009108dda42def1b9255e8516a7d6a060d5715 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 30 Jun 2025 21:41:39 +0200 Subject: [PATCH 08/29] feat: initial configuration for galene --- certificates/id_ed25519_srv-videoconf.pub | 1 + hosts/srv-videoconf/boot.nix | 12 ++++++++++++ hosts/srv-videoconf/default.nix | 15 +++++++++++++++ hosts/srv-videoconf/hardware-configuration.nix | 10 ---------- outputs.nix | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 certificates/id_ed25519_srv-videoconf.pub create mode 100644 hosts/srv-videoconf/boot.nix diff --git a/certificates/id_ed25519_srv-videoconf.pub b/certificates/id_ed25519_srv-videoconf.pub new file mode 100644 index 0000000..058cd61 --- /dev/null +++ b/certificates/id_ed25519_srv-videoconf.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPel38K6eMnz1kS/od+4znlq0/wqUk1HifXVerv/DZUZ srv-videoconf diff --git a/hosts/srv-videoconf/boot.nix b/hosts/srv-videoconf/boot.nix new file mode 100644 index 0000000..24a7a29 --- /dev/null +++ b/hosts/srv-videoconf/boot.nix @@ -0,0 +1,12 @@ +{ + # Use the GRUB 2 boot loader. + boot.loader.grub = { + enable = true; + # efiSupport = true; + # efiInstallAsRemovable = true; + # Define on which hard drive you want to install Grub. + device = "/dev/vda"; # or "nodev" for efi only + }; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; +} + diff --git a/hosts/srv-videoconf/default.nix b/hosts/srv-videoconf/default.nix index a1a0222..c816902 100644 --- a/hosts/srv-videoconf/default.nix +++ b/hosts/srv-videoconf/default.nix @@ -1,7 +1,22 @@ {rootPath, ...}: { imports = [ + ./boot.nix ./hardware-configuration.nix (rootPath + /system_profiles/server.nix) ]; + services.galene = { + enable = true; + + insecure = true; + }; + + users = let + username = "root"; + in { + users."${username}".openssh.authorizedKeys.keyFiles = [ + (rootPath + /certificates/id_ed25519_srv-videoconf.pub) + ]; + }; + } diff --git a/hosts/srv-videoconf/hardware-configuration.nix b/hosts/srv-videoconf/hardware-configuration.nix index e26ed92..368ee81 100644 --- a/hosts/srv-videoconf/hardware-configuration.nix +++ b/hosts/srv-videoconf/hardware-configuration.nix @@ -3,7 +3,6 @@ # to /etc/nixos/configuration.nix instead. { lib, - modulesPath, ... }: { boot = { @@ -13,15 +12,6 @@ extraModulePackages = []; }; - fileSystems."/" = { - device = "/dev/disk/by-uuid/d290e12c-d93c-45f6-b737-135b551c1951"; - fsType = "ext4"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/8c56f52e-568a-4e03-b22c-6d1c7de7c118";} - ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction diff --git a/outputs.nix b/outputs.nix index 5c64096..436b714 100644 --- a/outputs.nix +++ b/outputs.nix @@ -15,7 +15,7 @@ in { nixosConfigurations = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) { crocoite = {stateVersion = "24.05";}; - #srv-videoconf = {stateVersion = "24.11";}; + srv-videoconf = {stateVersion = "25.05";}; game-luanti = {stateVersion = "25.05";}; From ac2b4b2c6d729678f32c29fd2e47677009ad5a01 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sun, 6 Jul 2025 22:44:51 +0200 Subject: [PATCH 09/29] feat: add nh --- modules/software/nix-helper/default.nix | 1 + modules/software/nix-helper/nh.nix | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 modules/software/nix-helper/nh.nix diff --git a/modules/software/nix-helper/default.nix b/modules/software/nix-helper/default.nix index 3de729c..8bc7716 100644 --- a/modules/software/nix-helper/default.nix +++ b/modules/software/nix-helper/default.nix @@ -2,6 +2,7 @@ imports = [ #./doc.nix ./index.nix + ./nh.nix ./nix-ld.nix ]; } diff --git a/modules/software/nix-helper/nh.nix b/modules/software/nix-helper/nh.nix new file mode 100644 index 0000000..a215203 --- /dev/null +++ b/modules/software/nix-helper/nh.nix @@ -0,0 +1,8 @@ +{ + programs.nh = { + enable = true; + #clean.enable = true; + #clean.extraArgs = "--keep-since 4d --keep 3"; + #flake = "/home/user/my-nixos-config"; + }; +} From f96c84621b7be76c24fead162b4186e6ed1e21f4 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sun, 6 Jul 2025 22:45:08 +0200 Subject: [PATCH 10/29] feat: fd & meld --- modules/software/packages/extended.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/software/packages/extended.nix b/modules/software/packages/extended.nix index 028ac4d..d203f32 100644 --- a/modules/software/packages/extended.nix +++ b/modules/software/packages/extended.nix @@ -15,16 +15,15 @@ lm_sensors unstable.neovim - gitui lazygit + meld gnumake gcc nodePackages.npm nodejs-slim python3 - fd nodejs-slim cargo rustc @@ -34,6 +33,7 @@ unstable.yt-dlp miniserve fzf + fd qemu home-manager dfc From 6f5bf97a1c795f0693daa409a8f2399e44d288b6 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 11 Jul 2025 17:30:10 +0200 Subject: [PATCH 11/29] chore: update lock --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 0479253..7d1714d 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", + "lastModified": 1751810233, + "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", + "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", "type": "github" }, "original": { @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { @@ -245,11 +245,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1749394952, - "narHash": "sha256-WbWkzIvB0gqAdBLghdmUpGveY7MlAS2iMj3VEJnJ9yE=", + "lastModified": 1751276396, + "narHash": "sha256-oOYrnKStMsOXST+wKnzuSZ49h8Dr1Q3mIn2f5Kb5GAw=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "64c6e53a3999957c19ab95cda78bde466d8374cc", + "rev": "59adb9ad1cbd915494fc35cd0e0a9d582ca9de74", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750837715, - "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1751320053, + "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750964616, - "narHash": "sha256-C4Ze08bSadL/3Xba88wrxcmlzn/kPM2Bj3lBX501htk=", + "lastModified": 1751770411, + "narHash": "sha256-vYEATPgPd4B44935y8oztuMN4svY2G+03tgEOW1zKzQ=", "owner": "danth", "repo": "stylix", - "rev": "d25e22b5c559651da55c0f46106e44fc88069ae1", + "rev": "edfbd2e57bc3b03b675585401684f94425b367c3", "type": "github" }, "original": { @@ -468,11 +468,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -484,11 +484,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { From 460c074343878996d3dbd4935ca321b8db3c5b60 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 11 Jul 2025 19:34:44 +0200 Subject: [PATCH 12/29] chore: update flake --- flake.lock | 124 ++++++++--------------------------------------------- 1 file changed, 18 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index 7d1714d..9c4d7d2 100644 --- a/flake.lock +++ b/flake.lock @@ -83,21 +83,6 @@ "type": "github" } }, - "flake-compat": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -135,54 +120,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -207,33 +144,11 @@ ] }, "locked": { - "lastModified": 1751810233, - "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", + "lastModified": 1752208517, + "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", + "rev": "c6a01e54af81b381695db796a43360bf6db5702f", "type": "github" }, "original": { @@ -281,11 +196,11 @@ ] }, "locked": { - "lastModified": 1747663185, - "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", + "lastModified": 1751903740, + "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", + "rev": "032decf9db65efed428afd2fa39d80f7089085eb", "type": "github" }, "original": { @@ -296,11 +211,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -312,11 +227,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751637120, - "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -328,11 +243,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { @@ -386,11 +301,8 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], @@ -403,11 +315,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751770411, - "narHash": "sha256-vYEATPgPd4B44935y8oztuMN4svY2G+03tgEOW1zKzQ=", + "lastModified": 1752232804, + "narHash": "sha256-a5PUeIEXQhs9TIj+KeWuJTPaCRFMxYnW7izkOhp5tsw=", "owner": "danth", "repo": "stylix", - "rev": "edfbd2e57bc3b03b675585401684f94425b367c3", + "rev": "3035b3107e4d8b6ad8f228052bd198aebcc09047", "type": "github" }, "original": { From ac48ec9a0ae694303f3600be2d9a8bade40f7886 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 11 Jul 2025 19:55:06 +0200 Subject: [PATCH 13/29] feat: add sshfs package --- modules/software/packages/extended.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/software/packages/extended.nix b/modules/software/packages/extended.nix index d203f32..4f8bf47 100644 --- a/modules/software/packages/extended.nix +++ b/modules/software/packages/extended.nix @@ -3,6 +3,7 @@ # low level stuff efibootmgr #exfat + sshfs exfatprogs greetd.greetd greetd.tuigreet From b429e7b7e22ff907482ebee91a331df95fa07df0 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 20 Aug 2025 21:21:00 +0200 Subject: [PATCH 14/29] feat: add direnv --- modules/direnv.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 modules/direnv.nix diff --git a/modules/direnv.nix b/modules/direnv.nix new file mode 100644 index 0000000..244e198 --- /dev/null +++ b/modules/direnv.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: { + #set to default values + programs.direnv = { + package = pkgs.direnv; + silent = false; + loadInNixShell = true; + direnvrcExtra = ""; + nix-direnv = { + enable = true; + package = pkgs.nix-direnv; + }; + }; +} From f7aaa37b643088c099beaf67e4702401e1bc47d9 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 20 Aug 2025 21:54:26 +0200 Subject: [PATCH 15/29] chore: update lock --- flake.lock | 239 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 220 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 9c4d7d2..5fd67f1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,55 @@ { "nodes": { + "agenix": { + "inputs": { + "agenix": "agenix_2", + "crane": "crane", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nix-secrets", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "agenix_2": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nix-secrets", + "agenix", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "owner": "ryantm", + "repo": "agenix", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -67,6 +117,45 @@ "type": "github" } }, + "crane": { + "locked": { + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "nix-secrets", + "agenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -104,6 +193,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -144,11 +251,11 @@ ] }, "locked": { - "lastModified": 1752208517, - "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6a01e54af81b381695db796a43360bf6db5702f", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -158,13 +265,36 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nix-secrets", + "agenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nix-flatpak": { "locked": { - "lastModified": 1751276396, - "narHash": "sha256-oOYrnKStMsOXST+wKnzuSZ49h8Dr1Q3mIn2f5Kb5GAw=", + "lastModified": 1754777568, + "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "59adb9ad1cbd915494fc35cd0e0a9d582ca9de74", + "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", "type": "github" }, "original": { @@ -173,6 +303,24 @@ "type": "github" } }, + "nix-secrets": { + "inputs": { + "agenix": "agenix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754250341, + "narHash": "sha256-Z7GVaLs0mJnMyMrQYMZdNHEdfwBRW8w2fLqWxYjXFIA=", + "path": "/home/ranomier/Projects/nix-secrets", + "type": "path" + }, + "original": { + "path": "/home/ranomier/Projects/nix-secrets", + "type": "path" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -211,11 +359,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -227,11 +375,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -243,11 +391,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751943650, - "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", + "lastModified": 1755593991, + "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", "type": "github" }, "original": { @@ -287,6 +435,7 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", @@ -294,6 +443,28 @@ "stylix": "stylix" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nix-secrets", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741400194, + "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -307,7 +478,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -315,11 +486,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752232804, - "narHash": "sha256-a5PUeIEXQhs9TIj+KeWuJTPaCRFMxYnW7izkOhp5tsw=", + "lastModified": 1755710103, + "narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=", "owner": "danth", "repo": "stylix", - "rev": "3035b3107e4d8b6ad8f228052bd198aebcc09047", + "rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808", "type": "github" }, "original": { @@ -344,6 +515,36 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { From 6fe837a3de701d4325b788035d62ea75b4d56aec Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 20 Aug 2025 21:55:28 +0200 Subject: [PATCH 16/29] fix: import direnv --- modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default.nix b/modules/default.nix index a2abd41..22f5da1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,6 +2,7 @@ imports = [ ./accessibility.nix ./customisation.nix + ./direnv.nix # should only be imported directly or via system_profiles #./dhcp-all-interfaces.nix From 2acabfe09f334f610f22ca8d37dd603ecf979137 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 23 Aug 2025 14:23:27 +0200 Subject: [PATCH 17/29] wip: add my nix secrets repo --- flake.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flake.nix b/flake.nix index ef446c9..5367730 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-secrets = { + url = "path:/home/ranomier/Projects/nix-secrets"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # for managing flatpaks, like which ones are installed and which not nix-flatpak.url = "github:gmodena/nix-flatpak"; }; From c8236dfa7ead66f7742429636f198e02279df4cb Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 23 Aug 2025 14:35:57 +0200 Subject: [PATCH 18/29] feat: add scratch files and folders to gitignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index cd3c43b..8565e0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ nixos-switch.log + +# make it possible to just put stuff in the repo to test things +# or to have a reference, but they don't end up upstream +**/*/scratch/ +scratch +**/*/*.scratch +*.scratch From 751609cb72cd35ee61b4bd57e84acaec2c0fe45b Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 23 Aug 2025 14:36:43 +0200 Subject: [PATCH 19/29] wip: add test secret for game-luanti --- hosts/game-luanti/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/game-luanti/default.nix b/hosts/game-luanti/default.nix index cbac390..0a179be 100644 --- a/hosts/game-luanti/default.nix +++ b/hosts/game-luanti/default.nix @@ -1,4 +1,4 @@ -{rootPath, ...}: { +{inArgs, rootPath, config, ...}: { imports = [ ./boot.nix ./hardware-configuration.nix @@ -6,8 +6,11 @@ (rootPath + /modules/game/server/luanti) (rootPath + /modules/pkg_mgrmnt/unattended-updates.nix) + inArgs.nix-secrets.nixos-modules.game-luanti ]; + environment.etc."bla".source = config.age.secrets.hello.path; + users = let username = "root"; in { From 5ad19562e647c3a84eb27aebae6956260a2efc99 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 23 Aug 2025 15:02:05 +0200 Subject: [PATCH 20/29] chore: update flake.lock --- flake.lock | 14 +++++++------- system_profiles/components/nix-defaults.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 5fd67f1..0696130 100644 --- a/flake.lock +++ b/flake.lock @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -311,7 +311,7 @@ ] }, "locked": { - "lastModified": 1754250341, + "lastModified": 1755720954, "narHash": "sha256-Z7GVaLs0mJnMyMrQYMZdNHEdfwBRW8w2fLqWxYjXFIA=", "path": "/home/ranomier/Projects/nix-secrets", "type": "path" @@ -391,11 +391,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755593991, - "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", + "lastModified": 1755704039, + "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", + "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", "type": "github" }, "original": { diff --git a/system_profiles/components/nix-defaults.nix b/system_profiles/components/nix-defaults.nix index 13be0a2..157ced6 100644 --- a/system_profiles/components/nix-defaults.nix +++ b/system_profiles/components/nix-defaults.nix @@ -9,7 +9,7 @@ # Lix is a modern, delicious implementation of the Nix package manager, # focused on correctness, usability, and growth – # and committed to doing right by its community. - package = lib.mkDefault pkgs.lix; + #package = lib.mkDefault pkgs.lix; channel.enable = lib.mkDefault false; From d36f14b847cbaa0e4fa6bef356facfa1aafdef06 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sun, 31 Aug 2025 23:01:48 +0200 Subject: [PATCH 21/29] move home-manager into system_profiles --- modules/software/packages/extended.nix | 1 - modules/users/ranomier/home-manager.nix | 5 ----- system_profiles/components/home-manager.nix | 10 ++++++++++ system_profiles/desktop.nix | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 system_profiles/components/home-manager.nix diff --git a/modules/software/packages/extended.nix b/modules/software/packages/extended.nix index 4f8bf47..c425183 100644 --- a/modules/software/packages/extended.nix +++ b/modules/software/packages/extended.nix @@ -36,7 +36,6 @@ fzf fd qemu - home-manager dfc sops diff --git a/modules/users/ranomier/home-manager.nix b/modules/users/ranomier/home-manager.nix index f097950..2bd6b49 100644 --- a/modules/users/ranomier/home-manager.nix +++ b/modules/users/ranomier/home-manager.nix @@ -1,9 +1,4 @@ {inArgs, pkgs, ...}: { - imports = [ - inArgs.home-manager.nixosModules.home-manager - ]; - home-manager.useUserPackages = true; - home-manager.useGlobalPkgs = true; home-manager.users."ranomier" = { stylix.iconTheme = { diff --git a/system_profiles/components/home-manager.nix b/system_profiles/components/home-manager.nix new file mode 100644 index 0000000..42eeaba --- /dev/null +++ b/system_profiles/components/home-manager.nix @@ -0,0 +1,10 @@ +{inArgs, pkgs, ...}: { + imports = [ inArgs.home-manager.nixosModules.home-manager ]; + + environment.systemPackages = [ pkgs.home-manager ]; + + home-manager = { + useUserPackages = true; + useGlobalPkgs = true; + }; +} diff --git a/system_profiles/desktop.nix b/system_profiles/desktop.nix index dc96afc..9c27f35 100644 --- a/system_profiles/desktop.nix +++ b/system_profiles/desktop.nix @@ -1,5 +1,6 @@ { imports = [ + ./components/home-manager.nix ./components/nix-defaults.nix #./components/nixpkgs-ng.nix From b63c133f38945f74461eb92de5aa97cae5ad47ae Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sun, 31 Aug 2025 23:19:14 +0200 Subject: [PATCH 22/29] chore: update flake.lock --- flake.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 0696130..f73277b 100644 --- a/flake.lock +++ b/flake.lock @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1756245065, + "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "54b2879ce622d44415e727905925e21b8f833a98", "type": "github" }, "original": { @@ -311,8 +311,8 @@ ] }, "locked": { - "lastModified": 1755720954, - "narHash": "sha256-Z7GVaLs0mJnMyMrQYMZdNHEdfwBRW8w2fLqWxYjXFIA=", + "lastModified": 1756408834, + "narHash": "sha256-q7CzXgleZlV2f6T6gO4Qgj6s/QjODz2oMVZrB2LzTog=", "path": "/home/ranomier/Projects/nix-secrets", "type": "path" }, @@ -359,11 +359,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -391,11 +391,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1756617294, + "narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "b4c2c57c31e68544982226d07e4719a2d86302a8", "type": "github" }, "original": { From 43eb7d3add368ba236058284db835c36a117c295 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 6 Sep 2025 00:45:29 +0200 Subject: [PATCH 23/29] chore: update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f73277b..05a831a 100644 --- a/flake.lock +++ b/flake.lock @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1756245065, - "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "54b2879ce622d44415e727905925e21b8f833a98", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -391,11 +391,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756617294, - "narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=", + "lastModified": 1757020766, + "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4c2c57c31e68544982226d07e4719a2d86302a8", + "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755710103, - "narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=", + "lastModified": 1757101897, + "narHash": "sha256-gRfs83f1bF52O5GLNpGF4o15NOtgE5EW1oYJiW8JdOw=", "owner": "danth", "repo": "stylix", - "rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808", + "rev": "fbe628a289404d527c1eb3cd39cebd417c705a13", "type": "github" }, "original": { From 461a4b0146ae3a1661bcb8fffb209c99e44418bd Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 6 Sep 2025 00:45:42 +0200 Subject: [PATCH 24/29] feat: add current (nixos-unstabe) version of waydroid-helper --- modules/software/android.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/software/android.nix b/modules/software/android.nix index a31f709..479458a 100644 --- a/modules/software/android.nix +++ b/modules/software/android.nix @@ -1,5 +1,7 @@ -{ +{pkgs, ...}: { # for running android apps # also starts the systemd service waydroid-container virtualisation.waydroid.enable = true; + + environment.systemPackages = [ pkgs.unstable.waydroid-helper ]; } From cf9395d91d27a19ae2f99f0100cd9b226c548b60 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sun, 7 Sep 2025 23:27:01 +0200 Subject: [PATCH 25/29] feat: multiple xD look bellow - clean up login stuff - add uwsm - move "no-x" to system_profiles - clean up hyprland.nix --- modules/sec_auth/default.nix | 4 +- modules/sec_auth/login/default.nix | 6 + .../sec_auth/{ => login}/login-manager.nix | 0 modules/sec_auth/login/uwsm.nix | 3 + modules/sec_auth/uwsm.nix | 3 + modules/wm_and_de/hyprland.nix | 112 +++++++++--------- system_profiles/components/no-x.nix | 9 ++ system_profiles/desktop.nix | 1 + 8 files changed, 78 insertions(+), 60 deletions(-) create mode 100644 modules/sec_auth/login/default.nix rename modules/sec_auth/{ => login}/login-manager.nix (100%) create mode 100644 modules/sec_auth/login/uwsm.nix create mode 100644 modules/sec_auth/uwsm.nix create mode 100644 system_profiles/components/no-x.nix diff --git a/modules/sec_auth/default.nix b/modules/sec_auth/default.nix index 27bdd07..0007eb8 100644 --- a/modules/sec_auth/default.nix +++ b/modules/sec_auth/default.nix @@ -1,10 +1,12 @@ { imports = [ + ./login + ./apparmor.nix ./firejail.nix - ./login-manager.nix ./ssh-client.nix #./ssh-server.nix ./sudo-rs.nix + ./uwsm.nix ]; } diff --git a/modules/sec_auth/login/default.nix b/modules/sec_auth/login/default.nix new file mode 100644 index 0000000..00031fe --- /dev/null +++ b/modules/sec_auth/login/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./login-manager.nix + ./uwsm.nix + ]; +} diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login/login-manager.nix similarity index 100% rename from modules/sec_auth/login-manager.nix rename to modules/sec_auth/login/login-manager.nix diff --git a/modules/sec_auth/login/uwsm.nix b/modules/sec_auth/login/uwsm.nix new file mode 100644 index 0000000..fa4da9f --- /dev/null +++ b/modules/sec_auth/login/uwsm.nix @@ -0,0 +1,3 @@ +{ + programs.uwsm.enable = true; +} diff --git a/modules/sec_auth/uwsm.nix b/modules/sec_auth/uwsm.nix new file mode 100644 index 0000000..fa4da9f --- /dev/null +++ b/modules/sec_auth/uwsm.nix @@ -0,0 +1,3 @@ +{ + programs.uwsm.enable = true; +} diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index 8482832..9e99b65 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -2,12 +2,6 @@ #imports = [ # ./components/rofi.nix #]; - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = false; - - # force chromium and electron apps to use wayland - environment.sessionVariables.NIXOS_OZONE_WL = "1"; xdg = { portal = { @@ -20,76 +14,76 @@ ]; }; }; + # Enable the hyprland window manager with additions programs = { hyprland = { enable = true; - xwayland.enable = true; - systemd.setPath.enable = true; #package = pkgs.unstable.hyprland; + + systemd.setPath.enable = true; + withUWSM = true; + xwayland.enable = true; }; hyprlock = { enable = true; #package = pkgs.unstable.hyprlock; }; }; - services.hypridle = { - enable = true; - #package = pkgs.unstable.hypridle; + + services = { + hypridle = { + enable = true; + #package = pkgs.unstable.hypridle; + }; + + # for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit + gvfs.enable = true; }; - # for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit - services.gvfs.enable = true; + environment = { + pathsToLink = ["/share/foot"]; - #qt = { - # enable = true; - # platformTheme = "qt5ct"; - # style = "kvantum"; - #}; + systemPackages = with pkgs; [ + hyprsunset + hyprpolkitagent + hyprutils + # for tiling window manager + foot + foot.themes + wofi + wl-clipboard # for waydroid and maybe more + wlogout + pamixer + waybar + hyprpaper + #unstable.kanshi + shikane + dunst - environment.pathsToLink = ["/share/foot"]; + # audio + mixxc + ncpamixer - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - hyprsunset - hyprpolkitagent - hyprutils - # for tiling window manager - foot - foot.themes - wofi - wl-clipboard # for waydroid and maybe more - wlogout - pamixer - waybar - hyprpaper - #unstable.kanshi - shikane - dunst + # for screenshot + annotation + grim + slurp + satty + flameshot - # audio - mixxc - ncpamixer + # theming + gruvbox-plus-icons + gruvbox-gtk-theme + kde-gruvbox + capitaine-cursors-themed + libsForQt5.qtstyleplugin-kvantum + kdePackages.qtstyleplugin-kvantum - # for screenshot + annotation - grim - slurp - satty - flameshot + # polkit auth agent + lxqt.lxqt-policykit - # theming - gruvbox-plus-icons - gruvbox-gtk-theme - kde-gruvbox - capitaine-cursors-themed - libsForQt5.qtstyleplugin-kvantum - kdePackages.qtstyleplugin-kvantum - - # polkit auth agent - lxqt.lxqt-policykit - - # file manager - nautilus - ]; + # file manager + nautilus + ]; + }; } diff --git a/system_profiles/components/no-x.nix b/system_profiles/components/no-x.nix new file mode 100644 index 0000000..6ed1892 --- /dev/null +++ b/system_profiles/components/no-x.nix @@ -0,0 +1,9 @@ +{ + # Enable the X11 windowing system. + # You can disable this if you're only using the Wayland session. + services.xserver.enable = false; + + # force chromium and electron apps to use wayland + environment.sessionVariables.NIXOS_OZONE_WL = "1"; +} + diff --git a/system_profiles/desktop.nix b/system_profiles/desktop.nix index 9c27f35..afbcd25 100644 --- a/system_profiles/desktop.nix +++ b/system_profiles/desktop.nix @@ -2,6 +2,7 @@ imports = [ ./components/home-manager.nix ./components/nix-defaults.nix + ./components/no-x.nix #./components/nixpkgs-ng.nix ./importers/desktop.nix From 3c1e10b585bbd3cbe8dd2f10a7a915bccb9c7f99 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sun, 7 Sep 2025 23:29:41 +0200 Subject: [PATCH 26/29] fix: remove unneeded imports --- modules/wm_and_de/qtile.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/wm_and_de/qtile.nix b/modules/wm_and_de/qtile.nix index dab6d1c..51c6006 100644 --- a/modules/wm_and_de/qtile.nix +++ b/modules/wm_and_de/qtile.nix @@ -1,7 +1,5 @@ { - config, pkgs, - lib, ... }: { nixpkgs.overlays = [ From fc13a247b67074f141f18d907949c89104659972 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sun, 7 Sep 2025 23:30:02 +0200 Subject: [PATCH 27/29] feat: add first niri config --- modules/wm_and_de/niri.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 modules/wm_and_de/niri.nix diff --git a/modules/wm_and_de/niri.nix b/modules/wm_and_de/niri.nix new file mode 100644 index 0000000..9d3656d --- /dev/null +++ b/modules/wm_and_de/niri.nix @@ -0,0 +1,3 @@ +{ + programs.niri = true; +} From b005f8d83158bfefd3f6530680b7f9387c2fe6b3 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 12 Sep 2025 23:33:32 +0200 Subject: [PATCH 28/29] fix: deactivate srv-videoconf it seems to miss some harddrive config --- outputs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/outputs.nix b/outputs.nix index 436b714..234698b 100644 --- a/outputs.nix +++ b/outputs.nix @@ -15,7 +15,7 @@ in { nixosConfigurations = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) { crocoite = {stateVersion = "24.05";}; - srv-videoconf = {stateVersion = "25.05";}; + #srv-videoconf = {stateVersion = "25.05";}; game-luanti = {stateVersion = "25.05";}; From 67f2ce05b9fdf30f9b524fbbb5e4f9ad24c2018c Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 12 Sep 2025 23:35:01 +0200 Subject: [PATCH 29/29] fix: add mkDefault to all components --- system_profiles/components/home-manager.nix | 6 +++--- system_profiles/components/nix-defaults.nix | 2 +- system_profiles/components/nixpkgs-ng.nix | 4 ++-- system_profiles/components/no-x.nix | 6 +++--- system_profiles/components/qemu.nix | 4 ++-- system_profiles/components/serial-console.nix | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/system_profiles/components/home-manager.nix b/system_profiles/components/home-manager.nix index 42eeaba..5b6500e 100644 --- a/system_profiles/components/home-manager.nix +++ b/system_profiles/components/home-manager.nix @@ -1,10 +1,10 @@ -{inArgs, pkgs, ...}: { +{inArgs, pkgs, lib, ...}: { imports = [ inArgs.home-manager.nixosModules.home-manager ]; environment.systemPackages = [ pkgs.home-manager ]; home-manager = { - useUserPackages = true; - useGlobalPkgs = true; + useUserPackages = lib.mkDefault true; + useGlobalPkgs = lib.mkDefault true; }; } diff --git a/system_profiles/components/nix-defaults.nix b/system_profiles/components/nix-defaults.nix index 157ced6..c0eb3f3 100644 --- a/system_profiles/components/nix-defaults.nix +++ b/system_profiles/components/nix-defaults.nix @@ -1,6 +1,6 @@ # This loads some nix and nixpkgs specific settints # i often need -{lib, pkgs, ...}: { +{lib, ...}: { # Disable if you don't want unfree packages nixpkgs.config.allowUnfree = lib.mkDefault true; diff --git a/system_profiles/components/nixpkgs-ng.nix b/system_profiles/components/nixpkgs-ng.nix index 4321bdd..9950e12 100644 --- a/system_profiles/components/nixpkgs-ng.nix +++ b/system_profiles/components/nixpkgs-ng.nix @@ -1,5 +1,5 @@ -{ +{lib, ...}: { system = { - rebuild.enableNg = false; + rebuild.enableNg = lib.mkDefault false; }; } diff --git a/system_profiles/components/no-x.nix b/system_profiles/components/no-x.nix index 6ed1892..f0c491b 100644 --- a/system_profiles/components/no-x.nix +++ b/system_profiles/components/no-x.nix @@ -1,9 +1,9 @@ -{ +{lib, ...}: { # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. - services.xserver.enable = false; + services.xserver.enable = lib.mkDefault false; # force chromium and electron apps to use wayland - environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.sessionVariables.NIXOS_OZONE_WL = lib.mkDefault "1"; } diff --git a/system_profiles/components/qemu.nix b/system_profiles/components/qemu.nix index 4a14da3..2ed31c6 100644 --- a/system_profiles/components/qemu.nix +++ b/system_profiles/components/qemu.nix @@ -1,6 +1,6 @@ -{modulesPath, ...}: { +{modulesPath, lib, ...}: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - services.qemuGuest.enable = true; + services.qemuGuest.enable = lib.mkDefault true; } diff --git a/system_profiles/components/serial-console.nix b/system_profiles/components/serial-console.nix index 521887f..9bc085c 100644 --- a/system_profiles/components/serial-console.nix +++ b/system_profiles/components/serial-console.nix @@ -1,6 +1,6 @@ -{ +{lib, ...}: { boot.kernelParams = [ "console=ttyS0,115200n8" ]; - boot.loader.grub.extraConfig = " + boot.loader.grub.extraConfig = lib.mkDefault " serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 terminal_input serial terminal_output serial