make it somewhat make sense

5 files changed, 30 insertions, 11 deletions

diff --git a/machines/lemptop.nix b/machines/lemptop.nix
index 5c9b5e0..fb05a3d 100644
--- a/machines/lemptop.nix
+++ b/machines/lemptop.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, modulesPath, ... }:
-
+with lib;
 {
   imports =
     [ (modulesPath + "/installer/scan/not-detected.nix")
@@ -30,6 +30,12 @@
       -----END CERTIFICATE-----
     '';
   };
+  users.users.${ivi.username} = {
+    shell = pkgs.zsh;
+  };
+  environment.shells = [pkgs.bashInteractive pkgs.zsh];
+  environment.pathsToLink = [ "/share/zsh" ];
+  programs.zsh.enable = true;
 
   documentation.dev.enable = true;
   networking.hostName = "lemptop";
diff --git a/mut/bin/vremote b/mut/bin/vremote
index 9cdc9e9..75b404e 100755
--- a/mut/bin/vremote
+++ b/mut/bin/vremote
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if [ -z "$PATH" ]; then
     PATH="/etc/profiles/per-user/$USER/bin:/run/current-system/sw/bin:/usr/bin:/bin"
 fi
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 08e2c06..eb0bcac 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -6,8 +6,8 @@
   ...
 }: with lib; {
   programs.tmux = let
-    config = ''
-        set-option -g default-shell ${pkgs.bashInteractive}/bin/bash
+    cfg = ''
+        set-option -g default-shell ${config.ivi.shell}/bin/zsh
         set -g status off
         set -s set-clipboard on
         setw -g mouse on
@@ -19,6 +19,19 @@
         set -g prefix M-x
         bind M-x send-prefix
 
+        bind -n M-w switch-client -T windows
+        bind -T windows c if 'n=`tmux list-panes | grep -c ^`; [ $n -gt 1 ]' {
+           kill-pane
+        }
+        bind -T windows n splitp
+        bind -T windows N splitp -h
+        bind -T windows h select-pane -L
+        bind -T windows j select-pane -D
+        bind -T windows k select-pane -U
+        bind -T windows l select-pane -R
+        bind -T windows _ resize-pane -Z
+        bind -T windows = selectl even-vertical
+
         set-window-option -g mode-keys vi
         bind-key -T copy-mode-vi v send -X begin-selection
         bind-key -T copy-mode-vi V send -X select-line
@@ -28,9 +41,9 @@
   in {
     enable = true;
   } // (if machine.isDarwin then {
-    tmuxConfig = config;
+    tmuxConfig = cfg;
   } else {
-    extraConfig = config;
+    extraConfig = cfg;
   });
 
   hm = {
diff --git a/profiles/core/lf.nix b/profiles/core/lf.nix
index 9ea30b0..5e1474c 100644
--- a/profiles/core/lf.nix
+++ b/profiles/core/lf.nix
@@ -1,9 +1,9 @@
 {pkgs,config,...}: {
   hm.home.packages = [pkgs.ueberzug pkgs.lf];
   hm.xdg.configFile = {
-    "lf/cleaner".source = config.lib.meta.mkMutableSymlink /mut/lf/cleaner;
-    "lf/scope".source = config.lib.meta.mkMutableSymlink /mut/lf/scope;
-    "lf/lfrc".source = config.lib.meta.mkMutableSymlink /mut/lf/lfrc;
+    # "lf/cleaner".source = config.lib.meta.mkMutableSymlink /mut/lf/cleaner;
+    # "lf/scope".source = config.lib.meta.mkMutableSymlink /mut/lf/scope;
+    # "lf/lfrc".source = config.lib.meta.mkMutableSymlink /mut/lf/lfrc;
     "lf/icons".text = ''
     di	📁
     fi	📃
diff --git a/profiles/station/suckless.nix b/profiles/station/suckless.nix
index 36a299f..2814b8c 100644
--- a/profiles/station/suckless.nix
+++ b/profiles/station/suckless.nix
@@ -11,8 +11,8 @@
     xsession = {
       enable = true;
       initExtra = ''
-      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "remove mod1 = Alt_R"
-      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "add mod3 = Alt_R"
+      ${pkgs.xorg.setxkbmap}/bin/setxkbmap -option "ctrl:swapcaps"
+      ${pkgs.xorg.xset}/bin/xset r rate 220 30
       wal -R
       dwm
       dwmblocks &