ble.sh: fix newlines inserted at the top of the terminal

flake.lock

@@ -145,11 +145,11 @@
     },
     "fork": {
       "locked": {
-        "lastModified": 1712959986,
-        "narHash": "sha256-/4PhrnC+W5gWJAiRDf3tfLouxJc1UhSAnCpwKf1q1K4=",
+        "lastModified": 1713097260,
+        "narHash": "sha256-SeVFaTcyoFAH55RjlH0W72OkGZNUVIpSQ9lQdQG9Xjk=",
         "owner": "teutat3s",
         "repo": "nixpkgs",
-        "rev": "2186dafc19798a5314d42c126b7520957e019cef",
+        "rev": "de9ce02bdc6d778fc7f6ac4d65e71c98dc9623d2",
         "type": "github"
       },
       "original": {
@@ -182,11 +182,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1712662562,
-        "narHash": "sha256-rlY2j5lNyOLbuYKT6zY3HlXfBM+w7qWhfOqCTHshPw0=",
+        "lastModified": 1713124637,
+        "narHash": "sha256-RU0SoHGn2aYXYcnjCBg4/1S+zMZx9tA1dPUE+P2IH9g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c81c2414155adffb06d68b894f791dc243ecf2ae",
+        "rev": "ec2cb66cbeac92550b324009773b83401a9e2477",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1712566108,
-        "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=",
+        "lastModified": 1712909959,
+        "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465",
+        "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
         "type": "github"
       },
       "original": {
@@ -265,11 +265,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712741485,
-        "narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
+        "lastModified": 1713013257,
+        "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
+        "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
         "type": "github"
       },
       "original": {
@@ -445,11 +445,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1712608508,
-        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
+        "lastModified": 1712963716,
+        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
+        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
         "type": "github"
       },
       "original": {

hosts/fae/fae.nix

@@ -20,6 +20,7 @@
     services.openssh = {
       enable = true;
       openFirewall = true;
+      allowSFTP = true;
     };
 
     boot.kernelParams = [

hosts/fae/paperless.nix

@@ -48,17 +48,17 @@ in {
     dataDir = dataDir;
     address = "127.0.0.1";
     extraConfig = {
-      PAPERLESS_OCR_LANGUAGE = "nld+deu";
       PAPERLESS_ADMIN_USER = psCfg.user.name;
       PAPERLESS_AUTO_LOGIN_USERNAME = psCfg.user.name;
       PAPERLESS_URL = "https://paperless.faenix.eu";
     };
   };
 
-  #hardware.sane = {
-  #  enable = true;
-  #  extraBackends = [pkgs.hplipWithPlugin];
-  #};
+  hardware.sane = {
+    enable = true;
+    # No aarch64 support for now
+    #brscan5.enable = true;
+  };
 
   users.users."${psCfg.user.name}".packages = with pkgs; [
     scan2paperless
@@ -85,6 +85,7 @@ in {
     recommendedGzipSettings = true;
     recommendedTlsSettings = true;
     recommendedProxySettings = true;
+    clientMaxBodySize = "256m";
 
     virtualHosts = {
       "paperless.faenix.eu" = {

modules/terminal-life/bash/default.nix

@@ -9,7 +9,8 @@
 in {
   enable = true;
 
-  historyControl = ["ignorespace"];
+  historyControl = ["ignoredups" "ignorespace"];
+  historyFileSize = 300000;
 
   # Run when initializing a login shell
   profileExtra = if config.programs.sway.enable then ''
@@ -73,7 +74,28 @@ in {
     # Bash vim mode keybindings
     if [[ $- == *i* ]]; then # in interactive session
       set -o vi
+    fi
 
+    # Don't show a mode name in the normal mode
+    function ferdinandyb/set-up-mode-indicator {
+      # Define \q{ferdinandyb/mode-indicator}
+      function ble/prompt/backslash:ferdinandyb/mode-indicator {
+        if local mode; ble/keymap:vi/script/get-mode; [[ $mode != i ]]; then
+          # call the built-in mode indicator
+          ble/prompt/process-prompt-string '\q{keymap:vi/mode-indicator}'
+        fi
+      }
+
+      # Specify \q{ferdinandyb/mode-indicator} in the mode-indicator prompt
+      bleopt prompt_vi_mode_indicator='\q{ferdinandyb/mode-indicator}'
+
+      # In case you would like to show "-- NORMAL --" instead of "~"
+      bleopt keymap_vi_mode_string_nmap=$'\e[1m-- NORMAL --\e[m'
+    }
+    blehook/eval-after-load keymap_vi ferdinandyb/set-up-mode-indicator
+
+    function blerc/vim-mode-hook {
+      # Write your settings for vi/vim mode here
       ble-bind -m vi_imap -f 'ENTER' 'vi_imap/complete'
       ble-bind -m vi_imap -f 'TAB' 'vi_imap/complete'
 
@@ -87,7 +109,9 @@ in {
       ble-bind -m vi_nmap -f 'l' 'vi-command/forward-char'
 
       ble-bind -m vi_imap -f 'C-c' discard-line
-    fi
+
+    }
+    blehook/eval-after-load keymap_vi blerc/vim-mode-hook
 
     # end of .bashrc
     # Somehow we need to ensure starship starts later than ble.sh

overlays/element-desktop.nix

@@ -1,56 +0,0 @@
-final: prev: {
-  element-desktop = prev.element-desktop.overrideAttrs (oldAttrs: rec {
-
-  installPhase =
-    let
-      libPath = prev.lib.makeLibraryPath [
-        prev.libnotify
-      ];
-  executableName = "element-desktop";
-  desktopItem = prev.makeDesktopItem {
-    name = "element-desktop";
-    exec = "${executableName} %u";
-    icon = "element";
-    desktopName = "Element";
-    genericName = "Matrix Client";
-    comment = oldAttrs.meta.description;
-    categories = [ "Network" "InstantMessaging" "Chat" ];
-    startupWMClass = "element";
-    mimeTypes = [ "x-scheme-handler/element" ];
-  };
-    in
-  ''
-    runHook preInstall
-
-    # resources
-    mkdir -p "$out/share/element"
-    ln -s '${prev.element-web}' "$out/share/element/webapp"
-    cp -r '.' "$out/share/element/electron"
-    cp -r './res/img' "$out/share/element"
-    rm -rf "$out/share/element/electron/node_modules"
-    cp -r './node_modules' "$out/share/element/electron"
-    cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
-    ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
-
-    # icons
-    for icon in $out/share/element/electron/build/icons/*.png; do
-      mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
-      ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
-    done
-
-    # desktop item
-    mkdir -p "$out/share"
-    ln -s "${desktopItem}/share/applications" "$out/share/applications"
-
-    # executable wrapper
-    # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
-    makeWrapper '${prev.electron}/bin/electron' "$out/bin/element-desktop" \
-      --set LD_PRELOAD ${prev.sqlcipher}/lib/libsqlcipher.so \
-      --set LD_LIBRARY_PATH "${libPath}" \
-      --add-flags "$out/share/element/electron" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WebRTCPipeWireCapturer,WaylandWindowDecorations}}"
-
-    runHook postInstall
-  '';
-  });
-}