Switch to ghostty

Has better matching.

.gitignore

@@ -0,0 +1,3 @@
+.editorconfig
+.gemini
+result

alex/core.nix

@@ -1,38 +1,9 @@
-{ config, pkgs, inputs, isDesktop, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   home.username = "alex";
   home.homeDirectory = "/home/alex";
 
-  # link the configuration file in current directory to the specified location in home directory
-  # home.file.".config/i3/wallpaper.jpg".source = ./wallpaper.jpg;
-
-  # link all files in `./scripts` to `~/.config/i3/scripts`
-  # home.file.".config/i3/scripts" = {
-  #   source = ./scripts;
-  #   recursive = true;   # link recursively
-  #   executable = true;  # make all files executable
-  # };
-
-  # encode the file content in nix configuration file directly
-  # home.file.".xxx".text = ''
-  #     xxx
-  # '';
-
-  dconf.settings = if isDesktop then {
-    "org/gnome/settings-daemon/plugins/media-keys" = {
-      custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom0/" ];
-    };
-    "org/gnome/settings-daemon/plugins/media-keys/custom0" = {
-      binding = "<Primary><Alt>t";
-      command = "wezterm";
-      name = "open-terminal";
-    };
-    "org/gnome/desktop/interface" = {
-      color-scheme = "prefer-dark";
-    };
-  } else {};
-
   home.shellAliases = {
     e = "ls -lh";
     tree  = "eza --tree";
@@ -49,7 +20,6 @@
   home.file.".config/nvim/init.lua".source = ./nvim/init.lua;
   home.file.".config/tmux/tmux.conf".source = ./tmux/tmux.conf;
   home.file.".config/tmux/tmux.conf.local".source = ./tmux/tmux.conf.local;
-  home.file.".wezterm.lua".source = ./wezterm.lua;
   home.file.".config/jrnl/jrnl.yaml".source = ./jrnl/jrnl.yaml;
   home.file.".config/fish/functions" = {
     source = ./fish/functions;
@@ -65,25 +35,19 @@
     nnn # terminal file manager
 
     # archives
-    zip
     xz
-    unzip
     # p7zip
 
     # utils
-    ripgrep # recursively searches directories for a regex pattern
-    bat
     jq # A lightweight and flexible command-line JSON processor
     # yq-go # yaml processor https://github.com/mikefarah/yq
     eza # A modern replacement for ‘ls’
     fzf # A command-line fuzzy finder
-    fd
     xclip
     trash-cli
 
     # networking tools
     dig
-    mtr # A network diagnostic tool
     # iperf3
     # dnsutils  # `dig` + `nslookup`
     # ldns # replacement of `dig`, it provide the command `drill`
@@ -129,11 +93,7 @@
     pciutils # lspci
     usbutils # lsusb
     zoxide
-  ] ++ (if isDesktop then [
+  ];
-    anki-bin
-    wezterm
-    chromium
-  ] else []);
 
   # basic configuration of git, please change to your own
   programs.git = {
@@ -146,6 +106,9 @@
       init = {
         defaultBranch = "main";
       };
+      push = {
+        autoSetupRemote = true;
+      };
     };
   };
 

alex/desktop.nix

@@ -0,0 +1,49 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  imports = [
+    ./sway.nix
+  ];
+
+  home.file.".wezterm.lua".source = ./wezterm.lua;
+
+  dconf.settings = {
+    "org/gnome/settings-daemon/plugins/media-keys" = {
+      custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom0/" ];
+    };
+    "org/gnome/settings-daemon/plugins/media-keys/custom0" = {
+      binding = "<Primary><Alt>t";
+      command = "wezterm";
+      name = "open-terminal";
+    };
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+    };
+  };
+
+  home.packages = with pkgs; [
+    anki-bin
+    wezterm
+    chromium
+    loupe
+  ];
+
+  programs.ghostty = {
+    enable = true;
+    settings = {
+      font-family = "JetBrainsMono Nerd Font";
+      font-size = 10;
+      theme = "Catppuccin Mocha";
+    };
+  };
+
+  xdg.mimeApps = {
+    enable = true;
+    defaultApplications = {
+      "image/jpeg" = [ "org.gnome.Loupe.desktop" ];
+      "image/png" = [ "org.gnome.Loupe.desktop" ];
+      "image/gif" = [ "org.gnome.Loupe.desktop" ];
+      "image/webp" = [ "org.gnome.Loupe.desktop" ];
+    };
+  };
+}

