update

flake.nix

@@ -9,15 +9,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix-colors = {
-      url = "github:Misterio77/nix-colors";
-    };
-
-    bobthefish = {
-      url = "github:oh-my-fish/theme-bobthefish";
-      flake = false;
-    };
-
     friendly-snippets = {
       url = "github:rafamadriz/friendly-snippets";
       flake = false;
@@ -76,7 +67,7 @@
 
   };
 
-  outputs = { self, nixpkgs, home-manager, nix-colors, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, ... }@inputs:
     let
     system = "x86_64-linux";
 
@@ -149,13 +140,19 @@
         visualizerSupport = true;
       };
 
+      catppuccin-gtk-macchiato = prev.catppuccin-gtk.override {
+        accents = [ "lavender" ];
+        size = "standard";
+        variant = "macchiato";
+      };
+
       catppuccin-kvantum-macchiato = prev.catppuccin-kvantum.override {
-        accent = "Blue";
+        accent = "Lavender";
         variant = "Macchiato";
       };
 
       catppuccin-papirus-folders-macchiato = prev.catppuccin-papirus-folders.override {
-        accent = "blue";
+        accent = "lavender";
         flavor = "macchiato";
       };
 
@@ -178,7 +175,7 @@
           home-manager = {
             useUserPackages = true;
             users.manuel = import ./user/home.nix;
-            extraSpecialArgs = { inherit inputs pkgs nix-colors; };
+            extraSpecialArgs = { inherit inputs pkgs; };
           };
         }
       inputs.grub2-themes.nixosModules.default

user/configs/cava/default.nix

@@ -4,7 +4,29 @@
 
   xdg.configFile."cava/config".text = lib.generators.toINI { } {
     general = {
-      bar_width = "3";
+      bars = "0";
+      bar_width = "2";
+    };
+
+    input = {
+      method = "fifo";
+      source = "/tmp/mpd.fifo";
+      sample_rate = "44100";
+      sample_bits = "16";
+    };
+
+    color = {
+      gradient = "1";
+
+
+      gradient_color_1 = "'#8bd5ca'";
+      gradient_color_2 = "'#91d7e3'";
+      gradient_color_3 = "'#7dc4e4'";
+      gradient_color_4 = "'#8aadf4'";
+      gradient_color_5 = "'#c6a0f6'";
+      gradient_color_6 = "'#f5bde6'";
+      gradient_color_7 = "'#ee99a0'";
+      gradient_color_8 = "'#ed8796'";   
     };
   };
 }

user/configs/kvantum/default.nix

@@ -14,7 +14,7 @@
   };
 
   xdg.configFile."Kvantum/kvantum.kvconfig".text = "theme=catppuccin";
-  xdg.configFile."Kvantum/catppuccin/catppuccin.kvconfig".source = pkgs.catppuccin-kvantum-macchiato + "/share/Kvantum/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.kvconfig";
-  xdg.configFile."Kvantum/catppuccin/catppuccin.svg".source = pkgs.catppuccin-kvantum-macchiato + "/share/Kvantum/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.svg";
+  xdg.configFile."Kvantum/catppuccin/catppuccin.kvconfig".source = pkgs.catppuccin-kvantum-macchiato + "/share/Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Lavender.kvconfig";
+  xdg.configFile."Kvantum/catppuccin/catppuccin.svg".source = pkgs.catppuccin-kvantum-macchiato + "/share/Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Lavender.svg";
 
 }

user/configs/neovim/default.nix

