wip: switch to niri [skip-ci]

Looks cooler c:

.forgejo/workflows/check.yml

@@ -3,13 +3,22 @@ on:
 jobs:
   check:
     runs-on: nixos
+    strategy:
+      matrix:
+        check:
+          - nvimDev
+          - nvimHeadless
+          - nvimNoBundledBins
+          - nvimNoLsp
+          - nvimNoTSGrammars
+          - treefmt
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - name: Run checks
         run: |
           nix --version
-          nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \
-            --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)"
+          # shellcheck disable=SC2016
+          nix build --print-build-logs '.#checks.x86_64-linux.${{ matrix.check }}'
   check-renovaterc:
     runs-on: nixos
     steps:
@@ -18,30 +27,27 @@ jobs:
         run: |
           nix --version
           nix shell nixpkgs#renovate --command renovate-config-validator
-  build-packages:
+  build:
     runs-on: nixos
     needs: check
+    strategy:
+      matrix:
+        target:
+          - audiomenu
+          - docs
+          - jpassmenu
+          - nixosConfigurations.vm.config.system.build.toplevel
+          - nvim
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - name: Build target
         run: |
           nix --version
-          nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \
-            --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)"
-  build-vm:
-    runs-on: nixos
-    needs: build-packages
-    steps:
-      - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
-      - name: Build VM configuration
-        run: |
-          nix --version
-          nix build --print-build-logs '.#nixosConfigurations.vm.config.system.build.toplevel'
+          # shellcheck disable=SC2016
+          nix build --print-build-logs '.#${{ matrix.target }}'
   report-size:
     runs-on: nixos
-    needs:
-      - build-packages
-      - build-vm
+    needs: build
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - run: nix --version

.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"

docs/book.toml

@@ -3,7 +3,7 @@ authors = ["Jalil David Salamé Messina"]
 language = "en"
 multilingual = false
 src = "src"
-title = "Jalil's NixOS configuration modules"
+title = "Jalil's NixOS configuration module"
 
 [preprocessor.toc]
 command = "mdbook-toc"

docs/src/SUMMARY.md

@@ -1,9 +1,6 @@
 # Summary
 
-[Nix Based Configuration](./configuration-overview.md)
-
-- [NixOS Module Options](./nixos-options.md)
-- [Neovim Module Options](./nvim-options.md)
-- [Home Manager Module Options](./home-options.md)
-
-[Search](./search/index.html)
+- [Nix Based Configuration](./configuration-overview.md)
+    - [NixOS Module Options](./nixos-options.md)
+    - [Neovim Module Options](./nvim-options.md)
+    - [Home Manager Module Options](./home-options.md)

example-vm/default.nix

@@ -1,41 +0,0 @@
-{
-  imports = [ ./vm-config.nix ];
-
-  time.timeZone = "Europe/Berlin";
-  i18n.defaultLocale = "en_US.UTF-8";
-  users.users.jdoe = {
-    password = "example";
-    isNormalUser = true;
-    extraGroups = [
-      "wheel"
-      "video"
-      "networkmanager"
-    ];
-  };
-  home-manager.users.jdoe = {
-    home = {
-      username = "jdoe";
-      homeDirectory = "/home/jdoe";
-      stateVersion = "24.11";
-    };
-    jhome = {
-      enable = true;
-      gui.enable = true;
-      dev = {
-        enable = true;
-        rust.enable = true;
-      };
-    };
-  };
-
-  # password is 'test' see module documentation for more options
-  services.jupyter.password = "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'";
-  jconfig = {
-    enable = true;
-    dev = {
-      enable = true;
-      jupyter.enable = true;
-    };
-    gui.enable = true;
-  };
-}

flake-modules/default.nix

@@ -10,8 +10,7 @@ in
     ./docs.nix
     ./example-vm.nix
     ./nixos-modules.nix
-    ./home-modules.nix
-    ./nixvim-modules.nix
+    ./nvim.nix
     ./overlays.nix
     ./scripts.nix
   ];

flake-modules/docs.nix

