Set delete window longer on work laptop

Remove duplicate libreoffice
Add meld
2025-12-16 13:44:25 +10:00 · 2025-12-16 13:02:30 +10:00 · 2025-12-16 13:02:18 +10:00 · 2025-12-16 13:01:31 +10:00 · 2025-12-16 13:00:52 +10:00 · 2025-12-16 13:00:22 +10:00
20 changed files with 262 additions and 738 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +0,0 @@
-.editorconfig
-.gemini
-result
--- a/alex/desktop.nix
+++ b/alex/desktop.nix
@@ -1,49 +0,0 @@
-{ 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" ];
-    };
-  };
-}
--- a/alex/home.nix
+++ b/alex/home.nix
@@ -1,9 +1,38 @@
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, inputs, isDesktop, ... }:

 {
  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";
@@ -20,6 +49,7 @@
  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;
@@ -35,19 +65,25 @@
    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`
@@ -93,22 +129,19 @@
    pciutils # lspci
    usbutils # lsusb
    zoxide
-  ];
+  ] ++ (if isDesktop then [
+    anki-bin
+    wezterm
+    chromium
+  ] else []);

  # basic configuration of git, please change to your own
  programs.git = {
    enable = true;
-    settings = {
-      user = {
-        name = "Alexander Wainwright";
-        email = "code@figtree.dev";
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      push = {
-        autoSetupRemote = true;
-      };
+    userName = "Alexander Wainwright";
+    userEmail = "alexander.l.wainwright@boeing.com";
+    extraConfig = {
+      pull.ff = "only";
    };
  };

--- a/alex/nvim/init.lua
+++ b/alex/nvim/init.lua
@@ -864,7 +864,6 @@ 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" },
--- a/alex/personal.nix
+++ b/alex/personal.nix
@@ -1,39 +0,0 @@
-{ 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
-     '';
-     })
-  ];
-}
--- a/alex/sway.nix
+++ b/alex/sway.nix
@@ -1,494 +0,0 @@
-{ 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};
-      }
-    '';
-  };
-}
--- a/alex/tmux/tmux.conf.local
+++ b/alex/tmux/tmux.conf.local
@@ -381,11 +381,6 @@ 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
--- a/alex/wezterm.lua
+++ b/alex/wezterm.lua
@@ -18,7 +18,14 @@ config.window_frame = {
 config.font_size =  9.5
 config.hide_tab_bar_if_only_one_tab = true

-config.font = wezterm.font 'Fira Code'
-config.font = wezterm.font 'Lilex Nerd Font'
+-- config.font = wezterm.font 'Fira Code'
+-- config.font = wezterm.font 'Lilex Nerd Font'
+
+config.font = wezterm.font_with_fallback {
+  'Fira Code', -- Replace with your preferred main font
+  'Noto Sans Symbols 2',     -- Great for arrows like \u{1f898}
+  'Noto Sans',
+  'Symbols Nerd Font Mono',
+}

 return config
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766553861,
-        "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
+        "lastModified": 1765605144,
+        "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
+        "rev": "90b62096f099b73043a747348c11dbfcfbdea949",
        "type": "github"
      },
      "original": {
@@ -74,29 +74,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1766651565,
-        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1766622938,
-        "narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=",
+        "lastModified": 1765311797,
+        "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f",
+        "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
        "type": "github"
      },
      "original": {
@@ -110,8 +94,7 @@
      "inputs": {
        "home-manager": "home-manager",
        "locutus": "locutus",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs": "nixpkgs_2"
      }
    },
    "systems": {
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,6 @@
  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.
@@ -16,67 +15,116 @@
    locutus.url = "git+https://git.figtree.dev/alex/locutus";
  };

-  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 {
+  outputs = { self, nixpkgs, home-manager, ... }@inputs: {
    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...
--- a/hosts/alt/configuration.nix
+++ b/hosts/alt/configuration.nix
@@ -11,7 +11,6 @@
      ../modules/base.nix
      ../modules/kafka-mounts.nix
      ../modules/server.nix
-      ../modules/syncthing.nix
      ./caddy.nix
    ];

@@ -21,8 +20,6 @@
    privileged = true;
  };

-  services.syncthing.guiAddress = "0.0.0.0:8384";
-
  networking.firewall.allowedTCPPorts = [
    80 443 # caddy
    8000
@@ -30,7 +27,6 @@
    8010 # audio bookshelf
    8080 # file browser
    8234 # shiori (non-standard)
-    8384 # syncthing
    9117
    8191 # flaresolverr
  ];
--- a/hosts/armitage/configuration.nix
+++ b/hosts/armitage/configuration.nix
@@ -13,15 +13,97 @@
      ../modules/laptop.nix
    ];

+  users.users.michael = {
+    isNormalUser = true;
+    description = "Michael Christian Latino";
+    extraGroups = [  ];
+    packages = with pkgs; [
+    ];
+    shell = pkgs.fish;
+  };
+
  # Bootloader.
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;

  # Use latest kernel.
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_6_12;

  networking.hostName = "armitage";
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  hardware.graphics.enable = true;
+
+  # Load nvidia driver for Xorg and Wayland
+  services.xserver.videoDrivers = ["nvidia" "displaylink" "modesetting"];
+
+  boot = {
+    blacklistedKernelModules = [ "nouveau" ];
+  };
+
+  hardware.nvidia = {
+
+    # Modesetting is required.
+    modesetting.enable = true;
+
+    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+    # Enable this if you have graphical corruption issues or application crashes after waking
+    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
+    # of just the bare essentials.
+    powerManagement.enable = false;
+
+    # Fine-grained power management. Turns off GPU when not in use.
+    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+    powerManagement.finegrained = false;
+
+    # Use the NVidia open source kernel module (not to be confused with the
+    # independent third-party "nouveau" open source driver).
+    # Support is limited to the Turing and later architectures. Full list of
+    # supported GPUs is at:
+    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+    # Only available from driver 515.43.04+
+    open = true;
+
+    # Enable the Nvidia settings menu,
+	# accessible via `nvidia-settings`.
+    nvidiaSettings = true;
+
+    # Optionally, you may need to select the appropriate driver version for your specific GPU.
+    # package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      version = "580.76.05";
+      sha256_64bit = "sha256-IZvmNrYJMbAhsujB4O/4hzY8cx+KlAyqh7zAVNBdl/0=";
+      sha256_aarch64 = "sha256-NL2DswzVWQQMVM092NmfImqKbTk9VRgLL8xf4QEvGAQ=";
+      openSha256 = "sha256-xEPJ9nskN1kISnSbfBigVaO6Mw03wyHebqQOQmUg/eQ=";
+      settingsSha256 = "sha256-ll7HD7dVPHKUyp5+zvLeNqAb6hCpxfwuSyi+SAXapoQ=";
+      persistencedSha256 = "sha256-bs3bUi8LgBu05uTzpn2ugcNYgR5rzWEPaTlgm0TIpHY=";
+    };
+
+    prime = {
+      sync.enable = true;
+
+      amdgpuBusId = "PCI:0:65:0";
+      nvidiaBusId = "PCI:0:64:0";
+    };
+  };
+
+  # packages
+  environment.systemPackages = with pkgs; [
+    displaylink
+    libreoffice
+  ];
+
+  # Already detected directories
+  programs = {
+    direnv = {
+      enable = true;
+      enableBashIntegration = true;
+      nix-direnv.enable = true;
+    };
+  };
+
+  # # display link drivers
+  # systemd.services.dlm.wantedBy = [ "multi-user.target" ];

  # This value determines the NixOS release from which the default
  # settings for stateful data, like file locations and database versions
--- a/hosts/case/configuration.nix
+++ b/hosts/case/configuration.nix
@@ -10,9 +10,8 @@
      ./hardware-configuration.nix
      ../modules/base.nix
      ../modules/desktop.nix
-      ../modules/personal.nix
+      ../modules/home.nix
      ../modules/laptop.nix
-      ../modules/sway.nix
    ];

  # Bootloader.
--- a/hosts/count/configuration.nix
+++ b/hosts/count/configuration.nix
@@ -11,9 +11,7 @@
      ../modules/base.nix
      ../modules/desktop.nix
      ../modules/brother-printer.nix
-      ../modules/personal.nix
-      ../modules/sway.nix
-      ../modules/syncthing.nix
+      ../modules/home.nix
    ];

  # Bootloader.
--- a/hosts/modules/base.nix
+++ b/hosts/modules/base.nix
@@ -11,16 +11,6 @@
    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";
-    size = 1024;
-  }];

  # enable zram. not totally sure if this does it in physical ram or just swap
  zramSwap.enable = true;
@@ -75,7 +65,7 @@
  nix.gc = {
    automatic = true;
    dates = "weekly";
-    options = "--delete-older-than 30d";
+    options = "--delete-older-than 60d";
  };

  # Enable zeroconf
@@ -126,12 +116,14 @@
    fd
    git
    gocryptfs
+    man-pages
    mosh
    neovim
    python314
    ripgrep
    rsync
    silver-searcher
+    sqlite
    tldr
    unzip
    uv
--- a/hosts/modules/desktop.nix
+++ b/hosts/modules/desktop.nix
@@ -1,20 +1,17 @@
 { config, pkgs, inputs, ... }:
 {
  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-    xkb = {
-      layout = "us";
-      variant = "dvorak";
-    };
-  };
+  services.xserver.enable = true;

-  services.displayManager.gdm = {
-    enable = true;
-    wayland = true;
-  };
+  # Enable the GNOME Desktop Environment.
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;

-  services.desktopManager.gnome.enable = true;
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "dvorak";
+  };

  # enable japanese input
  i18n.inputMethod = {
@@ -31,19 +28,19 @@
    enableDefaultPackages = true;

    packages = with pkgs; [
+      bitwarden-desktop
      khmeros
+      libreoffice-fresh
+      nerd-fonts.lilex
+      noto-fonts
      noto-fonts-cjk-sans
      noto-fonts-cjk-serif
-      nerd-fonts.lilex
+      noto-fonts-color-emoji
      fira-code
+      meld
    ];
  };

-  environment.systemPackages = with pkgs; [
-    libreoffice-fresh
-	meld
-  ];
-
  # Enable networking
  networking.networkmanager.enable = true;

@@ -70,10 +67,5 @@
  # services.xserver.libinput.enable = true;

  # Install firefox.
-  programs.firefox = {
-    enable = true;
-    languagePacks = [
-      "en-GB"
-    ];
-  };
+  programs.firefox.enable = true;
 }
--- a/hosts/modules/home.nix
+++ b/hosts/modules/home.nix
@@ -0,0 +1,24 @@
+{ 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
+  ];
+}
--- a/hosts/modules/personal.nix
+++ b/hosts/modules/personal.nix
@@ -1,8 +0,0 @@
-{ config, pkgs, inputs, ... }:
-{
-  # Mullvad vpn
-  services.mullvad-vpn = {
-    enable = true;
-    package = pkgs.mullvad-vpn;
-  };
-}
--- a/hosts/modules/sway.nix
+++ b/hosts/modules/sway.nix
@@ -1,20 +0,0 @@
-{ 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
-	];
-}
--- a/hosts/modules/syncthing.nix
+++ b/hosts/modules/syncthing.nix
@@ -1,11 +0,0 @@
-{ config, pkgs, inputs, ... }:
-{
-  # sync thing
-  services.syncthing = {
-    enable = true;
-    openDefaultPorts = true;
-    user = "alex";
-    configDir = "/home/alex/.config/syncthing";
-    dataDir = "/home/alex";
-  };
-}
Author	SHA1	Message	Date
Alexander Wainwright	5f4e768666	Set delete window longer on work laptop	2025-12-16 13:44:25 +10:00
Alexander Wainwright	3472cc5fb9	Remove duplicate libreoffice	2025-12-16 13:02:30 +10:00
Alexander Wainwright	9a77d382df	Add meld	2025-12-16 13:02:18 +10:00
Alexander Wainwright	f61c516048	Add fonts	2025-12-16 13:01:31 +10:00
Alexander Wainwright	b0180f42b3	Add man, sqlite and node	2025-12-16 13:00:52 +10:00
Alexander Wainwright	1d685b3600	Disable swap file	2025-12-16 13:00:22 +10:00
Alexander Wainwright	32b0b38523	Add michael's user	2025-12-16 13:00:08 +10:00
Alexander Wainwright	24c7043fa2	Add nvidia driver and set kernel version	2025-12-16 12:58:40 +10:00
Alexander Wainwright	7e6f12dac9	Update some font stuff	2025-12-16 12:57:35 +10:00
Alexander Wainwright	e737b45307	Enable mouse in tmux	2025-12-16 12:56:48 +10:00
Alexander Wainwright	db3b4c0441	Add some git config and work email	2025-12-16 12:56:35 +10:00