@@ -1,9 +1,10 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config, pkgs, ... }:
 {
     programs.neovim = {
         enable = true;
 
         plugins = with pkgs.vimPlugins; [
+                nvim-web-devicons
                 catppuccin-nvim
                 lualine-nvim
                 bufferline-nvim
@@ -12,13 +13,13 @@
                 comment-nvim
                 neo-tree-nvim
                 nvim-notify
-                nvim-treesitter.withAllGrammars
                 which-key-nvim
 
                 telescope-nvim
                 telescope-fzf-native-nvim
 
                 nvim-lspconfig
+                nvim-treesitter.withAllGrammars
 
                 nvim-cmp
                 lspkind-nvim

user/configs/neovim/init.lua

@@ -16,8 +16,30 @@ vim.o.timeoutlen = 100
 vim.wo.number = true
 vim.wo.relativenumber = true
 
+-- keymaps 
+vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Go to left window" })
+vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Go to lower window" })
+vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Go to upper window" })
+vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Go to right window" })
+
+vim.keymap.set("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
+vim.keymap.set("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
+vim.keymap.set("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
+vim.keymap.set("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })
+
+vim.keymap.set("n", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
+vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
+vim.keymap.set("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
+vim.keymap.set("n", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
+vim.keymap.set("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
+vim.keymap.set("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
+vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
+
+
+
 require("catppuccin").setup({
-  flavour = "macchiato"
+  flavour = "macchiato",
+  transparent_background = true,
 })
 vim.cmd.colorscheme "catppuccin"
 
@@ -31,7 +53,17 @@ require("bufferline").setup({
   highlights = require("catppuccin.groups.integrations.bufferline").get(),
   options = {
     show_tab_indicators = true,
-    separator_style = { "", "" },
+    -- separator_style = { "", "" },
+    indicator = { style = "icon", icon = "▎" },
+    color_icons = true,
+    offsets = {
+      {
+        filetype = "neo-tree",
+        text = "File Explorer",
+        text_align = "center",
+        separator = true,
+      },
+    },
   },
 })
 
@@ -96,7 +128,7 @@ lspconfig.lua_ls.setup {
   settings = {
     Lua = {
       diagnostics = {
-        globals = {"vim"},
+        globals = { "vim" },
       },
       telemetry = {
         enable = false,
@@ -169,8 +201,8 @@ cmp.setup({
 
 local cmp_autopairs = require('nvim-autopairs.completion.cmp')
 cmp.event:on(
-'confirm_done',
-cmp_autopairs.on_confirm_done()
+  'confirm_done',
+  cmp_autopairs.on_confirm_done()
 )
 
 cmp.setup.cmdline(":", {
@@ -187,4 +219,3 @@ cmp.setup.cmdline("/", {
     { name = "buffer" },
   })
 })
-

user/configs/rofi/default.nix

@@ -5,7 +5,7 @@
     package = pkgs.rofi-wayland;
     terminal = "${pkgs.foot}/bin/foot";
     extraConfig = {
-        modi = "drun,run,window";
+        modi = "drun,run";
     };
     theme = ./catppuccin-macchiato.rasi;
   };

user/configs/wayland/foot/default.nix

@@ -6,8 +6,7 @@
       main = {
         font = "JetBrainsMono Nerd Font:pixelsize=12";
         pad = "16x16 center";
-        horizontal-letter-offset = "0";
-        vertical-letter-offset = "0";
+        underline-offset = "4px";
       };
 
       colors = {

user/configs/wayland/hyprland/default.nix

@@ -7,7 +7,7 @@ let
   leftMonitor = "HDMI-A-1";
   rightMonitor = "DP-1";
 
-  wallpaper = "/mnt/hdd/Wallpapers/flat-landscape-minimalism-trees-sunset-river-artwork-22750-.jpeg";
+  wallpaper = "/mnt/hdd/Wallpapers/wallhaven-qdgx55.jpg";
 
   wob-voldaemon = pkgs.writeShellScriptBin "wob-volumeindicator.sh" ''
     if pgrep "wob";  then
@@ -34,7 +34,7 @@ let
   '';
 
   killprocess = pkgs.writeShellScriptBin "killprocess.sh" ''
-    ps -x -o pid=,comm= | column -t -o "    " | ${pkgs.rofi}/bin/rofi -dmenu -p "kill process: " | awk '{print $1}' | uniq | xargs -r kill -9
+    ps -x -o pid=,comm= | column -t -o "    " | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "kill process: " | awk '{print $1}' | uniq | xargs -r kill -9
   '';
 in
 
@@ -74,7 +74,7 @@ in
 
       general {
           gaps_in = 16
-          border_size = 4
+          border_size = 6
           col.active_border = 0xff$surface2Alpha 0xff$surface0alpha 45deg
           col.inactive_border = 0xff$baseAlpha
       }
@@ -158,7 +158,7 @@ in
       bind = ${modKey}, F, fullscreen
 
       bind = ${modKey} SHIFT, Q, killactive
-      bind = ${modKey}, d, exec, ${pkgs.rofi}/bin/rofi -show drun -show-icons
+      bind = ${modKey}, d, exec, ${pkgs.rofi-wayland}/bin/rofi -show drun -show-icons
 
       bind = ${modKey}, q, exec, ${pkgs.firefox}/bin/firefox
 

user/configs/zellij.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ...}:
+{
+  programs.zellij = {
+    enable = true;
+    enableFishIntegration = false;
+
+    settings = {
+      theme = "catppuccin-macchiato";
+
+      themes.catppuccin-macchiato = {
+        bg = "#5b6078";
+        fg = "#cad3f5";
+        red = "#ed8796";
+        green = "#a6da95";
+        blue = "#8aadf4";
+        yellow = "#eed49f";
+        magenta = "#f5bde6";
+        orange = "#f5a97f";
+        cyan = "#91d7e3";
+        black = "#1e2030";
+        white = "#cad3f5";
+      };
+    };
+  };
+}
+

user/home.nix

@@ -13,6 +13,7 @@
       ./configs/dircolors.nix
       ./configs/xdg-mime.nix
       ./configs/kvantum
+      ./configs/zellij.nix
   ];
 
 # Home Manager needs a bit of information about you and the
@@ -98,13 +99,8 @@
   gtk = {
     enable = true;
     theme = {
-      package = pkgs.catppuccin-gtk.override {
-        accents = [ "blue" ];
-        size = "standard";
-        tweaks = [];
-        variant = "macchiato";
-      };
-      name = "Catppuccin-Macchiato-Standard-Blue-Dark";
+      package = pkgs.catppuccin-gtk-macchiato;
+      name = "Catppuccin-Macchiato-Standard-Lavender-Dark";
     };
 
     font = {