change apps

Former-commit-id: 7aa07cde8e

.github/assets/README_template.md

@@ -65,8 +65,7 @@ Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, .
 
 ### 🎨 themes
 
-Those are the themes used in the system configuration.
-Those themes are based on [stylix](https://github.com/danth/stylix).
+Those are the themes used in the system configuration. The `stylix` folder contains the [stylix](https://github.com/danth/stylix) defined themes, the `var` folder contains the variables not handled by stylix.
 See avaiable themes in [THEMES.md](docs/THEMES.md)
 
 ### 💻 hosts

.github/workflows/update-hyprland-keybindings.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Run a script
         run: |
           chmod +x ./.github/scripts/keybindings_to_markdown.sh
-          ./docs/.github/keybindings_to_markdown.sh
+          ./.github/scripts/keybindings_to_markdown.sh
           git config user.name github-actions
           git config user.email github-actions@github.com
           git add .

.github/workflows/update-scripts-docs.yml

@@ -1,7 +1,7 @@
 on:
   push:
      paths:
-       - 'home/scripts'
+       - 'home/scripts/**'
 permissions:
   contents: write
 jobs:

.gitignore

@@ -1 +1,2 @@
 todolist.md
+.sops.yaml

.sops.yaml

@@ -1,11 +0,0 @@
-keys:
-  - &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
-creation_rules:
-  - path_regex: hosts/laptop/secrets/secrets.yaml$
-    key_groups:
-      - age:
-        - *primary
-  - path_regex: hosts/server/secrets/secrets.yaml$
-    key_groups:
-      - age:
-        - *primary

README.md

@@ -74,8 +74,7 @@ Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, .
 
 ### 🎨 themes
 
-Those are the themes used in the system configuration.
-Those themes are based on [stylix](https://github.com/danth/stylix).
+Those are the themes used in the system configuration. The `stylix` folder contains the [stylix](https://github.com/danth/stylix) defined themes, the `var` folder contains the variables not handled by stylix.
 See avaiable themes in [THEMES.md](docs/THEMES.md)
 
 ### 💻 hosts

docs/KEYBINDINGS-HYPRLAND.md

@@ -15,7 +15,9 @@
 | Lock | SUPER + L |
 | Powermenu | SUPER + X |
 | Launcher | SUPER + SPACE |
+| Quickmenu | SUPER + C |
 | Toggle HyprFocus | SHIFT + SUPER + SPACE |
+| "$mod,TAB, overview:toggle"  |  |
 | Close window | SUPER + Q |
 | Toggle Floating | SUPER + T |
 | Toggle Fullscreen | SUPER + F |
@@ -27,10 +29,11 @@
 | Focus next monitor | SHIFT + SUPER + down |
 | Add to master | SHIFT + SUPER + left |
 | Remove from master | SHIFT + SUPER + right |
-| Screenshot window | SUPER + PRINT |
+| Screenshot region | SUPER + PRINT |
 | Screenshot monitor | PRINT |
-| Screenshot region | SHIFT + SUPER + PRINT |
+| Screenshot window | SHIFT + SUPER + PRINT |
 | Screenshot region then edit | ALTPRINT |
+| Toggle hyprpanel | SHIFT + SUPER + T |
 | Search on internet with wofi | SHIFT + SUPER + S |
 | Clipboard picker with wofi | SHIFT + SUPER + C |
 | Emoji picker with wofi | SHIFT + SUPER + E |
@@ -39,6 +42,9 @@
 | Move Window (mouse) | SUPER + mouse:272 |
 | Resize Window (mouse) | SUPER + R |
 | Toggle Mute | XF86AudioMute |
+| Play/Pause Song | XF86AudioPlay |
+| Next Song | XF86AudioNext |
+| Previous Song | XF86AudioPrev |
 | Lock when closing Lid | switch:Lid Switch |
 | Sound Up | XF86AudioRaiseVolume |
 | Sound Down | XF86AudioLowerVolume |

docs/SCRIPTS.md

@@ -31,11 +31,12 @@ A simple script to toggle focus on few windows in Hyprland.
 
 ## Hyprpanel
 
-Quick scripts to toggle, reload and kill hyprpanel.
+Quick scripts to toggle, reload, hide & show hyprpanel.
 
-- `hyprpanel-toggle` - Toggle hyprpanel.
+- `hyprpanel-toggle` - Toggle hyprpanel (hide/show).
+- `hyprpanel-show` - Show hyprpanel.
+- `hyprpanel-hide` - Hide hyprpanel.
 - `hyprpanel-reload` - Reload hyprpanel.
-- `hyprpanel-kill` - Kill hyprpanel.
 
 ## Nerdfont FZF
 
@@ -46,6 +47,7 @@ This module provides a script to search for Nerd Fonts icons using fzf.
 ## Night-Shift
 
 Night-Shift is a feature that reduces the amount of blue light emitted by your screen, which can help reduce eye strain and improve sleep quality. This module provides a set of scripts to control Night-Shift on your system.
+It use hyprsunset to control the screen temperature.
 
 - `night-shift-on` activates Night-Shift.
 - `night-shift-off` deactivates Night-Shift.
@@ -63,9 +65,17 @@ Nixy is a simple script that I use to manage my NixOS system. It's a simple scri
 
 
 
+## OpenVPN
+
+OpenVPN allows you to connect/disconnect quickly to a openVPN server
+
+- `openvpn-up` turn on the vpn
+- `openvpn-down` turn down the vpn
+- `openvpn-toggle` toggle the vpn
+
 ## Screenshot
 
-This module provides a script to take screenshots using `hyprshot` and `swappy`.
+This module provides a script to take screenshots using `grimblast` and `swappy`.
 
 - `screenshot [region|window|monitor] [swappy]` - Take a screenshot of the region, window, or monitor. Optionally, use `swappy` to copy the screenshot to the clipboard.
 
@@ -82,7 +92,7 @@ This module provides a set of scripts to control the volume of the default audio
 
 Usefull quick scripts
 
-- `menu` - Open wofi with drun mode.
-- `powermenu` - Open power dropdown menu.
-- `lock` - Lock the screen.
+- `menu` - Open wofi with drun mode. (wofi)
+- `powermenu` - Open power dropdown menu. (wofi)
+- `lock` - Lock the screen. (hyprlock)
 

docs/TODO.md

@@ -2,12 +2,9 @@
 
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
-- [!] Qutebrowser Bitwarden integration (I need this.)
-
-- [ ] Nixvim
-  - [ ] Change headings foreground
-  - [ ] neotest golang
-  - [ ] nvim dap
-
-- [ ] Tofi configuration
-- [ ] OS Hardening with nix-mineral
+- [ ] ${config.users.users.${user}.home} instead of "/home/${username}"
+- [ ] Hyprpanel screenshot
+- [ ] PIA Vpn (issue in progress)
+- [ ] Webcord (system24 theme? Tui)
+- [ ] check gvolpe/nix-config
+- [ ] <https://github.com/isabelroses/dotfiles/blob/main/home/comfy/system/xdg.nix>

flake.nix

@@ -24,33 +24,35 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    hyprspace = { url = "github:KZDKM/Hyprspace"; };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
     hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
-    nixy-wallpapers = {
-      url = "github:anotherhadi/nixy-wallpapers";
-      flake = false;
-    };
     stylix.url = "github:danth/stylix";
     apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    hyprswitch.url = "github:h3rmt/hyprswitch/release";
+    nur.url = "github:nix-community/NUR";
+    zen-browser.url =
+      "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake
   };
 
   outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-      nixy = # CHANGEME
+      nixy = # CHANGEME: This should match the 'hostname' in your variables.nix file
         nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             {
-              nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
+              nixpkgs.overlays =
+                [ inputs.hyprpanel.overlay inputs.nur.overlays.default ];
               _module.args = { inherit inputs; };
             }
-            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
+            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
             inputs.home-manager.nixosModules.home-manager
             inputs.stylix.nixosModules.stylix
-            ./hosts/laptop/configuration.nix # CHANGEME
+            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
           ];
         };
+
     };
   };
 }

home/programs/duckduckgo-colorscheme/default.nix

@@ -0,0 +1,44 @@
+# A duckduckgo colorscheme generated for the Stylix theme used.
+{ config, ... }:
+let
+  accent = config.lib.stylix.colors.base0D;
+  background = config.lib.stylix.colors.base00;
+  foreground = config.lib.stylix.colors.base05;
+  background-alt = config.lib.stylix.colors.base01;
+  foreground-alt = config.lib.stylix.colors.base06;
+in {
+  home.file.".duckduckgo-colorscheme.js".text =
+    # js
+    ''
+      // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
+      // based on https://ddg.codingcodax.dev/
+      // Cookies string for your theme
+      const cookie = '7=${background}; j=${background}; 9=${foreground}; aa=${foreground-alt}; 8=${foreground}; x=${accent}; 21=${background-alt};';
+
+      // Converts cookie string into formatted JSON
+      const cookieToJSON = (cookieRaw) => {
+        const cookieJson = {};
+        const items = cookieRaw.split(/[ ,]+/);
+
+        items.forEach((item) => {
+          const parts = item.split('=');
+          cookieJson[parts[0]] = parts[1];
+        });
+
+        return cookieJson;
+      };
+
+      // Iterates over JSON, and adds to browser cookie store
+      const setCookies = (cookieJson) => {
+        Object.keys(cookieJson).forEach((key) => {
+          document.cookie = `''${key}=''${cookieJson [ key ]}`;
+        });
+      };
+
+      // Call set cookies, passing in formated cookie data
+      setCookies(cookieToJSON(cookie));
+
+      // All done, reload page for changes to take effect :)
+      location.reload();
+    '';
+}

home/programs/git/default.nix

@@ -22,6 +22,7 @@ in {
     extraConfig = {
       init.defaultBranch = "main";
       push.autoSetupRemote = true;
+      color.ui = "1";
     };
     aliases = {
       essa = "push --force";

home/programs/markdown/default.nix

@@ -1,4 +0,0 @@
-# Work in progress on another repo
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ wkhtmltopdf ];
-}

home/programs/nvim/autocmds.nix

@@ -0,0 +1,187 @@
+{
+  programs.nixvim = {
+    autoGroups = {
+      auto_quit.clear = true;
+      autoview.clear = true;
+      bufferline.clear = true;
+      checktime.clear = true;
+      create_dir.clear = true;
+      editorconfig_filetype.clear = true;
+      file_user_events.clear = true;
+      highlighturl.clear = true;
+      highlightyank.clear = true;
+      large_buf_settings.clear = true;
+      q_close_windows.clear = true;
+      terminal_settings.clear = true;
+      unlist_quickfix.clear = true;
+    };
+
+    autoCmd = [
+      # auto_quit
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L18-L46
+      {
+        desc =
+          "Quit neovim if more than one window is open and only sidebar windows are list";
+        event = "BufEnter";
+        group = "auto_quit";
+
+        callback.__raw = ''
+          function()
+            local wins = vim.api.nvim_tabpage_list_wins(0)
+            -- Both neo-tree and aerial will auto-quit if there is only a single window left
+            if #wins <= 1 then return end
+            local sidebar_fts = { aerial = true, ["neo-tree"] = true }
+            for _, winid in ipairs(wins) do
+              if vim.api.nvim_win_is_valid(winid) then
+                local bufnr = vim.api.nvim_win_get_buf(winid)
+                local filetype = vim.bo[bufnr].filetype
+                -- If any visible windows are not sidebars, early return
+                if not sidebar_fts[filetype] then
+                  return
+                -- If the visible window is a sidebar
+                else
+                  -- only count filetypes once, so remove a found sidebar from the detection
+                  sidebar_fts[filetype] = nil
+                end
+              end
+            end
+            if #vim.api.nvim_list_tabpages() > 1 then
+              vim.cmd.tabclose()
+            else
+              vim.cmd.qall()
+            end
+          end
+        '';
+      }
+
+      # autoview
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L49-L70
+      {
+        desc = "Save view with mkview for real files";
+        event = [ "BufWinLeave" "BufWritePost" "WinLeave" ];
+        group = "autoview";
+
+        callback.__raw = ''
+          function(event)
+            if vim.b[event.buf].view_activated then vim.cmd.mkview { mods = { emsg_silent = true } } end
+          end
+        '';
+      }
+      {
+        desc =
+          "Try to load file view if available and enable view saving for real files";
+        event = "BufWinEnter";
+        group = "autoview";
+
+        callback.__raw = ''
+          function(event)
+            if not vim.b[event.buf].view_activated then
+              local filetype = vim.bo[event.buf].filetype
+              local buftype = vim.bo[event.buf].buftype
+              local ignore_filetypes = { "gitcommit", "gitrebase", "svg", "hgcommit" }
+              if buftype == "" and filetype and filetype ~= "" and not vim.tbl_contains(ignore_filetypes, filetype) then
+                vim.b[event.buf].view_activated = true
+                vim.cmd.loadview { mods = { emsg_silent = true } }
+              end
+            end
+          end
+        '';
+      }
+
+      # checktime
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L118-L122
+      {
+        desc = "Check if buffers changed on editor focus";
+        event = [ "FocusGained" "TermClose" "TermLeave" ];
+        group = "checktime";
+        command = "checktime";
+      }
+
+      # editorconfig_filetype
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L135-L144
+      {
+        desc =
+          "Configure editorconfig after filetype detection to override `ftplugin`s";
+        event = "FileType";
+        group = "editorconfig_filetype";
+
+        callback.__raw = ''
+          function(args)
+            if vim.F.if_nil(vim.b.editorconfig, vim.g.editorconfig, true) then
+              local editorconfig_avail, editorconfig = pcall(require, "editorconfig")
+              if editorconfig_avail then editorconfig.config(args.buf) end
+            end
+          end
+        '';
+      }
+
+      # highlightyank
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L206-L211
+      {
+        desc = "Highlight yanked text";
+        event = "TextYankPost";
+        group = "highlightyank";
+        pattern = "*";
+
+        callback.__raw = ''
+          function()
+            vim.highlight.on_yank()
+          end
+        '';
+      }
+
+      # q_close_windows
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L242-L255
+      {
+        desc = "Make q close help, man, quickfix, dap floats";
+        event = "BufWinEnter";
+        group = "q_close_windows";
+
+        callback.__raw = ''
+          function(event)
+            if vim.tbl_contains({ "help", "nofile", "quickfix" }, vim.bo[event.buf].buftype) then
+              vim.keymap.set("n", "q", "<Cmd>close<CR>", {
+                desc = "Close window",
+                buffer = event.buf,
+                silent = true,
+                nowait = true,
+              })
+            end
+          end
+        '';
+      }
+
+      # terminal_settings
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L258-L266
+      {
+        desc = "Disable line number/fold column/sign column for terminals";
+        event = "TermOpen";
+        group = "terminal_settings";
+
+        callback.__raw = ''
+          function()
+            vim.opt_local.number = false
+            vim.opt_local.relativenumber = false
+            vim.opt_local.foldcolumn = "0"
+            vim.opt_local.signcolumn = "no"
+          end
+        '';
+      }
+
+      # unlist_quickfix
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L270-L275
+      {
+        desc = "Unlist quickfix buffers";
+        event = "FileType";
+        group = "unlist_quickfix";
+        pattern = "qf";
+
+        callback.__raw = ''
+          function()
+            vim.opt_local.buflisted = false
+          end
+        '';
+      }
+    ];
+  };
+}

