Update

home/apps/default.nix

@@ -1,4 +1,13 @@
 {
-  imports =
-    [ ./kitty ./lf ./neofetch ./nvim ./qutebrowser ./spicetify ./wofi ./cava ];
+  imports = [
+    ./kitty
+    ./lf
+    ./neofetch
+    ./nvim
+    ./qutebrowser
+    ./spicetify
+    ./wofi
+    ./cava
+    ./tmux
+  ];
 }

home/apps/kitty/default.nix

@@ -16,7 +16,7 @@
       confirm_os_window_close = "0";
       remember_window_size = "no";
       disable_ligatures = "never";
-      shell = "${pkgs.zsh}/bin/zsh";
+      shell = "${pkgs.tmux}/bin/tmux";
       initial_window_width = 1200;
       initial_window_height = 600;
 

home/apps/nvim/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }: {
+{ inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
     ./auto-pairs.nix
@@ -22,6 +22,7 @@
     ./comment.nix
     ./oil.nix
     ./trouble.nix
+    ./tmux-navigator.nix
   ];
 
   programs.nixvim = {

home/apps/nvim/keymaps.nix

@@ -46,19 +46,19 @@
 
     {
       key = "<C-h>";
-      action = "<C-w>h";
+      action = "<cmd>TmuxNavigateLeft<cr>";
     }
     {
       key = "<C-j>";
-      action = "<C-w>j";
+      action = "<cmd>TmuxNavigateDown<cr>";
     }
     {
       key = "<C-k>";
-      action = "<C-w>k";
+      action = "<cmd>TmuxNavigateUp<cr>";
     }
     {
       key = "<C-l>";
-      action = "<C-w>l";
+      action = "<cmd>TmuxNavigateRight<cr>";
     }
 
     # Terminal Mappings

home/apps/nvim/tmux-navigator.nix

@@ -0,0 +1 @@
+{ programs.nixvim.plugins.tmux-navigator = { enable = true; }; }

home/apps/tmux/default.nix

@@ -0,0 +1,46 @@
+{ pkgs, ... }: {
+  programs.tmux = {
+    enable = true;
+    mouse = true;
+    shell = "${pkgs.zsh}/bin/zsh";
+    prefix = "C-s";
+    terminal = "kitty";
+    keyMode = "vi";
+
+    extraConfig = ''
+      bind-key h select-pane -L
+      bind-key j select-pane -D
+      bind-key k select-pane -U
+      bind-key l select-pane -R
+    '';
+
+    plugins = with pkgs; [
+      tmuxPlugins.vim-tmux-navigator
+      {
+        plugin = tmuxPlugins.catppuccin;
+        extraConfig = ''
+          set-option -g status-position top
+          set -g @catppuccin_window_left_separator ""
+          set -g @catppuccin_window_right_separator " "
+          set -g @catppuccin_window_middle_separator " █"
+          set -g @catppuccin_window_number_position "right"
+
+          set -g @catppuccin_window_default_fill "number"
+          set -g @catppuccin_window_default_text "#W"
+
+          set -g @catppuccin_window_current_fill "number"
+          set -g @catppuccin_window_current_text "#W"
+
+          set -g @catppuccin_status_modules_right "directory session"
+          set -g @catppuccin_status_left_separator  " "
+          set -g @catppuccin_status_right_separator ""
+          set -g @catppuccin_status_fill "icon"
+          set -g @catppuccin_status_connect_separator "no"
+
+          set -g @catppuccin_directory_text "#{pane_current_path}"
+          set -g @catppuccin_status_background "default"
+        '';
+      }
+    ];
+  };
+}

home/home.nix

@@ -39,6 +39,7 @@ in {
       wget
       curl
       ripgrep
+      neovide
       tree # temp
 
       # Just cool

home/scripts/startup.nix

@@ -52,6 +52,7 @@ let
     [[ ${toString variable.enableNextcloud} == "true" ]] && nextcloud-watch &
 
     battery-notif &
+    sleep 2
     ${pkgs.waybar}/bin/waybar &
   '';
 

home/system/hyprland/default.nix

@@ -1,12 +1,13 @@
-{ self, pkgs, config, hyprland, ... }:
+{ pkgs, config, hyprland, ... }:
 let variable = import ../../../variables.nix;
 in {
 
-  imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ./hyprcursor.nix ];
+  imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ];
 
   home.packages = with pkgs; [
     hyprshot
     hyprpicker
+    hyprcursor
     xdg-desktop-portal-hyprland
     wlr-randr
     wl-clipboard
@@ -105,7 +106,7 @@ in {
         "QT_QPA_PLATFORM=wayland,xcb"
         "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
         "GTK_THEME,Flat-Remix-GTK-Violet-Darkest-Solid:dark"
-        # "HYPRCURSOR_THEME,rose-pine"
+        # "HYPRCURSOR_THEME,rose-pine-hyprcursor"
         # "HYPRCURSOR_SIZE,16"
       ];
 

home/system/hyprland/hyprcursor.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ hyprcursor ];
-
-  #  home.file.".local/share/icons/rose-pine-hyprcursor" = {
-  #   recursive = true;
-  #  source = ./rose-pine;
-  #};
-
-}

home/system/waybar/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }: {
+{ config, ... }: {
   services = {
     blueman-applet.enable = true;
     network-manager-applet.enable = true;
@@ -6,7 +6,7 @@
 
   programs.waybar = {
     enable = true;
-    package = inputs.waybar.packages."${pkgs.system}".waybar;
+    # package = inputs.waybar.packages."${pkgs.system}".waybar;
     settings = {
       mainBar = {
         layer = "top";