Modules/Niri: Add wallpaper switcher keybindings

README.md

@@ -1,9 +1,16 @@
 # NixOS Configuration
 
-Modular NixOS configuration, using [Niri](https://github.com/niri-wm/niri) and [Waybar](https://github.com/Alexays/Waybar) for a light desktop.
+Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolling desktop.
 
 ![](FastFetch.png)
-![](Darwin.png)
+
+<p float="left" align="middle">
+  <img src="/NeoVim.png" width="33%" />
+  <img src="/Rmpc.png" width="33%" />
+  <img src="/Btop.png" width="33%" />
+</p>
+
+![](Niri.png)
 
 To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
 Alternatively, use `nh os switch` or `nh os boot`.

flake.lock

@@ -522,27 +522,6 @@
         "type": "github"
       }
     },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1773000227,
-        "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
-        "owner": "nix-darwin",
-        "repo": "nix-darwin",
-        "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-darwin",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1767983141,
@@ -614,16 +593,16 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1773814637,
+        "lastModified": 1767313136,
-        "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
+        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
+        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -845,7 +824,6 @@
         "masssprings": "masssprings",
         "niri": "niri",
         "nix-alien": "nix-alien",
-        "nix-darwin": "nix-darwin",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-stable": "nixpkgs-stable_2",

flake.nix

@@ -12,12 +12,8 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
 
-    # Darwin
-    nix-darwin.url = "github:nix-darwin/nix-darwin/master";
-    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
-
     # NOTE: Update this after May and November
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
 
     # Home Manager
     home-manager.url = "github:nix-community/home-manager";
@@ -62,6 +58,51 @@
     walker.url = "github:abenz1267/walker";
     walker.inputs.elephant.follows = "elephant";
 
+    # Quickshell
+    # quickshell.url = "github:quickshell-mirror/quickshell";
+    # quickshell.inputs.nixpkgs.follows = "nixpkgs";
+
+    # Noctalia shell
+    # noctalia.url = "github:noctalia-dev/noctalia-shell";
+    # noctalia.inputs.nixpkgs.follows = "nixpkgs";
+    # noctalia.inputs.quickshell.follows = "quickshell";
+
+    # Lol
+    # waifu-cursors.url = "github:kagurazakei/waifu-cursors";
+
+    # Caelestia shell
+    # caelestia.url = "github:caelestia-dots/shell";
+    # caelestia.inputs.nixpkgs.follows = "nixpkgs";
+    # caelestia.inputs.quickshell.follows = "quickshell";
+    # caelestia-cli.url = "github:caelestia-dots/cli";
+    # caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
+
+    # DankMaterialShell
+    # dgop.url = "github:AvengeMedia/dgop";
+    # dgop.inputs.nixpkgs.follows = "nixpkgs";
+    # dms-cli.url = "github:AvengeMedia/danklinux";
+    # dms-cli.inputs.nixpkgs.follows = "nixpkgs";
+    # dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
+    # dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
+    # dank-material-shell.inputs.dgop.follows = "dgop";
+    # danksearch.url = "github:AvengeMedia/danksearch";
+    # danksearch.inputs.nixpkgs.follows = "nixpkgs";
+
+    # Hyprland (use flake so plugins are not built from source)
+    # hyprland.url = "github:hyprwm/Hyprland";
+    # hyprland.inputs.nixpkgs.follows = "nixpkgs";
+
+    # HyprPlugins
+    # hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
+    # hyprland-plugins.inputs.nixpkgs.follows = "nixpkgs";
+    # hyprland-plugins.inputs.hyprland.follows = "hyprland";
+    # hypr-dynamic-cursors.url = "github:VirtCode/hypr-dynamic-cursors";
+    # hypr-dynamic-cursors.inputs.nixpkgs.follows = "nixpkgs";
+    # hypr-dynamic-cursors.inputs.hyprland.follows = "hyprland";
+    # hyprspace.url = "github:KZDKM/Hyprspace";
+    # hyprspace.inputs.nixpkgs.follows = "nixpkgs";
+    # hyprspace.inputs.hyprland.follows = "hyprland";
+
     # NeoVim <3
     nixvim.url = "github:nix-community/nixvim";
     nixvim.inputs.nixpkgs.follows = "nixpkgs";
@@ -82,6 +123,10 @@
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
 
+    # ComfyUI
+    # nixified-ai.url = "github:nixified-ai/flake";
+    # comfyui-nix.url = "github:utensils/comfyui-nix";
+
     # HyTale
     hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
 
@@ -95,14 +140,12 @@
   outputs = {
     self,
     nixpkgs,
-    nix-darwin,
     ...
   } @ inputs: let
     # Our configuration is buildable on the following system/platform.
     # Configs can support more than a single system simultaneously,
     # e.g. NixOS (linux) and MacOS (darwin) or Arm.
     system = "x86_64-linux";
-    darwinSystem = "aarch64-darwin";
 
     # We configure our global packages here.
     # Usually, "nixpkgs.legacyPackages.${system}" is used (and more efficient),
@@ -145,26 +188,6 @@
       ];
     };
 
