wip: niri take 2 [skip-ci]

Take two, since one wasn't enough.

.github/workflows/check.yml

@@ -16,6 +16,7 @@ jobs:
         with:
           source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux"
           diagnostic-endpoint: ""
+      - uses: DeterminateSystems/magic-nix-cache-action@6221693898146dc97e38ad0e013488a16477a4c4 # v9
       - name: Run `nix flake check`
         run: |
           nix flake check --verbose --keep-going
@@ -24,6 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: DeterminateSystems/magic-nix-cache-action@6221693898146dc97e38ad0e013488a16477a4c4 # v9
       - uses:  DeterminateSystems/nix-installer-action@v13
         with:
           source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux"

example-vm/default.nix

@@ -1,5 +1,5 @@
 {
-  imports = [ ./vm-config.nix ];
+  import = [ ./vm_config.nix ];
 
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
@@ -16,7 +16,6 @@
     home = {
       username = "jdoe";
       homeDirectory = "/home/jdoe";
-      stateVersion = "24.11";
     };
     jhome = {
       enable = true;

flake-modules/docs.nix

@@ -10,13 +10,13 @@
             toplevelOption: option:
             option // { visible = option.visible && builtins.elemAt option.loc 0 == toplevelOption; };
           home-eval = lib.evalModules {
-            modules = [ "${modules}/hm/options.nix" ];
+            modules = [ (modules + "/hm/options.nix") ];
             specialArgs = {
               inherit pkgs;
             };
           };
-          nvim-eval = lib.evalModules { modules = [ "${modules}/nixvim/options.nix" ]; };
+          nvim-eval = lib.evalModules { modules = [ (modules + "/nixvim/options.nix") ]; };
-          nixos-eval = lib.evalModules { modules = [ "${modules}/nixos/options.nix" ]; };
+          nixos-eval = lib.evalModules { modules = [ (modules + "/nixos/options.nix") ]; };
           home-markdown =
             (pkgs.nixosOptionsDoc {
               inherit (home-eval) options;
@@ -56,7 +56,7 @@
             '';
 
             nativeBuildInputs = [ pkgs.mdbook-toc ];
-            buildPhase = "${pkgs.mdbook}/bin/mdbook build --dest-dir \"$out\"";
+            buildPhase = "${pkgs.mdbook}/bin/mdbook build --dest-dir $out";
           };
         };
     };

flake-modules/home-modules.nix

@@ -8,7 +8,7 @@
       defaultModules = [
         inputs.nixvim.homeManagerModules.nixvim
         self.nixvimModules.homeManager
-        ../modules/hm
+        ../module/hm
       ];
       nixos = {
         imports = defaultModules;

flake-modules/nixos-modules.nix

@@ -9,6 +9,7 @@
     let
       nixosModule = {
         imports = [
+          inputs.niri.nixosModules.niri
           inputs.stylix.nixosModules.stylix
           inputs.home-manager.nixosModules.home-manager
           ../modules/nixos

flake.lock

@@ -275,6 +275,50 @@
         "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": [],
+        "nixpkgs": [
+          "unstable"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ],
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": []
+      },
+      "locked": {
+        "lastModified": 1742108116,
+        "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "824f10012de455a1d0ef795a605f28948ee10467",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1740117926,
+        "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.02",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1742388435,
@@ -334,6 +378,7 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "lix-module": "lix-module",
+        "niri": "niri",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
         "stylix": "stylix",
@@ -471,6 +516,23 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1739246919,
+        "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.5.1",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -43,6 +43,17 @@
         nuschtosSearch.follows = "";
       };
     };
+    niri = {
+      url = "github:sodiboo/niri-flake";
+      inputs = {
+        # Deduplicate
+        nixpkgs.follows = "unstable";
+        nixpkgs-stable.follows = "nixpkgs";
+        # Unused
+        niri-unstable.follows = "";
+        xwayland-satellite-unstable.follows = "";
+      };
+    };
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";

modules/hm/default.nix

@@ -16,7 +16,6 @@ in
   imports = [
     ./options.nix
     ./gui
-    ./dev.nix
     ./users.nix
   ];
 
@@ -24,7 +23,7 @@ in
     (lib.mkIf (cfg.enable && cfg.styling.enable) {
       stylix = {
         enable = true;
-        targets.nixvim.enable = false; # I prefer styling it myself
+        targets.nixvim.enable = false; # I prefer doing it myself
       };
     })
     (lib.mkIf cfg.enable {
@@ -36,7 +35,6 @@ in
         "settings"
         "use-xdg-base-directories"
       ] true;
-
       programs = {
         # Better cat (bat)
         bat = {
@@ -86,7 +84,6 @@ in
           syntaxHighlighting.enable = true;
         };
       };
-
       services = {
         # GPG Agent
         gpg-agent = {
@@ -106,8 +103,9 @@ in
           };
         };
       };
-
       home = {
+        stateVersion = "22.11";
+        # Extra packages
         # Extra variables
         sessionVariables = {
           CARGO_HOME = "${config.xdg.dataHome}/cargo";
@@ -129,7 +127,6 @@ in
           tree = "eza --tree";
         };
       };
-
       # XDG directories
       xdg = {
         enable = true;
@@ -139,5 +136,86 @@ in
         };
       };
     })