alex/nvim/init.lua

@@ -864,6 +864,7 @@ require("lazy").setup({
 	},
 	{ -- Highlight, edit, and navigate code
 		"nvim-treesitter/nvim-treesitter",
+		branch = 'master',
 		build = ":TSUpdate",
 		opts = {
 			ensure_installed = { "python", "bash", "c", "diff", "html", "lua", "luadoc", "markdown", "vim", "vimdoc" },

alex/personal.nix

@@ -0,0 +1,39 @@
+{ config, pkgs, inputs, ... }:
+
+let
+  unstable = import inputs.nixpkgs-unstable {
+    system = pkgs.stdenv.hostPlatform.system;
+    config.allowUnfree = true;
+  };
+in
+{
+  home.packages = with pkgs; [
+    foliate
+    inputs.locutus.packages.${pkgs.stdenv.hostPlatform.system}.default
+    jrnl
+    mullvad-browser
+    tor-browser
+    exiftool
+    digikam
+    shotwell
+    nextcloud-client
+    bitwarden-desktop
+    signal-desktop
+    spotify
+    gemini-cli
+
+    (symlinkJoin {
+     name = "darktable";
+     paths = [ unstable.darktable ];
+     nativeBuildInputs = [ makeWrapper ];
+     postBuild = ''
+     # Remove the symlink to the original binary
+     rm $out/bin/darktable
+
+     # Create a wrapper that points to the cached original
+     makeWrapper ${unstable.darktable}/bin/darktable $out/bin/darktable \
+     --set GDK_BACKEND wayland
+     '';
+     })
+  ];
+}

alex/sway.nix

@@ -0,0 +1,494 @@
+{ pkgs, lib, ... }:
+
+let
+  # Catppuccin Mocha Palette
+  base = "#1e1e2e";
+  mantle = "#181825";
+  surface0 = "#313244";
+  surface1 = "#45475a";
+  text = "#cdd6f4";
+  lavender = "#b4befe";
+  blue = "#89b4fa";
+  sapphire = "#74c7ec";
+  red = "#f38ba8";
+  peach = "#fab387";
+  yellow = "#f9e2af";
+  green = "#a6e3a1";
+  mauve = "#cba6f7";
+  overlay0 = "#6c7086";
+in
+{
+  home.packages = with pkgs; [
+    swaybg
+    swayidle
+    swaylock-effects
+    grim
+    slurp
+    wl-clipboard
+    mako
+    libnotify
+    nerd-fonts.jetbrains-mono
+  ];
+
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      clock = true;
+      color = base;
+      effect-pixelate = 50;
+      effect-greyscale = true;
+      screenshots = true;
+      font = "JetBrainsMono Nerd Font";
+      font-size = 24;
+      indicator-idle-visible = true;
+      indicator-radius = 200;
+      indicator-thickness = 17;
+      line-color = base;
+      ring-color = overlay0;
+      inside-color = base;
+      key-hl-color = lavender;
+      separator-color = base;
+      text-color = text;
+      text-caps-lock-color = text;
+      line-ver-color = base;
+      ring-ver-color = lavender;
+      inside-ver-color = base;
+      text-ver-color = text;
+      ring-wrong-color = red;
+      text-wrong-color = red;
+      inside-wrong-color = base;
+      inside-clear-color = base;
+      text-clear-color = text;
+      ring-clear-color = yellow;
+      line-clear-color = base;
+      line-wrong-color = base;
+      bs-hl-color = red;
+      grace = 2;
+      grace-no-mouse = true;
+      grace-no-touch = true;
+      datestr = "%a, %B %e";
+      timestr = "%H:%M";
+      fade-in = 0.3;
+      ignore-empty-password = true;
+    };
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+    package = pkgs.swayfx;
+    checkConfig = false;
+
+    config = {
+      modifier = "Mod4";
+      terminal = "ghostty";
+      menu = "fuzzel";
+      fonts = {
+        names = [ "JetBrainsMono Nerd Font" ];
+        style = "Regular";
+        size = 11.0;
+      };
+
+      input = {
+        "*" = {
+          xkb_layout = "us";
+          xkb_variant = "dvorak";
+        };
+        "type:touchpad" = {
+          dwt = "enabled";
+          tap = "enabled";
+          natural_scroll = "enabled";
+          middle_emulation = "enabled";
+        };
+      };
+
+      gaps = {
+        inner = 10;
+        outer = 5;
+      };
+
+      colors = {
+        focused = {
+          border = lavender;
+          background = base;
+          text = text;
+          indicator = lavender;
+          childBorder = lavender;
+        };
+        focusedInactive = {
+          border = overlay0;
+          background = base;
+          text = text;
+          indicator = overlay0;
+          childBorder = overlay0;
+        };
+        unfocused = {
+          border = overlay0;
+          background = base;
+          text = overlay0;
+          indicator = overlay0;
+          childBorder = overlay0;
+        };
+        urgent = {
+          border = red;
+          background = base;
+          text = red;
+          indicator = red;
+          childBorder = red;
+        };
+      };
+
+      output = {
+        "*" = {
+          bg = "/home/alex/Pictures/wallpaper.jpg fill";
+        };
+      };
+
+      bars = [];
+
+      startup = [
+        { command = "waybar"; }
+        { command = "mako"; }
+      ];
+
+      keybindings = let
+        modifier = "Mod4";
+      in lib.mkOptionDefault {
+        "${modifier}+Return" = "exec ghostty";
+        "${modifier}+d" = "exec fuzzel";
+        "${modifier}+Shift+q" = "kill";
+        "${modifier}+Shift+c" = "reload";
+        "${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'";
+
+        "${modifier}+Shift+l" = "exec swaylock -f";
+
+        "${modifier}+Shift+s" = "exec grim -g \"$(slurp)\" - | wl-copy";
+
+        # Workspaces
+        "--whole-window ${modifier}+button4" = "workspace prev";
+        "--whole-window ${modifier}+button5" = "workspace next";
+
+        "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
+        "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
+        "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+        "XF86MonBrightnessUp" = "exec light -A 5";
+        "XF86MonBrightnessDown" = "exec light -U 5";
+      };
+    };
+
+    extraConfig = ''
+      workspace number 1
+      default_border pixel 2
+      default_floating_border pixel 2
+
+      corner_radius 10
+      shadows enable
+      shadow_blur_radius 20
+      shadow_color #00000077
+
+      blur enable
+      blur_passes 3
+      blur_radius 5
+      layer_effects "waybar" blur enable; shadows enable; corner_radius 10;
+    '';
+  };
+
+  services.mako = {
+    enable = true;
+    settings = {
+      font = "JetBrainsMono Nerd Font 11";
+      background-color = "${base}dd";
+      border-color = lavender;
+      border-radius = 10;
+      border-size = 2;
+      text-color = text;
+      default-timeout = 5000;
+    };
+  };
+
+  services.swayidle =
+    let
+    lock = "${pkgs.swaylock-effects}/bin/swaylock --daemonize";
+    # modify "display" function based on your window manager
+    # Sway
+    display = status: "${pkgs.sway}/bin/swaymsg 'output * power ${status}'";
+    # Niri
+    # display = status: "${pkgs.niri}/bin/niri msg action power-${status}-monitors";
+  in
+  {
+    enable = true;
+    timeouts = [
+    {
+      timeout = 295; # in seconds
+      command = "${pkgs.libnotify}/bin/notify-send 'Locking in 5 seconds' -t 5000";
+    }
+    {
+      timeout = 300;
+      command = lock;
+    }
+    {
+      timeout = 330;
+      command = display "off";
+      resumeCommand = display "on";
+    }
+    {
+      timeout = 600;
+      command = "${pkgs.systemd}/bin/systemctl suspend";
+    }
+    ];
+    events = [
+    {
+      event = "before-sleep";
+      # adding duplicated entries for the same event may not work
+      command = (display "off") + "; " + lock;
+    }
+    {
+      event = "after-resume";
+      command = display "on";
+    }
+    {
+      event = "lock";
+      command = (display "off") + "; " + lock;
+    }
+    {
+      event = "unlock";
+      command = display "on";
+    }
+    ];
+  };
+
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        terminal = "${pkgs.ghostty}/bin/ghostty";
+        layer = "overlay";
+        width = 100;
+        line-height = 40;
+        font = "JetBrainsMono Nerd Font:size=12";
+      };
+      colors = {
+        background = "${lib.strings.removePrefix "#" base}ff";
+        text = "${lib.strings.removePrefix "#" text}ff";
+        match = "${lib.strings.removePrefix "#" lavender}ff";
+        selection = "${lib.strings.removePrefix "#" surface1}ff";
+        selection-text = "${lib.strings.removePrefix "#" text}ff";
+        selection-match = "${lib.strings.removePrefix "#" lavender}ff";
+        border = "${lib.strings.removePrefix "#" lavender}ff";
+      };
+      border = {
+        width = 2;
+        radius = 10;
+      };
+    };
+  };
+
+  programs.waybar = {
+    enable = true;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+        margin-top = 5;
+        margin-left = 10;
+        margin-right = 10;
+        spacing = 4;
+
+        modules-left = [ "sway/workspaces" "sway/mode" ];
+        modules-center = [ "clock" ];
+        modules-right = [ "pulseaudio" "network" "cpu" "memory" "battery" "tray" ];
+
+        "sway/workspaces" = {
+          disable-scroll = true;
+          all-outputs = true;
+        };
+
+        "clock" = {
+          format = "{:%a %d %b %H:%M:%S}";
+          tooltip-format = "<big>{:%Y %B}</big>\n<tt>{calendar}</tt>";
+          interval = 1;
+        };
+
+        "cpu" = {
+          format = "{usage}% ";
+        };
+
+        "memory" = {
+          format = "{}% ";
+          tooltip-format = "RAM: {used}GiB / {total}GiB ({percentage}%)\nSwap: {swapUsed}GiB / {swapTotal}GiB ({swapPercentage}%)";
+        };
+
+        "battery" = {
+          states = {
+            warning = 30;
+            critical = 15;
+          };
+          format = "{capacity}% {icon}";
+          format-charging = "{capacity}% ";
+          format-plugged = "{capacity}% ";
+          format-icons = ["" "" "" "" ""];
+        };
+
+        "network" = {
+          format-wifi = "{essid} ({signalStrength}%) ";
+          format-ethernet = "{ipaddr}/{cidr} 󰈀";
+          tooltip-format = "{ifname} via {gwaddr} 󱂇";
+          format-linked = "{ifname} (No IP) 󰈀";
+          format-disconnected = "Disconnected ⚠";
+          format-alt = "{ifname}: {ipaddr}/{cidr}";
+        };
+
+        "pulseaudio" = {
+          format = "{volume}% {icon} {format_source}";
+          format-bluetooth = "{volume}% {icon} {format_source}";
+          format-bluetooth-muted = " {icon} {format_source}";
+          format-muted = " {format_source}";
+          format-source = "{volume}% ";
+          format-source-muted = "";
+          format-icons = {
+            headphone = "";
+            hands-free = "";
+            headset = "";
+            phone = "";
+            portable = "";
+            car = "";
+            default = ["" "" ""];
+          };
+          on-click = "pavucontrol";
+        };
+      };
+    };
+
+    style = ''
+      * {
+        font-family: "JetBrainsMono Nerd Font";
+        font-size: 13px;
+      }
+
+      window#waybar {
+        background-color: transparent;
+        color: ${text};
+        transition-property: background-color;
+        transition-duration: .5s;
+      }
+
+      window#waybar > box {
+        background-color: ${base};
+        border-radius: 15px;
+        opacity: 1.0;
+        padding: 0 3px 0 13px;
+      }
+
+      button {
+        box-shadow: inset 0 -3px transparent;
+        border: none;
+        border-radius: 0;
+      }
+
+      button:hover {
+        background: inherit;
+        box-shadow: inset 0 -3px ${text};
+      }
+
+      #workspaces button {
+        padding: 0 5px;
+        background-color: transparent;
+        color: ${text};
+      }
+
+      #workspaces button:hover {
+        background: rgba(0, 0, 0, 0.2);
+      }
+
+      #workspaces button.focused {
+        background-color: ${surface1};
+        box-shadow: inset 0 -3px ${lavender};
+      }
+
+      #workspaces button.urgent {
+        background-color: ${red};
+      }
+
+      #mode {
+        background-color: ${surface0};
+        border-bottom: 3px solid ${text};
+      }
+
+      #clock,
+      #battery,
+      #cpu,
+      #memory,
+      #disk,
+      #temperature,
+      #backlight,
+      #network,
+      #pulseaudio,
+      #custom-media,
+      #tray,
+      #mode,
+      #idle_inhibitor,
+      #mpd {
+        padding: 0 10px;
+        color: ${text};
+        background-color: ${surface0};
+        border-radius: 10px;
+        margin: 5px 2px;
+      }
+
+      #clock {
+        background-color: ${mauve};
+        color: ${base};
+      }
+
+      #battery {
+        background-color: ${green};
+        color: ${base};
+      }
+
+      #battery.charging, #battery.plugged {
+        color: ${base};
+        background-color: ${green};
+      }
+
+      #battery.critical:not(.charging) {
+        background-color: ${red};
+        color: ${text};
+        animation-name: blink;
+        animation-duration: 0.5s;
+        animation-timing-function: linear;
+        animation-iteration-count: infinite;
+        animation-direction: alternate;
+      }
+
+      #cpu {
+        background-color: ${peach};
+        color: ${base};
+      }
+
+      #memory {
+        background-color: ${yellow};
+        color: ${base};
+      }
+
+      #network {
+        background-color: ${sapphire};
+        color: ${base};
+      }
+
+      #pulseaudio {
+        background-color: ${blue};
+        color: ${base};
+      }
+
+      #pulseaudio.muted {
+        background-color: ${overlay0};
+        color: ${text};
+      }
+
+      #tray {
+        background-color: ${surface0};
+      }
+    '';
+  };
+}

