fix default.nix in .gitignore (oops)

.gitignore

@@ -5,3 +5,5 @@ wallpapers
 # nix
 result
 result-*
+# that broke every single default.nix file
+# default.nix

justfile

@@ -0,0 +1,49 @@
+set unstable
+flake_path := "/etc/nixos"
+
+privesc := if which("sudo") != "" { 
+    "sudo" 
+} else if which("doas") != "" { 
+    "doas" 
+} else if which("run0") != "" { 
+    "run0 --background="
+} else if which("pkexec") != "" { 
+    "pkexec" 
+} else { 
+    error("No privilege escalation tool found")
+}
+
+default:
+    @just --list
+
+# Rebuild and switch
+[group('nix')]
+sw:
+    nh os switch {{flake_path}}
+
+# Update and switch
+[group('nix')]
+up:
+    nh os switch --update {{flake_path}}
+
+# Update specific input: `just upp nixpkgs`
+[group('nix')]
+upp input:
+    nix flake update {{input}}
+
+# Test
+[group('nix')]
+test:
+    nh os test {{flake_path}}
+
+# Collect garbage
+[group('nix')]
+gc:
+    nix-collect-garbage --delete-old
+    {{privesc}} nix-collect-garbage -d
+    {{privesc}} /run/current-system/bin/switch-to-configuration boot
+
+# Run `nh clean all`
+[group('nix')]
+ca:
+    nh clean all

modules/home/desktop/dms/config/default.nix

@@ -0,0 +1,23 @@
+{
+  lib,
+  importWithArgs,
+  ...
+}:
+lib.mkMerge [
+  (import ./dconf.nix)
+  (importWithArgs ./mimeapps.nix)
+  (importWithArgs ./packages.nix)
+  (importWithArgs ./programs/niri.nix)
+  (import ./programs/satty.nix)
+  (importWithArgs ./programs/wl-kbptr.nix)
+  (importWithArgs ./services.nix)
+  (importWithArgs ./stylix.nix)
+  {
+    programs.dankMaterialShell = {
+      enable = true;
+      systemd.enable = true;
+      niri.enableKeybinds = false; # Automatic keybinding configuration
+      # niri.enableSpawn = true; # Auto-start DMS with niri
+    };
+  }
+]

modules/home/desktop/dms/config/programs/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./niri.nix
+    ./satty.nix
+    ./wl-kbptr.nix
+  ];
+}

modules/home/desktop/dms/config/programs/niri.nix

@@ -131,7 +131,7 @@ in {
     binds = with config.lib.niri.actions; let
       dms-ipc = spawn "dms" "ipc";
       sh = spawn "sh" "-c";
-      focus = spawn "wlrctl" "window" "focus";
+      focus = spawn "${lib.getExe pkgs.wlrctl}" "window" "focus";
       focus-meet = pkgs.writeShellApplication {
         name = "focus-zen-google-meet";
         runtimeInputs = with pkgs; [wlrctl jq gnugrep config.programs.niri.package];

modules/shared/nixos/boot/default.nix

@@ -9,10 +9,11 @@
     ./lanzaboote.nix
   ];
   boot = {
-    plymouth.enable = true;
     consoleLogLevel = 0;
+    kernel.sysctl."vm.swappiness" = 10;
     # kernelPackages = pkgs.linuxPackages_cachyos;
     kernelPackages = pkgs.linuxPackages_latest;
+    plymouth.enable = true;
     initrd = {
       systemd.enable = true;
     };

modules/users/user/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./common.nix
+    ./flatpak.nix
+    ./programs.nix
+  ];
+}