+    (lib.mkIf (cfg.enable && devcfg.enable) {
+      home = {
+        sessionVariables.MANPAGER = lib.optionalString devcfg.neovimAsManPager "nvim -c 'Man!' -o -";
+        packages = devcfg.extraPackages;
+      };
+      # Github CLI
+      programs = {
+        gh.enable = true;
+        gh-dash.enable = true;
+        # Git
+        git = {
+          enable = true;
+          difftastic = {
+            enable = true;
+            background = "dark";
+          };
+          lfs.enable = true;
+          extraConfig = {
+            # Add diff to the commit message editor
+            commit.verbose = true;
+            # Improve submodule diff
+            diff.submodule = "log";
+            # Set the default branch name for new branches
+            init.defaultBranch = "main";
+            # Better conflicts (also shows parent commit state)
+            merge.conflictStyle = "zdiff3";
+            # Do not create merge commits when pulling (rebase but abort on conflict)
+            pull.ff = "only";
+            # Use `--set-upstream` if the remote does not have the branch
+            push.autoSetupRemote = true;
+            rebase = {
+              # If there are uncommitted changes, stash them before rebasing
+              autoStash = true;
+              # If there are fixup! commits, squash them while rebasing
+              autoSquash = true;
+            };
+            # Enable ReReRe (Reuse Recovered Resolution) auto resolve previously resolved conflicts
+            rerere.enabled = true;
+            # Improve submodule status
+            status.submoduleSummary = true;
+          };
+        };
+        lazygit.enable = true;
+        # Jujutsu (alternative DVCS (git-compatible))
+        jujutsu = {
+          enable = true;
+          package = pkgs.unstable.jujutsu;
+          settings = {
+            ui.pager = "bat";
+            # mimic git commit --verbose by adding a diff
+            templates.draft_commit_description = ''
+              concat(
+                description,
+                surround(
+                  "\nJJ: This commit contains the following changes:\n", "",
+                  indent("JJ:     ", diff.stat(72)),
+                ),
+                surround(
+                  "\nJJ: Diff:\n", "",
+                  indent("JJ:     ", diff.git()),
+                ),
+              )
+            '';
+          };
+        };
+      };
+    })
+    (lib.mkIf (cfg.enable && devcfg.enable && devcfg.rust.enable) {
+      home.packages = [ pkgs.rustup ] ++ devcfg.rust.extraPackages;
+      # Background code checker (for Rust)
+      programs.bacon = {
+        enable = true;
+        settings = {
+          export = {
+            enabled = true;
+            path = ".bacon-locations";
+            line_format = "{kind} {path}:{line}:{column} {message}";
+          };
+        };
+      };
+    })
   ];
 }

modules/hm/dev.nix

