komashi: updates, flake updates

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/0b6f96a6b9efcfa8d3cc8023008bcbcd1b9bc1a4' (2025-02-08)
  → 'github:lnl7/nix-darwin/a6746213b138fe7add88b19bafacd446de574ca7' (2025-02-11)
• Updated input 'home-manager':
    'github:nix-community/home-manager/5af1b9a0f193ab6138b89a8e0af8763c21bbf491' (2025-02-08)
  → 'github:nix-community/home-manager/83bd3a26ac0526ae04fa74df46738bb44b89dcdd' (2025-02-11)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=7d4912bcf9028db491fe1061d3efcf2392c4bd76' (2025-02-09)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=3bca42eb0049772d9079f29f25186575f8e5a4ae' (2025-02-10)
• Updated input 'niri':
    'github:sodiboo/niri-flake/c5a3826e2bf96f3092b79415e17703a7b194e1a8' (2025-02-09)
  → 'github:sodiboo/niri-flake/498e8bbc149b38fd14d4ff7fbf31c49fdaa23282' (2025-02-12)
• Updated input 'niri/niri-unstable':
    'github:YaLTeR/niri/397e704d644d1bfe7736f2fdacbfe5742c7b2f9f' (2025-02-07)
  → 'github:YaLTeR/niri/7e552333a993e83a2dba52392109617e486f5f60' (2025-02-12)
• Updated input 'niri/nixpkgs':
    'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547' (2025-02-08)
  → 'github:NixOS/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a' (2025-02-10)
• Updated input 'niri/nixpkgs-stable':
    'github:NixOS/nixpkgs/a45fa362d887f4d4a7157d95c28ca9ce2899b70e' (2025-02-08)
  → 'github:NixOS/nixpkgs/44534bc021b85c8d78e465021e21f33b856e2540' (2025-02-10)