@@ -1,50 +1,45 @@
-{ lib, ... }:
+{ lib, inputs, ... }:
 {
   perSystem =
-    { inputs', pkgs, ... }:
+    { pkgs, ... }:
     {
       packages =
         let
           filterVisible =
             toplevelOption: option:
             option // { visible = option.visible && builtins.elemAt option.loc 0 == toplevelOption; };
-          genOptionsDoc =
-            toplevelOption: module:
-            pkgs.nixosOptionsDoc {
-              inherit (lib.evalModules { modules = [ module ]; }) options;
-              transformOptions = filterVisible toplevelOption;
+          home-eval = lib.evalModules {
+            modules = [ ../home/options.nix ];
+            specialArgs = {
+              inherit pkgs;
             };
-          mkScope = name: options: {
-            inherit name;
-            optionsJSON = "${options.optionsJSON}/share/doc/nixos/options.json";
-            urlPrefix = "https://github.com/jalil-salame/configuration.nix/blob/main/";
           };
-          search = inputs'.nuschtosSearch.packages.mkMultiSearch {
-            title = "Search Jalil's configuration.nix";
-            baseHref = "/";
-
-            scopes = [
-              (mkScope "NixOS" nixos)
-              (mkScope "Home-Manager" home)
-              (mkScope "NixVIM" nvim)
-            ];
-          };
-          home = genOptionsDoc "jhome" ../modules/hm/options.nix;
-          nvim = genOptionsDoc "jhome" ../modules/nixvim/options.nix;
-          nixos = genOptionsDoc "jconfig" ../modules/nixos/options.nix;
-          nixos-markdown = nixos.optionsCommonMark;
-          home-markdown = home.optionsCommonMark;
-          nvim-markdown = nvim.optionsCommonMark;
+          nvim-eval = lib.evalModules { modules = [ ../nvim/options.nix ]; };
+          nixos-eval = lib.evalModules { modules = [ ../system/options.nix ]; };
+          home-markdown =
+            (pkgs.nixosOptionsDoc {
+              inherit (home-eval) options;
+              transformOptions = filterVisible "jhome";
+            }).optionsCommonMark;
+          nvim-markdown =
+            (pkgs.nixosOptionsDoc {
+              inherit (nvim-eval) options;
+              transformOptions = filterVisible "jhome";
+            }).optionsCommonMark;
+          nixos-markdown =
+            (pkgs.nixosOptionsDoc {
+              inherit (nixos-eval) options;
+              transformOptions = filterVisible "jconfig";
+            }).optionsCommonMark;
         in
         {
-          inherit search;
           docs-home-markdown = home-markdown;
           docs-nixos-markdown = nixos-markdown;
           docs-nvim-markdown = nvim-markdown;
           # Documentation
           docs = pkgs.stdenvNoCC.mkDerivation {
             name = "nixos-configuration-book";
-            src = ../docs;
+            src = inputs.self + "/docs";
 
             patchPhase = ''
               cleanup_md() {
@@ -57,12 +52,10 @@
               cleanup_md ${home-markdown} >> ./src/home-options.md
               cleanup_md ${nvim-markdown} >> ./src/nvim-options.md
               cleanup_md ${nixos-markdown} >> ./src/nixos-options.md
-              # link search site
-              ln -s "${search.override { baseHref = "/configuration.nix/search/"; }}" ./src/search
-            ''; # FIXME: only add the `/configuration.nix/` part for GH CI
+            '';
 
             nativeBuildInputs = [ pkgs.mdbook-toc ];
-            buildPhase = "${pkgs.mdbook}/bin/mdbook build --dest-dir \"$out\"";
+            buildPhase = "${pkgs.mdbook}/bin/mdbook build --dest-dir $out";
           };
         };
     };

flake-modules/example-vm.nix

@@ -8,11 +8,47 @@ in
 {
   # Example vm configuration
   flake.nixosConfigurations.vm = lib.nixosSystem {
-    inherit pkgs;
+    inherit system pkgs;
     modules = [
-      inputs.self.nixosModules.default
-      ../example-vm # import vm configuration
-      { nix.registry.nixpkgs.flake = inputs.nixpkgs; } # pin nixpkgs to the one used by the system
+      inputs.self.nixosModules.vm # import vm module
+      {
+        time.timeZone = "Europe/Berlin";
+        i18n.defaultLocale = "en_US.UTF-8";
+        users.users.jdoe = {
+          password = "example";
+          isNormalUser = true;
+          extraGroups = [
+            "wheel"
+            "video"
+            "networkmanager"
+          ];
+        };
+        home-manager.users.jdoe = {
+          home = {
+            username = "jdoe";
+            homeDirectory = "/home/jdoe";
+          };
+          jhome = {
+            enable = true;
+            gui.enable = true;
+            dev = {
+              enable = true;
+              rust.enable = true;
+            };
+          };
+        };
+        nix.registry.nixpkgs.flake = inputs.nixpkgs;
+        # password is 'test' see module documentation for more options
+        services.jupyter.password = "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'";
+        jconfig = {
+          enable = true;
+          dev = {
+            enable = true;
+            jupyter.enable = true;
+          };
+          gui.enable = true;
+        };
+      }
     ];
   };
 

flake-modules/home-modules.nix

@@ -1,31 +0,0 @@
-{ self, inputs, ... }:
-{
-  # FIXME(25.05): this version of HM should have the flake module
-  # imports = [ inputs.home-manager.flakeModules.home-manager ];
-
-  flake.homeModules =
-    let
-      defaultModules = [
-        inputs.nixvim.homeManagerModules.nixvim
-        self.nixvimModules.homeManager
-        ../modules/hm
-      ];
-      nixos = {
-        imports = defaultModules;
-      };
-      standalone = {
-        imports = defaultModules ++ [
-          inputs.stylix.homeManagerModules.stilyx
-          (
-            { config, ... }:
-            {
-              stylix.image = config.jhome.sway.background;
-            }
-          )
-        ];
-      };
-    in
-    {
-      inherit standalone nixos;
-    };
-}

flake-modules/nixos-modules.nix

@@ -1,29 +1,46 @@
-{
-  self,
-  inputs,
-  lib,
-  ...
-}:
+{ inputs, lib, ... }:
 {
   flake.nixosModules =
     let
+      nvim-config = {
+        imports = [
+          inputs.nixvim.homeManagerModules.nixvim
+          ../nvim
+        ];
+      };
+      homeManagerModuleSandalone = import ../home {
+        inherit nvim-config;
+        inherit (inputs) stylix;
+      };
+      homeManagerModuleNixOS = import ../home { inherit nvim-config; };
       nixosModule = {
         imports = [
-          inputs.stylix.nixosModules.stylix
+          (import ../system { inherit (inputs) stylix; })
+          inputs.niri.nixosModules.niri
           inputs.home-manager.nixosModules.home-manager
-          ../modules/nixos
         ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default;
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-          sharedModules = [ self.homeModules.nixos ];
+          sharedModules = [ homeManagerModuleNixOS ];
         };
         # Pin nixpkgs
         nix.registry.nixpkgs.flake = inputs.nixpkgs;
       };
+
+      machines = [ "vm" ];
+      mkMachine = hostname: {
+        imports = [
+          nixosModule
+          (import (../machines + "/${hostname}"))
+        ];
+        home-manager.sharedModules = [ { jhome.hostName = hostname; } ];
+      };
+      machineModules = lib.genAttrs machines mkMachine;
     in
     {
       default = nixosModule;
-      inherit nixosModule;
-    };
+      inherit nixosModule homeManagerModuleNixOS homeManagerModuleSandalone;
+    }
+    // machineModules;
 }

flake-modules/nixvim-modules.nix

@@ -1,61 +0,0 @@
-{ self, inputs, ... }:
-{
-  imports = [ inputs.nixvim.flakeModules.default ];
-
-  nixvim = {
-    packages.enable = true;
-    checks.enable = false; # FIXME: borked due to nix-community/nixvim#3074
-  };
-
-  flake.nixvimModules =
-    let
-      module = ../modules/nixvim;
-    in
-    {
-      standalone = "${module}/standalone.nix";
-      homeManager = module;
-    };
-
-  perSystem =
-    { system, ... }:
-    let
-      nvimModule = extraConfig: {
-        inherit system;
-        modules = [
-          self.nixvimModules.standalone
-          { performance.combinePlugins.enable = true; }
-          extraConfig
-        ];
-      };
-      modules = {
-        nvim = nvimModule { };
-        # Smaller derivations
-        nvim-headless = nvimModule {
-          jhome.nvim.dev.enable = false;
-          jhome.nvim.reduceSize = true;
-        };
-        nvim-small = nvimModule {
-          jhome.nvim.dev.bundleLSPs = false;
-        };
-        nvim-no-ts = nvimModule {
-          jhome.nvim.dev.bundleGrammars = false;
-        };
-        nvim-no-lsps = nvimModule {
-          jhome.nvim.dev = {
-            bundleLSPs = false;
-            bundleGrammars = false;
-          };
-        };
-      };
-    in
-    {
-      checks = builtins.mapAttrs (
-        _name: module:
-        inputs.nixvim.lib.${system}.check.mkTestDerivationFromNixvimModule {
-          module.imports = module.modules;
-        }
-      ) modules;
-
-      nixvimConfigurations = builtins.mapAttrs (_name: inputs.nixvim.lib.evalNixvim) modules;
-    };
-}

flake-modules/nvim.nix

@@ -0,0 +1,53 @@
+{ inputs, ... }:
+{
+  perSystem =
+    { lib, system, ... }:
+    let
+      nixvimLib = inputs.nixvim.lib.${system};
+      nixvim = inputs.nixvim.legacyPackages.${system};
+      testNvimModule = nixvimLib.check.mkTestDerivationFromNixvimModule;
+      nvimModule = extraConfig: {
+        pkgs = inputs.unstable.legacyPackages.${system};
+        module = {
+          imports = [ ../nvim/standalone.nix ];
+          config = lib.mkMerge [
+            { performance.combinePlugins.enable = true; }
+            extraConfig
+          ];
+        };
+      };
+      moduleDev = nvimModule { };
+      moduleHeadless = nvimModule {
+        jhome.nvim.dev.enable = false;
+        jhome.nvim.reduceSize = true;
+      };
+      moduleNoLsp = nvimModule { jhome.nvim.dev.bundleLSPs = false; };
+      moduleNoTSGrammars = nvimModule { jhome.nvim.dev.bundleGrammars = false; };
+      moduleNoBundledBins = nvimModule {
+        jhome.nvim.dev = {
+          bundleLSPs = false;
+          bundleGrammars = false;
+        };
+      };
+    in
+    {
+      # Check standalone nvim build
+      checks = {
+        nvimDev = testNvimModule moduleDev;
+        nvimHeadless = testNvimModule moduleHeadless;
+        nvimNoLsp = testNvimModule moduleNoLsp;
+        nvimNoTSGrammars = testNvimModule moduleNoTSGrammars;
+        nvimNoBundledBins = testNvimModule moduleNoBundledBins;
+      };
+
+      # Nvim standalone module
+      packages = {
+        nvim = nixvim.makeNixvimWithModule moduleDev;
+        # Smaller derivations
+        nvim-headless = nixvim.makeNixvimWithModule moduleHeadless;
+        nvim-small = nixvim.makeNixvimWithModule moduleNoBundledBins;
+        nvim-no-ts = nixvim.makeNixvimWithModule moduleNoTSGrammars;
+        nvim-no-lsps = nixvim.makeNixvimWithModule moduleNoLsp;
+      };
+    };
+}

flake.lock

@@ -70,11 +70,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1741628778,
-        "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
+        "lastModified": 1739223196,
+        "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
+        "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
+        "lastModified": 1741352980,
+        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
+        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741379162,
-        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743387206,
-        "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
         "type": "github"
       },
       "original": {
@@ -240,44 +240,18 @@
         "type": "github"
       }
     },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.6",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
         "lastModified": 1737234286,
-        "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=",
-        "rev": "079528098f5998ba13c88821a2eca1005c1695de",
+        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
+        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
       }
     },
     "lix-module": {
@@ -290,24 +264,68 @@
         ]
       },
       "locked": {
-        "lastModified": 1742943028,
-        "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=",
-        "rev": "3fae818597ca2f1474de62022f850c23be50528d",
+        "lastModified": 1737237494,
+        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
+        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3fae818597ca2f1474de62022f850c23be50528d.tar.gz?rev=3fae818597ca2f1474de62022f850c23be50528d"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
+      }
+    },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": [],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ],
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": []
+      },
+      "locked": {
+        "lastModified": 1741686876,
+        "narHash": "sha256-Kt37Zm9YcQoe/aRVbPFydZcfwIrEAg/U+iz3FcxsOZs=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "fa230971ab63885ba5666588a7b78f75f73d5a85",
+        "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": 1743576891,
-        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
+        "lastModified": 1741445498,
+        "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
+        "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
         "type": "github"
       },
       "original": {
@@ -319,11 +337,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1743538100,
-        "narHash": "sha256-Bl/ynRPIb4CdtbEw3gfJYpKiHmRmrKltXc8zipqpO0o=",
+        "lastModified": 1738797219,
+        "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b9d43b3fe5152d1dc5783a2ba865b2a03388b741",
+        "rev": "1da52dd49a127ad74486b135898da2cef8c62665",
         "type": "github"
       },
       "original": {
@@ -342,11 +360,11 @@
         "nuschtosSearch": []
       },
       "locked": {
-        "lastModified": 1743598191,
-        "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=",
+        "lastModified": 1741098523,
+        "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e",
+        "rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
         "type": "github"
       },
       "original": {
@@ -355,39 +373,14 @@
         "type": "github"
       }
     },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": [
