updates

4 files changed, 34 insertions, 31 deletions

diff --git a/.bashrc b/.bashrc
index 790d6d4..e03f566 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,23 +1,3 @@
-sessionizer() {
-  DIR=$(fdfind --type d --strip-cwd-prefix -L -H | fzf)
-  SESSION_NAME="$DIR_$(date +%M%S)"
-
-  if [ -n "$DIR" ]
-  then
-    if [ "$1" == "-cd" ]
-    then
-      cd $DIR
-      return
-    fi
-    tmux new-session -d -c "$DIR" -s "$SESSION_NAME"
-    if [ -n "$TMUX" ]
-    then
-      tmux switch -t "$SESSION_NAME"
-    else
-      tmux attach -t "$SESSION_NAME"
-    fi
-  fi
-}
-
+source $HOME/.sessionizer.sh
 bind '"\C-f": "sessionizer\n"'
 bind '"\C-F": "sessionizer -cd\n"'
diff --git a/.sessionizer.sh b/.sessionizer.sh
new file mode 100644
index 0000000..79dde27
--- /dev/null
+++ b/.sessionizer.sh
@@ -0,0 +1,25 @@
+sessionizer() {
+  DIR=$(fdfind . $HOME --type d -L -H | fzf)
+  SESSION_NAME="$DIR_$(date +%M%S)"
+
+  if [ -n "$DIR" ]
+  then
+    if [ "$1" == "-cd" ]
+    then
+      cd $DIR
+      return
+    fi
+    tmux new-session -d -c "$DIR" -s "$SESSION_NAME"
+    if [ -n "$TMUX" ]
+    then
+      tmux switch -t "$SESSION_NAME"
+    else
+      tmux attach -t "$SESSION_NAME"
+    fi
+  fi
+}
+
+if [[ $- != *i* ]]
+then
+  sessionizer
+fi
diff --git a/.tmux.conf b/.tmux.conf
index a3994aa..5a92a90 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -18,6 +18,7 @@ set -g @plugin 'tmux-plugins/tmux-yank'
 unbind C-b
 unbind '"'
 unbind %
+unbind c
 
 set-option -g prefix C-x
 bind-key C-x send-prefix
@@ -27,16 +28,17 @@ bind -n M-l next-window
 
 set-window-option -g mode-keys vi
 bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 
 bind | split-window -h -c "#{pane_current_path}"
 bind - split-window -v -c "#{pane_current_path}"
 
 bind-key r command-prompt -I "#W" "rename-window '%%'"
-bind-key b attach-session -c "#{pane_current_path}"
 bind-key x kill-pane
+bind-key c new-window -c "#{pane_current_path}"
 
 unbind f
-bind f split-pane "tmux-sessionizer"
+bind f split-pane "bash ~/.sessionizer.sh"
 
 bg="#698DDA"
 
diff --git a/configuration.nix b/configuration.nix
index 61dbcbf..c4940ef 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,8 +6,6 @@
       ./hardware-configuration.nix
     ];
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -67,7 +65,7 @@
     TTYVTDisallocate = true;
   };
 
-  nixpkgs.overlays = [
+  /* nixpkgs.overlays = [
     (self: super: {
        waybar = super.waybar.overrideAttrs (oldAttrs: {
          src = super.fetchFromGitHub {
@@ -78,7 +76,7 @@
          };
        });
     })
-  ];
+  ]; */
 
   users.users.compromyse = {
     isNormalUser = true;
@@ -93,6 +91,8 @@
     wget
     git
 
+    polkit_gnome
+
     waybar
     fuzzel
     dunst
@@ -105,13 +105,9 @@
     spotify
     virt-manager
 
-    cinnamon.nemo-with-extensions
     pavucontrol
     blueman
 
-    gparted
-    polkit_gnome
-
     libnotify
     libappindicator