From eeca795d8a48f7e19c4a2cfc6fcad22121ea3ee2 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Fri, 27 Sep 2024 14:17:11 -0400
Subject: [PATCH] configuring

---
 dotfiles/dot_config/kmonad/quefrency.kbd | 22 ++++++++++++++++++----
 home/home.nix                            |  6 ++++++
 system/eddie/configuration.nix           |  5 +++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/dotfiles/dot_config/kmonad/quefrency.kbd b/dotfiles/dot_config/kmonad/quefrency.kbd
index c5124d6..b274c8a 100644
--- a/dotfiles/dot_config/kmonad/quefrency.kbd
+++ b/dotfiles/dot_config/kmonad/quefrency.kbd
@@ -9,13 +9,27 @@
   tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
   caps a    s    d    f    g    h    j    k    l    ;    '    ret
   lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rmet
+  lctl nlck lmet lalt           spc            ralt rmet slck
 )
 
+(defalias
+  ctrlesc (tap-hold 100 esc lctrl)
+  sp-lsft (tap-hold 100 \( lsft)
+  sp-rsft (tap-hold 100 \) lsft)
+  hypr C-A-M-S)
+
 (deflayer qwerty
   grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
   tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
-  lctrl a    s    d    f    g    h    j    k    l    ;    '    ret
-  lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lalt lmet           spc            rmet ralt
+  @ctrlesc a    s    d    f    g    h    j    k    l    ;    '    ret
+  @sp-lsft z    x    c    v    b    n    m    ,    .    /    @sp-rsft
+  @hypr lctl lalt lmet           spc            rmet ralt @hypr
+)
+
+(deflayer fkeys
+  esc  f1   f2   f3   f4   f5   f6   f7   f8   f9   f10   f11    f12  bspc
+  -  -    -    -    -    -    -    -    -    -    -    -    -    -
+  - -    -    -    -    -    -    -    -    -    -    -    -
+  - -    -    -    -    -    -    -    -    -    -    -
+  - - - -           -            - - -
 )
diff --git a/home/home.nix b/home/home.nix
index 6c9d01e..200ded3 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -41,6 +41,12 @@
       wezterm 
       emacs
       fish
+      fishPlugins.foreign-env
+      fishPlugins.z
+      fishPlugins.fzf
+      fishPlugins.fifc
+      fishPlugins.bass
+      fishPlugins.autopair
       starship
       lazygit
       nnn
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index d7b07b3..04b0cf0 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -163,8 +163,8 @@
   # enable fish and launch it from bash for interactive shells
   programs.fish.enable = true;
   programs.bash = {
-	    interactiveShellInit = ''
-	      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+	  interactiveShellInit = ''
+	     if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
 	      then
 	        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
 	        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
@@ -187,6 +187,7 @@
     rsync
     #kanata
     kmonad
+    fishPlugins.foriegn-env
   ];
 
   #systemd.services.kanata = {