@@ -1,101 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  cfg = config.jhome.dev;
-in
-{
-  config =
-    lib.flip lib.pipe
-      [
-        lib.mkMerge
-        (lib.mkIf (config.jhome.enable && cfg.enable))
-      ]
-      [
-        (lib.mkIf cfg.rust.enable {
-          home.packages = [ pkgs.rustup ] ++ cfg.rust.extraPackages;
-          # Background code checker (for Rust)
-          programs.bacon = {
-            enable = true;
-            settings = {
-              export = {
-                enabled = true;
-                path = ".bacon-locations";
-                line_format = "{kind} {path}:{line}:{column} {message}";
-              };
-            };
-          };
-        })
-        {
-          home = {
-            sessionVariables.MANPAGER = lib.optionalString cfg.neovimAsManPager "nvim -c 'Man!' -o -";
-            packages = cfg.extraPackages;
-          };
-
-          # Github CLI
-          programs = {
-            gh.enable = true;
-            gh-dash.enable = true;
-            # Git
-            git = {
-              enable = true;
-              difftastic = {
-                enable = true;
-                background = "dark";
-              };
-              lfs.enable = true;
-              extraConfig = {
-                # Add diff to the commit message editor
-                commit.verbose = true;
-                # Improve submodule diff
-                diff.submodule = "log";
-                # Set the default branch name for new branches
-                init.defaultBranch = "main";
-                # Better conflicts (also shows parent commit state)
-                merge.conflictStyle = "zdiff3";
-                # Do not create merge commits when pulling (rebase but abort on conflict)
-                pull.ff = "only";
-                # Use `--set-upstream` if the remote does not have the branch
-                push.autoSetupRemote = true;
-                rebase = {
-                  # If there are uncommitted changes, stash them before rebasing
-                  autoStash = true;
-                  # If there are fixup! commits, squash them while rebasing
-                  autoSquash = true;
-                };
-                # Enable ReReRe (Reuse Recovered Resolution) auto resolve previously resolved conflicts
-                rerere.enabled = true;
-                # Improve submodule status
-                status.submoduleSummary = true;
-              };
-            };
-            lazygit.enable = true;
-            # Jujutsu (alternative DVCS (git-compatible))
-            jujutsu = {
-              enable = true;
-              package = pkgs.unstable.jujutsu;
-              settings = {
-                ui.pager = "bat";
-                # mimic git commit --verbose by adding a diff
-                templates.draft_commit_description = ''
-                  concat(
-                    description,
-                    surround(
-                      "\nJJ: This commit contains the following changes:\n", "",
-                      indent("JJ:     ", diff.stat(72)),
-                    ),
-                    surround(
-                      "\nJJ: Diff:\n", "",
-                      indent("JJ:     ", diff.git()),
-                    ),
-                  )
-                '';
-              };
-            };
-          };
-        }
-      ];
-}

modules/hm/gui/keybindings.nix

@@ -93,7 +93,7 @@ builtins.foldl' (l: r: l // r)
     "XF86AudioRaiseVolume" = "exec ${pkgs.avizo}/bin/volumectl up";
     "XF86AudioLowerVolume" = "exec ${pkgs.avizo}/bin/volumectl down";
     "XF86AudioMute" = "exec ${pkgs.avizo}/bin/volumectl toggle-mute";
-    "XF86ScreenSaver" = "exec ${pkgs.swaylock}/bin/swaylock --image ${cfg.background}";
+    "XF86ScreenSaver" = "exec swaylock --image ${cfg.background}";
     "XF86MonBrightnessUp" = "exec ${pkgs.avizo}/bin/lightctl up";
     "XF86MonBrightnessDown" = "exec ${pkgs.avizo}/bin/lightctl down";
     # Floating

modules/hm/users.nix

@@ -4,12 +4,15 @@ let
   inherit (cfg.defaultIdentity) signingKey;
 
   cfg = jhome.user;
+  hasConfig = jhome.enable && cfg != null;
   hasKey = signingKey != null;