home/programs/nvim/default.nix

@@ -2,19 +2,19 @@
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/cmp.nix
-    ./plugins/dashboard.nix
     ./plugins/lsp.nix
-    ./plugins/markdown.nix
     ./plugins/tree.nix
-    ./plugins/ui.nix
-    ./plugins/utils.nix
-    ./plugins/dap.nix
     ./plugins/telescope.nix
-    ./plugins/zenmode.nix
+    ./plugins/cmp.nix
+    ./plugins/ui.nix
+    ./plugins/lualine.nix
+    ./plugins/utils.nix
+    ./plugins/dashboard.nix
+    ./plugins/markdown.nix
 
     ./options.nix
     ./keymaps.nix
+    ./autocmds.nix
   ];
 
   programs.nixvim.enable = true;

home/programs/nvim/options.nix

@@ -1,38 +1,151 @@
 {
-  programs.nixvim.globals.mapleader = " ";
-  programs.nixvim.opts = {
-    updatetime = 50; # Faster completion
+  programs.nixvim = {
+    globals.mapleader = " ";
+    opts = {
+      autoindent = true;
 
-    number = true;
-    relativenumber = true;
+      smartindent = true;
 
-    autoindent = true;
-    clipboard = "unnamed,unnamedplus";
+      incsearch = true;
+      hlsearch = true;
+      wildmode = "list:longest";
+      scrolloff = 8;
 
-    expandtab = true;
-    tabstop = 2;
-    softtabstop = 2;
-    shiftwidth = 2;
-    smartindent = true;
-    breakindent = true;
+      swapfile = false;
+      conceallevel = 3;
+      clipboard = "unnamed,unnamedplus";
 
-    ignorecase = true;
-    incsearch = true;
-    hlsearch = true;
-    smartcase = true;
-    wildmode = "list:longest";
-    completeopt = [ "menuone" "noselect" "noinsert" ];
-    signcolumn = "yes";
-    cursorline = false;
-    scrolloff = 8;
-    mouse = "a";
-    termguicolors = true;
-    showmode = false;
+      # Don't stop backspace at insert
+      backspace.__raw = ''
+        vim.list_extend(vim.opt.backspace:get(), { "nostop" })
+      '';
 
-    wrap = false;
+      # Keep visual indentation on wrapped lines
+      breakindent = true;
 
-    swapfile = false;
-    undofile = true;
-    conceallevel = 3;
+      # Hide command line unless needed
+      cmdheight = 0;
+
+      # Insert mode completion options
+      completeopt = [ "menu" "menuone" "noselect" ];
+
+      # Raise a dialog asking if you wish to save the current file(s)
+      confirm = true;
+
+      # Copy previous indentation on autoindenting
+      copyindent = true;
+
+      # Highlight current line
+      cursorline = true;
+
+      # Enable linematch diff algorithm
+      diffopt.__raw = ''
+        vim.list_extend(vim.opt.diffopt:get(), { "algorithm:histogram", "linematch:60" })
+      '';
+
+      # Expand <Tab> to spaces
+      expandtab = true;
+
+      # Disable `~` on nonexistent lines
+      fillchars = { eob = " "; };
+
+      # Enable fold with all code unfolded
+      foldcolumn = "1";
+      foldenable = true;
+      foldlevel = 99;
+      foldlevelstart = 99;
+
+      # Ignore case in search patterns
+      ignorecase = true;
+
+      # Show substitution preview in split window
+      inccommand = "split";
+
+      # Infer casing on word completion
+      infercase = true;
+
+      # Global statusline
+      laststatus = 3;
+
+      # Wrap lines at 'breakat'
+      linebreak = true;
+
+      # Enable mouse support
+      mouse = "a";
+
+      # Show line numbers
+      number = true;
+
+      # Preserve indentation as much as possible
+      preserveindent = true;
+
+      # Height of the popup menu
+      pumheight = 10;
+
+      # Display line numbers relative to current line
+      relativenumber = true;
+
+      # Minimal number of lines to keep around the cursor
+      # This has the effect to move the view along with current line
+      #scrolloff = 999;
+
+      # Number of spaces to use for indentation
+      shiftwidth = 2;
+
+      # Disable search count wrap and startup messages
+      shortmess.__raw = ''
+        vim.tbl_deep_extend("force", vim.opt.shortmess:get(), { s = true, I = true })
+      '';
+
+      # Disable showing modes in command line
+      showmode = false;
+
+      # Always show tabline
+      showtabline = 2;
+
+      # Show signs column
+      signcolumn = "yes";
+
+      # Override ignorecase if search pattern contains uppercase characters
+      smartcase = true;
+
+      # Number of spaces input on <Tab>
+      softtabstop = 2;
+
+      # Open horizontal split below (:split)
+      splitbelow = true;
+
+      # Open vertical split to the right (:vsplit)
+      splitright = true;
+
+      # Number of spaces to represent a <Tab>
+      tabstop = 2;
+
+      # Enables 24-bit RGB color
+      termguicolors = true;
+
+      # Shorter timeout duration
+      timeoutlen = 500;
+
+      # Set window title to the filename
+      title = true;
+
+      # Save undo history to undo file (in $XDG_STATE_HOME/nvim/undo)
+      undofile = true;
+
+      viewoptions.__raw = ''
+        vim.tbl_filter(function(val) return val ~= "curdir" end, vim.opt.viewoptions:get())
+      '';
+
+      # Enable virtual edit in visual block mode
+      # This has the effect of selecting empty cells beyond lines boundaries
+      virtualedit = "block";
+
+      # Disable line wrapping
+      wrap = false;
+
+      # Disable making a backup before overwriting a file
+      writebackup = false;
+    };
   };
 }

home/programs/nvim/plugins/cmp.nix

@@ -112,6 +112,5 @@
         };
       };
     };
-
   };
 }

home/programs/nvim/plugins/dap.nix

@@ -1,28 +0,0 @@
-{ pkgs, ... }: {
-  programs.nixvim.plugins.dap = {
-    enable = true;
-    adapters = { };
-    signs = {
-      dapBreakpoint = {
-        text = "●";
-        texthl = "DapBreakpoint";
-      };
-      dapBreakpointCondition = {
-        text = "●";
-        texthl = "DapBreakpointCondition";
-      };
-      dapLogPoint = {
-        text = "◆";
-        texthl = "DapLogPoint";
-      };
-    };
-    extensions = {
-      dap-go = {
-        enable = true;
-        delve.path = "${pkgs.delve}/bin/dlv";
-      };
-      dap-ui = { enable = true; };
-      dap-virtual-text = { enable = true; };
-    };
-  };
-}

home/programs/nvim/plugins/lsp.nix

@@ -7,7 +7,16 @@
         bashls.enable = true;
         clangd.enable = true;
         gopls.enable = true;
-        nixd.enable = true;
+        eslint.enable = true;
+        ts_ls.enable = true;
+        nixd = {
+          enable = true;
+          extraOptions = {
+            expr = "import <nixpkgs> {}";
+            # fix- encoding: https://github.com/nix-community/nixvim/issues/2390
+            offset_encoding = "utf-8";
+          };
+        };
         tailwindcss.enable = true;
         html.enable = true;
         svelte.enable = true;

home/programs/nvim/plugins/lualine.nix

@@ -0,0 +1,30 @@
+{
+  programs.nixvim.plugins.lualine = {
+    enable = true;
+    settings = {
+      options.disabled_filetypes.statusline =
+        [ "dashboard" "alpha" "neo-tree" ];
+
+      alwaysDivideMiddle = true;
+      globalstatus = true;
+      ignoreFocus = [ "neo-tree" ];
+      extensions = [ "fzf" ];
+      componentSeparators = {
+        left = "|";
+        right = "|";
+      };
+      sectionSeparators = {
+        left = "█"; # 
+        right = "█"; # 
+      };
+      sections = {
+        lualine_a = [ "mode" ];
+        lualine_b = [ "branch" "diff" "diagnostics" ];
+        lualine_c = [ "filename" ];
+        lualine_x = [ "filetype" ];
+        lualine_y = [ "progress" ];
+        lualine_z = [ ''" " .. os.date("%R")'' ];
+      };
+    };
+  };
+}

home/programs/nvim/plugins/markdown.nix