-          "lix-module",
-          "flake-utils"
-        ],
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743683223,
-        "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "lix-module": "lix-module",
+        "niri": "niri",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
-        "nuschtosSearch": "nuschtosSearch",
         "stylix": "stylix",
         "systems": "systems",
         "treefmt-nix": "treefmt-nix",
@@ -425,11 +418,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1741961698,
-        "narHash": "sha256-utsgC6H3ja6sLAXMd8//I2D7yjyScFqVDRX0wpbqPZo=",
+        "lastModified": 1740520580,
+        "narHash": "sha256-QRlcA8rtfNdyKpBE+ptjiB9717Tzum4/sKBSbsyqL6k=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "9bfc74f330ead111e8ea354b2220a431b0cfaa26",
+        "rev": "aaa2eb8956770c096f9c46fb163bb26602e20e56",
         "type": "github"
       },
       "original": {
@@ -491,11 +484,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1740877430,
-        "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
+        "lastModified": 1740272597,
+        "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
+        "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
         "type": "github"
       },
       "original": {
@@ -511,11 +504,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743677901,
-        "narHash": "sha256-eWZln+k+L/VHO69tUTzEmgeDWNQNKIpSUa9nqQgBrSE=",
+        "lastModified": 1739829690,
+        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "57dabe2a6255bd6165b2437ff6c2d1f6ee78421a",
+        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
         "type": "github"
       },
       "original": {
@@ -523,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

@@ -12,7 +12,7 @@
     unstable.follows = "nixvim/nixpkgs";
     # Lix
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.inputs.systems.follows = "systems";
@@ -23,6 +23,15 @@
       url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    niri = {
+      url = "github:sodiboo/niri-flake";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        nixpkgs-stable.follows = "nixpkgs";
+        niri-unstable.follows = "";
+        xwayland-satellite-unstable.follows = "";
+      };
+    };
     stylix = {
       url = "github:danth/stylix/release-24.11";
       inputs = {
@@ -47,19 +56,10 @@
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
-    # For the formatter (can be set to null)
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # For generating the docs (can be set to null)
-    nuschtosSearch = {
-      url = "github:NuschtOS/search";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "lix-module/flake-utils";
-      };
-    };
     # For deduplication
     systems.url = "github:nix-systems/default";
   };

home/default.nix

@@ -0,0 +1,231 @@
+{
+  nvim-config,
+  stylix ? null,
+}:
+{
+  config,
+  pkgs,
+  lib,
+  osConfig ? null,
+  ...
+}:
+let
+  cfg = config.jhome;
+  devcfg = cfg.dev;
+  # Query the osConfig for a setting. Return the default value if missing or in standalone mode
+  fromOs =
+    path: default: if osConfig == null then default else lib.attrsets.attrByPath path default osConfig;
+in
+{
+  imports =
+    [
+      nvim-config
+      ./options.nix
+      ./gui
+      ./users.nix
+    ]
+    ++ lib.optionals (stylix != null) [
+      stylix.homeManagerModules.stylix
+      { stylix.image = cfg.sway.background; }
+    ];
+
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable && cfg.styling.enable) {
+      stylix = {
+        enable = true;
+        targets.nixvim.enable = false; # I prefer doing it myself
+      };
+    })
+    (lib.mkIf cfg.enable {
+      # Add gopass if pass is enabled
+      home.packages = lib.optional config.programs.password-store.enable pkgs.gopass;
+
+      nix.settings.use-xdg-base-directories = fromOs [
+        "nix"
+        "settings"
+        "use-xdg-base-directories"
+      ] true;
+      programs = {
+        # Better cat (bat)
+        bat = {
+          enable = true;
+          config = {
+            # Disable headers and numbers
+            style = "plain";
+            theme = lib.mkForce "gruvbox-dark";
+          };
+        };
+        # Direnv
+        direnv = {
+          enable = true;
+          nix-direnv.enable = true;
+        };
+        # ls replacement
+        eza = {
+          enable = true;
+          git = true;
+          icons = "auto";
+        };
+        # GnuPG
+        gpg = {
+          enable = true;
+          homedir = "${config.xdg.dataHome}/gnupg";
+        };
+        # Mail client
+        himalaya.enable = lib.mkDefault true;
+        # Password manager
+        password-store = {
+          enable = lib.mkDefault true;
+          package = pkgs.pass-nodmenu;
+          settings.PASSWORD_STORE_DIR = "${config.xdg.dataHome}/pass";
+        };
+        # SSH
+        ssh.enable = true;
+        # cd replacement
+        zoxide.enable = true;
+        # Shell
+        zsh = {
+          enable = true;
+          autosuggestion.enable = true;
+          enableCompletion = true;
+          autocd = true;
+          dotDir = ".config/zsh";
+          history.path = "${config.xdg.dataHome}/zsh/zsh_history";
+          syntaxHighlighting.enable = true;
+        };
+      };
+      services = {
+        # GPG Agent
+        gpg-agent = {
+          enable = true;
+          maxCacheTtl = 86400;
+          pinentryPackage = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses;
+          extraConfig = "allow-preset-passphrase";
+        };
+        # Spotifyd
+        spotifyd = {
+          inherit (config.jhome.gui) enable;
+          settings.global = {
+            device_name = config.jhome.hostName;
+            device_type = "computer";
+            backend = "pulseaudio";
+            zeroconf_port = 2020;
+          };
+        };
+      };
+      home = {
+        stateVersion = "22.11";
+        # Extra packages
+        # Extra variables
+        sessionVariables = {
+          CARGO_HOME = "${config.xdg.dataHome}/cargo";
+          RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+          GOPATH = "${config.xdg.dataHome}/go";
+        };
+        shellAliases = {
+          # Verbose Commands
+          cp = "cp --verbose";
+          ln = "ln --verbose";
+          mv = "mv --verbose";
+          mkdir = "mkdir --verbose";
+          rename = "rename --verbose";
+          rm = "rm --verbose";
+          # Add Color
+          grep = "grep --color=auto";
+          ip = "ip --color=auto";
+          # Use exa/eza
+          tree = "eza --tree";
+        };
+      };
+      # XDG directories
+      xdg = {
+        enable = true;
+        userDirs = {
+          enable = true;
+          createDirectories = true;
+        };
+      };
+    })
+    (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}";
+          };
+        };
+      };
+    })
+  ];
+}