+  gpgHome = config.programs.gpg.homedir;
+  unlockKey = hasConfig && cfg.gpg.unlockKeys != [ ];
 in
 {
-  config = lib.mkIf (jhome.enable && cfg != null) {
+  config = lib.mkMerge [
-    programs = {
+    (lib.mkIf hasConfig {
-      git = {
+      programs.git = {
         userName = cfg.defaultIdentity.name;
         userEmail = cfg.defaultIdentity.email;
         signing = lib.mkIf hasKey {
@@ -17,8 +20,7 @@ in
           key = signingKey;
         };
       };
-
+      programs.jujutsu.settings = {
-      jujutsu.settings = {
         user = lib.mkIf (cfg.defaultIdentity != null) { inherit (cfg.defaultIdentity) name email; };
         git.sign-on-push = lib.mkDefault hasKey;
         signing = lib.mkIf hasKey {
@@ -27,13 +29,14 @@ in
           key = signingKey;
         };
       };
-    };
+    })
-
+    (lib.mkIf unlockKey {
       xdg.configFile.pam-gnupg.text =
-      lib.mkIf (cfg.unlockKeys != [ ]) ''
+        ''
-        ${config.programs.gpg.homedir}
+          ${gpgHome}
 
         ''
         + (lib.strings.concatLines cfg.gpg.unlockKeys);
-  };
+    })
+  ];
 }

modules/lib.nix

@@ -1,27 +0,0 @@
-{ lib }:
-let
-  inherit (lib) types;
-in
-{
-  # Like mkEnableOption but defaults to true
-  mkDisableOption =
-    option:
-    (lib.mkEnableOption option)
-    // {
-      default = true;
-      example = false;
-    };
-  # A option that accepts an image (and shows it in the docs)
-  mkImageOption =
-    {
-      description,
-      url,
-      sha256 ? "",
-    }:
-    lib.mkOption {
-      inherit description;
-      type = types.path;
-      default = builtins.fetchurl { inherit url sha256; };
-      defaultText = lib.literalMD "![${description}](${url})";
-    };
-}

modules/nixos/default.nix

@@ -1,6 +1,11 @@
-{ pkgs, lib, ... }@args:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
-  cfg = args.config.jconfig;
+  cfg = config.jconfig;
   keysFromGithub = lib.attrsets.mapAttrs' (username: sha256: {
     name = "pubkeys/${username}";
     value = {
@@ -15,12 +20,17 @@ in
 {
   imports = [
     ./options.nix
-    ./dev.nix
+    ./gui
-    ./gui.nix
+    { stylix = import ./stylix-config.nix { inherit config pkgs; }; }
-    ./styling.nix
   ];
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        boot.plymouth = {
+          inherit (cfg.styling) enable;
+        };
+
         # Enable unlocking the gpg-agent at boot (configured through home.nix)
         security.pam.services.login.gnupg.enable = true;
 
@@ -34,6 +44,10 @@ in
           pkgs.unzip
         ];
 
+        # Enable dev documentation
+        documentation.dev = {
+          inherit (cfg.dev) enable;
+        };
         programs = {
           # Shell prompt
           starship = {
@@ -55,7 +69,7 @@ in
               # Add nerdfont symbols
               (lib.mkIf cfg.styling.enable (import ./starship-nerdfont-symbols.nix))
               # Remove the `in`s and `on`s from the prompt
-          (import ./starship-shorter-text.nix)
+              (lib.mkIf cfg.styling.enable (import ./starship-shorter-text.nix))
             ];
           };
           # Default shell
@@ -66,11 +80,11 @@ in
         services = {
           # Enable printer autodiscovery if printing is enabled
           avahi = {
-        inherit (args.config.services.printing) enable;
+            inherit (config.services.printing) enable;
             nssmdns4 = true;
             openFirewall = true;
           };
-      openssh.authorizedKeysFiles = builtins.map (keys: "/etc/${keys}") (
+          openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (
             builtins.attrNames keysFromGithub
           );
         };
@@ -98,5 +112,16 @@ in
             ];
           };
         };
-  };
+      }
+      # dev configuration
+      (lib.mkIf cfg.dev.enable {
+        users.extraUsers = lib.mkIf cfg.dev.jupyter.enable { jupyter.group = "jupyter"; };
+        services.jupyter = {
+          inherit (cfg.dev.jupyter) enable;
+          group = "jupyter";
+          user = "jupyter";
+        };
+      })
+    ]
+  );
 }

modules/nixos/dev.nix