• Updated input 'niri/xwayland-satellite-unstable':
    'github:Supreeeme/xwayland-satellite/3944c9a0e40e5629f16ad023bbc90dac80d35a0f' (2025-01-25)
  → 'github:Supreeeme/xwayland-satellite/44590a416d4a3e8220e19e29e0b6efe64a80315d' (2025-02-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547' (2025-02-08)
  → 'github:NixOS/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a' (2025-02-10)
• Updated input 'stylix':
    'github:danth/stylix/eb5f81756731a3eefa42b1caf494ba5a9c8aedb4' (2025-02-10)
  → 'github:danth/stylix/d8289c3f0e5995863921ea207392c122f5d59f6d' (2025-02-11)
• Added input 'stylix/tinted-schemes':
    'github:tinted-theming/schemes/ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9' (2025-01-22)

flake.lock

@@ -33,11 +33,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731270564,
+        "lastModified": 1738524606,
-        "narHash": "sha256-6KMC/NH/VWP5Eb+hA56hz0urel3jP6Y6cF2PX6xaTkk=",
+        "narHash": "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=",
         "owner": "zhaofengli",
         "repo": "attic",
-        "rev": "47752427561f1c34debb16728a210d378f0ece36",
+        "rev": "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738033138,
+        "lastModified": 1739548217,
-        "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
+        "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
+        "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0",
         "type": "github"
       },
       "original": {
@@ -483,11 +483,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738228963,
+        "lastModified": 1739724290,
-        "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=",
+        "narHash": "sha256-dvByZPuVmBgOBLq8GohBy9hEd0/JXj5goXK2OY1Pvgk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8",
+        "rev": "ec130e700959ee10b63eedbc87758d20264a9588",
         "type": "github"
       },
       "original": {
@@ -505,11 +505,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736785676,
+        "lastModified": 1737630279,
-        "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
+        "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
+        "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c",
         "type": "github"
       },
       "original": {
@@ -527,11 +527,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1738174211,
+        "lastModified": 1739715375,
-        "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=",
+        "narHash": "sha256-JoEraLxp/7wlR95rV0ze59578K36DiguwfFO//BUjf4=",
         "ref": "refs/heads/main",
-        "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a",
+        "rev": "e12deec9fb99383392ba3dbb936d2dc77ae50d03",
-        "revCount": 17329,
+        "revCount": 17415,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
@@ -570,11 +570,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1738237661,
+        "lastModified": 1739627445,
-        "narHash": "sha256-9QNTd6lazGEqDEkI13itPwq6uvh9z7LGmn4OY1+xAL0=",
+        "narHash": "sha256-fl1kOwskXXa5dJsRcly9e+UaOTdjdvy8Jqg9WhKe0Nw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "5921aa096d1bc92fb1960f8f1db78f58a96b4c51",
+        "rev": "b4f7ae09bc209e76944fed4648191dac8381ca76",
         "type": "github"
       },
       "original": {
@@ -603,11 +603,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1738234654,
+        "lastModified": 1739625307,
-        "narHash": "sha256-HJR2r/e4ZxbAfLYHNrQD8vaxZDZvKpma9jchJr8zYH8=",
+        "narHash": "sha256-BVTlrmelSAq+rlxwlRvsyZxHrmcviRu3aHJYG37Yq8c=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "fb5fedbf24aa66909bb9d112856f27ceb04766a8",
+        "rev": "f01c840ebe71f152906dbc6212f077fc72626f89",
         "type": "github"
       },
       "original": {
@@ -699,11 +699,11 @@
     },
     "nix-hardware": {
       "locked": {
-        "lastModified": 1737751639,
+        "lastModified": 1738816619,
-        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
+        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
+        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
         "type": "github"
       },
       "original": {
@@ -758,11 +758,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1737751639,
+        "lastModified": 1738816619,
-        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
+        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
+        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
         "type": "github"
       },
       "original": {
@@ -852,11 +852,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1738163270,
+        "lastModified": 1739484910,
-        "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=",
+        "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0",
+        "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
         "type": "github"
       },
       "original": {
@@ -915,11 +915,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1738142207,
+        "lastModified": 1739446958,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
         "type": "github"
       },
       "original": {
@@ -931,11 +931,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1738142207,
+        "lastModified": 1739446958,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
         "type": "github"
       },
       "original": {
@@ -962,10 +962,10 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1737632463,
+        "lastModified": 1739214665,
-        "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
+        "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
-        "path": "/nix/store/8dh0832snzamw6wk2rdfjz29xdzgma49-source",
+        "path": "/nix/store/zbvf6xwri9kvf42xl3vai3mx8jry6ax8-source",
-        "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
+        "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
         "type": "path"
       },
       "original": {
@@ -1139,15 +1139,16 @@
         "systems": "systems_6",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
+        "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1738025638,
+        "lastModified": 1739375014,
-        "narHash": "sha256-nU3JpvIeEmcDHzQK4OTD1KXSoL/GOff6j9kuSO4X8eM=",
+        "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "55418e8fc8d4696af619176a22cefcfac56ad2ef",
+        "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777",
         "type": "github"
       },
       "original": {
@@ -1302,6 +1303,22 @@
         "type": "github"
       }
     },
+    "tinted-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737565458,
+        "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
     "tinted-tmux": {
       "flake": false,
       "locked": {
@@ -1372,11 +1389,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1737837494,
+        "lastModified": 1739246919,
-        "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=",
+        "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f",
+        "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -145,8 +145,6 @@
         ./nixos/configs/mount-rsync-kate.nix
         ./nixos/configs/mount-fastmail-tmllc.nix
 
-        ./nixos/services/taskwarrior.nix
-
         ./nixos/overlays/fixup-canon.nix
 
         #

nixos/configs/gui/niri.nix

@@ -217,6 +217,14 @@ in
               proportion = 1.0;
             };
           }
+
+          # Keep our system monitor on the monitoring screen.
+          {
+            matches = [ { app-id = "io.missioncenter.MissionCenter"; } ];
+            open-on-output = "Shenzhen Soogeen Electronics Co., LTD. L01N8A 0x01348C5C";
+            open-fullscreen = true;
+            open-focused = false;
+          }
         ];
 
         #
@@ -353,6 +361,7 @@ in
 
               niri msg action spawn -- ${xwayland-satellite-loop}/bin/xwayland-satellite-loop
               niri msg action spawn -- home-assistant-desktop
