From 3238b146d95f3b714eb8b715fb01bc5712aa34bf Mon Sep 17 00:00:00 2001
From: fqbn207 <fqbn207>
Date: Wed, 8 Jan 2025 04:52:20 +0100
Subject: [PATCH] kekl

---
 configuration.nix                             | 3 ++-
 modules/nix/default.nix                       | 4 ++--
 modules/nix/{ => editors}/nvim/alpha.nix      | 0
 modules/nix/{ => editors}/nvim/cmp.nix        | 0
 modules/nix/{ => editors}/nvim/default.nix    | 2 +-
 modules/nix/{ => editors}/nvim/dev.nix        | 0
 modules/nix/{ => editors}/nvim/lsp.nix        | 0
 modules/nix/{ => editors}/nvim/lualine.nix    | 0
 modules/nix/{ => editors}/nvim/neotree.nix    | 0
 modules/nix/{ => editors}/nvim/nonels.nix     | 0
 modules/nix/{ => editors}/nvim/opts.nix       | 6 ------
 modules/nix/{ => editors}/nvim/treesitter.nix | 3 ---
 modules/nix/tmux.nix                          | 5 ++++-
 modules/nix/{ => wm}/sway/alacritty.nix       | 0
 modules/nix/{ => wm}/sway/default.nix         | 0
 modules/nix/{ => wm}/sway/raw/config.rasi     | 0
 modules/nix/{ => wm}/sway/sway.nix            | 0
 17 files changed, 9 insertions(+), 14 deletions(-)
 rename modules/nix/{ => editors}/nvim/alpha.nix (100%)
 rename modules/nix/{ => editors}/nvim/cmp.nix (100%)
 rename modules/nix/{ => editors}/nvim/default.nix (98%)
 rename modules/nix/{ => editors}/nvim/dev.nix (100%)
 rename modules/nix/{ => editors}/nvim/lsp.nix (100%)
 rename modules/nix/{ => editors}/nvim/lualine.nix (100%)
 rename modules/nix/{ => editors}/nvim/neotree.nix (100%)
 rename modules/nix/{ => editors}/nvim/nonels.nix (100%)
 rename modules/nix/{ => editors}/nvim/opts.nix (91%)
 rename modules/nix/{ => editors}/nvim/treesitter.nix (87%)
 rename modules/nix/{ => wm}/sway/alacritty.nix (100%)
 rename modules/nix/{ => wm}/sway/default.nix (100%)
 rename modules/nix/{ => wm}/sway/raw/config.rasi (100%)
 rename modules/nix/{ => wm}/sway/sway.nix (100%)

diff --git a/configuration.nix b/configuration.nix
index 8c36f31..df0748c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -168,6 +168,7 @@ in
     pavucontrol
     usbutils
     alsa-utils
+    neovide
 
     # cli
     neofetch
@@ -277,7 +278,7 @@ in
     "pacman.conf".source = ./modules/raw/pacman.conf;
   };
 
-  system.stateVersion = "24.11";
+  system.stateVersion = "unstable";
   home-manager.users.fabian = ./modules/home.nix;
 
 }
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 1e64473..f5db0f6 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -1,8 +1,8 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./nvim/default.nix
-    ./sway/default.nix
+    ./editors/nvim/default.nix
+    ./wm/sway/default.nix
     ./bash.nix
     ./git.nix
     ./tmux.nix