@@ -1,18 +0,0 @@
-{ lib, config, ... }:
-let
-  cfg = config.jconfig.dev;
-in
-{
-  config = lib.mkIf (config.jconfig.enable && cfg.enable) {
-    # Enable dev documentation
-    documentation.dev = { inherit (cfg) enable; };
-
-    users.extraUsers = lib.mkIf cfg.jupyter.enable { jupyter.group = "jupyter"; };
-
-    services.jupyter = {
-      inherit (cfg.jupyter) enable;
-      group = "jupyter";
-      user = "jupyter";
-    };
-  };
-}

modules/nixos/gui.nix

@@ -1,117 +0,0 @@
-{ lib, pkgs, ... }@args:
-let
-  cfg = args.config.jconfig.gui;
-  enable = args.config.jconfig.enable && cfg.enable;
-  linuxOlderThan6_3 = lib.versionOlder args.config.boot.kernelPackages.kernel.version "6.3";
-in
-{
-  config =
-    lib.flip lib.pipe
-      [ lib.mkMerge (lib.mkIf enable) ]
-      [
-        {
-          environment.systemPackages = [
-            pkgs.adwaita-icon-theme
-            pkgs.adwaita-qt
-            pkgs.nordzy-cursor-theme
-            pkgs.pinentry-qt
-          ];
-          # Fix xdg-portals issue issue: https://github.com/NixOS/nixpkgs/issues/189851
-          systemd.user.extraConfig = ''
-            DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"
-          '';
-
-          fonts.fontDir.enable = true;
-          programs = {
-            dconf.enable = true;
-            sway = {
-              enable = cfg.sway;
-              # No extra packages (by default it adds foot, dmenu, and other stuff)
-              extraPackages = [ ];
-              wrapperFeatures = {
-                base = true;
-                gtk = true;
-              };
-            };
-          };
-          security = {
-            polkit.enable = true;
-            rtkit.enable = true; # Recommended for pipewire
-          };
-          services = {
-            flatpak.enable = true;
-            # Audio
-            pipewire = {
-              enable = true;
-              alsa = {
-                enable = true;
-                support32Bit = true;
-              };
-              pulse.enable = true;
-              wireplumber.enable = true;
-            };
-            # Dbus
-            dbus.enable = true;
-            # Virtual Filesystem (for PCManFM)
-            gvfs.enable = true;
-          };
-          xdg.portal = {
-            # XDG portals
-            enable = true;
-            wlr.enable = true;
-            extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-            config.preferred = {
-              # Default to the gtk portal
-              default = "gtk";
-              # Use wlr for screenshots and screen recording
-              "org.freedesktop.impl.portal.Screenshot" = "wlr";
-            };
-            # Consider using darkman like upstream
-          };
-          hardware = {
-            graphics.enable = true;
-            uinput.enable = true;
-            steam-hardware.enable = cfg.steamHardwareSupport;
-          };
-        }
-        (lib.mkIf cfg.ydotool.enable {
-          environment.systemPackages = [ pkgs.ydotool ];
-          systemd.user.services.ydotool = {
-            enable = cfg.ydotool.autoStart;
-            wantedBy = [ "default.target" ];
-            description = "Generic command-line automation tool";
-            documentation = [
-              "man:ydotool(1)"
-              "man:ydotoold(8)"
-            ];
-            serviceConfig = {
-              Type = "simple";
-              Restart = "always";
-              ExecStart = "${pkgs.ydotool}/bin/ydotoold";
-              ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
-              KillMode = "process";
-              TimeoutSec = 180;
-            };
-          };
-        })
-        (lib.mkIf (linuxOlderThan6_3 && cfg."8bitdoFix") {
-          # Udev rules to start or stop systemd service when controller is connected or disconnected
-          services.udev.extraRules = # udev
-            ''
-              # May vary depending on your controller model, find product id using 'lsusb'
-              SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106"
-              # This device (2dc8:3016) is "connected" when the above device disconnects
-              SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3016", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106"
-            '';
-
-          # Systemd service which starts xboxdrv in xbox360 mode
-          systemd.services."8bitdo-ultimate-xinput@" = {
-            unitConfig.Description = "8BitDo Ultimate Controller XInput mode xboxdrv daemon";
-            serviceConfig = {
-              Type = "simple";
-              ExecStart = "${pkgs.xboxdrv}/bin/xboxdrv --mimic-xpad --silent --type xbox360 --device-by-id %I --force-feedback";
-            };
-          };
-        })
-      ];
-}