alex/tmux/tmux.conf.local

@@ -381,6 +381,11 @@ tmux_conf_urlscan_options="--compact --dedupe"
 # start with mouse mode enabled
 set -g mouse on
 
+# allow passthrough for fancy stuff like images
+set -g allow-passthrough on
+set -g allow-rename off
+
+
 # force Vi mode
 #   really you should export VISUAL or EDITOR environment variable, see manual
 #set -g status-keys vi

flake.lock

@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765979862,
+        "lastModified": 1766553861,
-        "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=",
+        "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9",
+        "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
         "type": "github"
       },
       "original": {
@@ -74,13 +74,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1765838191,
+        "lastModified": 1766651565,
-        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1766622938,
+        "narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f",
         "type": "github"
       },
       "original": {
@@ -94,7 +110,8 @@
       "inputs": {
         "home-manager": "home-manager",
         "locutus": "locutus",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
     "systems": {

flake.nix

@@ -4,6 +4,7 @@
   inputs = {
     # NixOS official package source
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       # The `follows` keyword in inputs is used for inheritance.
@@ -15,116 +16,67 @@
     locutus.url = "git+https://git.figtree.dev/alex/locutus";
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs: {
+  outputs = { self, nixpkgs, home-manager, ... }@inputs:
+  let
+    # Shared Home Manager configuration function
+    mkHomeManagerConfig = { extraModules ? [] }: {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.backupFileExtension = "backup";
+      home-manager.users.alex = {
+        imports = [ ./alex/core.nix ] ++ extraModules;
+      };
+      home-manager.extraSpecialArgs = { inherit inputs; };
+    };
+  in {
     nixosConfigurations = {
       case = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-
         specialArgs = { inherit inputs; };
         modules = [
-
           ./hosts/case/configuration.nix
-
-          # enable home manager
           home-manager.nixosModules.home-manager
-          {
+          (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ./alex/personal.nix ]; })
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-
-            home-manager.users.alex = import ./alex/home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to
-            # home.nix
-            home-manager.extraSpecialArgs = { inherit inputs; isDesktop=true; };
-          }
         ];
       };
+
       count = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-
         specialArgs = { inherit inputs; };
         modules = [
-
           ./hosts/count/configuration.nix
-
-          # enable home manager
           home-manager.nixosModules.home-manager
-          {
+          (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ./alex/personal.nix ]; })
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-
-            home-manager.users.alex = import ./alex/home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to
-            # home.nix
-            home-manager.extraSpecialArgs = { inherit inputs; isDesktop=true; };
-          }
         ];
       };
+
       armitage = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-
         specialArgs = { inherit inputs; };
         modules = [
-
           ./hosts/armitage/configuration.nix
-
-          # enable home manager
           home-manager.nixosModules.home-manager
-          {
+          (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ]; })
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-
-            home-manager.users.alex = import ./alex/home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to
-            # home.nix
-            home-manager.extraSpecialArgs = { inherit inputs; isDesktop=true; };
-          }
         ];
       };
