better organization and tmux

8 files changed, 89 insertions, 27 deletions

diff --git a/flake.nix b/flake.nix
index 3119ebd..31b073e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,29 +1,34 @@
 {
-description = "Home Manager configuration of swarn";
-inputs = {
-  nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  
-  home-manager = {
-    url = "github:nix-community/home-manager";
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
+  description = "Home Manager configuration of swarn";
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-  hypr-wellbeing = {
-    url = "github:demonkingswarn/hypr-wellbeing";
-    inputs.nixpkgs.follows = "nixpkgs";
+    hypr-wellbeing = {
+      url = "github:demonkingswarn/hypr-wellbeing";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
-};
 
-outputs = inputs@{ self, nixpkgs, home-manager, ... }:
-  let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-  in
-  {
-    homeConfigurations."swarn" = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      modules = [ ./home.nix ];
-      extraSpecialArgs = { inherit inputs; };
+  outputs = inputs@{ self, nixpkgs, home-manager, ... }:
+    let
+      system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+
+      environment.systemPackages = [
+        pkgs.git
+        pkgs.tmux
+      ];
+    in
+    {
+      homeConfigurations."swarn" = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = [ ./home.nix ];
+        extraSpecialArgs = { inherit inputs; };
+      };
     };
-  };
 }
diff --git a/home.nix b/home.nix
index f6e8d0c..271401c 100644
--- a/home.nix
+++ b/home.nix
@@ -2,10 +2,11 @@
 
 {
   imports = [
-    ./config/git.nix
-    ./config/zsh.nix
-    ./config/starship.nix
-    ./config/ghostty.nix
+    ./home/git.nix
+    ./home/zsh.nix
+    ./home/tmux.nix
+    ./home/starship.nix
+    ./home/ghostty.nix
   ];
 
   home.username = "swarn";
diff --git a/config/ghostty.nix b/home/ghostty.nix
index a8288f2..a8288f2 100644
--- a/config/ghostty.nix
+++ b/home/ghostty.nix
diff --git a/config/git.nix b/home/git.nix
index 4b75f9c..4b75f9c 100644
--- a/config/git.nix
+++ b/home/git.nix
diff --git a/config/niri.nix b/home/niri.nix
index 91b5073..91b5073 100644
--- a/config/niri.nix
+++ b/home/niri.nix
diff --git a/config/starship.nix b/home/starship.nix
index 500a0cd..500a0cd 100644
--- a/config/starship.nix
+++ b/home/starship.nix
diff --git a/home/tmux.nix b/home/tmux.nix
new file mode 100644
index 0000000..7d4167e
--- /dev/null
+++ b/home/tmux.nix
@@ -0,0 +1,56 @@
+{ pkgs, ... }:
+{
+  xdg.enable = true;
+
+  programs.tmux = {
+    enable = true;
+    prefix = "C-s";
+    mouse = true;
+    baseIndex = 0;
+
+    plugins = with pkgs.tmuxPlugins; [
+      sensible
+      vim-tmux-navigator
+      yank
+    ];
+
+    extraConfig = ''
+      set-option -g status-position top
+      set -g focus-events on
+
+      unbind r
+      bind r source-file ~/.config/tmux/tmux.conf \; display-message "tmux.conf reloaded."
+
+      bind-key d detach
+      bind-key p display-popup
+      bind-key f run-shell "~/.dots/.local/bin/tmux-sessionizer"
+
+      bind-key h select-pane -L
+      bind-key j select-pane -D
+      bind-key k select-pane -U
+      bind-key l select-pane -R
+
+      # Catppuccin Mocha colors
+      # base=#1e1e2e surface0=#313244 surface1=#45475a
+      # text=#cdd6f4 subtext0=#a6adc8
+      # mauve=#cba6f7 blue=#89b4fa cyan=#89dceb
+      # green=#a6e3a1 pink=#f38ba8
+
+      set -g pane-border-style fg=#313244
+      set -g pane-active-border-style fg=#cba6f7
+
+      set -g message-style fg=#cdd6f4,bg=#313244
+
+      set -g status-style fg=#cdd6f4,bg=#1e1e2e
+      set -g status-justify left
+
+      set -g window-status-format "#[fg=#1e1e2e,bg=#313244,nobold,noitalics,nounderscore] #[fg=#a6adc8,bg=#313244]#I #[fg=#313244,bg=#45475a,nobold,noitalics,nounderscore] #[fg=#cdd6f4,bg=#45475a]#W #F #[fg=#45475a,bg=#1e1e2e,nobold,noitalics,nounderscore]"
+      set -g window-status-current-format "#[fg=#1e1e2e,bg=#cba6f7,nobold,noitalics,nounderscore] #[fg=#1e1e2e,bg=#cba6f7]#I #[fg=#cba6f7,bg=#89b4fa,nobold,noitalics,nounderscore] #[fg=#1e1e2e,bg=#89b4fa]#W #F #[fg=#89b4fa,bg=#1e1e2e,nobold,noitalics,nounderscore]"
+      set -g window-status-separator ""
+
+      set -g status-left "#[fg=#1e1e2e,bg=#cba6f7,bold] #S #[fg=#cba6f7,bg=#1e1e2e,nobold,noitalics,nounderscore]"
+      set -g status-right "#[fg=#313244,bg=#1e1e2e,nobold,noitalics,nounderscore]#[fg=#a6adc8,bg=#313244] #{pane_current_path} #[fg=#45475a,bg=#313244,nobold,noitalics,nounderscore]#[fg=#cdd6f4,bg=#45475a] #(whoami)@#H #[fg=#cba6f7,bg=#45475a,nobold,noitalics,nounderscore]#[fg=#1e1e2e,bg=#cba6f7,bold] #S "
+      set -g status-right-length 150
+    '';
+  };
+}
diff --git a/config/zsh.nix b/home/zsh.nix
index 84badd5..84badd5 100644
--- a/config/zsh.nix
+++ b/home/zsh.nix