modules/nixos/gui/default.nix

@@ -0,0 +1,118 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.jconfig.gui;
+  enable = config.jconfig.enable && cfg.enable;
+  linuxOlderThan6_3 = lib.versionOlder config.boot.kernelPackages.kernel.version "6.3";
+in
+{
+  config = lib.mkMerge [
+    (lib.mkIf enable {
+      environment.systemPackages = [
+        pkgs.adwaita-icon-theme
+        pkgs.adwaita-qt
+        pkgs.nordzy-cursor-theme
+        pkgs.pinentry-qt
+      ] ++ lib.optional cfg.ydotool.enable pkgs.ydotool;
+      systemd = {
+        user.services.ydotool = lib.mkIf cfg.ydotool.enable {
+          enable = cfg.ydotool.autoStart;
+          wantedBy = [ "default.target" ];
+          description = "Generic command-line automation tool";
+          documentation = [
+            "man:ydotool(1)"
+            "man:ydotoold(8)"
+          ];
+          serviceConfig = {
+            Type = "simple";
+            Restart = "always";
+            ExecStart = "${pkgs.ydotool}/bin/ydotoold";
+            ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
+            KillMode = "process";
+            TimeoutSec = 180;
+          };
+        };
+        # Fix xdg-portals issue issue: https://github.com/NixOS/nixpkgs/issues/189851
+        user.extraConfig = ''
+          DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"
+        '';
+      };
+
+      fonts.fontDir.enable = true;
+      programs = {
+        dconf.enable = true;
+        sway = {
+          enable = cfg.sway;
+          # No extra packages (by default it adds foot, dmenu, and other stuff)
+          extraPackages = [ ];
+          wrapperFeatures = {
+            base = true;
+            gtk = true;
+          };
+        };
+      };
+      security = {
+        polkit.enable = true;
+        rtkit.enable = true; # Recommended for pipewire
+      };
+      services = {
+        flatpak.enable = true;
+        # Audio
+        pipewire = {
+          enable = true;
+          alsa = {
+            enable = true;
+            support32Bit = true;
+          };
+          pulse.enable = true;
+          wireplumber.enable = true;
+        };
+        # Dbus
+        dbus.enable = true;
+        # Virtual Filesystem (for PCManFM)
+        gvfs.enable = true;
+      };
+      xdg.portal = {
+        # XDG portals
+        enable = true;
+        wlr.enable = true;
+        extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+        config.preferred = {
+          # Default to the gtk portal
+          default = "gtk";
+          # Use wlr for screenshots and screen recording
+          "org.freedesktop.impl.portal.Screenshot" = "wlr";
+        };
+        # Consider using darkman like upstream
+      };
+      hardware = {
+        graphics.enable = true;
+        uinput.enable = true;
+        steam-hardware.enable = cfg.steamHardwareSupport;
+      };
+    })
+    (lib.mkIf (enable && linuxOlderThan6_3 && cfg."8bitdoFix") {
+      # Udev rules to start or stop systemd service when controller is connected or disconnected
+      services.udev.extraRules = # udev
+        ''
+          # May vary depending on your controller model, find product id using 'lsusb'
+          SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106"
+          # This device (2dc8:3016) is "connected" when the above device disconnects
+          SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3016", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106"
+        '';
+
+      # Systemd service which starts xboxdrv in xbox360 mode
+      systemd.services."8bitdo-ultimate-xinput@" = {
+        unitConfig.Description = "8BitDo Ultimate Controller XInput mode xboxdrv daemon";
+        serviceConfig = {
+          Type = "simple";
+          ExecStart = "${pkgs.xboxdrv}/bin/xboxdrv --mimic-xpad --silent --type xbox360 --device-by-id %I --force-feedback";
+        };
+      };
+    })
+  ];
+}

modules/nixos/options.nix

@@ -1,18 +1,80 @@
 { lib, ... }:
 let
   inherit (lib) types;