+
       alt = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-
         specialArgs = { inherit inputs; };
         modules = [
-
           ./hosts/alt/configuration.nix
-
-          # enable home manager
           home-manager.nixosModules.home-manager
-          {
+          (mkHomeManagerConfig {})
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-
-            home-manager.users.alex = import ./alex/home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to
-            # home.nix
-            home-manager.extraSpecialArgs = { inherit inputs; isDesktop=false; };
-          }
         ];
       };
+
       nightcity = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-
         specialArgs = { inherit inputs; };
         modules = [
-
           ./hosts/nightcity/configuration.nix
-
-          # enable home manager
           home-manager.nixosModules.home-manager
-          {
+          (mkHomeManagerConfig {})
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-
-            home-manager.users.alex = import ./alex/home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to
-            # home.nix
-            home-manager.extraSpecialArgs = { inherit inputs; isDesktop=false; };
-          }
         ];
       };
       # other hosts...

hosts/case/configuration.nix

@@ -10,8 +10,9 @@
       ./hardware-configuration.nix
       ../modules/base.nix
       ../modules/desktop.nix
-      ../modules/home.nix
+      ../modules/personal.nix
       ../modules/laptop.nix
+      ../modules/sway.nix
     ];
 
   # Bootloader.

hosts/count/configuration.nix

