update from lemptop

4 files changed, 20 insertions, 19 deletions

diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 51e2f91..bfebed3 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -32,7 +32,7 @@
         uid = mkIf (!machine.isDarwin) 1000;
         description = ivi.realName;
         openssh.authorizedKeys.keys = ivi.sshKeys;
-        extraGroups = ["wheel" "networkmanager" "docker" "transmission"];
+        extraGroups = ["wheel" "networkmanager" "docker" "transmission" "dialout"];
         isNormalUser = true;
       };
       root = {
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 5238800..f535e57 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -40,8 +40,11 @@
       '';
   in {
     enable = true;
+  } // (if machine.isDarwin then {
+    tmuxConfig = cfg;
+  } else {
     extraConfig = cfg;
-  };
+  });
 
   hm = {
     fonts.fontconfig.enable = true;
@@ -120,15 +123,12 @@
       zsh = {
         enable = true;
         completionInit = ''
-        if type brew &>/dev/null; then
-          FPATH="$(brew --prefix)/share/zsh/site-functions:''${FPATH}"
-        fi
-        autoload -U compinit select-word-style select-word-style
-        select-word-style bash
-        zstyle ':completion:*' menu select
-        zmodload zsh/complist
-        compinit
-        _comp_options+=(globdots) # Include hidden files.
+          autoload -U compinit select-word-style select-word-style
+          select-word-style bash
+          zstyle ':completion:*' menu select
+          zmodload zsh/complist
+          compinit
+          _comp_options+=(globdots) # Include hidden files.
         '';
         initExtra = ''
           # Use vim keys in tab complete menu:
@@ -136,15 +136,14 @@
           bindkey -M menuselect 'k' vi-up-line-or-history
           bindkey -M menuselect 'l' vi-forward-char
           bindkey -M menuselect 'j' vi-down-line-or-history
-          bindkey -M menuselect 'n' vi-forward-blank-word
-          bindkey -M menuselect 'p' vi-backward-blank-word
+          set -o emacs
 
 
           # Use lf to switch directories and bind it to ctrl-o
           lfcd () {
               tmp="$(mktemp -uq)"
               trap 'rm -f $tmp >/dev/null 2>&1 && trap - HUP INT QUIT TERM EXIT' HUP INT QUIT TERM EXIT
-              EDITOR=vremote lf -last-dir-path="$tmp" "$@"
+              EDITOR=vremote lfub -last-dir-path="$tmp" "$@"
               if [ -f "$tmp" ]; then
                   dir="$(cat "$tmp")"
                   [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
@@ -174,6 +173,7 @@
           ssh-add -l > /dev/null || ssh-add ~/.ssh/id_ed25519_sk
         '';
         shellAliases = {
+          open          = "xdg-open ";
           k9s           = "k9s ";
           k             = "kubectl ";
           d             = "docker ";
@@ -276,8 +276,7 @@
       enableSshSupport = false;
       defaultCacheTtl = 34550000;
       maxCacheTtl = 34550000;
-      # pinentryFlavor = "gtk2";
-      pinentryPackage = pkgs.pinentry-gtk2;
+      pinentryFlavor = "gtk2";
     };
   };
 }
diff --git a/profiles/core/lf.nix b/profiles/core/lf.nix
index 5e1474c..2fb11f6 100644
--- a/profiles/core/lf.nix
+++ b/profiles/core/lf.nix
@@ -1,5 +1,5 @@
 {pkgs,config,...}: {
-  hm.home.packages = [pkgs.ueberzug pkgs.lf];
+  hm.home.packages = [pkgs.ueberzugpp pkgs.lf pkgs.nsxiv];
   hm.xdg.configFile = {
     # "lf/cleaner".source = config.lib.meta.mkMutableSymlink /mut/lf/cleaner;
     # "lf/scope".source = config.lib.meta.mkMutableSymlink /mut/lf/scope;
diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix
index 4d16657..7a3c0fb 100644
--- a/profiles/station/packages.nix
+++ b/profiles/station/packages.nix
@@ -12,6 +12,9 @@
       bashInteractive
       powershell
 
+      arduino-ide
+      arduino-cli
+
       k9s
       krew
       azure-cli
@@ -21,16 +24,15 @@
       ]))
       imagemagick
     ] ++ (optionals (!machine.isDarwin) [
+      xdotool
       pywal
       dasel
-      ueberzug
       inotify-tools
       raylib
       maim
       profanity
       mypaint
       lynx
-      sxiv
       sent
       initool
       dmenu