home/gui/default.nix

@@ -80,10 +80,8 @@ in
         settings = lib.mkIf config.jhome.styling.enable (
           import ./waybar-settings.nix { inherit config lib; }
         );
-        # Style overrides to highlight workspaces with windows
         style =
-          lib.pipe
-            # css
+          lib.optionalString config.jhome.styling.enable # css
             ''
               .modules-left #workspaces button {
                 border-bottom: 3px solid @base01;
@@ -91,11 +89,7 @@ in
               .modules-left #workspaces button.persistent {
                 border-bottom: 3px solid transparent;
               }
-            ''
-            [
-              (lib.optionalString config.jhome.styling.enable)
-              lib.mkAfter
-            ];
+            '';
       };
       # Terminal
       wezterm = {
@@ -125,27 +119,17 @@ in
           };
         };
       };
-      zellij = {
-        enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexer built-in
-        # Set default shell
-        settings.default_shell =
-          if config.programs.fish.enable then
-            "fish"
-          else if config.programs.zsh.enable then
-            "zsh"
-          else
-            "bash";
-      };
+      zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexer built-in
       # PDF reader
       zathura.enable = true;
       # Auto start sway
-      fish.loginShellInit =
-        lib.optionalString cfg.sway.autostart # fish
+      zsh.loginExtra =
+        lib.optionalString cfg.sway.autostart # sh
           ''
             # Start Sway on login to TTY 1
-            if test "$(tty)" = /dev/tty1
+            if [ "$TTY" = /dev/tty1 ]; then
               exec sway
-            end
+            fi
           '';
     };
     services = {
@@ -174,13 +158,59 @@ in
     };
 
     # Window Manager
-    wayland.windowManager.sway = {
-      inherit (cfg.sway) enable;
-      package = swayPkg; # no sway package if it comes from the OS
-      config = import ./sway-config.nix { inherit config pkgs; };
-      systemd = {
-        enable = true;
-        xdgAutostart = true;
+    programs.niri = {
+      package = pkgs.niri; # use nixpkgs' package instead of the flake's
+      settings = {
+        binds =
+          let
+            # Modifier key
+            mod = "Mod";
+            # Available workspaces (1..=9)
+            workspaces = lib.range 1 9;
+            # Run function for each workspace
+            perWorkspace = f: lib.mergeAttrsList (builtins.map f workspaces);
+            # alias for concatStringsSep
+            joinWith = lib.strings.concatStringsSep;
+          in
+          with config.lib.niri.actions;
+          {
+            # Open Terminal
+            "${mod}+Return".action.spawn =
+              if config.jhome.gui.terminal == "alacritty" then "alacritty" else config.jhome.gui.terminalCommand;
+            # Open menu
+            "${mod}+D".action =
+              spawn "${lib.getExe pkgs.fuzzel}" "--terminal"
+                "${joinWith " " config.jhome.gui.terminalCommand}";
+            # Close Window
+            "${mod}+Q".action = close-window;
+            # Fullscreen
+            "${mod}+F".action = fullscreen-window;
+            # Hotkey help menu
+            "${mod}+Shift+Slash".action = show-hotkey-overlay;
+            # Media Keys
+            "XF86AudioRaiseVolume" = {
+              action = spawn "${pkgs.avizo}/bin/volumectl" "up";
+              allow-when-locked = true;
+            };
+            "XF86AudioLowerVolume" = {
+              action = spawn "${pkgs.avizo}/bin/volumectl" "down";
+              allow-when-locked = true;
+            };
+            "XF86AudioMute" = {
+              action = spawn "${pkgs.avizo}/bin/volumectl" "toggle-mute";
+              allow-when-locked = true;
+            };
+            # FIXME: swaylock is missing so this doesn't work anyways
+            # Lock screen
+            # "XF86ScreenSaver".action = spawn "swaylock" "--image" "${cfg.background}";
+            # Screen brightness
+            "XF86MonBrightnessUp".action = spawn "${pkgs.avizo}/bin/lightctl" "up";
+            "XF86MonBrightnessDown".action = spawn "${pkgs.avizo}/bin/lightctl" "down";
+          }
+          // perWorkspace (workspace: {
+            # Focus workspace N
+            "${mod}+${builtins.toString workspace}".action = focus-workspace workspace;
+          });
       };
     };
 

home/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

home/gui/sway-config.nix

@@ -2,14 +2,7 @@
 let
   cfg = config.jhome.gui.sway;
   modifier = "Mod4";
-  inherit (config.jhome.gui) terminal;
-  termCmd =
-    if terminal == "wezterm" then
-      "wezterm start"
-    else if terminal == "alacritty" then
-      "alacritty -e"
-    else
-      builtins.abort "no command configured for ${terminal}";
+  termCmd = builtins.concatStringsSep " " config.jhome.gui.terminalCommand;
   menu = "${pkgs.fuzzel}/bin/fuzzel --terminal '${termCmd}'";
   # currently, there is some friction between sway and gtk:
   # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
@@ -46,7 +39,8 @@ let
   };
 in
 {
-  inherit modifier terminal menu;
+  inherit (config.jhome.gui) terminal;
+  inherit modifier menu;
   keybindings = import ./keybindings.nix { inherit config pkgs; };
   # Appearance
   bars = [ ]; # Waybar is started as a systemd service

home/options.nix

@@ -78,13 +78,23 @@ let
     example = "/sys/class/hwmon/hwmon2/temp1_input";
   };
 
-  sway.options = {
-    enable = lib.mkEnableOption "sway" // {
+  windowManager.options = {
+    enable = lib.mkEnableOption "window manager" // {
       default = fromConfig [
         "gui"
-        "sway"
+        "windowManager"
+        "enable"
       ] true;
     };
+    windowManager = lib.mkOption {
+      description = "Which window manager to enable";
+      type = types.enum [ "niri" ];
+      default = fromConfig [
+        "gui"
+        "windowManager"
+        "windowManager"
+      ] "niri";
+    };
     background = lib.mkOption {
       description = "The wallpaper to use.";
       type = types.path;
@@ -114,55 +124,60 @@ let
       default = true;
       example = false;
     };
-    exec = lib.mkOption {
-      description = "Run commands when starting sway.";
-      default = { };
-      type = types.submodule {
-        options = {
-          once = lib.mkOption {
-            description = "Programs to start only once (`exec`).";
-            type = types.listOf types.str;
-            default = [ ];
-            example = [ "signal-desktop --start-in-tray" ];
-          };
-          always = lib.mkOption {
-            description = "Programs to start whenever the config is sourced (`exec_always`).";
-            type = types.listOf types.str;
-            default = [ ];
-            example = [ "signal-desktop --start-in-tray" ];
-          };
-        };
-      };
-    };
   };
 
