Merge pull request 'feature/appimage' (#70) from feature/bitbox02 into main

Reviewed-on: #70

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "lastModified": 1782949081,
+        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782159472,
-        "narHash": "sha256-S+/v+BWz9c8IbGhRM8L4UUVC5j2oZuAHj1b5XlkBjyw=",
+        "lastModified": 1785958398,
+        "narHash": "sha256-5r/JgsoNMTx+qIh83WkxpujEKBR7PF5ssnh5vYCuSAw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "351959fcdbe5cadec1c3434d7abd14dff31af2d5",
+        "rev": "a7c70cc290290f373f50cd820403833d250459ac",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781577229,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "lastModified": 1785967620,
+        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1782160744,
-        "narHash": "sha256-cHC0CeygNx5y07oTyNo6Gkc0k3fD964MRvwQerlImPY=",
+        "lastModified": 1785763201,
+        "narHash": "sha256-wA373y/B9orM3HatLu9oS+Ke5lmdZyBl/bdjd2gLMq4=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "f60bf47332d1564a175ad4b517a83ff0c288f2e7",
+        "rev": "c7be49306b23a952c0151cf4bbeacd944ed82f2a",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782159196,
-        "narHash": "sha256-+2SNFxlnmetcPCIfai0gv89mgnXFQr3kMwLDKUyn0ZE=",
+        "lastModified": 1786013897,
+        "narHash": "sha256-u14Iaus6ROW6IWQUNGZ/IZJ3TcIUs1ngxn5sUMNnwMM=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "a5a5ea605ac68599d29669030d39173f1e1a0c17",
+        "rev": "0247e4c5e5268f8c2a5658b60b97cb5f2eca7766",
         "type": "github"
       },
       "original": {

hosts/argon/configuration.nix

@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../../modules/nixos/appimage.nix
     ../../modules/nixos/astro.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/bootloader.nix

hosts/neon/configuration.nix

@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../../modules/nixos/appimage.nix
     ../../modules/nixos/astro.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/bootloader.nix

modules/home-manager/tmux.nix

@@ -1,60 +1,123 @@
 { config, pkgs, inputs, ... }:
 
+let
+  # Powerline separators, U+E0B0..U+E0B3.
+  #
+  # Written as escapes rather than literal glyphs. These are Private Use Area
+  # codepoints: they render only with a patched font, they survive copy/paste
+  # badly, and when they get stripped the loss is invisible, the config still
+  # parses, the status bar just quietly loses its separators. Nix has no \u
+  # escape of its own, but fromJSON does.
+  sep = builtins.fromJSON ''
+    {
+      "right":     "\ue0b0",
+      "rightThin": "\ue0b1",
+      "left":      "\ue0b2",
+      "leftThin":  "\ue0b3"
+    }
+  '';
+in
 {
   programs.tmux = {
+    # defaults
     enable = true;
     prefix = "C-a";
     keyMode = "vi";
     mouse = true;
-    terminal = "screen-256color";
+
+    # tmux-256color gives truecolor, italics and undercurl in nvim.
+    terminal = "tmux-256color";
+
+    # Default is 500ms. Causes lag you feel when leaving insert mode in nvim,
+    # because tmux is waiting to see whether Esc starts an escape sequence.
+    escapeTime = 10;
+
+    # nvim autoread / :checktime react to focus.
+    focusEvents = true;
+
+    # History limit.
+    historyLimit = 50000;
+
+    # Window numbers matching the number row.
+    baseIndex = 1;
+
     extraConfig = ''
       # Status keys
       set -g status-keys vi
+
+      # Tell tmux the outer terminal can do 24-bit colour (tmux >= 3.2).
+      set -sa terminal-features ",*:RGB"
+
+      # Shift+Enter / extended keys
+      # These make tmux forward CSI-u sequences unconditionally.
+      # Needs tmux >= 3.5 for the format option,
+      set -s extended-keys always
+      set -s extended-keys-format csi-u
+      set -as terminal-features '*:extkeys'
+
       # Status bar options
-      set -g status-interval 1
-      set -g status on
+      set -g status-interval 5
       set -g status-justify left
+
       # Clock mode
       setw -g clock-mode-colour cyan
+
       # Colors
       set -g status-bg black
       set -g status-fg white
+
       # Key bindings
-      # Reload configuration 
-      bind r source-file ~/.config/tmux/tmux.conf
-      # Panel split and selection
+      bind r source-file ~/.config/tmux/tmux.conf \; display-message "tmux.conf reloaded"
+
+      # Panel split and selection, new panes/windows inherit the cwd
       unbind %
       unbind '"'
-      bind v split-window -v
-      bind c split-window -h
-      bind i new-window
-      bind b previous-window
-      bind n next-window
+      bind v split-window -v -c "#{pane_current_path}"
+      bind c split-window -h -c "#{pane_current_path}"
+      bind i new-window -c "#{pane_current_path}"
+      bind -r b previous-window
+      bind -r n next-window
+
       # Move around panes with hjkl
       bind h select-pane -L
       bind j select-pane -D
       bind k select-pane -U
       bind l select-pane -R
+
       # Resize panes
-      bind H resize-pane -L 5
-      bind J resize-pane -D 5
-      bind K resize-pane -U 5
-      bind L resize-pane -R 5
+      bind -r H resize-pane -L 5
+      bind -r J resize-pane -D 5
+      bind -r K resize-pane -U 5
+      bind -r L resize-pane -R 5
+
       # Wayland clipboard integration
       # Copy selection to both clipboard (Ctrl+V / Shift+Insert) and primary (middle-click)
+      bind -T copy-mode-vi v send-keys -X begin-selection
+      bind -T copy-mode-vi C-v send-keys -X rectangle-toggle
       bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
       bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
       bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
+      # Uncomment if you want yanks to also travel over SSH via OSC52.
+      # Locally redundant with wl-copy above.
+      #set -g set-clipboard on
+
       # Kill commands
-      bind q kill-window
-      bind Q kill-session
+      bind q confirm-before -p "kill window #W? (y/n)" kill-window
+      bind Q confirm-before -p "kill session #S? (y/n)" kill-session
+
       # Bars
+      # This is the nord-tmux status line. #{prefix_highlight} came from that
+      # theme's tmux-prefix-highlight integration -- a plugin you never loaded,
+      # so the token expanded to nothing. tmux can do it natively. Commas inside
+      # #{?...} are argument separators and have to be escaped as #, hence the
+      # look of the style spec.
       set -g status-left-length 24
-      set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]"
-      set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H "
+      set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]${sep.right}"
+      set -g status-right "#{?client_prefix,#[fg=black#,bg=yellow#,bold] ^A ,}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.left}#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.leftThin}#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]${sep.left}#[fg=black,bg=cyan,bold] #H "
+
       # Windows
-      set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"
-      set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]"
+      set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore]${sep.right} #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.rightThin} #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.right}"
+      set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore]${sep.right} #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore]${sep.rightThin} #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]${sep.right}"
       set -g window-status-separator ""
     '';
   };