+              niri msg action spawn -- ${pkgs.mission-center}/bin/missioncenter
 
               sleep 10
 

nixos/configs/printing.nix

@@ -7,13 +7,12 @@
 {
   services.printing = {
 
-    # Run as a "stateless" service in which printing is 
+    # Run as a "stateless" service in which printing is
     # configrued via Nix.
     enable = true;
     stateless = true;
 
     drivers = [
-      pkgs.canon-cups-ufr2
     ];
   };
 

nixos/configs/syncthing.nix

@@ -11,6 +11,7 @@ let
     "aigis"       = { id = "VKRQ6Q4-CCLJR2I-ECOWXRE-TANA2QZ-BJIAPCN-FFVJSB4-GYJNS4R-Z3LLHQ5"; };
     "hinata"      = { id = "2SFRG2A-AZ3XPMN-H3RK2Z6-UXPBPIN-DJN7AMN-JBOY23D-EZGFYNR-HRBI2AY"; };
     "miko"        = { id = "BTJ3C7W-DBPNTTV-NBKNLNM-SYSGFRZ-VG7ODVU-66RQTO7-XXHYXEY-HX323A6"; };
+    "komashi"     = { id = "ND72W65-APMFRHT-LS5UFJV-C4WMOEF-CYCZA25-BQOOD5H-645AT6X-YQTMOAV"; };
   };
 in
 {

nixos/dotfiles/default.nix

@@ -11,8 +11,6 @@
 
   # Additional HM config modules.
   imports = [
-    (normalizeModule ./kakoune.hm.nix)
-    (normalizeModule ./kakoune-lsp.hm.nix)
     (normalizeModule ./git.hm.nix)
     (normalizeModule ./talon.hm.nix)
   ];

nixos/dotfiles/droid.nix

@@ -7,7 +7,5 @@
 
   # Additional HM config modules.
   imports = [
-    (normalizeModule ./kakoune.hm.nix)
-    (normalizeModule ./kakoune-lsp.hm.nix)
   ];
 }

nixos/dotfiles/hm.nix

@@ -6,6 +6,9 @@
   # Tie our configruation to the version it was written for.
   home.stateVersion = "24.05";
 
+  # Disable Home Manager's various asseritons, as many of them break things. T_T
+  assertions = lib.mkForce [];
+
   #
   # "Raw file" dotfiles.
   # These aren't generated by Nix, specifically so we can use them on Windows as well.

nixos/hosts/komashi/cellular.nix

@@ -6,6 +6,7 @@
 {
   pkgs,
   deprekages,
+  config,
   ...
 }:
 {
@@ -135,6 +136,28 @@
       # Let anyone execute this.
       mode = "555";
     };
+
+    # Work properly with KPN's 4-over-6 IP-wonk.
+    services.clatd = {
+      enable = true;
+      settings = {
+        ip6tables-enable = true;
+        v4-conncheck-delay = 1;
+      };
+    };
+    networking.networkmanager.dispatcherScripts = [{
+      source = pkgs.writeShellScript "magic" ''
+        if [[ "$DEVICE_IFACE" == wwan* ]]; then
+          if [[ "$NM_DISPATCHER_ACTION" == "up" ]]; then
+            printf '[Service]\nExecStart=\nExecStart=${config.systemd.services.clatd.serviceConfig.ExecStart} dns64-servers=%s' "$(printf "%s" "$IP6_NAMESERVERS" | ${pkgs.coreutils}/bin/tr ' ' ',')" | ${pkgs.systemd}/bin/systemctl edit --stdin clatd.service --runtime
+            ${pkgs.systemd}/bin/systemctl restart clatd
+          fi
+          if [[ "$NM_DISPATCHER_ACTION" == "down" ]]; then
+            ${pkgs.systemd}/bin/systemctl restart clatd
+          fi
+        fi
+      '';
+    }];
   };
 
 }

nixos/hosts/komashi/default.nix

@@ -111,7 +111,7 @@
   };
 
   # Override stylix font sizes.