-  gui.options = {
-    enable = lib.mkEnableOption "GUI applications" // {
-      default = fromConfig [
-        "gui"
-        "enable"
-      ] false;
+  gui.options =
+    let
+      cfg = attrs.config.jhome.gui;
+    in
+    {
+      enable = lib.mkEnableOption "GUI applications" // {
+        default = fromConfig [
+          "gui"
+          "enable"
+        ] false;
+      };
+      tempInfo = lib.mkOption {
+        description = "Temperature info to display in the statusbar.";
+        default = null;
+        type = types.nullOr (types.submodule tempInfo);
+      };
+      windowManager = lib.mkOption {
+        description = "Window manager configuration.";
+        default = { };
+        type = types.submodule windowManager;
+      };
+      terminal = lib.mkOption {
+        description = "The terminal emulator to use.";
+        default = "alacritty";
+        example = "wezterm";
+        type = types.enum [
+          "wezterm"
+          "alacritty"
+        ];
+      };
+      terminalCommand = lib.mkOption {
+        description = "The command to run in order to start the terminal.";
+        default =
+          if cfg.terminal == "wezterm" then
+            [
+              "wezterm"
+              "start"
+            ]
+          else if cfg.terminal == "alacritty" then
+            [
+              "alacritty"
+              "-e"
+            ]
+          else
+            builtins.abort "no command configured for ${cfg.terminal}";
+        example = [
+          "wezterm"
+          "start"
+        ];
+        type = types.listOf types.str;
+      };
     };
-    tempInfo = lib.mkOption {
-      description = "Temperature info to display in the statusbar.";
-      default = null;
-      type = types.nullOr (types.submodule tempInfo);
-    };
-    sway = lib.mkOption {
-      description = "Sway window manager configuration.";
-      default = { };
-      type = types.submodule sway;
-    };
-    terminal = lib.mkOption {
-      description = "The terminal emulator to use.";
-      default = "alacritty";
-      example = "wezterm";
-      type = types.enum [
-        "wezterm"
-        "alacritty"
-      ];
-    };
-  };
 in
 {
   options.jhome = lib.mkOption {

home/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) {
-    programs = {
-      git = {
+  config = lib.mkMerge [
+    (lib.mkIf hasConfig {
+      programs.git = {
         userName = cfg.defaultIdentity.name;
         userEmail = cfg.defaultIdentity.email;
         signing = lib.mkIf hasKey {
@@ -17,24 +20,22 @@ in
           key = signingKey;
         };
       };
-
-      jujutsu.settings = {
+      programs.jujutsu.settings = {
         user = lib.mkIf (cfg.defaultIdentity != null) { inherit (cfg.defaultIdentity) name email; };
-        git.sign-on-push = lib.mkDefault hasKey;
         signing = lib.mkIf hasKey {
-          behaviour = "own";
+          sign-all = true;
           backend = "gpg";
           key = signingKey;
         };
       };
-    };
+    })
+    (lib.mkIf unlockKey {
+      xdg.configFile.pam-gnupg.text =
+        ''
+          ${gpgHome}
 
-    xdg.configFile.pam-gnupg = lib.mkIf (cfg.gpg.unlockKeys != [ ]) {
-      text = ''
-        ${config.programs.gpg.homedir}
-
-        ${lib.strings.concatLines cfg.gpg.unlockKeys}
-      '';
-    };
-  };
+        ''
+        + (lib.strings.concatLines cfg.gpg.unlockKeys);
+    })
+  ];
 }

justfile

@@ -13,19 +13,22 @@ run-vm: build-vm
 
 update-vim-plugins:
     #!/bin/sh
-    plugindir=./modules/nixvim/extraPlugins
+    # Use local nixpkgs if available
+    nixpkgs="$HOME/Dev/nixpkgs"
     # copy nixpkgs from local checkout
-    nixpkgs="$(mktemp -d)"
-    cp -r /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/. "$nixpkgs"
-    cd "$nixpkgs"
-    git init .
-    git add .
-    git commit -m 'dummy commit'
-    cd -
+    if [ ! -d "$nixpkgs" ]; then
+        nixpkgs="$(mktemp -d)"
+        cp -r /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/. "$nixpkgs"
+        cd "$nixpkgs"
+        git init .
+        git add .
+        git commit -m 'dummy commit'
+        cd -
+    fi
     # update vim plugins
-    nix run nixpkgs#vimPluginsUpdater -- --proc=1 --nixpkgs "$nixpkgs" --no-commit -i "$plugindir/plugins" -o "$plugindir/generated.nix" update
+    nix run nixpkgs#vimPluginsUpdater -- --proc=1 --nixpkgs "$nixpkgs" --no-commit -i ./nvim/extraPlugins/plugins -o ./nvim/extraPlugins/generated.nix update
     # format the generated output
-    nix fmt "$plugindir/generated.nix"
+    nix fmt ./nvim/extraPlugins/generated.nix
 
 # Amend Update flake.lock PR
 flake-pr:

machines/vm/default.nix

@@ -1,34 +1,31 @@
-## Default QEMU guest config
 {
-  services = {
-    qemuGuest.enable = true;
-    openssh.enable = true;
-  };
+  services.qemuGuest.enable = true;
 
-  boot = {
-    loader.systemd-boot.enable = true;
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "ehci_pci"
-      "ahci"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-      "virtio_balloon"
-      "virtio_blk"
-      "virtio_pci"
-      "virtio_ring"
-      # "virtio_vga"
-      "virtio_gpu"
-    ];
-  };
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "virtio_balloon"
+    "virtio_blk"
+    "virtio_pci"
+    "virtio_ring"
+    # "virtio_vga"
+    "virtio_gpu"
+  ];
   fileSystems."/".device = "/dev/disk/by-label/nixos";
 
+  boot.loader.systemd-boot.enable = true;
+
+  services.openssh.enable = true;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "22.11"; # Did you read the comment?
 }

modules/hm/default.nix