-  inherit (import ../lib.nix { inherit lib; })
+  # Like mkEnableOption but defaults to true
-    mkDisableOption
+  mkDisableOption =
-    mkImageOption
+    option:
-    ;
+    (lib.mkEnableOption option)
-in
+    // {
+      default = true;
+      example = false;
+    };
+  mkImageOption =
     {
-  options.jconfig = lib.mkOption {
+      description,
-    description = "Jalil's default NixOS configuration.";
+      url,
+      sha256 ? "",
+    }:
+    lib.mkOption {
+      inherit description;
+      type = types.path;
+      default = builtins.fetchurl { inherit url sha256; };
+      defaultText = lib.literalMD "![${description}](${url})";
+    };
+
+  gui.options = {
+    enable = lib.mkEnableOption "jalil's default gui configuration.";
+    # Fix for using Xinput mode on 8bitdo Ultimate C controller
+    # Inspired by https://aur.archlinux.org/packages/8bitdo-ultimate-controller-udev
+    # Adapted from: https://gist.github.com/interdependence/28452fbfbe692986934fbe1e54c920d4
+    "8bitdoFix" = mkDisableOption "a fix for 8bitdo controllers";
+    steamHardwareSupport = mkDisableOption "steam hardware support";
+    ydotool = lib.mkOption {
+      description = "Jalil's default ydotool configuration.";
       default = { };
       type = types.submodule {
-      options = {
+        options.enable = mkDisableOption "ydotool";
+        options.autoStart = mkDisableOption "autostarting ydotool at login";
+      };
+    };
+    sway = mkDisableOption "sway";
+  };
+
+  styling.options = {
+    enable = mkDisableOption "jalil's default styling (disables stylix)";
+    wallpaper = mkImageOption {
+      description = "The wallpaper to use.";
+      url = "https://raw.githubusercontent.com/lunik1/nixos-logo-gruvbox-wallpaper/d4937c424fad79c1136a904599ba689fcf8d0fad/png/gruvbox-dark-rainbow.png";
+      sha256 = "036gqhbf6s5ddgvfbgn6iqbzgizssyf7820m5815b2gd748jw8zc";
+    };
+    bootLogo = mkImageOption {
+      description = "The logo used by plymouth at boot.";
+      # http://xenia-linux-site.glitch.me/images/cathodegaytube-splash.png
+      url = "https://efimero.github.io/xenia-images/cathodegaytube-splash.png";
+      sha256 = "qKugUfdRNvMwSNah+YmMepY3Nj6mWlKFh7jlGlAQDo8=";
+    };
+  };
+
+  config.options = {
     enable = lib.mkEnableOption "jalil's default configuration.";
+    dev = lib.mkOption {
+      description = "Options for setting up a dev environment";
+      default = { };
+      type = types.submodule {
+        options.enable = lib.mkEnableOption "dev configuration";
+        options.jupyter.enable = lib.mkEnableOption "jupyter configuration";
+      };
+    };
+    gui = lib.mkOption {
+      description = "Jalil's default configuration for a NixOS gui.";
+      default = { };
+      type = types.submodule gui;
+    };
+    styling = lib.mkOption {
+      description = "Jalil's styling options";
+      default = { };
+      type = types.submodule styling;
+    };
     importSSHKeysFromGithub = lib.mkOption {
       description = ''
         Import public ssh keys from a github username.
@@ -33,63 +95,12 @@ in
       };
       type = types.attrsOf types.str;
     };
-
+  };
-        dev = lib.mkOption {
+in
-          description = "Options for setting up a dev environment";
+{
+  options.jconfig = lib.mkOption {
+    description = "Jalil's default NixOS configuration.";
     default = { };
-          type = types.submodule {
+    type = types.submodule config;
-            options = {
-              enable = lib.mkEnableOption "dev configuration";
-              jupyter.enable = lib.mkEnableOption "jupyter configuration";
-            };
-          };
-        };
-
-        gui = lib.mkOption {
-          description = "Jalil's default configuration for a NixOS gui.";
-          default = { };
-          type = types.submodule {
-            options = {
-              enable = lib.mkEnableOption "jalil's default gui configuration.";
-              # Fix for using Xinput mode on 8bitdo Ultimate C controller
-              # Inspired by https://aur.archlinux.org/packages/8bitdo-ultimate-controller-udev
-              # Adapted from: https://gist.github.com/interdependence/28452fbfbe692986934fbe1e54c920d4
-              "8bitdoFix" = mkDisableOption "a fix for 8bitdo controllers";
-              steamHardwareSupport = mkDisableOption "steam hardware support";
-              ydotool = lib.mkOption {
-                description = "Jalil's default ydotool configuration.";
-                default = { };
-                type = types.submodule {
-                  options.enable = mkDisableOption "ydotool";
-                  options.autoStart = mkDisableOption "autostarting ydotool at login";
-                };
-              };
-              sway = mkDisableOption "sway";
-            };
-          };
-        };
-
-        styling = lib.mkOption {
-          description = "Jalil's styling options";
-          default = { };
-          type = types.submodule {
-            options = {
-              enable = mkDisableOption "jalil's default styling (disables stylix)";
-              wallpaper = mkImageOption {
-                description = "The wallpaper to use.";
-                url = "https://raw.githubusercontent.com/lunik1/nixos-logo-gruvbox-wallpaper/d4937c424fad79c1136a904599ba689fcf8d0fad/png/gruvbox-dark-rainbow.png";
-                sha256 = "036gqhbf6s5ddgvfbgn6iqbzgizssyf7820m5815b2gd748jw8zc";
-              };
-              bootLogo = mkImageOption {
-                description = "The logo used by plymouth at boot.";
-                # http://xenia-linux-site.glitch.me/images/cathodegaytube-splash.png
-                url = "https://efimero.github.io/xenia-images/cathodegaytube-splash.png";
-                sha256 = "qKugUfdRNvMwSNah+YmMepY3Nj6mWlKFh7jlGlAQDo8=";
-              };
-            };
-          };
-        };
-      };
-    };
   };
 }