-  stylix.fonts.sizes.desktop = lib.mkForce 24;
+  stylix.fonts.sizes.desktop = lib.mkForce 16;
 
   #
   # Hardware config.

nixos/hosts/trailblazer/default.nix

@@ -154,6 +154,38 @@ in
   #
   # Niri configuration for our monitors.
   #
+  home-manager.users.deprekated = {
+    programs.niri.settings = {
+
+      # Center monitor.
+      outputs."LG Electronics LG ULTRAFINE 408NTYT4A658" = {
+        position = {
+          x = 0;
+          y = 0;
+        };
+        scale = 1.5;
+        transform.rotation = 270;
+      };
+
+      # Laptop screen.
+      outputs."Samsung Electric Company Odyssey G70B H1AK50000" = {
+        position = {
+          x = 1440;
+          y = 0;
+        };
+        scale = 1.5;
+      };
+
+      # Front panel display.
+      outputs."Shenzhen Soogeen Electronics Co., LTD. L01N8A 0x01348C5C" = {
+        scale = 1.0;
+        transform.rotation = 90;
+      };
+    };
+
+    # Also position waybar on only one monitor.
+    programs.waybar.settings.mainBar.output = "DP-2";
+  };
 
   # Override stylix font sizes.
   stylix.fonts.sizes.desktop = lib.mkForce 16;

nixos/packages/default.pkgs.nix

@@ -22,7 +22,6 @@ with pkgs;
   nix-index
   rsync
   tree-sitter
-  deprekages.kak-tree-sitter
   tmux
   deprekages._7zz
 
@@ -33,8 +32,6 @@ with pkgs;
   khal
   vit
   tasksh
-  taskwarrior-tui
-  taskwarrior3
   taskjuggler
   deprekages.hrvst-cli
 
@@ -60,7 +57,7 @@ with pkgs;
   agenix.agenix
   atool
   bat
-  bitwarden-cli
+  #bitwarden-cli
   bzip2
   cardpeek
   cpio
@@ -155,7 +152,7 @@ with pkgs;
   ))
 
   # Reversing.
-  binwalk
+  #binwalk
 
   # Development.
   colmena
@@ -231,7 +228,7 @@ with pkgs;
       dig
       magic-wormhole
 
-      jadx
+      #jadx
 
       steam-run
       attic.attic
@@ -244,7 +241,6 @@ with pkgs;
 ++ (
   if (!is-hm-standalone && !is-droid) then
     [
-      kakoune
     ]
   else
     [ ]

nixos/packages/gui.pkgs.nix

@@ -13,7 +13,7 @@
 let
 
 	# Hack wine to not explode when starting MLO.
-  wineWayland = pkgs.wineWowPackages.waylandFull;
+  wineWayland = pkgs.wineWowPackages.full;
   wine = wineWayland.overrideAttrs (prev: {
 
 		patches = prev.patches ++ [

packages/mergiraf.nix

@@ -6,7 +6,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mergiraf";
-  version = "0.3.1";
+  version = "0.5.1";
 
   doCheck = false;
 
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec {
     owner = "mergiraf";
     repo = "mergiraf";
     rev = "v${version}";
-    hash = "sha256-ORCGGSODZnZH3Ukzmqrweth4KggWGt5YFYEqA4DbTls=";
+    hash = "sha256-CiZG0O5F2sidInSFUtB1q5GSfTIjX9xUr52y0TZ5tDs=";
   };
 
-  cargoHash = "sha256-Rr59x+/sDA0ttkVZh7hVhnvkNogQj9q9aXomNjHIXII=";
+  cargoHash = "sha256-ldgFCq2MaFmJhTcPx8zTLX7ErgNGlSqRaQRr9fWf1uU=";
 
   meta = {
     description = "A syntax-aware git merge driver for a growing collection of programming languages and file formats";

wezterm/wezterm.lua

@@ -213,6 +213,7 @@ font_overrides = {
 	trailblazer = 11,
 	kanbaru = 12,
 	aigis = 12;
+	komashi = 12;
 }
 
 if font_overrides[hostname] ~= nil then