@@ -1,139 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  osConfig ? null,
-  ...
-}:
-let
-  cfg = config.jhome;
-  devcfg = cfg.dev;
-  # Query the osConfig for a setting. Return the default value if missing or in standalone mode
-  fromOs =
-    path: default: if osConfig == null then default else lib.attrsets.attrByPath path default osConfig;
-in
-{
-  imports = [
-    ./options.nix
-    ./gui
-    ./dev.nix
-    ./users.nix
-  ];
-
-  config = lib.mkMerge [
-    (lib.mkIf (cfg.enable && cfg.styling.enable) {
-      stylix = {
-        enable = true;
-        targets.nixvim.enable = false; # I prefer styling it myself
-      };
-    })
-    (lib.mkIf cfg.enable {
-      # Add gopass if pass is enabled
-      home.packages = lib.optional config.programs.password-store.enable pkgs.gopass;
-
-      nix.settings.use-xdg-base-directories = fromOs [
-        "nix"
-        "settings"
-        "use-xdg-base-directories"
-      ] true;
-
-      programs = {
-        # Better cat (bat)
-        bat = {
-          enable = true;
-          config = {
-            # Disable headers and numbers
-            style = "plain";
-            theme = lib.mkForce "gruvbox-dark";
-          };
-        };
-        # Direnv
-        direnv = {
-          enable = true;
-          nix-direnv.enable = true;
-        };
-        # ls replacement
-        eza = {
-          enable = true;
-          git = true;
-          icons = "auto";
-        };
-        # Shell
-        bash.enable = true; # ensure HM variables are passed to `bash` too (otherwise `jpassmenu` doesn't work)
-        fish = {
-          enable = true;
-          preferAbbrs = true; # when defining an alias, prefer instead to define an abbreviation
-        };
-        # GnuPG
-        gpg = {
-          enable = true;
-          homedir = "${config.xdg.dataHome}/gnupg";
-        };
-        # Mail client
-        himalaya.enable = lib.mkDefault true;
-        # Password manager
-        password-store = {
-          enable = lib.mkDefault true;
-          package = pkgs.pass-nodmenu;
-          settings.PASSWORD_STORE_DIR = "${config.xdg.dataHome}/pass";
-        };
-        # SSH
-        ssh.enable = true;
-        # cd replacement
-        zoxide.enable = true;
-      };
-
-      services = {
-        # GPG Agent
-        gpg-agent = {
-          enable = true;
-          maxCacheTtl = 86400;
-          pinentryPackage = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses;
-          extraConfig = "allow-preset-passphrase";
-        };
-        # Spotifyd
-        spotifyd = {
-          inherit (config.jhome.gui) enable;
-          settings.global = {
-            device_name = config.jhome.hostName;
-            device_type = "computer";
-            backend = "pulseaudio";
-            zeroconf_port = 2020;
-          };
-        };
-      };
-
-      home = {
-        # Extra variables
-        sessionVariables = {
-          CARGO_HOME = "${config.xdg.dataHome}/cargo";
-          RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
-          GOPATH = "${config.xdg.dataHome}/go";
-        };
-        shellAliases = {
-          # Verbose Commands
-          cp = "cp --verbose";
-          ln = "ln --verbose";
-          mv = "mv --verbose";
-          mkdir = "mkdir --verbose";
-          rename = "rename --verbose";
-          rm = "rm --verbose";
-          # Add Color
-          grep = "grep --color=auto";
-          ip = "ip --color=auto";
-          # Use exa/eza
-          tree = "eza --tree";
-        };
-      };
-
-      # XDG directories
-      xdg = {
-        enable = true;
-        userDirs = {
-          enable = true;
-          createDirectories = true;
-        };
-      };
-    })
-  ];
-}

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/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,101 +0,0 @@
-{ pkgs, lib, ... }@args:
-let
-  cfg = args.config.jconfig;
-  keysFromGithub = lib.attrsets.mapAttrs' (username: sha256: {
-    name = "pubkeys/${username}";
-    value = {
-      mode = "0755";
-      source = builtins.fetchurl {
-        inherit sha256;
-        url = "https://github.com/${username}.keys";
-      };
-    };
-  }) cfg.importSSHKeysFromGithub;
-in
-{
-  imports = [
-    ./options.nix
-    ./dev.nix
-    ./gui.nix
-    ./styling.nix
-  ];
-
-  config = lib.mkIf cfg.enable {
-    # Enable unlocking the gpg-agent at boot (configured through home.nix)
-    security.pam.services.login.gnupg.enable = true;
-
-    environment.systemPackages = [
-      # CLI tools
-      pkgs.fd
-      pkgs.ripgrep
-      pkgs.du-dust
-      pkgs.curl
-      pkgs.zip
-      pkgs.unzip
-    ];
-
-    programs = {
-      # Default shell
-      fish.enable = true;
-      # Shell prompt
-      starship = {
-        enable = true;
-        settings = lib.mkMerge [
-          {
-            format = "$time$all";
-            add_newline = false;
-            cmd_duration.min_time = 500;
-            cmd_duration.show_milliseconds = true;
-            time.disabled = false;
-            status = {
-              format = "[$signal_name$common_meaning$maybe_int](red)";
-              symbol = "[✗](bold red)";
-              disabled = false;
-            };
-            sudo.disabled = false;
-          }
-          # 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)
-        ];
-      };
-    };
-
-    environment.etc = keysFromGithub;
-    services = {
-      # Enable printer autodiscovery if printing is enabled
-      avahi = {
-        inherit (args.config.services.printing) enable;
-        nssmdns4 = true;
-        openFirewall = true;
-      };
-      openssh.authorizedKeysFiles = builtins.map (keys: "/etc/${keys}") (
-        builtins.attrNames keysFromGithub
-      );
-    };
-    # Open ports for spotifyd
-    networking.firewall = {
-      allowedUDPPorts = [ 5353 ];
-      allowedTCPPorts = [ 2020 ];
-    };
-    # Nix Settings
-    nix = {
-      gc = {
-        automatic = true;
-        dates = "weekly";
-        options = "--delete-older-than 30d";
-        # run between 0 and 45min after boot if run was missed
-        randomizedDelaySec = "45min";
-      };
-      settings = {
-        use-xdg-base-directories = true;
-        auto-optimise-store = true;
-        experimental-features = [
-          "nix-command"
-          "flakes"
-        ];
-      };
-    };
-  };
-}

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/options.nix