diff --git a/modules/nix/nvim/alpha.nix b/modules/nix/editors/nvim/alpha.nix
similarity index 100%
rename from modules/nix/nvim/alpha.nix
rename to modules/nix/editors/nvim/alpha.nix
diff --git a/modules/nix/nvim/cmp.nix b/modules/nix/editors/nvim/cmp.nix
similarity index 100%
rename from modules/nix/nvim/cmp.nix
rename to modules/nix/editors/nvim/cmp.nix
diff --git a/modules/nix/nvim/default.nix b/modules/nix/editors/nvim/default.nix
similarity index 98%
rename from modules/nix/nvim/default.nix
rename to modules/nix/editors/nvim/default.nix
index 5c296bf..02ecd89 100644
--- a/modules/nix/nvim/default.nix
+++ b/modules/nix/editors/nvim/default.nix
@@ -28,7 +28,7 @@ in
     enable = true;
     plugins = {
       transparent = {
-        enable = true;
+        enable = false;
         settings = {
           groups = [
             "Normal"
diff --git a/modules/nix/nvim/dev.nix b/modules/nix/editors/nvim/dev.nix
similarity index 100%
rename from modules/nix/nvim/dev.nix
rename to modules/nix/editors/nvim/dev.nix
diff --git a/modules/nix/nvim/lsp.nix b/modules/nix/editors/nvim/lsp.nix
similarity index 100%
rename from modules/nix/nvim/lsp.nix
rename to modules/nix/editors/nvim/lsp.nix
diff --git a/modules/nix/nvim/lualine.nix b/modules/nix/editors/nvim/lualine.nix
similarity index 100%
rename from modules/nix/nvim/lualine.nix
rename to modules/nix/editors/nvim/lualine.nix
diff --git a/modules/nix/nvim/neotree.nix b/modules/nix/editors/nvim/neotree.nix
similarity index 100%
rename from modules/nix/nvim/neotree.nix
rename to modules/nix/editors/nvim/neotree.nix
diff --git a/modules/nix/nvim/nonels.nix b/modules/nix/editors/nvim/nonels.nix
similarity index 100%
rename from modules/nix/nvim/nonels.nix
rename to modules/nix/editors/nvim/nonels.nix
diff --git a/modules/nix/nvim/opts.nix b/modules/nix/editors/nvim/opts.nix
similarity index 91%
rename from modules/nix/nvim/opts.nix
rename to modules/nix/editors/nvim/opts.nix
index 7d5eac1..716198c 100644
--- a/modules/nix/nvim/opts.nix
+++ b/modules/nix/editors/nvim/opts.nix
@@ -37,12 +37,6 @@
           virtual_lines = false,
       })
 
-      vim.api.nvim_create_autocmd("VimEnter", {
-        callback = function()
-          vim.cmd("TransparentEnable")
-        end,
-      })
-
       vim.cmd [[
         hi VertSplit guibg=NONE guifg=#000000
         cnoreabbrev W! w!
diff --git a/modules/nix/nvim/treesitter.nix b/modules/nix/editors/nvim/treesitter.nix
similarity index 87%
rename from modules/nix/nvim/treesitter.nix
rename to modules/nix/editors/nvim/treesitter.nix
index 637f2ce..f07b7d6 100644
--- a/modules/nix/nvim/treesitter.nix
+++ b/modules/nix/editors/nvim/treesitter.nix
@@ -7,9 +7,6 @@
 {
   programs.nixvim = {
     plugins = {
-      treesitter-context = {
-        enable = true;
-      };
       treesitter = {
         enable = true;
         grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
diff --git a/modules/nix/tmux.nix b/modules/nix/tmux.nix
index 8752fc1..e1f2035 100644
--- a/modules/nix/tmux.nix
+++ b/modules/nix/tmux.nix
@@ -21,7 +21,7 @@
         unbind %
 
         bind t new-window
-        bind -n M-q previous-window
+        bind -n M-w previous-window
         bind -n M-e next-window
         bind r source-file ~/.config/tmux/tmux.conf
         bind -n M-Left select-pane -L
@@ -29,6 +29,9 @@
         bind -n M-Up select-pane -U
         bind -n M-Down select-pane -D
 
+        setw -g window-status-current-format "#T(#I:#W#F)"  
+        setw -g window-status-format "#T(#I:#W#F)"  
+
         set-option -s status-interval 1
         set -g status-right-length 100
         set -g @net_speed_interfaces "wg0-mullvad"
diff --git a/modules/nix/sway/alacritty.nix b/modules/nix/wm/sway/alacritty.nix
similarity index 100%
rename from modules/nix/sway/alacritty.nix
rename to modules/nix/wm/sway/alacritty.nix
diff --git a/modules/nix/sway/default.nix b/modules/nix/wm/sway/default.nix
similarity index 100%
rename from modules/nix/sway/default.nix
rename to modules/nix/wm/sway/default.nix
diff --git a/modules/nix/sway/raw/config.rasi b/modules/nix/wm/sway/raw/config.rasi
similarity index 100%
rename from modules/nix/sway/raw/config.rasi
rename to modules/nix/wm/sway/raw/config.rasi
diff --git a/modules/nix/sway/sway.nix b/modules/nix/wm/sway/sway.nix
similarity index 100%
rename from modules/nix/sway/sway.nix
rename to modules/nix/wm/sway/sway.nix