modules/nixos/appimage.nix

@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # AppImages ship a squashfs payload that the bundled runtime mounts through
+  # libfuse.so.2 at startup. nix-ld resolves the ELF interpreter but not that
+  # dlopen, so running one directly dies with "dlopen(): error loading
+  # libfuse.so.2". appimage-run sidesteps the mount entirely: it unpacks the
+  # image and runs the payload inside an FHS sandbox, which the bundled Qt and
+  # electron style binaries need anyway.
+  #
+  # Used for the BitBox02 wallet AppImage, downloaded fresh from
+  # https://bitbox.swiss/download/ rather than installed from nixpkgs.
+  programs.appimage = {
+    enable = true;
+    # register AppImages with binfmt_misc so ./Something.AppImage runs as-is,
+    # no appimage-run prefix to remember.
+    binfmt = true;
+  };
+}

modules/nixos/bootloader.nix

@@ -17,7 +17,7 @@
   };
 
   # kernel options
-  boot.kernelParams = [ "quiet" "acpi.debug_level=0"];
+  boot.kernelParams = [ "quiet" "acpi.debug_level=0" ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.consoleLogLevel = 2;
 

modules/nixos/packages.nix

@@ -4,6 +4,7 @@
   # system packages
   environment.systemPackages = with pkgs; [
     btop
+    cifs-utils
     cowsay
     dnsutils
     ethtool
@@ -20,6 +21,7 @@
     ltrace
     mtr
     neovim
+    nfs-utils
     nh
     nix-output-monitor
     nmap
@@ -34,9 +36,9 @@
     unzip
     usbutils
     vim
-    wl-clipboard
     wget
     which
+    wl-clipboard
     xz
     zip
     zstd