feat: new zsh config

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>

flake.lock

@@ -1391,11 +1391,11 @@
         "nixpkgs": "nixpkgs_11"
       },
       "locked": {
-        "lastModified": 1780920949,
+        "lastModified": 1781028989,
-        "narHash": "sha256-0aUc1DUHupGFXc1WkSnpvAqyFQTlVS/Z8cHyQv1FSvE=",
+        "narHash": "sha256-wN9iKLIUrD1xOTKB2GXsTBlXYsByL/Tk0hk/KPh0/vw=",
         "owner": "anotherhadi",
         "repo": "nur-packages",
-        "rev": "3a3412876627343386097b1a1cc0a803ed55bf82",
+        "rev": "afedd9b527fc7f0e418e6384fa581d8bb7564675",
         "type": "github"
       },
       "original": {
@@ -1534,7 +1534,6 @@
         "nur-anotherhadi": "nur-anotherhadi",
         "nvf": "nvf",
         "sops-nix": "sops-nix",
-        "spicetify-nix": "spicetify-nix",
         "stylix": "stylix"
       }
     },
@@ -1577,27 +1576,6 @@
         "type": "github"
       }
     },
-    "spicetify-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_6"
-      },
-      "locked": {
-        "lastModified": 1780422259,
-        "narHash": "sha256-dWGk4SEdI189kQW5cE4Uo1Mc+P+kQEdgMcyMgTtmQOA=",
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "rev": "8414bbf2fcc7bc0a22c675e498e3c7365c1aec0a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "type": "github"
-      }
-    },
     "stylix": {
       "inputs": {
         "base16": "base16",
@@ -1609,7 +1587,7 @@
         "gnome-shell": "gnome-shell",
         "nixpkgs": "nixpkgs_14",
         "nur": "nur",
-        "systems": "systems_7",
+        "systems": "systems_6",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
@@ -1719,21 +1697,6 @@
         "type": "github"
       }
     },