@@ -11,7 +11,8 @@
       ../modules/base.nix
       ../modules/desktop.nix
       ../modules/brother-printer.nix
-      ../modules/home.nix
+      ../modules/personal.nix
+      ../modules/sway.nix
       ../modules/syncthing.nix
     ];
 

hosts/modules/base.nix

@@ -11,6 +11,11 @@
     shell = pkgs.fish;
   };
 
+  # this is to avoid some problem that happens apparently only when fish is
+  # enabled, where generating man cahes takes a very long time. note that it may
+  # break fish man completion and apropos.
+  documentation.man.generateCaches = false;
+
   # enable a 1GB swap file
   swapDevices = [{
     device = "/swapfile";

hosts/modules/desktop.nix

@@ -1,18 +1,21 @@
 { config, pkgs, inputs, ... }:
 {
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  services.xserver = {
-
+    enable = true;
-  # Enable the GNOME Desktop Environment.
+    xkb = {
-  services.xserver.displayManager.gdm.enable = true;
+      layout = "us";
-  services.xserver.desktopManager.gnome.enable = true;
+      variant = "dvorak";
-
+    };
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "dvorak";
   };
 
+  services.displayManager.gdm = {
+    enable = true;
+    wayland = true;
+  };
+
+  services.desktopManager.gnome.enable = true;
+
   # enable japanese input
   i18n.inputMethod = {
     enable = true;
@@ -37,8 +40,8 @@
   };
 
   environment.systemPackages = with pkgs; [
-    bitwarden-desktop
     libreoffice-fresh
+	meld
   ];
 
   # Enable networking

hosts/modules/home.nix

@@ -1,24 +0,0 @@
-{ config, pkgs, inputs, ... }:
-{
-  # Mullvad vpn
-  services.mullvad-vpn = {
-    enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    foliate
-    inputs.locutus.packages.${pkgs.system}.default
-    jrnl
-    mullvad-browser
-    mullvad-vpn
-    tor-browser
-    exiftool
-    darktable
-    digikam
-    shotwell
-    nextcloud-client
-    bitwarden-desktop
-    signal-desktop
-    spotify
-  ];
-}

hosts/modules/personal.nix

@@ -0,0 +1,8 @@
+{ config, pkgs, inputs, ... }:
+{
+  # Mullvad vpn
+  services.mullvad-vpn = {
+    enable = true;
+    package = pkgs.mullvad-vpn;
+  };
+}

hosts/modules/sway.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+{
+	# Enable the Sway binary and hardware wrappers
+	programs.sway = {
+		enable = true;
+		package = pkgs.swayfx;
+		wrapperFeatures.gtk = true;
+	};
+
+	# Hardware and security services that must be system-wide
+	services.gnome.gnome-keyring.enable = true;
+	security.polkit.enable = true;
+	programs.light.enable = true; # Allow brightness control
+
+	# Move system-wide packages here
+	environment.systemPackages = with pkgs; [
+		pavucontrol
+		light
+	];
+}