@@ -1,95 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) types;
-  inherit (import ../lib.nix { inherit lib; })
-    mkDisableOption
-    mkImageOption
-    ;
-in
-{
-  options.jconfig = lib.mkOption {
-    description = "Jalil's default NixOS configuration.";
-    default = { };
-    type = types.submodule {
-      options = {
-        enable = lib.mkEnableOption "jalil's default configuration.";
-        importSSHKeysFromGithub = lib.mkOption {
-          description = ''
-            Import public ssh keys from a github username.
-
-            This will fetch the keys from https://github.com/$${username}.keys.
-
-            The format is `"$${github-username}" = $${sha256-hash}`. The example
-            will try to fetch the keys from <https://github.com/jalil-salame.keys>.
-
-            **Warning**: this will interfere with services like gitea that override
-            the default ssh behaviour. In that case you want to use
-            `users.users.<name>.openssh.authorizedKeys.keyFiles` on the users you
-            want to allow ssh logins.
-          '';
-          default = { };
-          example = {
-            "jalil-salame" = "sha256:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-          };
-          type = types.attrsOf types.str;
-        };
-
-        dev = lib.mkOption {
-          description = "Options for setting up a dev environment";
-          default = { };
-          type = types.submodule {
-            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/nixvim/plugins.nix

@@ -1,151 +0,0 @@
-{ lib, helpers, ... }:
-let
-  inherit (helpers) mkRaw;
-in
-{
-  config.plugins = {
-    cmp =
-      let
-        srcWithIndex = groupIndex: name: { inherit name groupIndex; };
-      in
-      {
-        enable = true;
-        cmdline = {
-          "/" = {
-            mapping =
-              mkRaw
-                # lua
-                ''
-                  cmp.mapping.preset.cmdline()
-                '';
-            sources = [
-              { name = "rg"; }
-              { name = "buffer"; }
-            ];
-          };
-          ":" = {
-            mapping =
-              mkRaw
-                # lua
-                "cmp.mapping.preset.cmdline()";
-            sources = [
-              { name = "path"; }
-              { name = "cmdline"; }
-            ];
-          };
-        };
-        settings = {
-          # Snippets
-          snippet.expand =
-            # lua
-            "function(args) require('luasnip').lsp_expand(args.body) end";
-          # Completion Sources
-          sources = [
-            # very specific (not noisy)
-            (srcWithIndex 1 "calc")
-            (srcWithIndex 1 "crates")
-            (srcWithIndex 1 "fish")
-            (srcWithIndex 1 "luasnip")
-            (srcWithIndex 1 "nvim_lsp")
-            # Generally ok
-            (srcWithIndex 2 "conventionalcommits")
-            (srcWithIndex 2 "nvim_lsp_document_symbol")
-            (srcWithIndex 2 "nvim_lsp_signature_help")
-            # Noisy
-            (srcWithIndex 2 "path")
-            (srcWithIndex 3 "spell")
-            (srcWithIndex 3 "treesitter")
-            # Very noisy
-            (srcWithIndex 4 "buffer")
-          ];
-          mapping =
-            mkRaw
-              # lua
-              ''
-                cmp.mapping.preset.insert({
-                  ["<C-n>"] = function(fallback)
-                    if cmp.visible() then
-                      cmp.select_next_item()
-                    elseif require("luasnip").expand_or_jumpable() then
-                      require("luasnip").expand_or_jump()
-                    elseif has_words_before() then
-                      cmp.complete()
-                    else
-                      fallback()
-                    end
-                  end,
-                  ["<C-p>"] = function(fallback)
-                    if cmp.visible() then
-                      cmp.select_prev_item()
-                    elseif require("luasnip").jumpable(-1) then
-                      require("luasnip").jump(-1)
-                    else
-                      fallback()
-                    end
-                  end,
-                  ["<C-u>"] = cmp.mapping(function(fallback)
-                    if require("luasnip").choice_active() then
-                      require("luasnip").next_choice()
-                    else
-                      fallback()
-                    end
-                  end),
-                  ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-                  ["<C-f>"] = cmp.mapping.scroll_docs(4),
-                  ["<C-Space>"] = cmp.mapping.complete { },
-                  ["<C-e>"] = cmp.mapping.close(),
-                  ["<CR>"] = cmp.mapping.confirm { select = true },
-                })
-              '';
-        };
-      };
-    cmp-fish.enable = true;
-    gitsigns.enable = true;
-    lualine = {
-      enable = true;
-      settings.options.theme = lib.mkForce "gruvbox";
-    };
-    luasnip = {
-      enable = true;
-      settings.update_events = "TextChanged,TextChangedI";
-    };
-    noice = {
-      enable = true;
-      settings = {
-        lsp.override = {
-          "vim.lsp.util.convert_input_to_markdown_lines" = true;
-          "vim.lsp.util.stylize_markdown" = true;
-          "cmp.entry.get_documentation" = true;
-        };
-        presets = {
-          # use a classic bottom cmdline for search
-          bottom_search = true;
-          # position the cmdline and popupmenu together
-          command_palette = false;
-          # long messages will be sent to a split
-          long_message_to_split = true;
-          # enables an input dialog for inc-rename.nvim
-          inc_rename = false;
-          # add a border to hover docs and signature help
-          lsp_doc_border = true;
-        };
-      };
-    };
-    notify = {
-      enable = true;
-      settings.background_colour = "#000000";
-    };
-    telescope = {
-      enable = true;
-      extensions = {
-        ui-select.enable = true;
-        fzy-native.enable = true;
-      };
-    };
-    trouble = {
-      enable = true;
-      settings.auto_close = true;
-    };
-    web-devicons.enable = true;
-  };
-}

nvim/dev-plugins.nix

@@ -21,7 +21,6 @@ let
     "typos_lsp"
     # "typst_lsp" # Not using it
     "zls"
-    "fish_lsp"
   ];
 in
 {
@@ -96,7 +95,6 @@ in
           pkgs.stylua
           pkgs.taplo
           pkgs.yamlfmt
-          pkgs.fish
         ];
         plugins.conform-nvim = {
           enable = true;
@@ -113,7 +111,6 @@ in
               toml = [ "taplo" ];
               yaml = [ "yamlfmt" ];
               zig = [ "zigfmt" ];
-              fish = [ "fish_indent" ];
             };
           };
         };
@@ -130,6 +127,7 @@ in
             # latex = [ "chktex" ]; # Not in use
             nix = [ "statix" ];
             sh = [ "dash" ];
+            zsh = [ "zsh" ];
           };
         };
       }

nvim/extraPlugins/generated.nix

@@ -10,12 +10,12 @@
 final: prev: {
   nvim-silicon = buildVimPlugin {
     pname = "nvim-silicon";
-    version = "2025-01-09";
+    version = "2024-08-31";
     src = fetchFromGitHub {
       owner = "michaelrommel";
       repo = "nvim-silicon";
-      rev = "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32";
-      sha256 = "1zk6lgghvdcys20cqvh2g1kjf661q1w97niq5nx1zz4yppy2f9jy";
+      rev = "9fe6001dc8cad4d9c53bcfc8649e3dc76ffa169c";
+      sha256 = "1qczi06yndkr2pmwidlkgmk0395x189sznvscn4fnr96jx58j5yl";
     };
     meta.homepage = "https://github.com/michaelrommel/nvim-silicon/";
   };

nvim/plugins.nix

@@ -0,0 +1,178 @@
+{ lib, helpers, ... }:
+let
+  inherit (helpers) mkRaw;
+in
+{
+  config.plugins = {
+    cmp = {
+      enable = true;
+      cmdline = {
+        "/" = {
+          mapping =
+            mkRaw
+              # lua
+              ''
+                cmp.mapping.preset.cmdline()
+              '';
+          sources = [
+            { name = "rg"; }
+            { name = "buffer"; }
+          ];
+        };
+        ":" = {
+          mapping =
+            mkRaw
+              # lua
+              ''
+                cmp.mapping.preset.cmdline()
+              '';
+          sources = [
+            { name = "path"; }
+            { name = "cmdline"; }
+          ];
+        };
+      };
+      settings = {
+        # Snippets
+        snippet.expand =
+          # lua
+          ''
+            function(args) require('luasnip').lsp_expand(args.body) end
+          '';
+        # Completion Sources
+        sources = [
+          {
+            name = "buffer";
+            groupIndex = 3;
+          }
+          {
+            name = "calc";
+            groupIndex = 2;
+          }
+          {
+            name = "conventionalcommits";
+            groupIndex = 1;
+          }
+          {
+            name = "crates";
+            groupIndex = 1;
+          }
+          {
+            name = "luasnip";
+            groupIndex = 1;
+          }
+          {
+            name = "nvim_lsp";
+            groupIndex = 1;
+          }
+          {
+            name = "nvim_lsp_document_symbol";
+            groupIndex = 1;
+          }
+          {
+            name = "nvim_lsp_signature_help";
+            groupIndex = 1;
+          }
+          {
+            name = "path";
+            groupIndex = 2;
+          }
+          {
+            name = "spell";
+            groupIndex = 2;
+          }
+          {
+            name = "treesitter";
+            groupIndex = 2;
+          }
+        ];
+        mapping =
+          mkRaw
+            # lua
+            ''
+              cmp.mapping.preset.insert({
+                ["<C-n>"] = function(fallback)
+                  if cmp.visible() then
+                    cmp.select_next_item()
+                  elseif require("luasnip").expand_or_jumpable() then
+                    require("luasnip").expand_or_jump()
+                  elseif has_words_before() then
+                    cmp.complete()
+                  else
+                    fallback()
+                  end
+                end,
+                ["<C-p>"] = function(fallback)
+                  if cmp.visible() then
+                    cmp.select_prev_item()
+                  elseif require("luasnip").jumpable(-1) then
+                    require("luasnip").jump(-1)
+                  else
+                    fallback()
+                  end
+                end,
+                ["<C-u>"] = cmp.mapping(function(fallback)
+                  if require("luasnip").choice_active() then
+                    require("luasnip").next_choice()
+                  else
+                    fallback()
+                  end
+                end),
+                ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+                ["<C-f>"] = cmp.mapping.scroll_docs(4),
+                ["<C-Space>"] = cmp.mapping.complete { },
+                ["<C-e>"] = cmp.mapping.close(),
+                ["<CR>"] = cmp.mapping.confirm { select = true },
+              })
+            '';
+      };
+    };
+    gitsigns.enable = true;
+    lualine = {
+      enable = true;
+      settings.options.theme = lib.mkForce "gruvbox";
+    };
+    luasnip = {
+      enable = true;
+      settings.update_events = "TextChanged,TextChangedI";
+    };
+    noice = {
+      enable = true;
+      settings = {
+        lsp.override = {
+          "vim.lsp.util.convert_input_to_markdown_lines" = true;
+          "vim.lsp.util.stylize_markdown" = true;
+          "cmp.entry.get_documentation" = true;
+        };
+        presets = {
+          # use a classic bottom cmdline for search
+          bottom_search = true;
+          # position the cmdline and popupmenu together
+          command_palette = false;
+          # long messages will be sent to a split
+          long_message_to_split = true;
+          # enables an input dialog for inc-rename.nvim
+          inc_rename = false;
+          # add a border to hover docs and signature help
+          lsp_doc_border = true;
+        };
+      };
+    };
+    notify = {
+      enable = true;
+      settings.background_colour = "#000000";
+    };
+    telescope = {
+      enable = true;
+      extensions = {
+        ui-select.enable = true;
+        fzy-native.enable = true;
+      };
+    };
+    trouble = {
+      enable = true;
+      settings.auto_close = true;
+    };
+    web-devicons.enable = true;
+  };
+}

scripts/audiomenu/Cargo.lock

@@ -116,9 +116,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -126,9 +126,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
 dependencies = [
  "anstream",
  "anstyle",
@@ -214,15 +214,15 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.3"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
 
 [[package]]
 name = "memchr"
@@ -263,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
@@ -281,9 +281,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
 
 [[package]]
 name = "os_pipe"
@@ -312,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
 dependencies = [
  "proc-macro2",
 ]
@@ -327,9 +327,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
 dependencies = [
  "bitflags",
  "errno",

scripts/jpassmenu/Cargo.lock

@@ -124,9 +124,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -134,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
 dependencies = [
  "anstream",
  "anstyle",
@@ -217,9 +217,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.8"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
 dependencies = [
  "anstream",
  "anstyle",
@@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "jiff"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
+checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
 dependencies = [
  "jiff-static",
  "log",
@@ -306,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
+checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -329,21 +329,21 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.3"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "memchr"
@@ -384,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
@@ -402,9 +402,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
 
 [[package]]
 name = "os_pipe"
@@ -448,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
 dependencies = [
  "proc-macro2",
 ]
@@ -492,9 +492,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
 dependencies = [
  "bitflags",
  "errno",

system/default.nix

@@ -0,0 +1,129 @@
+{ stylix }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.jconfig;
+  keysFromGithub = lib.attrsets.mapAttrs' (username: sha256: {
+    name = "pubkeys/${username}";
+    value = {
+      mode = "0755";
+      source = builtins.fetchurl {
+        inherit sha256;
+        url = "https://github.com/${username}.keys";
+      };
+    };
+  }) cfg.importSSHKeysFromGithub;
+in
+{
+  imports = [
+    ./options.nix
+    ./gui
+    stylix.nixosModules.stylix
+    { stylix = import ./stylix-config.nix { inherit config pkgs; }; }
+  ];
+
+  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;
+
+        environment.systemPackages = [
+          # CLI tools
+          pkgs.fd
+          pkgs.ripgrep
+          pkgs.du-dust
+          pkgs.curl
+          pkgs.zip
+          pkgs.unzip
+        ];
+
+        # Enable dev documentation
+        documentation.dev = {
+          inherit (cfg.dev) enable;
+        };
+        programs = {
+          # Shell prompt
+          starship = {
+            enable = true;
+            settings = lib.mkMerge [
+              {
+                format = "$time$all";
+                add_newline = false;
+                cmd_duration.min_time = 500;
+                cmd_duration.show_milliseconds = true;
+                time.disabled = false;
+                status = {
+                  format = "[$signal_name$common_meaning$maybe_int](red)";
+                  symbol = "[✗](bold red)";
+                  disabled = false;
+                };
+                sudo.disabled = false;
+              }
+              # Add nerdfont symbols
+              (lib.mkIf cfg.styling.enable (import ./starship-nerdfont-symbols.nix))
+              # Remove the `in`s and `on`s from the prompt
+              (lib.mkIf cfg.styling.enable (import ./starship-shorter-text.nix))
+            ];
+          };
+          # Default shell
+          zsh.enable = true;
+        };
+
+        environment.etc = keysFromGithub;
+        services = {
+          # Enable printer autodiscovery if printing is enabled
+          avahi = {
+            inherit (config.services.printing) enable;
+            nssmdns4 = true;
+            openFirewall = true;
+          };
+          openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (
+            builtins.attrNames keysFromGithub
+          );
+        };
+        users.defaultUserShell = pkgs.zsh;
+        # Open ports for spotifyd
+        networking.firewall = {
+          allowedUDPPorts = [ 5353 ];
+          allowedTCPPorts = [ 2020 ];
+        };
+        # Nix Settings
+        nix = {
+          gc = {
+            automatic = true;
+            dates = "weekly";
+            options = "--delete-older-than 30d";
+            # run between 0 and 45min after boot if run was missed
+            randomizedDelaySec = "45min";
+          };
+          settings = {
+            use-xdg-base-directories = true;
+            auto-optimise-store = true;
+            experimental-features = [
+              "nix-command"
+              "flakes"
+            ];
+          };
+        };
+      }
+      # 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";
+        };
+      })
+    ]
+  );
+}