-    "systems_7": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-kitty": {
       "flake": false,
       "locked": {

flake.nix

@@ -33,10 +33,6 @@
       url = "github:caelestia-dots/cli";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    spicetify-nix = {
-      url = "github:Gerg-L/spicetify-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     # Server
     nixarr.url = "github:rasmus-kirk/nixarr";

home/programs/group/basic-apps.nix

@@ -27,8 +27,11 @@
     tealdeer # Fast tldr client
     sttr # Minimalist "cyberchef" like. Cross-platform, cli app to perform various operations on string
     wiremix # Simple TUI mixer for PipeWire
+    slides # A terminal-based presentation tool that allows you to create and deliver presentations directly from the command line
+    pom # Pomodoro timer in your terminal
     pkgs.wifitui # TUI for managing wifi
     pkgs-nur-hadi.usbguard-tui # TUI for managing USBGuard rules
+    pkgs-nur-hadi.sheets # Terminal based spreadsheet tool
 
     # I love CLIs
     httpie # Command-line HTTP client, a user-friendly cURL replacement

home/programs/group/dev-packages.nix

@@ -10,7 +10,6 @@
   nodejs
   air
   duckdb
-  docker
   python3
   jq
   nix-prefetch-github

home/programs/nvf/default.nix

@@ -1,12 +1,24 @@
 {
   inputs,
   pkgs,
+  config,
   ...
-}: {
+}: let
+  c = config.lib.stylix.colors;
+in {
   imports = [inputs.nvf.homeManagerModules.default];
   programs.nvf = {
     enable = true;
     settings = {
+      vim.luaConfigRC.hl-overrides = ''
+        local function apply_hl()
+          vim.api.nvim_set_hl(0, "MiniStarterHeader",   { fg = "#${c.base0D}", bold = true })
+          vim.api.nvim_set_hl(0, "SnacksPickerBorder",  { fg = "#${c.base0D}" })
+          vim.api.nvim_set_hl(0, "SnacksPickerTitle",   { fg = "#${c.base0D}", bold = true })
+        end
+        apply_hl()
+        vim.api.nvim_create_autocmd("ColorScheme", { pattern = "*", callback = apply_hl })
+      '';
       imports = [
         ./options.nix
         ./languages.nix

home/programs/nvf/keymaps.nix

@@ -1,6 +1,7 @@
 {
   vim = {
     globals.mapleader = " ";
+
     keymaps = [
       {
         key = "s";
@@ -144,6 +145,52 @@
         desc = "Todo (Trouble)";
       }
 
+      # Shell
+      {
+        key = "<leader>!";
+        mode = "n";
+        silent = true;
+        lua = true;
+        desc = "Insert command output";
+        action = ''
+          function()
+            local cmd = vim.fn.input("Command: ")
+            if cmd == "" then return end
+            local lines = vim.fn.systemlist(cmd)
+            while #lines > 0 and lines[#lines] == "" do
+              table.remove(lines)
+            end
+            if #lines == 0 then return end
+            vim.api.nvim_put(lines, "l", true, true)
+          end
+        '';
+      }
+      {
+        key = "<leader>!";
+        mode = "v";
+        silent = true;
+        lua = true;
+        desc = "Run command with selection";
+        action = ''
+          function()
+            local start_line = vim.fn.line("'<")
+            local end_line = vim.fn.line("'>")
+            local lines = vim.api.nvim_buf_get_lines(0, start_line - 1, end_line, false)
+            local input_text = table.concat(lines, "\n")
+
+            local cmd = vim.fn.input("$ ")
+            if cmd == "" then return end
+
+            local result = vim.fn.system({"bash", "-c", cmd}, input_text)
+            local output = vim.split(result, "\n", { plain = true })
+            if output[#output] == "" then table.remove(output) end
+            if #output == 0 then return end
+
+            vim.api.nvim_buf_set_lines(0, start_line - 1, end_line, false, output)
+          end
+        '';
+      }
+
       # QOL
       {
         key = ">";

home/programs/nvf/languages.nix

@@ -24,6 +24,7 @@
       autotagHtml = true;
       context.enable = true;
       highlight.enable = true;
+      textobjects.enable = true;
     };
     lsp = {
       enable = true;

home/programs/nvf/mini.nix

@@ -1,4 +1,4 @@
-{
+{lib, ...}: {
   vim.luaConfigRC.mini-clue = ''
     local miniclue = require('mini.clue')
     miniclue.setup({
@@ -27,6 +27,9 @@
         { mode = 'n', keys = '<Leader>u', desc = '+ui' },
         { mode = 'n', keys = '<Leader>l', desc = '+lsp' },
         { mode = 'n', keys = '<Leader>x', desc = '+trouble' },
+        { mode = 'n', keys = '<Leader>!', desc = 'shell' },
+        { mode = 'v', keys = '<Leader>!', desc = 'shell' },
+        { mode = 'n', keys = '<Leader>e', desc = 'yazi' },
       },
       window = { delay = 300 },
     })
@@ -34,7 +37,55 @@
 
   vim.mini = {
     ai.enable = true;
-    starter.enable = true;
+    starter = {
+      enable = true;
+      setupOpts = {
+        header = ''
+          ⣟⣯⣟⣯⡇⠀⣿⢩⣛⡼⣏⠀⠈⠋⠀⣈⡷⣙⢎⡳⣙⢮⣙⢮⣙⢎⡳⣙⢾⣿
+          ⢿⡾⣽⡞⣷⣤⣏⡳⡜⡼⠗⠁⢀⠀⠙⢧⠳⣍⢞⡱⣭⠲⣍⠶⣩⢞⡱⡭⣾⣿
+          ⠈⠻⠧⢿⣧⣿⠶⣵⢻⢞⡷⢲⡟⡶⢴⡭⢿⣜⣮⡱⢎⡳⣍⢞⡱⢮⡱⣳⣿⣽
+          ⠀⣰⣶⡏⢷⣈⣿⣸⣇⣾⣸⣿⣾⣹⣆⡹⡎⡶⢇⡿⣹⢷⣾⣈⠷⣇⢷⣿⣿⣹
+          ⣾⣻⣭⣿⣾⣿⣿⣟⣿⣿⡿⣽⡿⣿⢿⣿⣿⣿⣾⣶⣵⣾⠲⣭⢳⣞⣾⡿⣷⣿
+          ⣿⣿⣿⣯⣷⣿⣿⠿⢝⠚⠋⠉⠉⠉⠙⠚⠛⡾⢿⣿⣻⣿⣿⣶⣏⠶⣩⠿⣿⡈
+          ⣿⣟⣿⣻⣿⡏⠀⠀⠀⠳⡀⠀⠀⠀⠀⠰⠊⠀⠀⠈⠙⠳⣿⣿⣿⣿⣧⣻⣿⣿
+          ⠘⢻⣿⣿⣽⡇⠈⠧⣄⠀⠀⠀⠀⠀⠀⢀⣄⡤⠴⠚⠀⠀⠀⠙⢿⣷⡿⣿⣿⣿
+          ⠀⠠⢈⢛⣿⠀⠚⠉⠉⠱⣼⡷⠀⠀⠀⠀⠉⠉⠑⠶⠀⠀⠀⠀⠀⠻⣿⣿⣾⢿
+          ⠀⠡⠈⠉⠹⡀⠀⠀⡄⠀⣸⡀⠀⠀⠀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⣰⣿⣯⣿⢿
+          ⠀⠁⢶⣶⠀⢷⠀⠀⠉⠉⠀⠈⠉⠶⠆⠈⠀⠀⠀⠀⠀⠀⠀⠀⣸⣿⣿⣿⣾⣿
+          ⠀⠡⢸⢹⠏⡍⠓⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣺⡟⠋⠉⢹⢭⢣
+          ⠀⠀⢸⣹⡏⠭⠭⠭⠙⣲⣦⣤⣤⣀⣀⣀⣀⣤⣤⣶⣞⠉⠙⠛⠷⢀⣀⠘⣎⠧
+          ⢁⣈⣀⣀⢀⣀⣀⣀⣼⠟⠹⢿⣯⣟⣿⣻⡿⠿⠛⢿⣿⣦⡀⠀⠀⠀⠀⠉⠉⠘
+        '';
+        footer = "";
+        items = [
+          {
+            name = "files";
+            action = lib.mkLuaInline "function() Snacks.picker.files() end";
+            section = "";
+          }
+          {
+            name = "directories";
+            action = lib.mkLuaInline "function() Snacks.explorer() end";
+            section = "";
+          }
+          {
+            name = "tmp";
+            action = lib.mkLuaInline ''
+              function()
+                local uuid = vim.fn.system("uuidgen"):match("(%S+)")
+                vim.cmd("edit /tmp/" .. uuid .. ".md")
+              end
+            '';
+            section = "";
+          }
+          {
+            name = "recent";
+            action = lib.mkLuaInline "function() Snacks.picker.recent() end";
+            section = "";
+          }
+        ];
+      };
+    };
     comment.enable = true;
     icons.enable = true;
     indentscope.enable = true;
@@ -44,5 +95,6 @@
     jump2d.enable = true;
     statusline.enable = true;
     clue.enable = true;
+    surround.enable = true;
   };
 }

home/programs/nvf/picker.nix

@@ -18,7 +18,7 @@
         desc = "Smart Find Files";
       }
       {
-        key = "<leader>e";
+        key = "<leader>E";
         mode = "n";
         silent = true;
         action = "<cmd>lua Snacks.explorer()<cr>";

home/programs/nvf/utils.nix

@@ -5,6 +5,10 @@
       vim.keymap.del("n", "<leader>tdt")
     '';
     undoFile.enable = true;
+    utility.yazi-nvim = {
+      enable = true;
+      mappings.openYazi = "<leader>e";
+    };
     notes.todo-comments.enable = true;
     assistant.copilot = {
       enable = true;

home/programs/shell/zsh.nix

@@ -4,9 +4,7 @@
   lib,
   config,
   ...
-}: let
+}: {
-  fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
-in {
   home.packages = with pkgs; [
     bat
     ripgrep
@@ -47,30 +45,23 @@ in {
     '';
 
     shellAliases = {
-      spt = "spotatui";
+      # Change default
       vim = "nvim";
       vi = "nvim";
-      v = "nvim";
-      c = "clear";
-      clera = "clear";
-      celar = "clear";
-      claer = "clear";
-      e = "exit";
       cd = "z";
       ls = "eza --icons=always --no-quotes";
       tree = "eza --icons=always --tree --no-quotes";
-      sl = "ls";
-      open = "${pkgs.xdg-utils}/bin/xdg-open";
       cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
       mkdir = "mkdir -p";
 
-      obsidian-no-gpu = "env ELECTRON_OZONE_PLATFORM_HINT=auto obsidian --ozone-platform=x11";
+      # Shortcuts
-      wireguard-import = "nmcli connection import type wireguard file";
+      spt = "spotatui";
+      v = "nvim";
+      c = "clear";
+      e = "exit";
+      open = "${pkgs.xdg-utils}/bin/xdg-open";
 
       notes = "nvim ~/notes/index.md --cmd 'cd ~/notes' -c ':lua Snacks.picker.smart()'";
-      note = "notes";
-      tmp = "nvim /tmp/$(date | sed 's/ //g;s/\\.//g').md";
-
       nix-shell = "nix-shell --command zsh";
 
       # git
@@ -87,31 +78,41 @@ in {
       gbr = "git branch";
       grs = "git reset HEAD~1";
       grh = "git reset --hard HEAD~1";
-
       gaa = "git add .";
       gcm = "git commit -m";
+
+      # Typo
+      clera = "clear";
+      celar = "clear";
+      claer = "clear";
+      sl = "ls";
     };
 
     initContent =
       # bash
       ''
         bindkey -e
-        ${
-          if fetch == "neofetch"
-          then pkgs.neofetch + "/bin/neofetch"
-          else if fetch == "nerdfetch"
-          then "nerdfetch"
-          else if fetch == "pfetch"
-          then "echo; ${pkgs.pfetch}/bin/pfetch"
-          else ""
-        }
 
-        function n4c() {
+        # Open command in VIM
-          category=''${1:-all}
+        autoload -Uz edit-command-line
-          shift
+        zle -N edit-command-line
-          args=''${*}
+        bindkey '^X' edit-command-line
-          nix develop "github:nix4cyber/n4c#''${category}" ''${args} -c zsh
+
-        }
+        # Suffix Aliases
+        alias -s {nix,md,txt,json,yml,yaml,go}=nvim
+        alias -s {png,jpg,jpeg,gif,pdf}=xdg-open
+
+        # 3. Global Aliases (Remplacés n'importe où dans la commande, pas seulement au début)
+        alias -g G="| grep"
+        alias -g L="| less"
+        alias -g V="| nvim"
+        alias -g H="| head"
+        alias -g T="| tail"
+        alias -g JQ="| jq"
+        alias -g C="| wl-copy"
+        alias -g NE="2>/dev/null"
+        alias -g ND=">/dev/null"
+        alias -g NUL=">/dev/null 2>1"
 
         # search history based on what's typed in the prompt
         autoload -U history-search-end
@@ -152,7 +153,7 @@ in {
         # Colors
         zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
 
-        # case insensitive tab completion
+        # Case insensitive tab completion
         zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
         zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
         zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
@@ -168,6 +169,13 @@ in {
         zstyle ':completion:complete:*:options' sort false
         zstyle ':completion:files' sort false
 
+        autoload zmv
+
+        hash -d dl=~/Downloads
+        hash -d ni=~/.config/nixos
+        hash -d de=~/dev
+        hash -d cy=~/Cyber
+
         ${lib.optionalString config.services.gpg-agent.enable ''
           gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
           export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"

home/programs/spicetify/default.nix

@@ -1,43 +0,0 @@
-# Spicetify is a spotify client customizer
-{
-  pkgs,
-  pkgs-stable,
-  config,
-  lib,
-  inputs,
-  ...
-}: let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-  accent = "${config.lib.stylix.colors.base0D}";
-  background = "${config.lib.stylix.colors.base00}";
-in {
-  imports = [inputs.spicetify-nix.homeManagerModules.default];
-
-  stylix.targets.spicetify.enable = false;
-
-  programs.spicetify = {
-    enable = true;
-    spotifyPackage = pkgs-stable.spotify;
-    theme = lib.mkForce spicePkgs.themes.dribbblish;
-
-    colorScheme = "custom";
-
-    customColorScheme = {
-      button = accent;
-      button-active = accent;
-      tab-active = accent;
-      player = background;
-      main = background;
-      sidebar = background;
-    };
-
-    enabledExtensions = with spicePkgs.extensions; [
-      playlistIcons
-      historyShortcut
-      hidePodcasts
-      adblock
-      fullAppDisplay
-      keyboardShortcut
-    ];
-  };
-}

home/programs/yazi/default.nix

@@ -1,18 +1,18 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   programs.yazi = {
     enable = true;
     shellWrapperName = "y";
 
     plugins = {
-      git              = { package = pkgs.yaziPlugins.git;              setup = true; };
+      git = {
+        package = pkgs.yaziPlugins.git;
+        setup = true;
+      };
       ouch = pkgs.yaziPlugins.ouch;
       piper = pkgs.yaziPlugins.piper;
       convert = pkgs.yaziPlugins.convert;
-      "full-border"    = { package = pkgs.yaziPlugins."full-border";    setup = true; };
-      "toggle-pane"    = pkgs.yaziPlugins."toggle-pane";
       "jump-to-char" = pkgs.yaziPlugins."jump-to-char";
       "wl-clipboard" = pkgs.yaziPlugins."wl-clipboard";
-      starship         = { package = pkgs.yaziPlugins.starship;         setup = true; };
       "batch-rename-gui" = pkgs.yaziPlugins.mkYaziPlugin {
         pname = "batch-rename-gui.yazi";
         version = "0-unstable-2025-07-08";
@@ -23,54 +23,107 @@
           hash = "sha256-3RviPY3WOyYi5GWXWRYMWp6VLxCe5cuJX7Kb7AyWxLE=";
         };
       };
-      "command-palette" = pkgs.yaziPlugins.mkYaziPlugin {
-        pname   = "command-palette.yazi";
-        version = "0-unstable-2025-07-08";
-        src = pkgs.fetchFromGitHub {
-          owner = "Mr-Ples";
-          repo  = "command-palette.yazi";
-          rev   = "e5e61057381e2642d36ba5b9a4977c8196bc1791";
-          hash  = "sha256-Mt1q05YgexMyHpy8qQ778jBny9f7XrftDZXjzONZVxg=";
-        };
-        installPhase = ''
-          runHook preInstall
-          substituteInPlace main.lua \
-            --replace 'line = line:gsub' 'local line = line:gsub'
-          cp -r . $out
-          runHook postInstall
-        '';
-      };
     };
 
-    settings.mgr.ratio = [ 1 4 3 ];
+    settings.mgr.ratio = [0 4 3];
 
     settings.plugin = {
       prepend_fetchers = [
-        { url = "*";  run = "git"; group = "git"; }
+        {
-        { url = "*/"; run = "git"; group = "git"; }
+          url = "*";
+          run = "git";
+          group = "git";
+        }
+        {
+          url = "*/";
+          run = "git";
+          group = "git";
+        }
       ];
       prepend_previewers = [
-        { url = "*.md"; run = ''piper -- CLICOLOR_FORCE=1 glow -w=$w -s=dark "$1"''; }
+        {
+          url = "*.md";
+          run = ''piper -- CLICOLOR_FORCE=1 glow -w=$w -s=dark "$1"'';
+        }
       ];
       prepend_openers = [
-        { url = "*.{zip,tar,gz,bz2,xz,7z,rar}"; run = "ouch"; }
+        {
+          url = "*.{zip,tar,gz,bz2,xz,7z,rar}";
+          run = "ouch";
+        }
       ];
     };
 
     keymap.mgr.prepend_keymap = [
-      { on = ["C"]; run = "plugin ouch";                   desc = "Compress"; }
+      {
-      { on = ["X"]; run = "plugin ouch --args=extract";    desc = "Extract"; }
+        on = ["C"];
-      { on = ["c" "p"]; run = "plugin convert -- --extension='png'";  desc = "Convert to PNG"; }
+        run = "plugin ouch";
-      { on = ["c" "j"]; run = "plugin convert -- --extension='jpg'";  desc = "Convert to JPG"; }
+        desc = "Compress";
-      { on = ["c" "w"]; run = "plugin convert -- --extension='webp'"; desc = "Convert to WebP"; }
+      }
-      { on = ["M"]; run = ''shell 'exiftool "$@" | less' --block'';   desc = "Show metadata"; }
+      {
-      { on = ["T"]; run = "plugin toggle-pane min-parent";   desc = "Toggle parent pane"; }
+        on = ["X"];
-      { on = ["F"]; run = "plugin jump-to-char";            desc = "Jump to char"; }
+        run = "plugin ouch --args=extract";
-      { on = ["Y"]; run = "plugin wl-clipboard";            desc = "Copy to clipboard (Wayland)"; }
+        desc = "Extract";
-      { on = ["B"]; run = "plugin batch-rename-gui";        desc = "Batch rename"; }
+      }
-      { on = [";"]; run = "plugin command-palette";         desc = "Command palette"; }
+      {
+        on = ["c" "p"];
+        run = "plugin convert -- --extension='png'";
+        desc = "Convert to PNG";
+      }
+      {
+        on = ["c" "j"];
+        run = "plugin convert -- --extension='jpg'";
+        desc = "Convert to JPG";
+      }
+      {
+        on = ["c" "w"];
+        run = "plugin convert -- --extension='webp'";
+        desc = "Convert to WebP";
+      }
+      {
+        on = ["M"];
+        run = ''shell 'exiftool "$@" | less' --block'';
+        desc = "Show metadata";
+      }
+      {
+        on = ["T"];
+        run = "plugin toggle-parent";
+        desc = "Toggle parent pane";
+      }
+      {
+        on = ["F"];
+        run = "plugin jump-to-char";
+        desc = "Jump to char";
+      }
+      {
+        on = ["Y"];
+        run = "plugin wl-clipboard";
+        desc = "Copy to clipboard (Wayland)";
+      }
+      {
+        on = ["B"];
+        run = "plugin batch-rename-gui";
+        desc = "Batch rename";
+      }
     ];
   };
 
-  home.packages = with pkgs; [ glow ouch hexyl exiftool starship fzf ];
+  home.packages = with pkgs; [glow ouch hexyl exiftool fzf wl-clipboard];
+
+  xdg.configFile."yazi/plugins/toggle-parent.yazi/main.lua".text = ''
+    --- @sync entry
+    local RESTORE_WIDTH = 1
+    return {
+      entry = function(st, job)
+        local r = rt.mgr.ratio
+        if r.parent == 0 then
+          rt.mgr.ratio = { st.width or RESTORE_WIDTH, r.current, r.preview }
+        else
+          st.width = r.parent
+          rt.mgr.ratio = { 0, r.current, r.preview }
+        end
+        ya.emit("app:resize", {})
+      end
+    }
+  '';
 }

home/system/caelestia-shell/appearance.nix

@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  rounding = config.theme.rounding + config.theme.gaps-out;
+  inherit (config.theme) bar-rounding bar-thickness;
   inherit (config.stylix) fonts;
 in {
   home.packages = with pkgs; [
@@ -43,8 +43,8 @@ in {
     };
     dashboard.showOnHover = false;
     border = {
-      inherit rounding;
+      rounding = bar-rounding;
-      thickness = 8;
+      thickness = bar-thickness;
     };
   };
 }

hosts/laptop/home.nix

@@ -10,7 +10,6 @@
     ../../home/programs/git
     ../../home/programs/git/lazygit.nix
     ../../home/programs/git/signing.nix # CHANGEME: Change the key or remove this file
-    ../../home/programs/spicetify
     ../../home/programs/thunar
     ../../home/programs/nixy
     ../../home/programs/nightshift

hosts/laptop/variables.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # Choose your theme here:
-    ../../themes/darkviolet.nix
+    ../../themes/nixy.nix
   ];
 
   config.var = {

hosts/server/variables.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # Choose your theme here:
-    ../../themes/rose-pine.nix
+    ../../themes/nixy.nix
   ];
 
   config.var = {

hosts/work/home.nix

@@ -8,7 +8,6 @@
     ../../home/programs/shell
     ../../home/programs/git
     ../../home/programs/git/lazygit.nix
-    ../../home/programs/spicetify
     ../../home/programs/thunar
     ../../home/programs/nixy
     ../../home/programs/nightshift

hosts/work/variables.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # Choose your theme here:
-    ../../themes/darkviolet.nix
+    ../../themes/nixy.nix
   ];
 
   config.var = {

nixos/docker.nix

@@ -1,5 +1,5 @@
-# Docker is a containerization platform that allows you to run applications in isolated environments called containers.
+{config, pkgs, ...}: {
-{config, ...}: {
   virtualisation.docker.enable = true;
+  virtualisation.docker.package = pkgs.docker_29;
   users.users."${config.var.username}".extraGroups = ["docker"];
 }

themes/nixy.nix

@@ -7,16 +7,17 @@
   options.theme = lib.mkOption {
     type = lib.types.attrs;
     default = {
-      rounding = 25;
+      rounding = 20;
-      gaps-in = 10;
+      bar-rounding = 20 + 10;
-      gaps-out = 10 * 2;
+      bar-thickness = 0;
-      active-opacity = 0.99;
+      gaps-in = 8;
-      inactive-opacity = 0.97;
+      gaps-out = 8 * 2;
+      active-opacity = 0.96;
+      inactive-opacity = 0.92;
       blur = true;
       border-size = 2;
       animation-speed = "medium"; # "fast" | "medium" | "slow"
       fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-      textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
     };
     description = "Theme configuration options";
   };
@@ -26,8 +27,8 @@
 
     # See https://tinted-theming.github.io/tinted-gallery/ for more schemes
     base16Scheme = {
-      base00 = "110F12"; # Default Background
+      base00 = "0A0A0C"; # Default Background
-      base01 = "1C1920"; # Lighter Background (Used for status bars, line number and folding marks)
+      base01 = "110F12"; # Lighter Background (Used for status bars, line number and folding marks)
       base02 = "2D2A36"; # Selection Background
       base03 = "514D63"; # Comments, Invisibles, Line Highlighting
       base04 = "8E8AA0"; # Dark Foreground (Used for status bars)
@@ -74,8 +75,8 @@
 
     polarity = "dark";
     image = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/white-snow-and-a-tree_light.png";
+      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/black-moutains-and-a-city.png";
-      sha256 = "sha256-HKqDY/iCcV++WwNuNIWZEyXuxYuGWG+krn2vPTe58HQ=";
+      sha256 = "sha256-RTTA3Lf+hnPpo9hwS075kbnIouz12ul2GKO3EIgP6AU=";
     };
   };
 }

themes/rose-pine.nix

@@ -1,81 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
-  options.theme = lib.mkOption {
-    type = lib.types.attrs;
-    default = {
-      rounding = 30;
-      gaps-in = 12;
-      gaps-out = 12 * 2;
-      active-opacity = 0.96;
-      inactive-opacity = 0.94;
-      blur = true;
-      border-size = 4;
-      animation-speed = "fast"; # "fast" | "medium" | "slow"
-      fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-      textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
-    };
-    description = "Theme configuration options";
-  };
-
-  config.stylix = {
-    enable = true;
-
-    # See https://tinted-theming.github.io/tinted-gallery/ for more schemes
-    base16Scheme = {
-      base00 = "151320"; # Default Background
-      base01 = "1f1d2e"; # Lighter Background (Used for status bars, line number and folding marks)
-      base02 = "26233a"; # Selection Background
-      base03 = "6e6a86"; # Comments, Invisibles, Line Highlighting
-      base04 = "908caa"; # Dark Foreground (Used for status bars)
-      base05 = "e0def4"; # Default Foreground, Caret, Delimiters, Operators
-      base06 = "e0def4"; # Light Foreground (Not often used)
-      base07 = "524f67"; # Light Background (Not often used)
-      base08 = "eb6f92"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-      base09 = "f6c177"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
-      base0A = "ebbcba"; # Classes, Markup Bold, Search Text Background
-      base0B = "31748f"; # Strings, Inherited Class, Markup Code, Diff Inserted
-      base0C = "9ccfd8"; # Support, Regular Expressions, Escape Characters, Markup Quotes
-      base0D = "c4a7e7"; # Functions, Methods, Attribute IDs, Headings, Accent color
-      base0E = "f6c177"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-      base0F = "524f67"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
-    };
-
-    cursor = {
-      name = "BreezeX-RosePine-Linux";
-      package = pkgs.rose-pine-cursor;
-      size = 20;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.maple-mono.NF;
-        name = "Maple Mono NF";
-      };
-      sansSerif = {
-        package = pkgs.source-sans-pro;
-        name = "Source Sans Pro";
-      };
-      serif = config.stylix.fonts.sansSerif;
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-      sizes = {
-        applications = 13;
-        desktop = 13;
-        popups = 13;
-        terminal = 13;
-      };
-    };
-
-    polarity = "dark";
-    image = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/pink-clouds.png";
-      sha256 = "sha256-IvINf62mg9rKjml4sh8hl/j7UHrQQlbm6QnZTaI+TRk=";
-    };
-  };
-}

themes/zen.nix

@@ -1,81 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
-  options.theme = lib.mkOption {
-    type = lib.types.attrs;
-    default = {
-      rounding = 30;
-      gaps-in = 12;
-      gaps-out = 12 * 2;
-      active-opacity = 0.99;
-      inactive-opacity = 0.98;
-      blur = false;
-      border-size = 4;
-      animation-speed = "medium"; # "fast" | "medium" | "slow"
-      fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-      textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
-    };
-    description = "Theme configuration options";
-  };
-
-  config.stylix = {
-    enable = true;
-
-    # See https://tinted-theming.github.io/tinted-gallery/ for more schemes
-    base16Scheme = {
-      base00 = "090E13"; # Default Background
-      base01 = "12171E"; # Lighter Background (Used for status bars, line number and folding marks)
-      base02 = "393B44"; # Selection Background
-      base03 = "54546D"; # Comments, Invisibles, Line Highlighting
-      base04 = "A4A7A4"; # Dark Foreground (Used for status bars)
-      base05 = "C5C9C7"; # Default Foreground, Caret, Delimiters, Operators
-      base06 = "DCD7BA"; # Light Foreground (Not often used)
-      base07 = "C8C093"; # Light Background (Not often used)
-      base08 = "C4746E"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-      base09 = "B6927B"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
-      base0A = "C4B28A"; # Classes, Markup Bold, Search Text Background
-      base0B = "8A9A7B"; # Strings, Inherited Class, Markup Code, Diff Inserted
-      base0C = "8EA4A2"; # Support, Regular Expressions, Escape Characters, Markup Quotes
-      base0D = "8BA4B0"; # Functions, Methods, Attribute IDs, Headings, Accent color
-      base0E = "A292A3"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-      base0F = "B98D7B"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
-    };
-
-    cursor = {
-      name = "BreezeX-RosePine-Linux";
-      package = pkgs.rose-pine-cursor;
-      size = 20;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.maple-mono.NF;
-        name = "Maple Mono NF";
-      };
-      sansSerif = {
-        package = pkgs.source-sans-pro;
-        name = "Source Sans Pro";
-      };
-      serif = config.stylix.fonts.sansSerif;
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-      sizes = {
-        applications = 13;
-        desktop = 13;
-        popups = 13;
-        terminal = 13;
-      };
-    };
-
-    polarity = "dark";
-    image = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/nepal.png";
-      sha256 = "sha256-0o2+B3+yA++PCyfNC+VqmaX959aKk3GuD7XpOq3SGcM=";
-    };
-  };
-}