modules/nixos/styling.nix

@@ -1,43 +0,0 @@
-{ lib, pkgs, ... }@args:
-let
-  cfg = args.config.jconfig.styling;
-  enable = args.config.jconfig.enable && cfg.enable;
-in
-{
-  config = lib.mkIf enable {
-    boot.plymouth = { inherit (cfg) enable; };
-
-    stylix = {
-      inherit (cfg) enable;
-      image = cfg.wallpaper;
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
-      polarity = "dark";
-      fonts = {
-        monospace = {
-          name = "JetBrains Mono";
-          package = pkgs.jetbrains-mono;
-        };
-        sansSerif = {
-          name = "Noto Sans";
-          package = pkgs.noto-fonts;
-        };
-        serif = {
-          name = "Noto Serif";
-          package = pkgs.noto-fonts;
-        };
-        emoji = {
-          package = pkgs.noto-fonts-emoji;
-          name = "Noto Color Emoji";
-        };
-        sizes.popups = 12;
-      };
-      targets = {
-        plymouth = {
-          logoAnimated = false;
-          logo = cfg.bootLogo;
-        };
-        nixvim.enable = false;
-      };
-    };
-  };
-}

modules/nixos/stylix-config.nix

@@ -0,0 +1,36 @@
+{ config, pkgs }:
+let
+  cfg = config.jconfig.styling;
+in
+{
+  inherit (cfg) enable;
+  image = cfg.wallpaper;
+  base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
+  polarity = "dark";
+  fonts = {
+    monospace = {
+      name = "JetBrains Mono";
+      package = pkgs.jetbrains-mono;
+    };
+    sansSerif = {
+      name = "Noto Sans";
+      package = pkgs.noto-fonts;
+    };
+    serif = {
+      name = "Noto Serif";
+      package = pkgs.noto-fonts;
+    };
+    emoji = {
+      package = pkgs.noto-fonts-emoji;
+      name = "Noto Color Emoji";
+    };
+    sizes.popups = 12;
+  };
+  targets = {
+    plymouth = {
+      logoAnimated = false;
+      logo = cfg.bootLogo;
+    };
+    nixvim.enable = false;
+  };
+}