system/gui/default.nix

@@ -0,0 +1,113 @@
+{
+  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;
+        niri = {
+          enable = cfg.windowManager;
+          package = pkgs.niri; # use nixpkgs' package instead of the flake's
+        };
+      };
+      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";
+        };
+      };
+    })
+  ];
+}

system/options.nix

@@ -0,0 +1,119 @@
+{ lib, ... }:
+let
+  inherit (lib) types;
+  # Like mkEnableOption but defaults to true
+  mkDisableOption =
+    option:
+    (lib.mkEnableOption option)
+    // {
+      default = true;
+      example = false;
+    };
+  mkImageOption =
+    {
+      description,
+      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.enable = mkDisableOption "ydotool";
+        options.autoStart = mkDisableOption "autostarting ydotool at login";
+      };
+    };
+    windowManager = lib.mkOption {
+      description = "Window manager configuration";
+      default = { };
+      type = types.submodule {
+        options = {
+          enable = mkDisableOption "window manager";
+          windowManager = lib.mkOption {
+            description = "Which window manager to enable";
+            type = types.enum [ "niri" ];
+            default = "niri";
+          };
+        };
+      };
+    };
+  };
+
+  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.
+
+        This will fetch the keys from https://github.com/$${username}.keys.
+
+        The format is `"$${github-username}" = $${sha256-hash}`. The example
+        will try to fetch the keys from <https://github.com/jalil-salame.keys>.
+
+        **Warning**: this will interfere with services like gitea that override
+        the default ssh behaviour. In that case you want to use
+        `users.users.<name>.openssh.authorizedKeys.keyFiles` on the users you
+        want to allow ssh logins.
+      '';
+      default = { };
+      example = {
+        "jalil-salame" = "sha256:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+      };
+      type = types.attrsOf types.str;
+    };
+  };
+in
+{
+  options.jconfig = lib.mkOption {
+    description = "Jalil's default NixOS configuration.";
+    default = { };
+    type = types.submodule config;
+  };
+}

system/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;
+  };
+}