-    darwinPkgs = import nixpkgs {
-      system = darwinSystem;
-
-      hostPlatform = darwinSystem;
-      config.allowUnfree = true;
-      config.allowUnfreePredicate = pkg: true;
-
-      overlays = let
-        pkgs-stable = import inputs.nixpkgs-stable {
-          system = darwinSystem;
-
-          config.allowUnfree = true;
-          config.allowUnfreePredicate = pkg: true;
-        };
-      in [
-        # All my own overlays (derivations + modifications)
-        (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
-      ];
-    };
-
     # My own library functions are imported here.
     # They are made available to the system and HM configs by inheriting mylib.
     mylib = import ./lib {
@@ -179,15 +202,8 @@
       inherit (nixpkgs) lib;
     };
 
-    darwinMylib = import ./lib {
-      inherit inputs darwinPkgs;
-
-      inherit (nixpkgs) lib;
-
-      pkgs = darwinPkgs;
-    };
-
     # NOTE: Keep public keys here so they're easy to rotate
+
     publicKeys.christoph = {
       # /home/christoph/.ssh/id_ed25519.pub
       ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAoJac+GdGtzblCMA0lBfMdSR6aQ4YyovrNglCFGIny christoph.urlacher@protonmail.com";
@@ -211,20 +227,6 @@
     # Local shell for NixFlake directory
     devShells.${system}.default = import ./shell.nix {inherit pkgs;};
 
-    # Usage: sudo darwin-rebuild switch --flake .#darwinix
-    darwinConfigurations = {
-      darwinix = darwinMylib.nixos.mkDarwinConfigWithHomeManagerModule {
-        inherit publicKeys;
-
-        system = darwinSystem;
-        mylib = darwinMylib;
-        hostname = "darwinix";
-        username = "christoph";
-        headless = false;
-        extraModules = [];
-      };
-    };
-
     # We give each configuration a (host)name to choose a configuration when rebuilding.
     # This makes it easy to add different configurations (e.g. for a laptop).
     # Usage: sudo nixos-rebuild switch --flake .#nixinator

home/christoph/darwinix/default.nix

@@ -1,402 +0,0 @@
-{
-  pkgs,
-  nixosConfig,
-  config,
-  lib,
-  mylib,
-  username,
-  inputs,
-  ...
-}: {
-  config = let
-    inherit (config.homemodules) color;
-  in {
-    paths = rec {
-      nixflake = "${config.home.homeDirectory}/NixFlake";
-      dotfiles = "${nixflake}/config";
-    };
-
-    homemodules = {
-      color = {
-        scheme = "catppuccin-mocha";
-        accent = "mauve";
-        accentHl = "pink";
-        accentDim = "lavender";
-        accentText = "base";
-
-        font = "MonoLisa Alt Script";
-      };
-
-      fish.enable = true;
-
-      git = {
-        enable = true;
-
-        userName = "Christoph Urlacher";
-        userEmail = "christoph.urlacher@protonmail.com";
-        signCommits = true;
-      };
-
-      kitty.enable = true;
-      lazygit.enable = true;
-
-      neovim = {
-        enable = true;
-        alias = true;
-        neovide = true;
-      };
-
-      yazi.enable = true;
-    };
-
-    home = {
-      inherit username;
-
-      homeDirectory = "/Users/${config.home.username}";
-      enableNixpkgsReleaseCheck = true;
-
-      sessionVariables = {
-        LANG = "en_US.UTF-8";
-        EDITOR = "nvim";
-        MANPAGER = "nvim +Man!";
-        TERMINAL = "kitty";
-      };
-
-      packages = with pkgs; [
-        (ripgrep.override {withPCRE2 = true;})
-        gdu
-        duf
-        sd
-        fclones
-        tealdeer
-        killall
-        atool
-        exiftool
-        ouch
-        ffmpegthumbnailer
-        mediainfo
-        file
-        unrar
-        p7zip
-        unzip
-        progress
-        tokei
-        nix-search-tv
-        nix-tree
-        just
-
-        ffmpeg-full
-        imagemagick
-
-        poppler-utils
-        pdf2svg
-        pandoc
-
-        dig
-        tcpdump
-        gping
-        curlie
-        wget
-        doggo
-        rsync
-        rclone
-        httpie
-
-        inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
-
-        cachix
-
-        # GUI
-        ripdrag
-        jellyfin-tui
-      ];
-
-      stateVersion = "25.11";
-    };
-
-    # TODO: Deduplicate with other configs
-    programs = {
-      home-manager.enable = true;
-
-      bat = {
-        enable = true;
-
-        themes = {
-          catppuccin-latte = {
-            src = pkgs.fetchFromGitHub {
-              owner = "catppuccin";
-              repo = "bat";
-              rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-              sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-            };
-            file = "Catppuccin-latte.tmTheme";
-          };
-        };
-
-        config = {
-          theme = "catppuccin-latte";
-        };
-      };
-
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
-
-      eza = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      fastfetch = {
-        enable = true;
-
-        settings = {
-          logo = {
-            padding = {
-              top = 4;
-              left = 1;
-              right = 2;
-            };
-          };
-
-          display = {
-            separator = "";
-            key.width = 17;
-          };
-
-          # Box Drawing: ╭ ─ ╮ ╰ ╯ │
-          modules = [
-            # Title
-            {
-              type = "title";
-              format = "{#1}╭─── {#}{user-name-colored}";
-            }
-
-            # System Information
-            {
-              type = "custom";
-              format = "{#1}│ {#}System Information";
-            }
-            {
-              type = "os";
-              key = "{#separator}│  {#keys}󰍹 OS";
-            }
-            {
-              type = "kernel";
-              key = "{#separator}│  {#keys}󰒋 Kernel";
-            }
-            {
-              type = "bootmgr";
-              key = "{#separator}│  {#keys}󰒋 BootMGR";
-            }
-            {
-              type = "uptime";
-              key = "{#separator}│  {#keys}󰅐 Uptime";
-            }
-            {
-              type = "packages";
-              key = "{#separator}│  {#keys}󰏖 Packages";
-              # format = "{all}";
-            }
-            {
-              type = "custom";
-              format = "{#1}│";
-            }
-
-            # Desktop Environment
-            {
-              type = "custom";
-              format = "{#1}│ {#}Desktop Environment";
-            }
-            {
-              type = "de";
-              key = "{#separator}│  {#keys}󰧨 DE";
-            }
-            {
-              type = "wm";
-              key = "{#separator}│  {#keys}󱂬 WM";
-            }
-            {
-              type = "wmtheme";
-              key = "{#separator}│  {#keys}󰉼 Theme";
-            }
-            {
-              type = "display";
-              key = "{#separator}│  {#keys}󰹑 Resolution";
-            }
-            {
-              type = "shell";
-              key = "{#separator}│  {#keys}󰞷 Shell";
-            }
-            {
-              type = "terminalfont";
-              key = "{#separator}│  {#keys}󰛖 Font";
-            }
-            {
-              type = "icons";
-              key = "{#separator}│  {#keys} Icons";
-            }
-            {
-              type = "cursor";
-              key = "{#separator}│  {#keys}󰆽 Cursor";
-            }
-            {
-              type = "custom";
-              format = "{#1}│";
-            }
-
-            # Hardware Information
-            {
-              type = "custom";
-              format = "{#1}│ {#}Hardware Information";
-            }
-            {
-              type = "board";
-              key = "{#separator}│  {#keys} Board";
-            }
-            {
-              type = "cpu";
-              key = "{#separator}│  {#keys}󰻠 CPU";
-            }
-            {
-              type = "gpu";
-              key = "{#separator}│  {#keys}󰢮 GPU";
-            }
-            {
-              type = "memory";
-              key = "{#separator}│  {#keys}󰍛 Memory";
-            }
-            # {
-            #   type = "disk";
-            #   key = "{#separator}│  {#keys}󰋊 Disk (/)";
-            #   folders = "/";
-            # }
-            # {
-            #   type = "disk";
-            #   key = "{#separator}│  {#keys}󰋊 Disk (~/Games)";
-            #   folders = "/home/christoph/Games";
-            # }
-            {
-              type = "btrfs";
-              key = "{#separator}│  {#keys}󰋊 BTRFS";
-            }
-            {
-              type = "custom";
-              format = "{#1}│";
-            }
-
-            # Colors Footer
-            {
-              type = "colors";
-              key = "{#separator}╰─── {#1}";
-              keyWidth = 6;
-              symbol = "circle";
-            }
-          ];
-        };
-      };
-
-      fd.enable = true;
-
-      fzf = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      navi = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      ssh = {
-        enable = true;
-        enableDefaultConfig = false;
-
-        matchBlocks = {
-          "*" = {
-            forwardAgent = false;
-            addKeysToAgent = "yes";
-            compression = true;
-            serverAliveInterval = 0;
-            serverAliveCountMax = 3;
-            hashKnownHosts = false;
-            userKnownHostsFile = "~/.ssh/known_hosts";
-            controlMaster = "no";
-            controlPath = "~/.ssh/master-%r@%n:%p";
-            controlPersist = "no";
-          };
-          "nixinator" = {
-            user = "christoph";
-            hostname = "192.168.86.50";
-          };
-          "servenix" = {
-            user = "christoph";
-            hostname = "local.chriphost.de";
-          };
-          "thinknix" = {
-            user = "christoph";
-            hostname = "think.chriphost.de";
-          };
-          "vps" = {
-            user = "root";
-            hostname = "vps.chriphost.de";
-          };
-          "mars" = {
-            user = "smchurla";
-            hostname = "mars.cs.tu-dortmund.de";
-            serverAliveInterval = 60;
-            localForwards = [
-              {
-                # Resultbrowser
-                bind.port = 22941;
-                host.address = "127.0.0.1";
-                host.port = 22941;
-              }
-              {
-                # Mysql
-                bind.port = 3306;
-                host.address = "127.0.0.1";
-                host.port = 3306;
-              }
-            ];
-          };
-        };
-      };
-
-      tmux = {
-        enable = true;
-
-        clock24 = true;
-        escapeTime = 0; # Delay after pressing escape
-        # keyMode = "vi";
-        terminal = "xterm-256color";
-
-        plugins = with pkgs; [
-          {
-            plugin = tmuxPlugins.catppuccin;
-            extraConfig = ''
-              set -g @plugin 'catppuccin/tmux'
-              set -g @catppuccin_flavour 'latte' # or frappe, macchiato, mocha
-            '';
-          }
-        ];
-
-        extraConfig = ''
-          set -g default-terminal "xterm-256color"
-          set-option -ga terminal-overrides ",xterm-256color:Tc"
-        '';
-      };
-
-      yt-dlp.enable = true;
-
-      zoxide = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-    };
-
-    services = {
-    };
-  };
-}

home/christoph/default.nix

@@ -104,7 +104,7 @@ in
       rmpc.enable = !headless;
 
       rofi = {
-        enable = false;
+        enable = !headless;
       };
 
       waybar.enable = !headless;
@@ -300,6 +300,7 @@ in
             nix-tree # Browse the nix store sorted by size (gdu for closures)
             nurl # Generate nix fetcher sections based on URLs
             python313 # Nicer scripting than bash
+            binsider # Analyze binaries
             lazyjournal # Journalctl viewer
             systemctl-tui
             restic # Backups
@@ -756,7 +757,7 @@ in
       };
 
       tmux = {
-        enable = true;
+        enable = false;
 
         clock24 = true;
         escapeTime = 0; # Delay after pressing escape

home/homemodules/darwin.nix

@@ -1,17 +0,0 @@
-{inputs, ...}: {
-  imports = [
-    # My own HM modules
-    ./color
-    ./fish
-    ./git
-    ./kitty
-    ./lazygit
-    ./neovim
-    ./paths
-    ./yazi
-
-    # HM modules imported from the flake inputs
-    inputs.nixvim.homeModules.nixvim
-    inputs.textfox.homeManagerModules.default
-  ];
-}

home/homemodules/fish/default.nix

@@ -42,211 +42,162 @@ in {
       fish_pager_color_description ${color.hex.overlay0}
     '';
 
-    programs.fish = lib.mkMerge [
+    programs.fish = {
-      # Darwin exclusive config
+      enable = true;
-      (lib.mkIf pkgs.stdenv.isDarwin {
+      generateCompletions = nixosConfig.programs.fish.generateCompletions;
-        shellInit = ''
-          set fish_greeting
-          yes | fish_config theme save "system-theme"
 
-          set --global --export HOMEBREW_PREFIX "/opt/homebrew"
+      functions = lib.mergeAttrsList [
-          set --global --export HOMEBREW_CELLAR "/opt/homebrew/Cellar"
+        (lib.optionalAttrs config.homemodules.nnn.enable {
-          set --global --export HOMEBREW_REPOSITORY "/opt/homebrew"
+          nnncd = {
-          fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin"
+            wraps = "nnn";
-          if test -n "$MANPATH[1]"; set --global --export MANPATH ''' $MANPATH; end;
+            description = "support nnn quit and change directory";
-          if not contains "/opt/homebrew/share/info" $INFOPATH; set --global --export INFOPATH "/opt/homebrew/share/info" $INFOPATH; end;
+            body = ''
-        '';
+              # Block nesting of nnn in subshells
+              if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+                  echo "nnn is already running"
+                  return
+              end
 
-        shellAbbrs = let
+              # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
-          # These can be used for my config.homemodules and for HM config.programs,
+              # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
-          # as both of these add the package to home.packages
+              # see. To cd on quit only on ^G, remove the "-x" from both lines below,
-          hasHomePackage = package: (mylib.modules.contains config.home.packages package);
+              # without changing the paths.
+              if test -n "$XDG_CONFIG_HOME"
+                  set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
+              else
+                  set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
+              end
 
-          # Only add fish abbr if package is installed
+              # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
-          abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
+              # stty start undef
-        in
+              # stty stop undef
-          lib.mkMerge [
+              # stty lwrap undef
-            {
+              # stty lnext undef
-              rebuild = "sudo darwin-rebuild switch --flake .#darwinix";
-            }
 
-            (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'darwin,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
+              # The command function allows one to alias this function to `nnn` without
-          ];
+              # making an infinitely recursive alias
-      })
+              command nnn $argv
 
-      # Linux exclusive config
+              if test -e $NNN_TMPFILE
-      (lib.mkIf pkgs.stdenv.isLinux {
+                  source $NNN_TMPFILE
-        generateCompletions = nixosConfig.programs.fish.generateCompletions;
+                  rm $NNN_TMPFILE
+              end
+            '';
+          };
+        })
+      ];
 
-        shellInit = ''
+      plugins = [];
-          set fish_greeting
-          yes | fish_config theme save "system-theme"
-        '';
 
-        functions = lib.mergeAttrsList [
+      shellInit = ''
-          (lib.optionalAttrs config.homemodules.nnn.enable {
+        set fish_greeting
-            nnncd = {
+        yes | fish_config theme save "system-theme"
-              wraps = "nnn";
+      '';
-              description = "support nnn quit and change directory";
-              body = ''
-                # Block nesting of nnn in subshells
-                if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
-                    echo "nnn is already running"
-                    return
-                end
 
-                # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+      shellAbbrs = let
-                # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+        # Only add " | bat" if bat is installed
-                # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+        batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
-                # without changing the paths.
-                if test -n "$XDG_CONFIG_HOME"
-                    set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
-                else
-                    set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
-                end
 
-                # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+        # Same as above but with args for bat
-                # stty start undef
+        batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
-                # stty stop undef
-                # stty lwrap undef
-                # stty lnext undef
 
-                # The command function allows one to alias this function to `nnn` without
+        # These can be used for my config.homemodules and for HM config.programs,
-                # making an infinitely recursive alias
+        # as both of these add the package to home.packages
-                command nnn $argv
+        hasHomePackage = package: (mylib.modules.contains config.home.packages package);
 
-                if test -e $NNN_TMPFILE
+        # Only add fish abbr if package is installed
-                    source $NNN_TMPFILE
+        abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
-                    rm $NNN_TMPFILE
+      in
-                end
+        lib.mkMerge [
-              '';
+          # Abbrs that are always available are defined here.
-            };
+          {
+            # Shell basics
+            c = "clear";
+            q = "exit";
+
+            # Fish
+            h = batifyWithArgs "history" "-l fish"; # -l fish sets syntax highlighting to fish
+            abbrs = batifyWithArgs "abbr" "-l fish";
+
+            # Tools
+            cd = "z"; # zoxide for quickjump to previously visited locations
+            cdd = "zi";
+            b = "z -"; # jump to previous dir
+            mkdir = "mkdir -p"; # also create parents (-p)
+            blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MOUNTPOINT";
+            blkids = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
+            watch = "watch -d -c -n 0.5";
+            nps = "nps -e";
+            nd = "nix develop";
+            nb = "nix build -L";
+            ns = "nix shell nixpkgs#";
+            nr = "nix run";
+
+            ghidra = "_JAVA_AWT_WM_NONREPARENTING=1 ghidra"; # env var for wayland
+            sy = "sudo -E -u ${username} yazi";
+          }
+
+          # Abbrs only available if package is installed
+
+          (abbrify pkgs.duf {
+            disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*' -width 120";
+            alldisks = "duf";
           })
+
+          (abbrify pkgs.eza {
+            ls = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions";
+            lsl = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l";
+            lsa = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l -a";
+            tre = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -T -L 2";
+          })
+
+          (abbrify pkgs.fd {find = "fd";})
+
+          (abbrify pkgs.fzf {fuzzy = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";})
+
+          (abbrify pkgs.gdu {
+            # du = "gdu";
+            storage = "gdu";
+          })
+
+          (abbrify pkgs.git {
+            gs = "git status";
+            gd = "git diff --output-indicator-new=' ' --output-indicator-old=' '";
+            gl = "git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'";
+            ga = "git add";
+            gap = "git add --patch";
+            gc = "git commit --verbose";
+            gcm = "git commit -m";
+            gcl = "git clone";
+          })
+
+          (lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
+
+          (abbrify pkgs.lazygit {lg = "lazygit";})
+
+          (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
+
+          # Doesn't work with abbrify because I have nnn.override...
+          (lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";})
+          (lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";})
+
+          (abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
+
+          (abbrify pkgs.ripgrep rec {
+            rg = "rg --trim --pretty";
+            # grep = rg;
+          })
+
+          (lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
+
+          (abbrify pkgs.rsync rec {
+            rsync = "rsync -ahv --inplace --partial --info=progress2";
+            copy = rsync;
+          })
+
+          # (abbrify pkgs.sd {sed = "sd";})
         ];
-
+    };
-        shellAbbrs = let
-          # Only add " | bat" if bat is installed
-          batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
-
-          # Same as above but with args for bat
-          batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
-
-          # These can be used for my config.homemodules and for HM config.programs,
-          # as both of these add the package to home.packages
-          hasHomePackage = package: (mylib.modules.contains config.home.packages package);
-
-          # Only add fish abbr if package is installed
-          abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
-        in
-          lib.mkMerge [
-            # Abbrs that are always available are defined here.
-            {
-              # Fish
-              h = batifyWithArgs "history" "-l fish"; # -l fish sets syntax highlighting to fish
-              abbrs = batifyWithArgs "abbr" "-l fish";
-
-              # Tools
-              blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MOUNTPOINT";
-              blkids = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
-              nd = "nix develop";
-              nb = "nix build -L";
-              ns = "nix shell nixpkgs#";
-              nr = "nix run";
-
-              ghidra = "_JAVA_AWT_WM_NONREPARENTING=1 ghidra"; # env var for wayland
-            }
-
-            (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
-
-            # Doesn't work with abbrify because I have nnn.override...
-            (lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";})
-            (lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";})
-
-            (abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
-
-            (lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
-
-            # (abbrify pkgs.sd {sed = "sd";})
-          ];
-      })
-
-      # Common config
-      {
-        enable = true;
-
-        shellAbbrs = let
-          # These can be used for my config.homemodules and for HM config.programs,
-          # as both of these add the package to home.packages
-          hasHomePackage = package: (mylib.modules.contains config.home.packages package);
-
-          # Only add fish abbr if package is installed
-          abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
-        in
-          lib.mkMerge [
-            {
-              # Shell basics
-              c = "clear";
-              q = "exit";
-              mkdir = "mkdir -p"; # also create parents (-p)
-              watch = "watch -d -c -n 0.5";
-              sy = "sudo -u ${username} yazi";
-              cd = "z"; # zoxide for quickjump to previously visited locations
-              cdd = "zi";
-              b = "z -"; # jump to previous dir
-              nps = "nps -e";
-            }
-
-            # Abbrs only available if package is installed
-            (abbrify pkgs.rsync rec {
-              rsync = "rsync -ahv --inplace --partial --info=progress2";
-              copy = rsync;
-            })
-
-            (abbrify pkgs.duf {
-              disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*' -width 120";
-              alldisks = "duf";
-            })
-
-            (abbrify pkgs.ripgrep {
-              rg = "rg --trim --pretty";
-              # grep = rg;
-            })
-
-            (abbrify pkgs.eza {
-              ls = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions";
-              lsl = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l";
-              lsa = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l -a";
-              tre = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -T -L 2";
-            })
-
-            (abbrify pkgs.fd {find = "fd";})
-
-            (abbrify pkgs.fzf {fuzzy = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";})
-
-            (abbrify pkgs.gdu {
-              # du = "gdu";
-              storage = "gdu";
-            })
-
-            (abbrify pkgs.git {
-              gs = "git status";
-              gd = "git diff --output-indicator-new=' ' --output-indicator-old=' '";
-              gl = "git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'";
-              ga = "git add";
-              gap = "git add --patch";
-              gc = "git commit --verbose";
-              gcm = "git commit -m";
-              gcl = "git clone";
-            })
-
-            (lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
-
-            (abbrify pkgs.lazygit {lg = "lazygit";})
-          ];
-
-        plugins = [];
-      }
-    ];
 
     programs.starship = {
       enable = true;

home/homemodules/kitty/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   mylib,
-  pkgs,
   ...
 }: let
   inherit (config.homemodules) kitty color;
@@ -28,102 +27,96 @@ in {
         "kitty_mod+l" = "next_layout";
       };
 
-      settings = lib.mkMerge [
+      settings = {
-        # Linux config
+        editor = config.home.sessionVariables.EDITOR;
-        (lib.mkIf pkgs.stdenv.isLinux {
+        scrollback_lines = 10000;
-          allow_remote_control = "yes"; # For nnn file preview or nvim scrollback
+        window_padding_width = 10; # Looks stupid with editors if bg doesn't match
-          listen_on = "unix:@mykitty";
+        # hide_window_decorations = "yes";
-        })
+        enabled_layouts = "grid,vertical,horizontal";
 
-        # Common config
+        allow_remote_control = "yes"; # For nnn file preview or nvim scrollback
-        {
+        listen_on = "unix:@mykitty";
-          editor = config.home.sessionVariables.EDITOR;
-          scrollback_lines = 10000;
-          window_padding_width = 10; # Looks stupid with editors if bg doesn't match
-          # hide_window_decorations = "yes";
-          enabled_layouts = "grid,vertical,horizontal";
 
-          tab_bar_min_tabs = 2; # Don't show a single tab
+        tab_bar_min_tabs = 2; # Don't show a single tab
-          tab_bar_edge = "bottom";
+        tab_bar_edge = "bottom";
-          tab_bar_style = "powerline";
+        tab_bar_style = "powerline";
-          tab_powerline_style = "round";
+        tab_powerline_style = "round";
-          tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}";
+        tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}";
 
-          #
+        #
-          # Color Theme
+        # Color Theme
-          #
+        #
 
-          # The basic colors
+        # The basic colors
-          background = color.hexS.base;
+        background = color.hexS.base;
-          foreground = color.hexS.text;
+        foreground = color.hexS.text;
-          selection_foreground = color.hexS.base;
+        selection_foreground = color.hexS.base;
-          selection_background = color.hexS.rosewater;
+        selection_background = color.hexS.rosewater;
 
-          # Cursor colors
+        # Cursor colors
-          cursor = color.hexS.rosewater;
+        cursor = color.hexS.rosewater;
-          cursor_text_color = color.hexS.base;
+        cursor_text_color = color.hexS.base;
 
-          # URL underline color when hovering with mouse
+        # URL underline color when hovering with mouse
-          url_color = color.hexS.rosewater;
+        url_color = color.hexS.rosewater;
 
-          # Kitty window border colors
+        # Kitty window border colors
-          active_border_color = color.hexS.lavender;
+        active_border_color = color.hexS.lavender;
-          inactive_border_color = color.hexS.overlay0;
+        inactive_border_color = color.hexS.overlay0;
-          bell_border_color = color.hexS.yellow;
+        bell_border_color = color.hexS.yellow;
 
-          # OS Window titlebar colors
+        # OS Window titlebar colors
-          wayland_titlebar_color = "system";
+        wayland_titlebar_color = "system";
-          macos_titlebar_color = "system";
+        macos_titlebar_color = "system";
 
-          # Tab bar colors
+        # Tab bar colors
-          active_tab_foreground = color.hexS.base;
+        active_tab_foreground = color.hexS.base;
-          active_tab_background = color.hexS.lavender;
+        active_tab_background = color.hexS.lavender;
-          inactive_tab_foreground = color.hexS.text;
+        inactive_tab_foreground = color.hexS.text;
-          inactive_tab_background = color.hexS.crust;
+        inactive_tab_background = color.hexS.crust;
-          tab_bar_background = color.hexS.base;
+        tab_bar_background = color.hexS.base;
 
-          # Color for marks (marked text in the terminal)
+        # Color for marks (marked text in the terminal)
-          mark1_foreground = color.hexS.base;
+        mark1_foreground = color.hexS.base;
-          mark1_background = color.hexS.lavender;
+        mark1_background = color.hexS.lavender;
-          mark2_foreground = color.hexS.base;
+        mark2_foreground = color.hexS.base;
-          mark2_background = color.hexS.mauve;
+        mark2_background = color.hexS.mauve;
-          mark3_foreground = color.hexS.base;
+        mark3_foreground = color.hexS.base;
-          mark3_background = color.hexS.sapphire;
+        mark3_background = color.hexS.sapphire;
 
-          # The 16 terminal colors
+        # The 16 terminal colors
-          # black
+        # black
-          color0 = color.hexS.subtext1;
+        color0 = color.hexS.subtext1;
-          color8 = color.hexS.subtext0;
+        color8 = color.hexS.subtext0;
 
-          # red
+        # red
-          color1 = color.hexS.red;
+        color1 = color.hexS.red;
-          color9 = color.hexS.red;
+        color9 = color.hexS.red;
 
-          # green
+        # green
-          color2 = color.hexS.green;
+        color2 = color.hexS.green;
-          color10 = color.hexS.green;
+        color10 = color.hexS.green;
 
-          # yellow
+        # yellow
-          color3 = color.hexS.yellow;
+        color3 = color.hexS.yellow;
-          color11 = color.hexS.yellow;
+        color11 = color.hexS.yellow;
 
-          # blue
+        # blue
-          color4 = color.hexS.blue;
+        color4 = color.hexS.blue;
-          color12 = color.hexS.blue;
+        color12 = color.hexS.blue;
 
-          # magenta
+        # magenta
-          color5 = color.hexS.pink;
+        color5 = color.hexS.pink;
-          color13 = color.hexS.pink;
+        color13 = color.hexS.pink;
 
-          # cyan
+        # cyan
-          color6 = color.hexS.teal;
+        color6 = color.hexS.teal;
-          color14 = color.hexS.teal;
+        color14 = color.hexS.teal;
 
-          # white
+        # white
-          color7 = color.hexS.surface2;
+        color7 = color.hexS.surface2;
-          color15 = color.hexS.surface1;
+        color15 = color.hexS.surface1;
-        }
+      };
-      ];
     };
   };
 }

home/homemodules/neovim/default.nix

@@ -126,7 +126,7 @@ in {
         maplocalleader = ",";
       };
 
-      opts = import ./vim_opts.nix {inherit config lib mylib;};
+      opts = import ./vim_opts.nix {inherit lib mylib;};
       extraConfigLuaPost = builtins.readFile ./extraConfigLuaPost.lua;
       extraConfigLua = builtins.readFile ./extraConfigLua.lua;
 

home/homemodules/neovim/neovide_config.ini

@@ -1,5 +1,5 @@
 fork = true # Start neovide detached
-frame = "full" # full, buttonless, none
+frame = "none" # full, buttonless, none
 idle = true # Don't render frames without changes
 title-hidden = true
 tabs = false

home/homemodules/neovim/vim_opts.nix

@@ -1,4 +1,4 @@
-{config, ...}: {
+_: {
   showmode = false; # Status line already shows this
   backspace = ["indent" "eol" "start"];
   termguicolors = true; # Required by multiple plugins
@@ -37,7 +37,7 @@
   # swapfile = true;
   # backup = false;
   undofile = true;
-  undodir = "${config.home.homeDirectory}/.vim/undo";
+  undodir = "/home/christoph/.vim/undo";
   undolevels = 10000;
   # autochdir = true;
   confirm = true;

home/homemodules/niri/default.nix

@@ -77,40 +77,6 @@ in {
       file = {
         # Link theme for flatpak
         ".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
-
-        ".config/waypaper/config.ini".text = lib.generators.toINI {} {
-          Settings = {
-            use_xdg_state = true;
-
-            # Those are contained in the statefile (.local/state/waypaper/state.ini):
-            # backend = "swww";
-            # folder = "~/NixFlake/wallpapers";
-            # monitors = "All";
-            # wallpaper =
-
-            language = "en";
-            show_path_in_tooltip = true;
-            fill = "fill";
-            sort = "name";
-            color = "#ffffff";
-            subfolders = false;
-            all_subfolders = false;
-            show_hidden = false;
-            show_gifs_only = false;
-            zen_mode = false;
-            number_of_columns = 3;
-            swww_transition_type = "wipe";
-            swww_transition_step = 90;
-            swww_transition_angle = 30;
-            swww_transition_duration = 1;
-            swww_transition_fps = 60;
-            mpvpaper_sound = false;
-            # mpvpaper_options = "";
-            # post_command =
-            # stylesheet = /home/christoph/.config/waypaper/style.css
-            # keybindings = ~/.config/waypaper/keybindings.ini
-          };
-        };
       };
 
       sessionVariables = {
@@ -130,7 +96,7 @@ in {
         xwayland-satellite
         # ncpamixer # Audio control
         wiremix # Audio control
-        swww
+        swaybg
         waypaper
 
         # GTK apps (look good and work well with xdg portals)
@@ -147,41 +113,6 @@ in {
       ];
     };
 
-    services = {
-      dunst = {
-        enable = true;
-
-        iconTheme.package = color.iconPackage;
-        iconTheme.name = color.iconTheme;
-
-        settings = {
-          global = {
-            # monitor = config.homemodules.waybar.monitor;
-            follow = "keyboard";
-            font = "${color.font} 11";
-            offset = "9x11";
-            background = color.hexS.base;
-            foreground = color.hexS.text;
-            frame_width = 2;
-            corner_radius = 8;
-            separator_color = "frame";
-          };
-
-          urgency_low = {
-            frame_color = color.hexS.green;
-          };
-
-          urgency_normal = {
-            frame_color = color.hexS.green;
-          };
-
-          urgency_critical = {
-            frame_color = color.hexS.red;
-          };
-        };
-      };
-    };
-
     programs = {
       walker = {
         enable = true;
@@ -436,7 +367,7 @@ in {
 
           spawn-at-startup = [
             {argv = ["ashell" "-c" "${config.paths.dotfiles}/ashell/config.toml"];}
-            {argv = ["waypaper" "--restore"];}
+            {argv = ["waypaper" "--backend" "swaybg" "--fill" "fill" "--monitor" "All" "--folder" "${config.paths.nixflake}/wallpapers" "--random"];}
 
             {argv = ["kitty" "--hold" "fastfetch"];}
             {argv = ["fcitx5"];}
@@ -526,11 +457,6 @@ in {
               top = 4; # Somehow the bar eclusivity doesn't work as expected
               bottom = 2;
             };
-
-            shadow = {
-              enable = true;
-              draw-behind-window = true;
-            };
           };
 
           gestures = {
@@ -631,10 +557,6 @@ in {
               # Waybar rounded corners background clipping fix
               matches = [{namespace = "waybar";}];
               opacity = 0.99;
-              shadow = {
-                enable = true;
-                draw-behind-window = true;
-              };
             }
           ];
 
@@ -679,12 +601,12 @@ in {
               hotkey-overlay = {title = "Edit the NixFlake.";};
             };
             "Mod+W" = {
-              action = spawn "waypaper";
+              action = spawn "waypaper" "--backend" "swaybg" "--fill" "fill";
               hotkey-overlay = {title = "Open wallpaper chooser.";};
             };
             "Mod+Shift+W" = {
-              action = spawn "waypaper" "--random";
+              action = spawn "waypaper" "--backend" "swaybg" "--fill" "fill" "--monitor" "All";
-              hotkey-overlay = {title = "Select random wallpaper.";};
+              hotkey-overlay = {title = "Switch wallpaper.";};
             };
 
             "Mod+A" = {

home/homemodules/waybar/default.nix

@@ -30,7 +30,7 @@ in {
           "custom/launcher" = {
             format = "<span></span>";
             interval = "once";
-            on-click = "walker -m desktopapplications";
+            on-click = "rofi -drun-show-actions -show drun";
           };
 
           systemd-failed-units = {

lib/nixos.nix

@@ -80,75 +80,6 @@
       ];
     };
 
-  mkDarwinConfigWithHomeManagerModule = {
-    system,
-    mylib,
-    hostname,
-    username,
-    publicKeys,
-    extraModules ? [],
-    headless ? false,
-  }:
-    inputs.nix-darwin.lib.darwinSystem {
-      inherit system;
-
-      # Values in "specialArgs" are propagated to all system modules.
-      specialArgs = {
-        inherit inputs system hostname mylib username publicKeys headless;
-      };
-
-      modules = builtins.concatLists [
-        [
-          # Replace the default "pkgs" with my configured version
-          # to allow installation of unfree software and my own overlays.
-          {nixpkgs.pkgs = pkgs;}
-
-          # Import the toplevel system configuration module.
-          ../system/cachix.nix
-
-          # Host specific configuration
-          ../system/${hostname}
-
-          # Import all of my custom system modules
-          # ../system/systemmodules # TODO:
-        ]
-
-        extraModules
-
-        # HM is installed as a system module when using mkNixosConfigWithHomeManagerModule.
-        [
-          inputs.home-manager.darwinModules.home-manager
-          {
-            home-manager = {
-              # Values in "extraSpecialArgs" are propagated to all HM modules.
-              extraSpecialArgs = {
-                inherit inputs system hostname mylib username publicKeys headless;
-              };
-
-              # Use the "pkgs" from the system configuration.
-              # This disables "nixpkgs.*" options in HM modules.
-              useGlobalPkgs = true;
-
-              # Packages in "users.${username}.packages" will be installed
-              # to /etc/profiles instead of ~/.nix-profile.
-              useUserPackages = true;
-
-              users.${username}.imports = [
-                # Host specific configuration
-                ../home/${username}/${hostname}
-              ];
-
-              sharedModules = [
-                # Import all of my custom HM modules.
-                # Putting them into sharedModules enables correct nixd completions.
-                ../home/homemodules/darwin.nix
-              ];
-            };
-          }
-        ]
-      ];
-    };
-
   mkNixosSystemConfig = {
     system,
     mylib,

system/darwinix/default.nix

@@ -1,147 +0,0 @@
-{
-  self,
-  lib,
-  mylib,
-  pkgs,
-  username,
-  config,
-  inputs,
-  publicKeys,
-  hostname,
-  ...
-}: {
-  nix = {
-    enable = true;
-
-    package = pkgs.nixVersions.stable;
-    extraOptions = ''
-      experimental-features = nix-command flakes pipe-operators
-    '';
-
-    settings.trusted-users = ["root" "${username}"];
-
-    gc.automatic = false;
-    gc.options = "--delete-older-than 5d";
-    settings.auto-optimise-store = true;
-    optimise.automatic = true;
-
-    registry = lib.mapAttrs' (n: v: lib.nameValuePair n {flake = v;}) inputs;
-
-    nixPath = [
-      "nixpkgs=${inputs.nixpkgs.outPath}"
-      "home-manager=${inputs.home-manager.outPath}"
-    ];
-  };
-
-  networking = {
-    hostName = "${hostname}";
-    localHostName = "${hostname}";
-    computerName = "${hostname}";
-
-    applicationFirewall = {
-      enable = true;
-      enableStealthMode = false;
-      allowSigned = true;
-      allowSignedApp = true;
-      blockAllIncoming = false;
-    };
-
-    knownNetworkServices = [
-      "Wi-Fi"
-      "Thunderbold Bridge"
-    ];
-
-    dns = [
-      "192.168.86.26"
-      "8.8.8.8"
-      "8.8.4.4"
-    ];
-
-    # wg-quick = {};
-  };
-
-  power = {
-    # restartAfterFreeze = false;
-    # restartAfterPowerFailure = false;
-
-    sleep = {
-      computer = 10; # 10 minutes until sleep
-      display = 5;
-      harddisk = 5;
-    };
-  };
-
-  system = {
-    primaryUser = "${username}";
-
-    # TODO:
-    defaults = {
-      # dock = {};
-
-      trackpad = {
-        ActuateDetents = true; # Haptic feedback
-        ActuationStrength = 1;
-        Clicking = true; # Tap to click
-        Dragging = true; # Double tap to drag
-        TrackpadRightClick = true;
-      };
-    };
-
-    keyboard = {
-      enableKeyMapping = true;
-      swapLeftCtrlAndFn = true;
-      swapLeftCommandAndLeftAlt = true;
-    };
-  };
-
-  users.users.${username} = {
-    isHidden = false;
-    description = "Christoph";
-    home = "/Users/${username}";
-    createHome = false;
-
-    # NOTE: Not set if the user already exists on darwin, so use chsh for the root user
-    shell = pkgs.fish;
-
-    openssh.authorizedKeys.keys = [
-      publicKeys.${username}.ssh
-    ];
-
-    # packages = with pkgs; [];
-  };
-
-  environment.shells = with pkgs; [pkgs.fish];
-
-  environment.systemPackages = with pkgs; [
-    alejandra
-    neovim
-    wget
-  ];
-
-  fonts.packages = with pkgs; [
-    nerd-fonts.jetbrains-mono
-    monolisa
-  ];
-
-  programs = {
-    fish.enable = true;
-  };
-
-  services = {
-    # aerospace = {};
-  };
-
-  # NOTE: Not installed automatically
-  homebrew = {
-    enable = true;
-    enableFishIntegration = true;
-    # brews = [];
-  };
-
-  # Set Git commit hash for darwin-version.
-  # system.configurationRevision = self.rev or self.dirtyRev or null;
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 6;
-}

system/default.nix

@@ -276,7 +276,7 @@ with mylib.networking; {
     shell = pkgs.fish;
 
     openssh.authorizedKeys.keys = [
-      publicKeys.${username}.ssh
+      publicKeys.christoph.ssh
     ];
 
     # We do this with HomeManager

system/systemmodules/impermanence/default.nix

@@ -97,7 +97,6 @@ in {
             #       which leads to /home not being unmounted correctly during shutdown...
           ];
 
-          # TODO: I need something that lists stale folders in /persist (folders that are no longer mounted into the system)
           directories = [
             # Home directory
             (mkUDir "Downloads" m755)
@@ -169,6 +168,7 @@ in {
             # (mkUDir ".config/unity3d" m755) # Unity
             # (mkUDir ".config/unityhub" m755) # Unity
             (mkUDir ".config/vlc" m755)
+            (mkUDir ".config/waypaper" m755)
             (mkUDir ".config/Zeal" m755)
             (mkUDir ".config/zed" m755)
 
@@ -203,7 +203,6 @@ in {
             (mkUDir ".local/state/lazygit" m755)
             (mkUDir ".local/state/nix" m755)
             (mkUDir ".local/state/nvim" m755)
-            (mkUDir ".local/state/waypaper" m755)
             (mkUDir ".local/state/wireplumber" m755)
           ];
         };