@@ -1,168 +1,239 @@
-# The render-markdown.nvim plugin is a plugin that renders markdown files in a neovim in a more readable way.
 { config, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";
   muted = "#${config.lib.stylix.colors.base03}";
-  background = "#${config.lib.stylix.colors.base00}";
 in {
-
   programs.nixvim = {
-    plugins.mkdnflow = {
-      enable = true;
-      modules = { conceal = false; };
+    # Markdown settings
+    extraFiles."after/ftplugin/markdown.lua".text = ''
+      vim.bo.tabstop = 2
+      vim.bo.shiftwidth = 2
+      vim.bo.expandtab = true 
+    '';
 
-      toDo.symbols = [ " " "-" "x" "!" "/" ];
-      mappings = {
-        MkdnCreateLink = false;
-        MkdnCreateLinkFromClipboard = {
-          key = "<leader>ml";
-          modes = [ "n" "v" ];
-        };
-        MkdnDecreaseHeading = {
-          key = "<leader>m-";
-          modes = "n";
-        };
-        MkdnDestroyLink = false;
-        MkdnEnter = {
-          key = "<CR>";
-          modes = [ "v" ];
-        };
-        MkdnExtendList = false;
-        MkdnFoldSection = {
-          key = "<leader>mf";
-          modes = "n";
-        };
-        MkdnUnfoldSection = {
-          key = "<leader>mF";
-          modes = "n";
-        };
-        MkdnFollowLink = {
-          key = "gd";
-          modes = "n";
-        };
-        MkdnGoBack = false;
-        MkdnGoForward = false;
-        MkdnIncreaseHeading = {
-          key = "<leader>m+";
-          modes = "n";
-        };
-        MkdnMoveSource = false;
-        MkdnNewListItem = false;
-        MkdnNewListItemAboveInsert = {
-          key = "O";
-          modes = "n";
-        };
-        MkdnNewListItemBelowInsert = {
-          key = "o";
-          modes = "n";
-        };
-        MkdnNextHeading = {
-          key = "<leader>m#";
-          modes = "n";
-        };
-        MkdnNextLink = false;
-        MkdnPrevLink = false;
-        MkdnPrevHeading = {
-          key = "<leader>m*";
-          modes = "n";
-        };
-        MkdnSTab = false;
-        MkdnTab = false;
-        MkdnTableNewColAfter = {
-          key = "<leader>mc";
-          modes = "n";
-        };
-        MkdnTableNewColBefore = {
-          key = "<leader>mC";
-          modes = "n";
-        };
-        MkdnTableNewRowAbove = {
-          key = "<leader>mR";
-          modes = "n";
-        };
-        MkdnTableNewRowBelow = {
-          key = "<leader>mr";
-          modes = "n";
-        };
-        MkdnTableNextCell = {
-          key = "<S-Tab>";
-          modes = "n";
-        };
-        MkdnTableNextRow = false;
-        MkdnTablePrevCell = {
-          key = "<S-Tab>";
-          modes = "n";
-        };
-        MkdnTablePrevRow = false;
-        MkdnToggleToDo = {
-          key = "<C-Space>";
-          modes = [ "n" "v" ];
-        };
-        MkdnUpdateNumbering = {
-          key = "<leader>mn";
-          modes = "n";
-        };
-        MkdnYankAnchorLink = {
-          key = "ya";
-          modes = "n";
-        };
-        MkdnYankFileAnchorLink = {
-          key = "yfa";
-          modes = "n";
+    # Highlight colors
+    highlight = {
+      Headline1 = {
+        bg = "#4B4266";
+        fg = accent;
+      };
+      Headline2 = {
+        bg = "#3B575E";
+        fg = "#9FFEFE";
+      };
+      Headline3 = {
+        bg = "#3B5742";
+        fg = "#9FFE9F";
+      };
+      Headline4 = {
+        bg = "#574842";
+        fg = "#FECB9F";
+      };
+
+      RenderMarkdownTodo.fg = "#f78c6c";
+      RenderMarkdownWarning.fg = "#ff5370";
+      RenderMarkdownDone.fg = muted;
+    };
+
+    # Plugins
+    plugins = {
+      # Paste images from clipboard
+      clipboard-image = {
+        enable = true;
+        settings = { default.img_dir = [ "%:p:h" "img" ]; };
+      };
+
+      # Zen mode
+      zen-mode = {
+        enable = true;
+        settings = {
+          on_close = ''
+            function()
+            end
+          '';
+          on_open = ''
+            function()
+            end
+          '';
+          plugins = {
+            gitsigns = { enabled = false; };
+            options = {
+              enabled = true;
+              ruler = false;
+              showcmd = false;
+              laststatus = "0";
+              kitty = {
+                enabled = true;
+                font = "+4";
+              };
+            };
+          };
+          window = {
+            backdrop = 0.95;
+            height = 1;
+            options = {
+              signcolumn = "no";
+              number = false;
+              relativenumber = false;
+            };
+            width = 0.8;
+          };
         };
       };
-    };
-    extraFiles = {
-      "after/ftplugin/markdown.lua".text = ''
-        vim.bo.tabstop = 2
-        vim.bo.shiftwidth = 2
-        vim.bo.expandtab = true 
-      '';
-    };
-    highlight = {
-      RenderMarkdownBg.bg = background;
-      RenderMarkdownH1.fg = accent;
-      RenderMarkdownH2.fg = muted;
-      RenderMarkdownH3.fg = muted;
-      RenderMarkdownH4.fg = muted;
-      RenderMarkdownH5.fg = muted;
-      RenderMarkdownH6.fg = muted;
-      RenderMarkdownTodo.fg = muted;
-      RenderMarkdownWarning.fg = accent;
-    };
-    plugins.render-markdown = {
-      enable = true;
-      settings = {
-        heading = {
-          icons = [ "# " "󰲣 " "󰲥 " "󰲧 " "󰲩 " "󰲫 " ];
-          backgrounds = [ "RenderMarkdownBg" ];
-          foregrounds = [
-            "RenderMarkdownH1"
-            "RenderMarkdownH2"
-            "RenderMarkdownH3"
-            "RenderMarkdownH4"
-            "RenderMarkdownH5"
-            "RenderMarkdownH6"
-          ];
+
+      # Display images in markdown
+      image = {
+        enable = true;
+        integrations.markdown = {
+          clearInInsertMode = true;
+          onlyRenderImageAtCursor = true;
         };
-        checkbox = {
-          unchecked = { highlight = "RenderMarkdownTodo"; };
-          checked = { highlight = "RenderMarkdownTodo"; };
-          custom = {
-            pending = {
-              raw = "[-]";
-              rendered = "󰥔 ";
-              highlight = "RenderMarkdownTodo";
-            };
-            important = {
-              raw = "[!]";
-              rendered = " ";
-              highlight = "RenderMarkdownWarning";
-            };
-            cancel = {
-              raw = "[/]";
-              rendered = "󱋬 ";
-              highlight = "RenderMarkdownTodo";
+      };
+
+      # This one takes care of the markdown titles
+      headlines = {
+        enable = true;
+        settings = {
+          markdown = {
+            headline_highlights =
+              [ "Headline1" "Headline2" "Headline3" "Headline4" ];
+          };
+        };
+      };
+
+      # MkdnFlow is a plugin that helps you navigate markdown files
+      mkdnflow = {
+        enable = true;
+        modules = { conceal = false; };
+        toDo.symbols = [ " " "-" "x" "!" "/" ];
+        mappings = {
+          MkdnCreateLink = false;
+          MkdnCreateLinkFromClipboard = {
+            key = "<leader>ml";
+            modes = [ "n" "v" ];
+          };
+          MkdnDecreaseHeading = {
+            key = "<leader>m-";
+            modes = "n";
+          };
+          MkdnDestroyLink = false;
+          MkdnEnter = {
+            key = "<CR>";
+            modes = [ "v" ];
+          };
+          MkdnExtendList = false;
+
+          MkdnFoldSection = {
+            key = "<leader>mf";
+            modes = "n";
+          };
+
+          MkdnUnfoldSection = {
+            key = "<leader>mF";
+            modes = "n";
+          };
+
+          MkdnFollowLink = {
+            key = "gd";
+            modes = "n";
+          };
+          MkdnGoBack = false;
+          MkdnGoForward = false;
+          MkdnIncreaseHeading = {
+            key = "<leader>m+";
+            modes = "n";
+          };
+          MkdnMoveSource = false;
+          MkdnNewListItem = false;
+          MkdnNewListItemAboveInsert = {
+            key = "O";
+            modes = "n";
+          };
+          MkdnNewListItemBelowInsert = {
+            key = "o";
+            modes = "n";
+          };
+          MkdnNextHeading = {
+            key = "<leader>m#";
+            modes = "n";
+          };
+          MkdnNextLink = false;
+          MkdnPrevLink = false;
+          MkdnPrevHeading = {
+            key = "<leader>m*";
+            modes = "n";
+          };
+          MkdnSTab = false;
+          MkdnTab = false;
+          MkdnTableNewColAfter = {
+            key = "<leader>mc";
+            modes = "n";
+          };
+          MkdnTableNewColBefore = {
+            key = "<leader>mC";
+            modes = "n";
+          };
+          MkdnTableNewRowAbove = {
+            key = "<leader>mR";
+            modes = "n";
+          };
+          MkdnTableNewRowBelow = {
+            key = "<leader>mr";
+            modes = "n";
+          };
+          MkdnTableNextCell = {
+            key = "<S-Tab>";
+            modes = "n";
+          };
+          MkdnTableNextRow = false;
+          MkdnTablePrevCell = {
+            key = "<S-Tab>";
+            modes = "n";
+          };
+          MkdnTablePrevRow = false;
+          MkdnToggleToDo = {
+            key = "<C-Space>";
+            modes = [ "n" "v" ];
+          };
+          MkdnUpdateNumbering = {
+            key = "<leader>mn";
+            modes = "n";
+          };
+          MkdnYankAnchorLink = {
+            key = "ya";
+            modes = "n";
+          };
+          MkdnYankFileAnchorLink = {
+            key = "yfa";
+            modes = "n";
+          };
+        };
+      };
+
+      # Render UI elements
+      render-markdown = {
+        enable = true;
+        settings = {
+          heading = { enabled = false; };
+          checkbox = {
+            unchecked = { highlight = "RenderMarkdownTodo"; };
+            checked = { highlight = "RenderMarkdownDone"; };
+            custom = {
+              pending = {
+                raw = "[-]";
+                rendered = " ";
+                highlight = "RenderMarkdownTodo";
+              };
+              important = {
+                raw = "[!]";
+                rendered = "󰰱 ";
+                highlight = "RenderMarkdownWarning";
+              };
+              cancel = {
+                raw = "[/]";
+                rendered = "󱋬 ";
+                highlight = "RenderMarkdownWarning";
+              };
             };
           };
         };

home/programs/nvim/plugins/tree.nix

@@ -7,6 +7,11 @@
         settings = {
           default_file_explorer = false;
           skip_confirm_for_simple_edits = true;
+          view_options.is_hidden_file = ''
+            function(name, bufnr)
+              return vim.startswith(name, ".") or name == "img"
+            end
+          '';
           win_options = {
             concealcursor = "ncv";
             conceallevel = 3;

home/programs/nvim/plugins/ui.nix

@@ -1,54 +1,14 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [ ctags ];
 
-  programs.nixvim = {
-    plugins = {
-      lualine = {
-        enable = true;
-        settings = {
-          options.disabled_filetypes.statusline =
-            [ "dashboard" "alpha" "neo-tree" ];
-
-          alwaysDivideMiddle = true;
-          globalstatus = true;
-          ignoreFocus = [ "neo-tree" ];
-          extensions = [ "fzf" ];
-          theme = "auto";
-          componentSeparators = {
-            left = "|";
-            right = "|";
-          };
-          sectionSeparators = {
-            left = "█"; # 
-            right = "█"; # 
-          };
-          sections = {
-            lualine_a = [ "mode" ];
-            lualine_b = [ "branch" "diff" "diagnostics" ];
-            lualine_c = [ "filename" ];
-            lualine_x = [ "filetype" ];
-            lualine_y = [ "progress" ];
-            lualine_z = [ ''" " .. os.date("%R")'' ];
-          };
-        };
-      };
-      web-devicons.enable = true;
-      noice.enable = true;
-      notify = {
-        enable = true;
-        level = "warn";
-      };
-      gitsigns = {
-        enable = true;
-        settings.current_line_blame = false;
-      };
-      trouble.enable = true;
-      indent-blankline.enable = true;
-      nvim-colorizer.enable = true;
-      tagbar = {
-        enable = true;
-        tagsPackage = pkgs.universal-ctags;
-      };
+  programs.nixvim.plugins = {
+    web-devicons.enable = true;
+    noice.enable = true;
+    gitsigns = {
+      enable = true;
+      settings.current_line_blame = false;
     };
+    trouble.enable = true;
+    bufferline.enable = true;
   };
 }

home/programs/nvim/plugins/utils.nix

@@ -3,47 +3,23 @@
     highlightOverride = {
       FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
     };
+    nixpkgs.config = { allowUnfree = true; };
     plugins = {
       copilot-vim.enable = true;
       flash.enable = true;
-      image = {
-        enable = true;
-        integrations.markdown = {
-          clearInInsertMode = true;
-          onlyRenderImageAtCursor = true;
-        };
-      };
       tmux-navigator.enable = true;
       comment.enable = true;
       nvim-autopairs.enable = true;
-      friendly-snippets.enable = true;
       todo-comments.enable = true;
       treesitter = {
         enable = true;
         nixGrammars = true;
         settings = {
+          ensure_installed = "all";
           indent.enable = true;
           highlight.enable = true;
         };
       };
-      harpoon = {
-        enable = true;
-        enableTelescope = true;
-        keymapsSilent = true;
-        keymaps = {
-          addFile = "<leader>ha";
-          toggleQuickMenu = "<leader>hu";
-          navNext = "<leader>hl";
-          navPrev = "<leader>hh";
-          navFile = {
-            "1" = "<leader>h1";
-            "2" = "<leader>h2";
-            "3" = "<leader>h3";
-            "4" = "<leader>h4";
-          };
-        };
-      };
-      treesitter-context.enable = true;
     };
   };
 }

home/programs/nvim/plugins/zenmode.nix

@@ -1,46 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    zen-mode = {
-      enable = true;
-      settings = {
-        on_close = ''
-          function()
-            require("gitsigns.actions").toggle_current_line_blame()
-            vim.cmd('IBLEnable')
-            vim.opt.signcolumn = "yes:2"
-            vim.wo.wrap = false
-            vim.wo.linebreak = false
-            require("gitsigns.actions").refresh()
-          end
-        '';
-        on_open = ''
-          function()
-            require("gitsigns.actions").toggle_current_line_blame()
-            vim.cmd('IBLDisable')
-            vim.opt.relativenumber = false
-            vim.opt.signcolumn = "no"
-            vim.wo.wrap = true
-            vim.wo.linebreak = true
-            require("gitsigns.actions").refresh()
-          end
-        '';
-        window = {
-          backdrop = 1;
-          height = 1;
-          options = {
-            signcolumn = "no";
-            number = false;
-            relativenumber = false;
-            cursorline = false;
-            cursorcolumn = false;
-            foldcolumn = "0";
-            list = false;
-          };
-          width = 0.8;
-
-        };
-      };
-    };
-
-  };
-}

home/programs/qutebrowser/default.nix

@@ -2,7 +2,6 @@
 # My homepage is generated using https://github.com/anotherhadi/homepage
 { pkgs, config, ... }:
 let
-
   accent = "#${config.lib.stylix.colors.base0D}";
   background = "#${config.lib.stylix.colors.base00}";
   foreground = "#${config.lib.stylix.colors.base05}";

home/programs/shell/eza.nix

@@ -2,7 +2,7 @@
 {
   programs.eza = {
     enable = true;
-    icons = true;
+    icons = "auto";
 
     extraOptions = [
       "--group-directories-first"

home/programs/shell/tmux.nix

@@ -1,5 +1,30 @@
 # Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
-{ pkgs, ... }: {
+{ pkgs, ... }:
+let
+  Config = pkgs.writeShellScriptBin "Config" ''
+    SESSION="Nixy Config"
+
+    tmux has-session -t "$SESSION" 2>/dev/null
+
+    if [ $? == 0 ]; then
+      tmux attach -t "$SESSION"
+      exit 0
+    fi
+
+    tmux new-session -d -s "$SESSION"
+    tmux send-keys -t "$SESSION" "sleep 0.2 && clear && cd ~/.config/nixos/ && vim" C-m
+
+    tmux new-window -t "$SESSION" -n "nixy"
+    tmux send-keys -t "$SESSION":1 "sleep 0.2 && clear && cd ~/.config/nixos/ && nixy loop" C-m
+
+    tmux new-window -t "$SESSION" -n "lazygit"
+    tmux send-keys -t "$SESSION":2 "sleep 0.2 && clear && cd ~/.config/nixos/ && lazygit" C-m
+
+    tmux select-window -t "$SESSION":0
+    tmux select-pane -t 0
+    tmux attach -t "$SESSION"
+  '';
+in {
   programs.tmux = {
     enable = true;
     mouse = true;
@@ -16,7 +41,6 @@
 
       set -gq allow-passthrough on
       bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt
-      set -g detach-on-destroy off  # don't exit from tmux when closing a session
 
       bind-key -n C-Tab next-window
       bind-key -n C-S-Tab previous-window
@@ -25,9 +49,10 @@
 
     plugins = with pkgs; [
       tmuxPlugins.vim-tmux-navigator
-      tmuxPlugins.resurrect
+      # tmuxPlugins.resurrect
       tmuxPlugins.sensible
       tmuxPlugins.tokyo-night-tmux
     ];
   };
+  home.packages = [ Config ];
 }

home/programs/shell/zsh.nix

@@ -49,6 +49,18 @@ in {
       }"
     '';
 
+    #NOTE- for btop to show gpu usage 
+    #may want to check the driver version with:
+    #nix path-info -r /run/current-system | grep nvidia-x11
+    #and 
+    #nix search nixpkgs nvidia_x11
+    sessionVariables = {
+      LD_LIBRARY_PATH = lib.concatStringsSep ":" [
+        "${pkgs.linuxPackages_latest.nvidia_x11_beta}/lib" # change the package name according to nix search result
+        "$LD_LIBRARY_PATH"
+      ];
+    };
+
     shellAliases = {
       vim = "nvim";
       vi = "nvim";
@@ -61,13 +73,14 @@ in {
       ls = "eza --icons=always --no-quotes";
       tree = "eza --icons=always --tree --no-quotes";
       sl = "ls";
-      open = "${pkgs.xdg_utils}/bin/xdg-open";
+      open = "${pkgs.xdg-utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+      ssh = "kitty +kitten ssh";
 
       wireguard-import = "nmcli connection import type wireguard file";
 
       notes =
-        "nvim ~/nextcloud/Notes/index.md --cmd 'cd ~/nextcloud/Notes' -c ':Telescope find_files'";
+        "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':Telescope find_files'";
       note = "notes";
 
       # git
@@ -82,6 +95,8 @@ in {
       gco = "git checkout";
       gcb = "git checkout -b";
       gbr = "git branch";
+      grs = "git reset HEAD~1";
+      grh = "git reset --hard HEAD~1";
 
       gaa = "git add .";
       gcm = "git commit -m";

home/programs/spicetify/default.nix

@@ -6,9 +6,6 @@ let
 in {
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
 
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [ "spotify" ];
-
   stylix.targets.spicetify.enable = false;
 
   programs.spicetify = {

home/programs/thunar/default.nix

@@ -41,6 +41,7 @@
       <property name="last-show-hidden" type="bool" value="false"/>
       <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_38_PERCENT"/>
       <property name="last-details-view-column-widths" type="string" value="50,50,127,50,50,50,50,50,751,50,50,75,50,145"/>
+      <property name="last-toolbar-items" type="string" value="menu:1,back:1,forward:0,open-parent:0,open-home:0,undo:0,redo:0,zoom-in:0,zoom-out:0,zoom-reset:0,view-as-icons:0,view-as-detailed-list:0,view-as-compact-list:0,toggle-split-view:0,location-bar:1,reload:0,search:1,uca-action-1710183590071525-1:0,new-tab:0,new-window:0,view-switcher:0"/>
     </channel>
   '';
 }

home/programs/yazi/default.nix

@@ -1,17 +0,0 @@
-# Yazi is a TUI file explorer
-{
-  programs.yazi = {
-    enable = true;
-    enableZshIntegration = true;
-
-    settings = {
-      log = { enabled = false; };
-      manager = {
-        show_hidden = false;
-        sort_by = "modified";
-        sort_dir_first = true;
-        sort_reverse = true;
-      };
-    };
-  };
-}

home/programs/zen/default.nix

@@ -0,0 +1,86 @@
+{ pkgs, config, inputs, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  background = "#${config.lib.stylix.colors.base00}";
+  foreground = "#${config.lib.stylix.colors.base05}";
+  muted = "#${config.lib.stylix.colors.base03}";
+
+  settings = ''
+    {
+      "config": {
+        "title" : "Welcome Home",
+        "openLinksInNewTab": false,
+        "locale": "fr-FR",
+        "colors": {
+          "primary": "${accent}",
+          "background": "${background}",
+          "foreground": "${foreground}",
+          "muted": "#${muted}"
+        },
+        "folders": [
+          {
+            "name": "Bookmarks",
+            "links": [
+              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
+              {"title": "Github", "url": "https://github.com", "icon": ""},
+              {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
+              {"title": "Cloudflare One", "url": "https://one.dash.cloudflare.com/", "icon": ""},
+              {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
+              {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
+              {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
+              {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"},
+              {"title": "Figma", "url": "https://figma.com", "icon": ""},
+              {"title": "Server", "url": "https://home.anotherhadi.com", "icon": ""}
+            ]
+          },
+          {
+            "name": "Work",
+            "links": [
+              {"title": "Outlook", "url": "https://outlook.office.com/mail/", "icon": "󰴢"},
+              {"title": "Office", "url": "https://www.office.com/?auth=2", "icon": "󰏆"},
+              {"title": "Teams", "url": "https://teams.microsoft.com/_", "icon": "󰊻"}
+            ]
+          }
+        ]
+      }
+    }
+  '';
+
+  homepage = pkgs.buildNpmPackage {
+    pname = "homepage";
+    version = "0.0.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "anotherhadi";
+      repo = "homepage";
+      rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d";
+      hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0=";
+    };
+
+    # npmDepsHash = lib.fakeHash;
+    npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4=";
+
+    buildPhase = ''
+      npm install
+      cp ${
+        pkgs.writeText "src/routes/config.json" settings
+      } src/routes/config.json
+      npm run build
+      mkdir $out
+      mv build $out
+    '';
+
+    meta = {
+      description = "homepage";
+      homepage = "https://github.com/anotherhadi/homepage";
+    };
+  };
+in {
+  home.file.".config/homepage" = {
+    source = "${homepage}/build";
+    recursive = true;
+  };
+
+  home.packages = with pkgs;
+    [ inputs.zen-browser.packages."${system}".default ];
+}

home/scripts/default.nix

@@ -8,8 +8,9 @@
     ./hyprfocus
     ./night-shift
     ./screenshot
-    ./nerdfont_fzf
+    ./nerdfont-fzf
     ./notification
     ./system
+    ./openvpn
   ];
 }

home/scripts/hyprfocus/default.nix

@@ -11,9 +11,9 @@ let
   hyprfocus-on = pkgs.writeShellScriptBin "hyprfocus-on"
     # bash
     ''
+      hyprpanel-hide
       hyprctl keyword "general:gaps_in" 0
       hyprctl keyword "general:gaps_out" 0
-      hyprpanel-hide
       hyprctl keyword "general:border_size" 1
       hyprctl keyword "decoration:rounding" 0
       hyprctl keyword "decoration:drop_shadow" false

home/scripts/hyprpanel/default.nix

@@ -1,38 +1,39 @@
 # - ## Hyprpanel
 #- 
-#- Quick scripts to toggle, reload and kill hyprpanel.
+#- Quick scripts to toggle, reload, hide & show hyprpanel.
 #-
-#- - `hyprpanel-toggle` - Toggle hyprpanel.
+#- - `hyprpanel-toggle` - Toggle hyprpanel (hide/show).
+#- - `hyprpanel-show` - Show hyprpanel.
+#- - `hyprpanel-hide` - Hide hyprpanel.
 #- - `hyprpanel-reload` - Reload hyprpanel.
-#- - `hyprpanel-kill` - Kill hyprpanel.
 { pkgs, ... }:
 let
   hyprpanel-toggle = pkgs.writeShellScriptBin "hyprpanel-toggle" ''
-    hyprpanel -t bar-0
-    hyprpanel -t bar-1
-    hyprpanel -t bar-2
-    hyprpanel -t bar-3
+    hyprpanel toggleWindow bar-0
+    hyprpanel toggleWindow bar-1
+    hyprpanel toggleWindow bar-2
+    hyprpanel toggleWindow bar-3
   '';
 
   hyprpanel-hide = pkgs.writeShellScriptBin "hyprpanel-hide" ''
-    status=$(hyprpanel -r "isWindowVisible('bar-0')")
+    status=$(hyprpanel isWindowVisible bar-0)
     if [[ $status == "true" ]]; then
-      hyprpanel -t bar-0
+      hyprpanel toggleWindow bar-0
     fi
-    status=$(hyprpanel -r "isWindowVisible('bar-1')")
+    status=$(hyprpanel isWindowVisible bar-1)
     if [[ $status == "true" ]]; then
-      hyprpanel -t bar-1
+      hyprpanel toggleWindow bar-1
     fi
   '';
 
   hyprpanel-show = pkgs.writeShellScriptBin "hyprpanel-show" ''
-    status=$(hyprpanel -r "isWindowVisible('bar-0')")
+    status=$(hyprpanel isWindowVisible bar-0)
     if [[ $status == "false" ]]; then
-      hyprpanel -t bar-0
+      hyprpanel toggleWindow bar-0
     fi
-    status=$(hyprpanel -r "isWindowVisible('bar-1')")
+    status=$(hyprpanel isWindowVisible bar-1)
     if [[ $status == "false" ]]; then
-      hyprpanel -t bar-1
+      hyprpanel toggleWindow bar-1
     fi
   '';
 

home/scripts/night-shift/default.nix

@@ -1,6 +1,7 @@
 # - ## Night-Shift
 #-
 #- Night-Shift is a feature that reduces the amount of blue light emitted by your screen, which can help reduce eye strain and improve sleep quality. This module provides a set of scripts to control Night-Shift on your system.
+#- It use hyprsunset to control the screen temperature.
 #-
 #- - `night-shift-on` activates Night-Shift.
 #- - `night-shift-off` deactivates Night-Shift.
@@ -9,42 +10,52 @@
 #- - `night-shift-status-icon` checks if Night-Shift is active. (icon)
 { pkgs, ... }:
 let
+  value = "4500"; # Default value for night-shift temperature
 
-  night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
-    ${pkgs.hyprshade}/bin/hyprshade on blue-light-filter
-    title="󰖔  Night-Shift Activated"
-    description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
+  night-shift-on = pkgs.writeShellScriptBin "night-shift-on"
+    # bash 
+    ''
+      ${pkgs.hyprsunset}/bin/hyprsunset -t ${value} &
+      title="󰖔  Night-Shift Activated"
+      description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
 
-    notif "night-shift" "$title" "$description"
-  '';
+      notif "night-shift" "$title" "$description"
+    '';
 
-  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
-    ${pkgs.hyprshade}/bin/hyprshade off
-    title="󰖕  Night-Shift Deactivated"
-    description="Night-Shift is now deactivated! Your screen will return to normal."
+  night-shift-off = pkgs.writeShellScriptBin "night-shift-off"
+    # bash 
+    ''
+      pkill hyprsunset
+      title="󰖕  Night-Shift Deactivated"
+      description="Night-Shift is now deactivated! Your screen will return to normal."
 
-    notif "night-shift" "$title" "$description"
-  '';
+      notif "night-shift" "$title" "$description"
+    '';
 
-  night-shift = pkgs.writeShellScriptBin "night-shift" ''
-    if [[ $(${pkgs.hyprshade}/bin/hyprshade current) ]]; then
-      night-shift-off
-    else
-      night-shift-on
-    fi
-  '';
+  night-shift = pkgs.writeShellScriptBin "night-shift"
+    # bash
+    ''
+      if pidof "hyprsunset"; then
+        night-shift-off
+      else
+        night-shift-on
+      fi
+    '';
 
-  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
-    if [[ $(${pkgs.hyprshade}/bin/hyprshade current) ]]; then
-      echo "1"
-    else
-      echo "0"
-    fi
-  '';
+  night-shift-status = pkgs.writeShellScriptBin "night-shift-status"
+    # bash
+    ''
+      if pidof "hyprsunset"; then
+        echo "1"
+      else
+        echo "0"
+      fi
+    '';
 
-  night-shift-status-icon =
-    pkgs.writeShellScriptBin "night-shift-status-icon" ''
-      if [[ $(hyprshade current) ]]; then
+  night-shift-status-icon = pkgs.writeShellScriptBin "night-shift-status-icon"
+    # bash
+    ''
+      if pidof "hyprsunset"; then
           echo "󰖔"
         else
           echo "󰖕"
@@ -52,6 +63,7 @@ let
     '';
 in {
   home.packages = [
+    pkgs.hyprsunset
     night-shift-on
     night-shift-off
     night-shift

home/scripts/nixy/default.nix

@@ -29,7 +29,7 @@ let
           ";Collect Garbage;nixy gc"
           "󰍜;Clean Boot Menu;nixy cb"
           "󰌌;Hyprland Keybindings;nvim ${configDirectory}/docs/KEYBINDINGS-HYPRLAND.md"
-          "󰋩;Wallpapers;nvim ${inputs.nixy-wallpapers}/docs/MOBILE-VIEW.md"
+          "󰋩;Wallpapers;zen https://github.com/anotherhadi/nixy-wallpapers"
         )
 
         # Apply default icons if empty:
@@ -52,7 +52,7 @@ let
       if [[ $1 == "rebuild" ]];then
         sudo nixos-rebuild switch --flake ${configDirectory}#${hostname}
       elif [[ $1 == "upgrade" ]];then
-        sudo nixos-rebuild switch --upgrade --flake ${configDirectory}#${hostname}
+        sudo nixos-rebuild switch --upgrade --flake '${configDirectory}#${hostname}'
       elif [[ $1 == "update" ]];then
         cd ${configDirectory} && nix flake update
       elif [[ $1 == "gc" ]];then
@@ -62,6 +62,14 @@ let
       elif [[ $1 == "remote" ]];then
         cd ~/.config/nixos && git add . && git commit -m "update" && git push
         ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
+      elif [[ $1 == "loop" ]];then
+        while true; do
+          nixy
+          echo "Press enter to continue, e to exit" 
+          read -n 1 REPLY
+          clear
+          [[ $REPLY == "e" ]] && exit 0
+        done
       else
         echo "Unknown argument"
       fi

home/scripts/openvpn/default.nix

@@ -0,0 +1,37 @@
+# - ## OpenVPN
+#-
+#- OpenVPN allows you to connect/disconnect quickly to a openVPN server
+#-
+#- - `openvpn-up` turn on the vpn
+#- - `openvpn-down` turn down the vpn
+#- - `openvpn-toggle` toggle the vpn
+{ pkgs, ... }:
+let
+  id = "home"; # ID of the connection
+  password-file = "/home/hadi/.config/vpn-password";
+
+  openvpn-up = pkgs.writeShellScriptBin "openvpn-up"
+    # bash 
+    ''
+      nmcli con up id ${id} passwd-file ${password-file}
+      notif "VPN" "VPN activated" "The OpenVPN connection to ${id} has been activated"
+    '';
+
+  openvpn-down = pkgs.writeShellScriptBin "openvpn-down"
+    # bash 
+    ''
+      nmcli con down id ${id}
+      notif "VPN" "VPN deactivated" "The OpenVPN connection to ${id} has been deactivated"
+    '';
+
+  openvpn-toggle = pkgs.writeShellScriptBin "openvpn-toggle"
+    # bash 
+    ''
+      if nmcli connection show --active | grep -q "${id}"; then
+        openvpn-down
+      else
+        openvpn-up
+      fi
+    '';
+
+in { home.packages = [ openvpn-up openvpn-down openvpn-toggle ]; }

home/scripts/screenshot/default.nix

@@ -21,7 +21,7 @@ let
       mode="output"
     fi
 
-    ${pkgs.grimblast}/bin/grimblast --notify --freeze save $mode "$folder/$filename" || exit 1
+    ${pkgs.grimblast}/bin/grimblast --notify --freeze copy $mode "$folder/$filename" || exit 1
 
     if [[ $2 == "swappy" ]];then
       ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/$filename"

home/scripts/system/default.nix

@@ -14,8 +14,13 @@ let
       if pgrep wofi; then
       	pkill wofi
       else
-      	wofi --show drun
+      	wofi -p " Apps" --show drun
       fi
+      # if pgrep tofi; then
+      # 	pkill tofi
+      # else
+      # 	tofi-drun --drun-launch=true
+      # fi
     '';
 
   powermenu = pkgs.writeShellScriptBin "powermenu"
@@ -23,6 +28,8 @@ let
     ''
       if pgrep wofi; then
       	pkill wofi
+      # if pgrep tofi; then
+      #   pkill tofi
       else
         options=(
           "󰌾 Lock"
@@ -32,7 +39,8 @@ let
           "󰿅 Shutdown"
         )
 
-        selected=$(printf '%s\n' "''${options[@]}" | wofi --dmenu)
+        selected=$(printf '%s\n' "''${options[@]}" | wofi -p " Powermenu" --dmenu)
+        # selected=$(printf '%s\n' "''${options[@]}" | tofi --prompt-text "> ")
         selected=''${selected:2}
 
         case $selected in
@@ -55,10 +63,50 @@ let
       fi
     '';
 
+  quickmenu = pkgs.writeShellScriptBin "quickmenu"
+    # bash
+    ''
+      if pgrep wofi; then
+      	pkill wofi
+      # if pgrep tofi; then
+      #   pkill tofi
+      else
+        options=(
+          "󰅶 Caffeine"
+          "󰖔 Night-shift"
+          " Nixy"
+          "󰈊 Hyprpicker"
+          "󰖂 Toggle VPN"
+        )
+
+        selected=$(printf '%s\n' "''${options[@]}" | wofi -p " Quickmenu" --dmenu)
+        # selected=$(printf '%s\n' "''${options[@]}" | tofi --prompt-text "> ")
+        selected=''${selected:2}
+
+        case $selected in
+          "Caffeine")
+            caffeine
+            ;;
+          "Night-shift")
+            night-shift
+            ;;
+          "Nixy")
+            kitty zsh -c nixy
+            ;;
+          "Hyprpicker")
+            sleep 0.2 && ${pkgs.hyprpicker}/bin/hyprpicker -a
+            ;;
+          "Toggle VPN")
+            openvpn-toggle
+            ;;
+        esac
+      fi
+    '';
+
   lock = pkgs.writeShellScriptBin "lock"
     # bash
     ''
       ${pkgs.hyprlock}/bin/hyprlock
     '';
 
-in { home.packages = [ menu powermenu lock ]; }
+in { home.packages = [ menu powermenu lock quickmenu ]; }

home/system/gtk/default.nix

@@ -1,142 +0,0 @@
-# GTK & QT theme configuration
-{ config, pkgs, lib, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  foreground = "#${config.lib.stylix.colors.base05}";
-  background = "#${config.lib.stylix.colors.base00}";
-  background-alt = "#${config.lib.stylix.colors.base01}";
-
-  c0 = "#${config.lib.stylix.colors.base00}";
-  c1 = "#${config.lib.stylix.colors.base08}";
-  c2 = "#${config.lib.stylix.colors.base0B}";
-  c3 = "#${config.lib.stylix.colors.base0A}";
-  c4 = "#${config.lib.stylix.colors.base0D}";
-  c5 = "#${config.lib.stylix.colors.base0E}";
-  c6 = "#${config.lib.stylix.colors.base0C}";
-  c7 = "#${config.lib.stylix.colors.base05}";
-  c8 = "#${config.lib.stylix.colors.base03}";
-  c9 = "#${config.lib.stylix.colors.base08}";
-  c10 = "#${config.lib.stylix.colors.base0B}";
-  c11 = "#${config.lib.stylix.colors.base0A}";
-  c12 = "#${config.lib.stylix.colors.base0D}";
-  c13 = "#${config.lib.stylix.colors.base0E}";
-  c14 = "#${config.lib.stylix.colors.base0C}";
-  c15 = "#${config.lib.stylix.colors.base07}";
-
-in {
-
-  qt = {
-    enable = true;
-    platformTheme.name = "gtk2";
-    style.name = "gtk2";
-  };
-
-  gtk = {
-    enable = true;
-
-    theme = lib.mkForce { name = "FlatColor"; };
-
-    iconTheme = {
-      package = pkgs.kora-icon-theme;
-      name = "Kora";
-    };
-
-    font = { name = config.stylix.fonts.serif.name; };
-
-    gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; };
-
-    gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; };
-  };
-
-  home.file = {
-    ".local/share/themes/FlatColor" = {
-      recursive = true;
-      source = pkgs.stdenv.mkDerivation {
-        name = "FlatColor";
-
-        src = pkgs.fetchFromGitHub {
-          owner = "jasperro";
-          repo = "FlatColor";
-          rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
-          hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
-        };
-
-        buildPhase = ''
-          mkdir -p $out
-          # delete the default gtk-color-scheme:
-          file="./gtk-2.0/gtkrc"
-          sed -i '3,29d' $file
-          sed -i '3i include "../colors2"' $file
-
-          file="./gtk-3.0/gtk.css"
-          sed -i '2,10d' $file
-          sed -i '2i @import url("../colors3");' $file
-
-          file="./gtk-3.20/gtk.css"
-          sed -i '2,26d' $file
-          sed -i '2i @import url("../colors3");' $file
-
-          cp -r . $out 
-        '';
-      };
-    };
-
-    ".local/share/themes/FlatColor/colors2".text = ''
-      bg_color:${background}
-      color0:${c0}
-      color1:${c1}
-      color2:${c2}
-      color3:${c3}
-      color4:${c4}
-      color5:${c5}
-      color6:${c6}
-      color7:${c7}
-      color8:${c8}
-      color9:${c9}
-      color10:${c10}
-      color11:${c11}
-      color12:${c12}
-      color13:${c13}
-      color14:${c14}
-      color15:${c15}
-      text_color:${foreground}
-      selected_bg_color:${accent}
-      selected_fg_color:${foreground}
-      tooltip_bg_color:${background-alt}
-      tooltip_fg_color:${foreground}
-      titlebar_bg_color:${background}
-      titlebar_fg_color:${foreground}
-      menu_bg_color:${background-alt}
-      menu_fg_color:${foreground}
-      link_color:${accent}
-    '';
-
-    ".local/share/themes/FlatColor/colors3".text = ''
-      @define-color color0 ${c0};
-      @define-color color1 ${c1};
-      @define-color color2 ${c2};
-      @define-color color3 ${c3};
-      @define-color color4 ${c4};
-      @define-color color5 ${c5};
-      @define-color color6 ${c6};
-      @define-color color7 ${c7};
-      @define-color color8 ${c8};
-      @define-color color9 ${c9};
-      @define-color color10 ${c10};
-      @define-color color11 ${c11};
-      @define-color color12 ${c12};
-      @define-color color13 ${c13};
-      @define-color color14 ${c14};
-      @define-color color15 ${c15};
-      @define-color selected_bg_color ${accent};
-      @define-color selected_fg_color ${foreground};
-      @define-color bg_color ${background};
-      @define-color fg_color ${foreground};
-      @define-color base_color @bg_color;
-      @define-color text_color @fg_color;
-      @define-color text_color_disabled mix(@text_color, @base_color, 0.4);
-      @define-color tooltip_bg_color ${background-alt};
-      @define-color tooltip_fg_color ${foreground};
-    '';
-  };
-}

home/system/hyprland/bindings.nix

@@ -3,12 +3,14 @@
     bind = [
       "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty
       "$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
-      "$mod,B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" # Qutebrowser
+      "$mod,B, exec, zen" # Qutebrowser
       "$mod,K, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden
       "$mod,L, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
       "$mod,X, exec, powermenu" # Powermenu
       "$mod,SPACE, exec, menu" # Launcher
+      "$mod,C, exec, quickmenu" # Quickmenu
       "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
+      # "$mod,TAB, overview:toggle" # Overview
 
       "$mod,Q, killactive," # Close window
       "$mod,T, togglefloating," # Toggle Floating
@@ -22,11 +24,12 @@
       "$shiftMod,left, layoutmsg, addmaster" # Add to master
       "$shiftMod,right, layoutmsg, removemaster" # Remove from master
 
-      "$mod,PRINT, exec, screenshot window" # Screenshot window
+      "$mod,PRINT, exec, screenshot region" # Screenshot region
       ",PRINT, exec, screenshot monitor" # Screenshot monitor
-      "$shiftMod,PRINT, exec, screenshot region" # Screenshot region
+      "$shiftMod,PRINT, exec, screenshot window" # Screenshot window
       "ALT,PRINT, exec, screenshot region swappy" # Screenshot region then edit
 
+      "$shiftMod,T, exec, hyprpanel-toggle" # Toggle hyprpanel
       "$shiftMod,S, exec, ${pkgs.qutebrowser}/bin/qutebrowser :open $(wofi --show dmenu -L 1 -p ' Search on internet')" # Search on internet with wofi
       "$shiftMod,C, exec, clipboard" # Clipboard picker with wofi
       "$shiftMod,E, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji" # Emoji picker with wofi
@@ -46,6 +49,9 @@
 
     bindl = [
       ",XF86AudioMute, exec, sound-toggle" # Toggle Mute
+      ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" # Play/Pause Song
+      ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next" # Next Song
+      ",XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous" # Previous Song
       ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid
     ];
 

home/system/hyprland/default.nix

@@ -11,12 +11,17 @@ let
   keyboardLayout = config.var.keyboardLayout;
 in {
 
-  imports = [ ./animations.nix ./bindings.nix ];
+  imports = [
+    ./animations.nix
+    ./bindings.nix
+    ./polkitagent.nix
+    # ./hyprspace.nix 
+  ];
 
   home.packages = with pkgs; [
     qt5.qtwayland
     qt6.qtwayland
-    qt5ct
+    libsForQt5.qt5ct
     qt6ct
     hyprshot
     hyprpicker
@@ -46,10 +51,16 @@ in {
       "$mod" = "SUPER";
       "$shiftMod" = "SUPER_SHIFT";
 
-      exec-once = [ "${pkgs.bitwarden}/bin/bitwarden" ];
+      exec-once = [
+        "${pkgs.bitwarden}/bin/bitwarden"
+        "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+      ];
 
       monitor = [
         "eDP-2,highres,0x0,1"
+        "DP-7, disable"
+        "DP-8, disable"
+        "DP-9, disable"
         "HDMI-A-1,3440x1440@99.98,auto,1"
         ",prefered,auto,1"
       ];
@@ -67,8 +78,8 @@ in {
         "QT_QPA_PLATFORM=wayland,xcb"
         "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
         "ELECTRON_OZONE_PLATFORM_HINT,auto"
-        "GTK_THEME,FlatColor:dark"
-        "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
+        # "GTK_THEME,FlatColor:dark"
+        # "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
         "__GL_GSYNC_ALLOWED,0"
         "__GL_VRR_ALLOWED,0"
         "DISABLE_QT5_COMPAT,0"
@@ -80,7 +91,7 @@ in {
         "XDG_SESSION_TYPE,wayland"
         "SDL_VIDEODRIVER,wayland"
         "CLUTTER_BACKEND,wayland"
-        "AQ_DRM_DEVICES,/dev/dri/card2" # CHANGEME: Related to the GPU
+        "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU
       ];
 
       cursor = {
@@ -101,9 +112,11 @@ in {
         active_opacity = active-opacity;
         inactive_opacity = inactive-opacity;
         rounding = rounding;
-        drop_shadow = true;
-        shadow_range = 20;
-        shadow_render_power = 3;
+        shadow = {
+          enabled = true;
+          range = 20;
+          render_power = 3;
+        };
         blur = { enabled = if blur then "true" else "false"; };
       };
 
@@ -124,6 +137,11 @@ in {
         new_window_takes_over_fullscreen = 2;
       };
 
+      windowrulev2 =
+        [ "float, tag:modal" "pin, tag:modal" "center, tag:modal" ];
+
+      layerrule = [ "noanim, launcher" "noanim, ^ags-.*" ];
+
       input = {
         kb_layout = keyboardLayout;
 

home/system/hyprland/hyprspace.nix

@@ -0,0 +1,14 @@
+{ inputs, pkgs, ... }: {
+
+  wayland.windowManager.hyprland = {
+    plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ];
+    settings = {
+      plugin = { overview = { autoDrag = false; }; };
+
+      bind = [
+        "$mod,TAB, overview:toggle" # Overview
+
+      ];
+    };
+  };
+}

home/system/hyprland/polkitagent.nix

@@ -0,0 +1,7 @@
+{ inputs, pkgs, ... }: {
+  home.packages =
+    [ inputs.hyprpolkitagent.packages."${pkgs.system}".hyprpolkitagent ];
+
+  wayland.windowManager.hyprland.settings.exec-once =
+    [ "systemctl --user start hyprpolkitagent" ];
+}

home/system/hyprlock/default.nix

@@ -1,5 +1,5 @@
 # Hyprlock is a lockscreen for Hyprland
-{ config, ... }:
+{ config, lib, ... }:
 let
   foreground = "rgba(216, 222, 233, 0.70)";
   imageStr = toString config.stylix.image;
@@ -66,7 +66,7 @@ in {
       ];
 
       # INPUT FIELD
-      input-field = [{
+      input-field = lib.mkForce {
         monitor = "";
         size = "300, 60";
         outline_thickness = 2;
@@ -83,7 +83,7 @@ in {
         position = "0, -250";
         halign = "center";
         valign = "center";
-      }];
+      };
     };
   };
 }

home/system/hyprpanel/default.nix

@@ -1,6 +1,6 @@
 # Hyprpanel is the bar on top of the screen
 # Display informations like workspaces, battery, wifi, ...
-{ pkgs, config, ... }:
+{ inputs, config, ... }:
 let
   transparentButtons = config.var.theme.bar.transparentButtons;
 
@@ -20,219 +20,166 @@ let
 
   floating = config.var.theme.bar.floating;
   transparent = config.var.theme.bar.transparent;
+  position = config.var.theme.bar.position;
 
   location = config.var.location;
-  username = config.var.username;
 in {
-  wayland.windowManager.hyprland.settings.exec-once =
-    [ "${pkgs.hyprpanel}/bin/hyprpanel" ];
 
-  home.packages = with pkgs; [ hyprpanel libnotify ];
+  imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
 
-  home.file.".cache/ags/hyprpanel/options.json" = {
-    text = # json
-      ''
-        {
-          "bar.layouts": {
-            "0": {
-              "left": [
-                "dashboard",
-                "workspaces",
-                "windowtitle"
-              ],
-              "middle": [
-                "media"
-              ],
-              "right": [
-                "systray",
-                "volume",
-                "bluetooth",
-                "battery",
-                "network",
-                "clock",
-                "notifications"
-              ]
-            },
-            "1": {
-              "left": [
-                "dashboard",
-                "workspaces",
-                "windowtitle"
-              ],
-              "middle": [
-                "media"
-              ],
-              "right": [
-                "systray",
-                "volume",
-                "bluetooth",
-                "battery",
-                "network",
-                "clock",
-                "notifications"
-              ]
-            },
-            "2": {
-              "left": [
-                "dashboard",
-                "workspaces",
-                "windowtitle"
-              ],
-              "middle": [
-                "media"
-              ],
-              "right": [
-                "systray",
-                "volume",
-                "bluetooth",
-                "battery",
-                "network",
-                "clock",
-                "notifications"
-              ]
-            }
-          },
-          "theme.font.name": "${font}",
-          "theme.font.size": "${fontSize}px",
-          "theme.bar.outer_spacing": "${
-            if floating && transparent then "0" else "8"
-          }px",
-          "theme.bar.buttons.y_margins": "${
-            if floating && transparent then "0" else "8"
-          }px",
-          "theme.bar.buttons.spacing": "0.3em",
-          "theme.bar.buttons.radius": "${
-            if transparent then toString rounding else toString (rounding - 8)
-          }px",
-          "theme.bar.floating": ${if floating then "true" else "false"},
-          "theme.bar.buttons.padding_x": "0.8rem",
-          "theme.bar.buttons.padding_y": "0.4rem",
+  programs.hyprpanel = {
+    enable = true;
+    hyprland.enable = true;
+    overwrite.enable = true;
+    overlay.enable = true;
+    layout = {
+      "bar.layouts" = {
+        "0" = {
+          "left" = [ "dashboard" "workspaces" "windowtitle" ];
+          "middle" = [ "media" ];
+          "right" = [
+            "systray"
+            "volume"
+            "bluetooth"
+            "battery"
+            "network"
+            "clock"
+            "notifications"
+          ];
+        };
+      };
+    };
 
-          "theme.bar.buttons.workspaces.hover": "${accent-alt}",
-          "theme.bar.buttons.workspaces.active": "${accent}",
-          "theme.bar.buttons.workspaces.available": "${background}",
+    override = {
+      "theme.font.name" = "${font}";
+      "theme.font.size" = "${fontSize}px";
+      "theme.bar.outer_spacing" =
+        "${if floating && transparent then "0" else "8"}px";
+      "theme.bar.buttons.y_margins" =
+        "${if floating && transparent then "0" else "8"}px";
+      "theme.bar.buttons.spacing" = "0.3em";
+      "theme.bar.buttons.radius" = "${
+          if transparent then toString rounding else toString (rounding - 8)
+        }px";
+      "theme.bar.floating" = "${if floating then "true" else "false"}";
+      "theme.bar.buttons.padding_x" = "0.8rem";
+      "theme.bar.buttons.padding_y" = "0.4rem";
+      "theme.bar.buttons.workspaces.hover" = "${accent-alt}";
+      "theme.bar.buttons.workspaces.active" = "${accent}";
+      "theme.bar.buttons.workspaces.available" = "${accent-alt}";
+      "theme.bar.buttons.workspaces.occupied" = "${accent-alt}";
+      "theme.bar.margin_top" =
+        "${if position == "top" then toString (gaps-in * 2) else "0"}px";
+      "theme.bar.margin_bottom" =
+        "${if position == "top" then "0" else toString (gaps-in * 2)}px";
+      "theme.bar.margin_sides" = "${toString gaps-out}px";
+      "theme.bar.border_radius" = "${toString rounding}px";
+      "bar.launcher.icon" = "";
+      "theme.bar.transparent" = "${if transparent then "true" else "false"}";
+      "bar.workspaces.show_numbered" = false;
+      "bar.workspaces.workspaces" = 5;
+      "bar.workspaces.hideUnoccupied" = false;
+      "bar.windowtitle.label" = true;
+      "bar.volume.label" = false;
+      "bar.network.truncation_size" = 12;
+      "bar.bluetooth.label" = false;
+      "bar.clock.format" = "%a %b %d  %I:%M %p";
+      "bar.notifications.show_total" = true;
+      "theme.notification.border_radius" = "${toString rounding}px";
+      "theme.osd.enable" = true;
+      "theme.osd.orientation" = "vertical";
+      "theme.osd.location" = "left";
+      "theme.osd.radius" = "${toString rounding}px";
+      "theme.osd.margins" = "0px 0px 0px 10px";
+      "theme.osd.muted_zero" = true;
+      "menus.clock.weather.location" = "${location}";
+      "menus.clock.weather.unit" = "metric";
+      "menus.dashboard.powermenu.confirmation" = false;
 
-          "theme.bar.margin_top": "${toString (gaps-in * 2)}px",
-          "theme.bar.margin_sides": "${toString gaps-out}px",
-          "theme.bar.margin_bottom": "0px",
-          "theme.bar.border_radius": "${toString rounding}px",
+      "menus.dashboard.shortcuts.left.shortcut1.icon" = "";
+      "menus.dashboard.shortcuts.left.shortcut1.command" = "zen";
+      "menus.dashboard.shortcuts.left.shortcut1.tooltip" = "Zen";
+      "menus.dashboard.shortcuts.left.shortcut2.icon" = "󰅶";
+      "menus.dashboard.shortcuts.left.shortcut2.command" = "caffeine";
+      "menus.dashboard.shortcuts.left.shortcut2.tooltip" = "Caffeine";
+      "menus.dashboard.shortcuts.left.shortcut3.icon" = "󰖔";
+      "menus.dashboard.shortcuts.left.shortcut3.command" = "night-shift";
+      "menus.dashboard.shortcuts.left.shortcut3.tooltip" = "Night-shift";
+      "menus.dashboard.shortcuts.left.shortcut4.icon" = "";
+      "menus.dashboard.shortcuts.left.shortcut4.command" = "menu";
+      "menus.dashboard.shortcuts.left.shortcut4.tooltip" = "Search Apps";
+      "menus.dashboard.shortcuts.right.shortcut1.icon" = "";
+      "menus.dashboard.shortcuts.right.shortcut1.command" = "hyprpicker -a";
+      "menus.dashboard.shortcuts.right.shortcut1.tooltip" = "Color Picker";
+      "menus.dashboard.shortcuts.right.shortcut3.icon" = "󰄀";
+      "menus.dashboard.shortcuts.right.shortcut3.command" =
+        "screenshot region swappy";
+      "menus.dashboard.shortcuts.right.shortcut3.tooltip" = "Screenshot";
 
-          "bar.launcher.icon": "",
-          "theme.bar.transparent": ${if transparent then "true" else "false"},
-          "bar.workspaces.show_numbered": false,
-          "bar.workspaces.workspaces": 5,
-          "bar.workspaces.monitorSpecific": true,
-          "bar.workspaces.hideUnoccupied": false,
-          "bar.windowtitle.label": true,
-          "bar.volume.label": false,
-          "bar.network.truncation_size": 12,
-          "bar.bluetooth.label": false,
-          "bar.clock.format": "%a %b %d  %I:%M %p",
-          "bar.notifications.show_total": true,
-          "theme.notification.border_radius": "${toString rounding}px",
-          "theme.osd.enable": true,
-          "theme.osd.orientation": "vertical",
-          "theme.osd.location": "left",
-          "theme.osd.radius": "${toString rounding}px",
-          "theme.osd.margins": "0px 0px 0px 10px",
-          "theme.osd.muted_zero": true,
-          "menus.clock.weather.location": "${location}",
-          "menus.clock.weather.key": "myapikey",
-          "menus.clock.weather.unit": "metric",
-          "menus.dashboard.powermenu.avatar.image": "/home/${username}/.profile_picture.png",
-          "menus.dashboard.powermenu.confirmation": false,
-
-          "menus.dashboard.shortcuts.left.shortcut1.icon": "",
-          "menus.dashboard.shortcuts.left.shortcut1.command": "qutebrowser",
-          "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Qutebrowser",
-          "menus.dashboard.shortcuts.left.shortcut2.icon": "󰅶",
-          "menus.dashboard.shortcuts.left.shortcut2.command": "caffeine",
-          "menus.dashboard.shortcuts.left.shortcut2.tooltip": "Caffeine",
-          "menus.dashboard.shortcuts.left.shortcut3.icon": "󰖔",
-          "menus.dashboard.shortcuts.left.shortcut3.command": "night-shift",
-          "menus.dashboard.shortcuts.left.shortcut3.tooltip": "Night-shift",
-          "menus.dashboard.shortcuts.left.shortcut4.icon": "",
-          "menus.dashboard.shortcuts.left.shortcut4.command": "menu",
-          "menus.dashboard.shortcuts.left.shortcut4.tooltip": "Search Apps",
-          "menus.dashboard.shortcuts.right.shortcut1.icon": "",
-          "menus.dashboard.shortcuts.right.shortcut1.command": "hyprpicker -a",
-          "menus.dashboard.shortcuts.right.shortcut1.tooltip": "Color Picker",
-          "menus.dashboard.shortcuts.right.shortcut3.icon": "󰄀",
-          "menus.dashboard.shortcuts.right.shortcut3.command": "screenshot region swappy",
-          "menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshot",
-
-          "menus.dashboard.directories.left.directory1.label": "󰉍 Downloads",
-          "menus.dashboard.directories.left.directory1.command": "bash -c \"thunar $HOME/Downloads/\"",
-          "menus.dashboard.directories.left.directory2.label": "󰉏 Pictures",
-          "menus.dashboard.directories.left.directory2.command": "bash -c \"thunar $HOME/Pictures/\"",
-          "menus.dashboard.directories.left.directory3.label": "󱧶 Documents",
-          "menus.dashboard.directories.left.directory3.command": "bash -c \"thunar $HOME/Documents/\"",
-          "menus.dashboard.directories.right.directory1.label": "󱂵 Home",
-          "menus.dashboard.directories.right.directory1.command": "bash -c \"thunar $HOME/\"",
-          "menus.dashboard.directories.right.directory2.label": "󰚝 Projects",
-          "menus.dashboard.directories.right.directory2.command": "bash -c \"thunar $HOME/dev/\"",
-          "menus.dashboard.directories.right.directory3.label": " Config",
-          "menus.dashboard.directories.right.directory3.command": "bash -c \"thunar $HOME/.config/\"",
-
-          "theme.bar.menus.monochrome": true,
-          "wallpaper.enable": false,
-          "theme.bar.menus.background": "${background}",
-          "theme.bar.menus.cards": "${background-alt}",
-          "theme.bar.menus.card_radius": "${toString rounding}px",
-          "theme.bar.menus.label": "${foreground}",
-          "theme.bar.menus.text": "${foreground}",
-          "theme.bar.menus.border.size": "${toString border-size}px",
-          "theme.bar.menus.border.color": "${accent}",
-          "theme.bar.menus.border.radius": "${toString rounding}px",
-          "theme.bar.menus.popover.text": "${foreground}",
-          "theme.bar.menus.popover.background": "${background-alt}",
-          "theme.bar.menus.listitems.active": "${accent}",
-          "theme.bar.menus.icons.active": "${accent}",
-          "theme.bar.menus.switch.enabled":"${accent}",
-          "theme.bar.menus.check_radio_button.active": "${accent}",
-          "theme.bar.menus.buttons.default": "${accent}",
-          "theme.bar.menus.buttons.active": "${accent}",
-          "theme.bar.menus.iconbuttons.active": "${accent}",
-          "theme.bar.menus.progressbar.foreground": "${accent}",
-          "theme.bar.menus.slider.primary": "${accent}",
-          "theme.bar.menus.tooltip.background": "${background-alt}",
-          "theme.bar.menus.tooltip.text": "${foreground}",
-          "theme.bar.menus.dropdownmenu.background":"${background-alt}",
-          "theme.bar.menus.dropdownmenu.text": "${foreground}",
-          "theme.bar.background": "${
-            background + (if transparentButtons then "00" else "")
-          }",
-          "theme.bar.buttons.style": "default",
-          "theme.bar.buttons.monochrome": true,
-          "theme.bar.buttons.text": "${foreground}",
-          "theme.bar.buttons.background": "${
-            background-alt + (if transparentButtons then "00" else "")
-          }",
-          "theme.bar.buttons.icon": "${accent}",
-          "theme.bar.buttons.notifications.background": "${background-alt}",
-          "theme.bar.buttons.hover": "${background}",
-          "theme.bar.buttons.notifications.hover": "${background}",
-          "theme.bar.buttons.notifications.total": "${accent}",
-          "theme.bar.buttons.notifications.icon": "${accent}",
-          "theme.notification.background": "${background-alt}",
-          "theme.notification.actions.background": "${accent}",
-          "theme.notification.actions.text": "${foreground}",
-          "theme.notification.label": "${accent}",
-          "theme.notification.border": "${background-alt}",
-          "theme.notification.text": "${foreground}",
-          "theme.notification.labelicon": "${accent}",
-          "theme.osd.bar_color": "${accent}",
-          "theme.osd.bar_overflow_color": "${accent-alt}",
-          "theme.osd.icon": "${background}",
-          "theme.osd.icon_container": "${accent}",
-          "theme.osd.label": "${accent}",
-          "theme.osd.bar_container": "${background-alt}",
-          "theme.bar.menus.menu.media.background.color": "${background-alt}",
-          "theme.bar.menus.menu.media.card.color": "${background-alt}",
-          "theme.bar.menus.menu.media.card.tint": 90,
-          "bar.customModules.updates.pollingInterval": 1440000,
-          "bar.media.show_active_only": true
-        }
-      '';
+      "theme.bar.menus.monochrome" = true;
+      "wallpaper.enable" = false;
+      "theme.bar.menus.background" = "${background}";
+      "theme.bar.menus.cards" = "${background-alt}";
+      "theme.bar.menus.card_radius" = "${toString rounding}px";
+      "theme.bar.menus.label" = "${foreground}";
+      "theme.bar.menus.text" = "${foreground}";
+      "theme.bar.menus.border.size" = "${toString border-size}px";
+      "theme.bar.menus.border.color" = "${accent}";
+      "theme.bar.menus.border.radius" = "${toString rounding}px";
+      "theme.bar.menus.popover.text" = "${foreground}";
+      "theme.bar.menus.popover.background" = "${background-alt}";
+      "theme.bar.menus.listitems.active" = "${accent}";
+      "theme.bar.menus.icons.active" = "${accent}";
+      "theme.bar.menus.switch.enabled" = "${accent}";
+      "theme.bar.menus.check_radio_button.active" = "${accent}";
+      "theme.bar.menus.buttons.default" = "${accent}";
+      "theme.bar.menus.buttons.active" = "${accent}";
+      "theme.bar.menus.iconbuttons.active" = "${accent}";
+      "theme.bar.menus.progressbar.foreground" = "${accent}";
+      "theme.bar.menus.slider.primary" = "${accent}";
+      "theme.bar.menus.tooltip.background" = "${background-alt}";
+      "theme.bar.menus.tooltip.text" = "${foreground}";
+      "theme.bar.menus.dropdownmenu.background" = "${background-alt}";
+      "theme.bar.menus.dropdownmenu.text" = "${foreground}";
+      "theme.bar.background" = "${background
+        + (if transparentButtons && transparent then "00" else "")}";
+      "theme.bar.buttons.style" = "default";
+      "theme.bar.buttons.monochrome" = true;
+      "theme.bar.buttons.text" = "${foreground}";
+      "theme.bar.buttons.background" =
+        "${(if transparent then background else background-alt)
+        + (if transparentButtons then "00" else "")}";
+      "theme.bar.buttons.icon" = "${accent}";
+      "theme.bar.buttons.notifications.background" = "${background-alt}";
+      "theme.bar.buttons.hover" = "${background}";
+      "theme.bar.buttons.notifications.hover" = "${background}";
+      "theme.bar.buttons.notifications.total" = "${accent}";
+      "theme.bar.buttons.notifications.icon" = "${accent}";
+      "theme.notification.background" = "${background-alt}";
+      "theme.notification.actions.background" = "${accent}";
+      "theme.notification.actions.text" = "${foreground}";
+      "theme.notification.label" = "${accent}";
+      "theme.notification.border" = "${background-alt}";
+      "theme.notification.text" = "${foreground}";
+      "theme.notification.labelicon" = "${accent}";
+      "theme.osd.bar_color" = "${accent}";
+      "theme.osd.bar_overflow_color" = "${accent-alt}";
+      "theme.osd.icon" = "${background}";
+      "theme.osd.icon_container" = "${accent}";
+      "theme.osd.label" = "${accent}";
+      "theme.osd.bar_container" = "${background-alt}";
+      "theme.bar.menus.menu.media.background.color" = "${background-alt}";
+      "theme.bar.menus.menu.media.card.color" = "${background-alt}";
+      "theme.bar.menus.menu.media.card.tint" = 90;
+      "bar.customModules.updates.pollingInterval" = 1440000;
+      "bar.media.show_active_only" = true;
+      "theme.bar.location" = "${position}";
+      "bar.workspaces.numbered_active_indicator" = "color";
+      "bar.workspaces.monitorSpecific" = false;
+      "bar.workspaces.applicationIconEmptyWorkspace" = "";
+      "bar.workspaces.showApplicationIcons" = true;
+      "bar.workspaces.showWsIcons" = true;
+      "theme.bar.dropdownGap" = "4.5em";
+    };
   };
 }

home/system/kdeconnect/default.nix

@@ -1,7 +0,0 @@
-# KDE Connect is a project that enables all your devices to communicate with each other. (laptop/phone)
-{
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
-}

home/system/mime/default.nix

@@ -19,15 +19,22 @@
       "text/x-dockerfile" = "nvim.desktop";
       "text/x-xml" = "nvim.desktop";
       "text/x-php" = "nvim.desktop";
-      "image/png" = "imv.desktop";
       "image/jpeg" = "imv.desktop";
       "image/jpg" = "imv.desktop";
       "image/webp" = "imv.desktop";
-      "image/gif" = "org.qutebrowser.qutebrowser.desktop";
-      "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
-      "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
-      "text/html" = "org.qutebrowser.qutebrowser.desktop";
+      "image/gif" = "zen.desktop";
+      "x-scheme-handler/http" = "zen.desktop";
+      "x-scheme-handler/https" = "zen.desktop";
+      "text/html" = "zen.desktop";
       "application/pdf" = "zathura.desktop";
+      "image/png" = "imv-dir.desktop";
+      "x-scheme-handler/chrome" = "zen.desktop";
+      "application/x-extension-htm" = "zen.desktop";
+      "application/x-extension-html" = "zen.desktop";
+      "application/x-extension-shtml" = "zen.desktop";
+      "application/xhtml+xml" = "zen.desktop";
+      "application/x-extension-xhtml" = "zen.desktop";
+      "application/x-extension-xht" = "zen.desktop";
     };
   };
 }

hosts/laptop/configuration.nix

@@ -17,8 +17,10 @@
     ../../nixos/utils.nix
     ../../nixos/xdg-portal.nix
     ../../nixos/variables-config.nix
+    ../../nixos/docker.nix
 
-    ../../themes/nixy.nix
+    # Choose your theme here
+    ../../themes/stylix/2025.nix
 
     ./hardware-configuration.nix
     ./variables.nix
@@ -26,15 +28,6 @@
 
   home-manager.users."${config.var.username}" = import ./home.nix;
 
-  # For KDEConnect (Remove this if not needed)
-  networking.firewall = rec {
-    allowedTCPPortRanges = [{
-      from = 1714;
-      to = 1764;
-    }];
-    allowedUDPPortRanges = allowedTCPPortRanges;
-  };
-
   # Don't touch this
   system.stateVersion = "24.05";
 }

hosts/laptop/home.nix

@@ -6,16 +6,16 @@
     # Programs
     ../../home/programs/kitty
     ../../home/programs/nvim
-    ../../home/programs/qutebrowser
+    # ../../home/programs/qutebrowser
     ../../home/programs/shell
     ../../home/programs/fetch
     ../../home/programs/git
     ../../home/programs/spicetify
     ../../home/programs/nextcloud
-    ../../home/programs/yazi
-    ../../home/programs/markdown
     ../../home/programs/thunar
     ../../home/programs/lazygit
+    ../../home/programs/zen
+    ../../home/programs/duckduckgo-colorscheme
 
     # Scripts
     ../../home/scripts # All scripts
@@ -26,15 +26,12 @@
     ../../home/system/hyprlock
     ../../home/system/hyprpanel
     ../../home/system/hyprpaper
-    ../../home/system/gtk
     ../../home/system/wofi
     ../../home/system/batsignal
     ../../home/system/zathura
     ../../home/system/mime
     ../../home/system/udiskie
     ../../home/system/clipman
-    ../../home/system/kdeconnect
-    ../../home/system/tofi
 
     ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
@@ -49,6 +46,9 @@
       bitwarden # Password manager
       vlc # Video player
       blanket # White-noise app
+      obsidian # Note taking app
+      planify # Todolists
+      gnome-calendar
 
       # Dev
       go
@@ -56,6 +56,7 @@
       python3
       jq
       figlet
+      just
 
       # Utils
       zip
@@ -64,22 +65,22 @@
       pfetch
       pandoc
       btop
+      textpieces # Manipulate texts
+      curtail # Compress images
 
       # Just cool
       peaclock
       cbonsai
       pipes
       cmatrix
-      cava
 
       # Backup
-      vscode
       firefox
-      neovide
+      vscode
     ];
 
     # Import my profile picture, used by the hyprpanel dashboard
-    file.".profile_picture.png" = { source = ./profile_picture.png; };
+    file.".face.icon" = { source = ./profile_picture.png; };
 
     # Don't touch this
     stateVersion = "24.05";

hosts/laptop/secrets/default.nix

@@ -11,10 +11,28 @@
       github-key = { path = "/home/hadi/.ssh/github"; };
       gitlab-key = { path = "/home/hadi/.ssh/gitlab"; };
       jack-key = { path = "/home/hadi/.ssh/jack"; };
-      ovpn = { path = "/home/hadi/.ovpn.ovpn"; };
+      pia = { path = "/home/hadi/.config/pia/pia.ovpn"; };
     };
   };
 
+  home.file.".config/nixos/.sops.yaml".text = ''
+    keys:
+      - &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
+    creation_rules:
+      - path_regex: hosts/laptop/secrets/secrets.yaml$
+        key_groups:
+          - age:
+            - *primary
+      - path_regex: hosts/desktop/secrets/secrets.yaml$
+        key_groups:
+          - age:
+            - *primary
+      - path_regex: hosts/server/secrets/secrets.yaml$
+        key_groups:
+          - age:
+            - *primary
+  '';
+
   systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
   home.packages = with pkgs; [ sops age ];
 

hosts/laptop/secrets/secrets.yaml

@@ -1,8 +1,8 @@
+pia: ENC[AES256_GCM,data:0bnhHeVqKSLHVimd78a94ShHlO3+LUoZ4oiKD3cnBYkaZsw=,iv:S+/IChlFlqdI+PyFF+Ti4AJUkch2MS0qKiqHL1Q3RMk=,tag:+v2kV70ou84eIc01dKnAhA==,type:str]
 sshconfig: ENC[AES256_GCM,data:/sDTGVeYRjxF5Epp5kmVS0ScSYOqOs2grX0+Ap8HJc8CQftpNOYXNYdEyqLDMc5g5ualaO4iKg4sQ76J4j9ZPugt4iprIvOo2Uxmu7KRU47Z8SNwrrMNpv6x/XA2P6r261e/e/pOHyrmiFfV/I5Km9IwGqY5TWbEhvjx8qyRO2bQDIdffI1L1ZWJGC9ZOZ4o5RJCr2xB+qxLLI2pl8qHZhvfZlGHnyHw5ne0RfAFubIrW4nQJTamoaGHZqWro4tVSfXAEb+9IsYCc1aj3MehVdV8PUQ38/LxL2MAQTt9bs7sHLf9DmxZ6rGPWmpJ+IRoQbP1PA65tobFOd+Kf13XvWymNUcQpQFHDj0vpvDONxIikO+vj2T7SteRRPy+38UPdB8jrHfQ1JrGbxUQIrWOWeD3S44lINmquIMclJQ26zf6nvklXR7xCuzNAvmjublsnYK+CGDkt/ap/kDD7nCuQYYY,iv:VX55dyt2N80LJPDYoUES7ZWJjlqVyQrUQWvOQ/yItBc=,tag:6NlHwy0SqJ40+ltQHzmX7g==,type:str]
 github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
 gitlab-key: ENC[AES256_GCM,data:6271Tg7LIJsXAw7Co32vva+iUWv+eRAfVfXaGkoirHxiPTAgZfq8yDpGJwti2D/aFnLvbURcUgp3B5zy1aURu9puXi6QMu3orJOE2Zx0dX3lyeHyIhOZ1hAWsQxwBDkJYODuMZbIKHNrF26Mkk6smFF9SrGoADZGxY7XSou/iopw6yrLvQAXP6lN55PQvoP5/ek/QzKNwjJAbAjp7FjjtPqPUbUdj7bfIfr9avs6gpRYnRzb2H3auyhb5qvyuRWnKu4+FeZUofC7HnfRU1eSI8UzG49Rg4f2b1Xqr0JtsjvEmuRx7lbptINXEAjW7zaSZ2B9NgotWPIzkNZRNZkuTEaOulBf5iH3wJ9GM1FcbUu2gpCt6y+CMIk5QkVvETYtKuALLbcPx9/sc90doiH1411LeKQCs5l88BBILG9KPkKmXiGGUVNxzFtjbRYQIUEmmyl95kPPEdCkkzGzHXNfE3F9HRu4MCGKPK2yZPZtCXd3Jp1b21wKSIRNYqLqxru+J8eLSljd3czO0SuTG/Vx,iv:E+y3aVLaiStlPLTQBqyfJuEXtAQyOvDUYS+XfuOHuA0=,tag:6d1IAsGcmcpgL1pE9dDcbw==,type:str]
 jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
-ovpn: ENC[AES256_GCM,data:dz42g5IQ9FvXkE/yDfnPFUgZGfuboko3oTLtFHHB3T1+dLSbkhSLEpNM6l0FTJwef9cP2fn98JjeoiNkhnCAyOJvdnmA6KPJhz1RQH3j+lt4IPgYry3uThZvxPCDWTSbS0JwnQua/iNGeeX90bAMalqLJtP25LrW9dp+Tu7TXgqc+qs7/owBAdxu2r96ehVGu63x+JB5nDWRxUOmOjqmkaX0B37PNQRhfAyWKGN3ELSuI2LhxuRHRee+pXKutr2wuQNyCsUT2Zv+kdjOCR2S50sWZqdYV7t1Vw/QzIUyaV/giMp07u/tCJxyz4axZpIc0WuZJGV+Bbbh8hbJchkrkqXbkyt2RsL7v+ylrnABLgjJAn7cZK6rR4/yn3WaZ58vicLYqgdUVwxWm2C6L2v4LqkW2ouuL1ibiYPLGrFchdPWnAQklBG7QMO9OhbKRu2ibt7+Ltu4hlWQIr6NFVxraNihzWYVuUZHHv5yByxM9qSNVm9GwozxXA3g/SR61akIK7iclV/A9fec+BInvh1FWBcW2AoYr7UfcwnKSSWtBZh+6Lj4/ZfORVWuEggj++14jhEr5pc1Qx4GRNeCAr7/FzxW4z6P29iTgCmRZ/KE2WdYrid0eVj2fC/P9XP+Ou/9NbJFp7cHYWM9SNIRNAS9h7vkhpsyp+3t+2q5NDrBTZFVAgmQNX7eu2TegE6YTExmnMFf4HCfwpre9ardwDNWdFjVqkqynYotGK+jg80YnlxnnMwhn2xYYGCebL/N19dhAdAHW853NftIkYR+rBbfBGhtj4RPWGqRFzRhOCVuLmexniHjtjJrJJCz0Eh7Md9PM7jYxUpVcpdC3W+Hg7oVOooc67hX8hiwZf8I7evxNxWmTC2tPN32fTUZexvwQCl1SSdg5vJGhhtdu1VkIZ5n9rdhBmeMQHRTa+woRAIVxZ6Y0dt41WbHN6WcVkHEuOZvDLy4+iZP5DOQFUZ9jEr8gDCTFS920Pguv2cZOFAN3bfSr4vRq72vrZuYAuMShTgPaMruNaOHSWOLhEdg2VQm0ce1cfcR0Dj9wyAMuxBzo7a0+N9ipmD6aUrjh6dTE+rtyClyLsVDGCLA9N2cqAVghdXIauvzpDq9OGwAQeL4+BtXlkiRihTzrc8oNydEYwO1ZTFiUhZEOgrpL1/pCr+jf1QHTXeV07XswySUSOerE2RIerp9FMxvf5O1Wwhw0eowBlgLTTG4RtafBTQGQ19JSTOTJQcBhpycFzRgwxrXGRBXNrhUqGr/bkWGaktEDtOQ0PzNmc1X8Cgn6+Z9mPSfMUrTuhak9MjGVqtBYc/Kg2kSfLoFiIxaX5yd64hlznZBAQ7jinPVAKeAPtIt13S/6gKQyXPePn11lsox/PY/L4HkryrAnbT5nnl7ISfouQzenLh+zTxNxihabviS9FXwyDgzFvJb3VkBroX2w6YaWs75254qZ2txzrNTX93LgnKwkD6cWLdeU6FNW2DB82R2c6oxh9ewape5QmFzhvjc584S3Uztbwr/dPMwDdmyO5vP+llDRfQdxXJ7ax0Z01L4PhtBMe+qwU709XKkVQCeno+g3/4tDFhfp4tCKhCHRj+8x9lYSQPpTm3GozChpG0QFbo+y3rjeF4CVHqA80EJKBkc8ikykhDcQrMwnL4rVcDAPLycOzI4aF8HPdcUA8lGSzahil1MrExUUaexIua6f4By2tRCuAJ2ScnF6IikW3z5gRNKo9o+1Tptg1t+iVj7kj7PWgGJIJRpOaw57t0goeCfSUE+9NPnjiWcAOUTzeV0/j5MX8sArTaXaKsBh7HgrPlbL9w1yC7Ai+zHUT1ajIH/5U91v2mOM8stUifrYZnG7/KKNt90eFgYQPcsM3UZlTR/2nQpHPmPkw9Ar2QY3t/4w9/qAyBdtiN/B9n2adtr4pPf88bTLLPS+7yiV4/7yHqrzKgXQ124fQDNCY5nNY5o/KmjHj+YCgHlkfTF9tgaF6rDjAJXuXgfVIBRuFtXttL1AHWXY4WYJX17PX8gMHt/JugqKE6BF/N01XDKH1nAMPHDlc7zCJvgtGrI7P0+vNJIE/M37014Qw/xk/KeDj/HzXNUQL8tisf4pc1PbKOIJpHd7Ab8lR1h0TPSyntl6zNgAtfXDL031/tUr61VknkPDsWAVMiVY2UUvAxP8cdeiCUl+qjiYGrB8jHrFyVifSks0atjmWBH0QbFDHr2GEi0kh881Do7IwebJpAEEDMk+p4WqqKY/I+TpiHm0hAZTDsqtsRcVWXlot4n4OH+Z+Wjqdos6K8XtCWNz0VhgYNQeGOmroN6ruk0+3+lpikDUaCMl9UfQhm6Ba4KPZWLnGuD4OOqLbRj1itUWAvU9Xounp8yqr7u60VjuL0Wge1C/Ynf51Nhe1dZWWESCbutZu65NNnnyj29UDDYzbnwpqRnbOAb6OV9b85jhHaoWy7XTSw8CW0o9OtH++0f8+6g8o+XutZdqc+ihP4O+TvT3Ly/ohaatphzjz2MNuZ03LcnGOr2Q3zOzunf0kXy2cXyxfWvEuvLfhEWpN7GD1kRVyL7NVutzkWR09TLZaZDst1RxJiKaxQC6GNjOUMTF6oBHTWc7VAmOoxTlyhaABt+ZHInd9KX41d+wo+vg8UAI8+H56Sy4fva/FSwxlJyMgM2GuXk312uGfM/HOFUzUHDOq7MwbxekVH71LBPetBxZ1PdIoAXiZLl3GC0FOTEukzqFEipKJuWknBqeuYKmNxQa1VwrmC0575mofV1AG71AK4vz/SHWQ4giaws29+HYXQCT3GWg54g9PHX++vaJtWZd6/jOTeehMbqhqNi8gfk24lWCBSzxCzVVWQifLxVaYoitMkhhQXSgg+ZWS5w4mG9S5T3ZJImEy+ClXxfkbdatpEFWulChWO3ROgPxX+2OtvAjx7hS66MvNirLC2h9YtV/Ki35SLaSQ6QGRtrmNRDd+hBO1bObTYmZYolzpJAnwym2/qPsdGZHYCJISF1zC7n1jKjf60aI1k8sfx80wivMgpFYlS22ktaqqyK23a1I+FzZro5EhpIGidFmg4of+YcMqzhhYQFcT60JThFoW5lzxmGZbC3xj4sZvFZHcMoZJWJhBJJFWovK5CKqJ+HrMkp3ubVDMnUU+A3n8eqvhtFlqBx9gvWjF5szs0FASX4L9P1/TNXwlJtlXSAw2Any8YpF5fqU/IpFnpPEquTCF8UfWwbswqA1tyeurcnIw+UUa222iNTCa0d1//zTmiQr+Qo5OJAEwSU35Y/RZGhDWZiOmpOrLM27vflYcbefrDR7AJBtLZCYlxD23QQ1zgfT9Z9f2O/XnWk7yistPVoMx47itPZyqVH5pttlNxHE94XwVjtp6W3hvRYPEQfAKOrZAXgOZmMqA6ykdbOPyZT5y6/xTo6Z8uJHvJe40XDPQgkm/7A3kimPTKXgXtsGT+bmpHubU5kUFKz+fMTRceZLGuPRbW+krWtQVqJD5wTn26OznYALEfLfSYGqSc9nfBGro0wJOEuIEnudSNZQxIOt0ZOR0VDCCOeZnyOwZUPV1o6+3a7v/JLse3y5DUhzo2vRL61bOrjaM45wYgSEiUAJK8tZ2NWUUi64Zqg0ipKWOp+mDtAVor+jCA8PrK0g5ReAXN5vwStAwXSQCwlDV9KD4fP5XkHZ0tESBWtpOvgYAy+Hw7LpfWTWiNSOo9WAj5LFKeYkVtoginSv+1FsYroNM82vCU3x+1X1C1HkjLXuskNiRJx1IjrKzqkPOIEw2CxypwmHKrP49OBiZsYdFf5zqc1TbkaoEx67Jqy+49iXXBUHg+hOOIL/PfGk2/pgiMIm/VrvYs7/592OPxzzQUZlmWc3tC2wLhWpCbxnraDvQbMibLVAiqyltvstR60XirRbXLdNXEVvhQ+wa9k4tI4yoQkBnejpuFxgG1/9cbU+GyR+T8t0DWcpdkj3f2movp0ZiJXmkCB+lx7QrWThcrU81gGm3MKspckvMwsFyFRt54oQIiL7wLt6zlbyN5f2tHGbfjua0UPKFRXkrO9al/BjVoNvzO+WogmS6SNMTEPDWTEv+MXY5AK53doPTMLHxM6ISy5C3SkojUczXVZf+YymFGZLXw6BtS4x28Oc1Jak5+Er81rY09CbRS2/SvwToatjY6SviVEuOYVBwln3UtDF385shlhsHtks89nvdccwUvznFhqg/9vZlvJQuSN4HEPxQ2bWg==,iv:24+CrCdb5f04Uv5aM8k616hyeikbFJzptERlb9tl+U4=,tag:mPOcv3EfaJrEHxBwYRXRHA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -18,8 +18,8 @@ sops:
             cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
             FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-04T20:00:20Z"
-    mac: ENC[AES256_GCM,data:xKGnwLEpwzFrG7Xl5gaGTNL/0/z3pOfPBpEZ0rUqgMplc4UZ/LuBgc/2/ccaqoaJcou1IYYGFJGKqpAVEyLuSSWuvn4H63spbkt8LgZIToN3lxWa3EFB/4Xc2cCwUj9c6vAYaFQbnZ9Mm+ZsITluPAuLBHD1AWPPBlWOQbHbn4M=,iv:tE0WEj0YwsY2Tab8+AKNvIjU3dXLN5Bz/jYtG69x/Ow=,tag:a5kp6VqPa0hNfWK4T3SEZg==,type:str]
+    lastmodified: "2024-11-05T12:05:15Z"
+    mac: ENC[AES256_GCM,data:ggTUKhmfUp4CCE6w3uiuwV0ys6xUhaMBeXi4WiaxkED/lB9iUdP9UssE9iF5lToyNxt/6O2C60CXc4OvpqBxe5dsxPkVNeB6PNhQrD5Ga8+Cu0i6hKz6Fmm0Rq461OuX0Nu2Nl3MUBCWxjM0+1ywfLRKDcjoVC7RzP5eo1NtrV8=,iv:G+Ntog1claKwAY4PEpUK1hjNzspDZiO3bdWNxugUXDQ=,tag:Yg2ZJEV2VrnTmpw8TykmZg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.9.1

hosts/laptop/variables.nix

@@ -20,24 +20,9 @@
     };
 
     autoUpgrade = false;
-    autoGarbageCollector = false;
+    autoGarbageCollector = true;
 
-    theme = {
-      rounding = 15;
-      gaps-in = 10;
-      gaps-out = 10 * 2;
-      active-opacity = 1;
-      inactive-opacity = 0.89;
-      blur = true;
-      border-size = 3;
-      animation-speed = "medium"; # "fast" | "medium" | "slow"
-      fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-
-      bar = {
-        transparent = true;
-        transparentButtons = false;
-        floating = true;
-      };
-    };
+    # Choose your theme variables here
+    theme = import ../../themes/var/2025.nix;
   };
 }

nixos/audio.nix

@@ -1,6 +1,6 @@
 {
   security.rtkit.enable = true;
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
 
   services.pipewire = {
     enable = true;

nixos/docker.nix

@@ -0,0 +1,4 @@
+{ config, ... }: {
+  virtualisation.docker.enable = true;
+  users.users."${config.var.username}".extraGroups = [ "docker" ];
+}

nixos/fonts.nix

@@ -13,9 +13,10 @@
       jost
       dejavu_fonts
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "FiraCode" "Meslo" ]; })
+      nerd-fonts.fira-code
+      nerd-fonts.meslo-lg
       openmoji-color
       twemoji-color-font
       inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd

nixos/home-manager.nix

@@ -2,6 +2,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    backupFileExtension = "hm-backup";
     extraSpecialArgs = { inherit inputs; };
   };
 }

nixos/nix.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, inputs, ... }:
 let autoGarbageCollector = config.var.autoGarbageCollector;
 in {
   nixpkgs.config = {
@@ -6,6 +6,8 @@ in {
     allowBroken = true;
   };
   nix = {
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+    channel.enable = false;
     extraOptions = ''
       warn-dirty = false
     '';

nixos/pia.nix

@@ -0,0 +1,10 @@
+{ config, ... }: {
+  services.pia.enable = true;
+
+  # Alternatively, you can use the `authUserPassFile` attribute if you are using
+  # a Nix secrets manager. Here's an example using sops-nix.
+  #
+  # The secret you provide to `authUserPassFile` should be a multiline string with
+  # a single username on the first line a single password on the second line.
+  services.pia.authUserPassFile = "/home/hadi/.config/pia/pia.ovpn";
+}

nixos/systemd-boot.nix

@@ -6,6 +6,7 @@
       systemd-boot = {
         enable = true;
         consoleMode = "auto";
+        configurationLimit = 8;
       };
     };
     tmp.cleanOnBoot = true;

themes/stylix/2025.nix

@@ -0,0 +1,73 @@
+{ pkgs, inputs, ... }: {
+  stylix = {
+    enable = true;
+
+    # Edited catppuccin
+    base16Scheme = {
+      base00 = "10101a"; # Default Background
+      base01 =
+        "16161f"; # Lighter Background (Used for status bars, line number and folding marks)
+      base02 = "2b2b2b"; # Selection Background
+      base03 = "45475a"; # Comments, Invisibles, Line Highlighting
+      base04 = "585b70"; # Dark Foreground (Used for status bars)
+      base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators
+      base06 = "f5e0dc"; # Light Foreground (Not often used)
+      base07 = "b4befe"; # Light Background (Not often used)
+      base08 =
+        "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+      base09 =
+        "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+      base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background
+      base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted
+      base0C =
+        "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes
+      base0D =
+        "A594FD"; # Functions, Methods, Attribute IDs, Headings, Accent color
+      base0E =
+        "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+      base0F =
+        "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
+    };
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+      size = 24;
+    };
+
+    fonts = {
+      monospace = {
+        package = pkgs.nerd-fonts.jetbrains-mono;
+        name = "JetBrains Mono Nerd Font";
+      };
+      sansSerif = {
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      serif = {
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      emoji = {
+        package = pkgs.noto-fonts-emoji;
+        name = "Noto Color Emoji";
+      };
+      sizes = {
+        applications = 13;
+        desktop = 13;
+        popups = 13;
+        terminal = 13;
+      };
+    };
+
+    polarity = "dark";
+    image = pkgs.fetchurl {
+      url =
+        "https://github.com/anotherhadi/nixy-wallpapers/blob/main/wallpapers/"
+        + "3.png" + "?raw=true";
+      sha256 = "sha256-fT2ah18IAxoy3hzlLl9SkqhchzfVvZneUrZWzntMo40=";
+    };
+
+  };
+
+}

themes/stylix/nixy.nix

@@ -30,14 +30,14 @@
     };
 
     cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Ice";
+      package = pkgs.posy-cursors;
+      name = "Posy-Cursor-Mono";
       size = 24;
     };
 
     fonts = {
       monospace = {
-        package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
+        package = pkgs.nerd-fonts.jetbrains-mono;
         name = "JetBrains Mono Nerd Font";
       };
       sansSerif = {

themes/stylix/pinky.nix

@@ -0,0 +1,73 @@
+{ pkgs, inputs, ... }: {
+  stylix = {
+    enable = true;
+
+    # Edited catppuccin
+    base16Scheme = {
+      base00 = "0b0b0b"; # Default Background
+      base01 =
+        "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks)
+      base02 = "2b2b2b"; # Selection Background
+      base03 = "45475a"; # Comments, Invisibles, Line Highlighting
+      base04 = "585b70"; # Dark Foreground (Used for status bars)
+      base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators
+      base06 = "f5e0dc"; # Light Foreground (Not often used)
+      base07 = "b4befe"; # Light Background (Not often used)
+      base08 =
+        "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+      base09 =
+        "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+      base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background
+      base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted
+      base0C =
+        "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes
+      base0D =
+        "c6a0f6"; # Functions, Methods, Attribute IDs, Headings, Accent color
+      base0E =
+        "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+      base0F =
+        "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
+    };
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+      size = 20;
+    };
+
+    fonts = {
+      monospace = {
+        package = pkgs.nerd-fonts.jetbrains-mono;
+        name = "JetBrains Mono Nerd Font";
+      };
+      sansSerif = {
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      serif = {
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      emoji = {
+        package = pkgs.noto-fonts-emoji;
+        name = "Noto Color Emoji";
+      };
+      sizes = {
+        applications = 13;
+        desktop = 13;
+        popups = 13;
+        terminal = 13;
+      };
+    };
+
+    targets.nixvim.transparentBackground = {
+      main = true;
+      signColumn = true;
+    };
+    targets.nixvim.plugin = "base16-nvim";
+
+    polarity = "dark";
+    image = inputs.nixy-wallpapers + "/wallpapers/4.png";
+  };
+
+}

themes/stylix/whitish.nix

@@ -0,0 +1,73 @@
+{ pkgs, inputs, ... }: {
+  stylix = {
+    enable = true;
+
+    # Edited catppuccin
+    base16Scheme = {
+      base00 = "0b0b0b"; # Default Background
+      base01 =
+        "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks)
+      base02 = "2b2b2b"; # Selection Background
+      base03 = "45475a"; # Comments, Invisibles, Line Highlighting
+      base04 = "585b70"; # Dark Foreground (Used for status bars)
+      base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators
+      base06 = "f5e0dc"; # Light Foreground (Not often used)
+      base07 = "b4befe"; # Light Background (Not often used)
+      base08 =
+        "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+      base09 =
+        "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+      base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background
+      base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted
+      base0C =
+        "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes
+      base0D =
+        "8492EB"; # Functions, Methods, Attribute IDs, Headings, Accent color
+      base0E =
+        "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+      base0F =
+        "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
+    };
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+      size = 20;
+    };
+
+    fonts = {
+      monospace = {
+        package = pkgs.nerd-fonts.jetbrains-mono;
+        name = "JetBrains Mono Nerd Font";
+      };
+      sansSerif = {
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      serif = {
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      emoji = {
+        package = pkgs.noto-fonts-emoji;
+        name = "Noto Color Emoji";
+      };
+      sizes = {
+        applications = 13;
+        desktop = 13;
+        popups = 13;
+        terminal = 13;
+      };
+    };
+
+    targets.nixvim.transparentBackground = {
+      main = true;
+      signColumn = true;
+    };
+    targets.nixvim.plugin = "base16-nvim";
+
+    polarity = "dark";
+    image = inputs.nixy-wallpapers + "/wallpapers/zywgxy.png";
+  };
+
+}

themes/var/2025.nix

@@ -0,0 +1,18 @@
+{
+  rounding = 16;
+  gaps-in = 9;
+  gaps-out = 9 * 2;
+  active-opacity = 1;
+  inactive-opacity = 0.93;
+  blur = true;
+  border-size = 3;
+  animation-speed = "fast"; # "fast" | "medium" | "slow"
+  fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+  bar = {
+    position = "top"; # "top" | "bottom"
+    transparent = true;
+    transparentButtons = false;
+    floating = true;
+  };
+}

themes/var/nixy.nix

@@ -0,0 +1,18 @@
+{
+  rounding = 15;
+  gaps-in = 10;
+  gaps-out = 10 * 2;
+  active-opacity = 1;
+  inactive-opacity = 0.89;
+  blur = true;
+  border-size = 3;
+  animation-speed = "medium"; # "fast" | "medium" | "slow"
+  fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+  bar = {
+    position = "top"; # "top" | "bottom"
+    transparent = true;
+    transparentButtons = false;
+    floating = true;
+  };
+}

themes/var/pinky.nix

@@ -0,0 +1,18 @@
+{
+  rounding = 25;
+  gaps-in = 12;
+  gaps-out = 12 * 2;
+  active-opacity = 1;
+  inactive-opacity = 0.87;
+  blur = true;
+  border-size = 3;
+  animation-speed = "slow"; # "fast" | "medium" | "slow"
+  fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+  bar = {
+    position = "top"; # "top" | "bottom"
+    transparent = true;
+    transparentButtons = false;
+    floating = true;
+  };
+}

themes/var/whitish.nix

@@ -0,0 +1,18 @@
+{
+  rounding = 15;
+  gaps-in = 10;
+  gaps-out = 10 * 2;
+  active-opacity = 1;
+  inactive-opacity = 0.86;
+  blur = true;
+  border-size = 2;
+  animation-speed = "medium"; # "fast" | "medium" | "slow"
+  fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+  bar = {
+    position = "top"; # "top" | "bottom"
+    transparent = false;
+    transparentButtons = false;
+    floating = true;
+  };
+}