edit packages list

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

.github/assets/README_template.md

@@ -1,110 +1,134 @@
-<div align="center">
+<div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
+    <img alt="nixy logo" src="./.github/assets/logo.png" width="120px" />
-</div>
+</div>
-
+
-<br>
+<br>
-
+
-# Nixy
+# Nixy
-
+
-<br>
+<br>
-<div align="center">
+<div align="center">
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
-    </a>
+    </a>
-    <a href="https://github.com/anotherhadi/nixy/">
+    <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
-    </a>
+    </a>
-    <a href="https://nixos.org">
+    <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
-    </a>
+    </a>
-    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
-    </a>
+    </a>
-</div>
+</div>
-<br>
+<br>
-
+
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+**Nixy simplifies and unifies** the Hyprland ecosystem with a modular, easily
-It's a simple way to manage your system configuration and dotfiles.
+customizable setup. It provides a structured way to manage your system
-
+configuration and dotfiles with minimal effort. It includes _home-manager_,
-I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
+_secrets_, and _custom theming_ all in one place.
-This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
+
-I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
+**Features:**
-
+
-**Nixy key points:**
+- 💻 Hyprland & Caelestia: Preconfigured Hyprland ecosystem with Caelestia-shell (Ty to both projects!)
-
+- 🎨 Consistent Theming: Base16 & Stylix-powered themes
-- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
+- ⌨️ Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
-- Stylix/base16 themes
+
-- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
+## Table of Content
-
+
-## Table of Content
+{md_table_of_content}
-
+
-{md_table_of_content}
+## Screenshots
-
+
-## Gallery
+![Home](.github/assets/rose-pine/home.png)
-
+![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
-![Nixy helper, peaclock](.github/assets/nixy/1.png)
+![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.png)
-![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
+
-![nvim, lazygit](.github/assets/nixy/3.png)
+## Architecture
-![spotify, cava](.github/assets/nixy/4.png)
+
-
+### 🏠 /home (User-level configuration)
-## Architecture
+
-
+Contains **dotfiles and settings** that apply to your user environment.
-### 🏠 home
+
-
+**Subfolders:**
-Those are the dotfiles and configuration files for user-level configuration
+
-
+- `programs` is a collection of apps configured with home-manager
-**Subfolders:**
+- `system` is some "desktop environment" configuration
-
+
-- `programs` is a collection of apps configured with home-manager
+### 🐧 /nixos
-- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+
-- `system` is some "desktop environment" configuration
+Those are the system-level configurations. (audio, bluetooth, gpu, bootloader,
-
+...)
-### 🐧 nixos
+
-
+### 🎨 /themes
-Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
+
-
+This folder contains all system themes. Mainly
-### 🎨 themes
+[stylix](https://stylix.danth.me/) configurations. Check out the available
-
+themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
-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
-
+
-### 💻 hosts
+This directory contains host-specific configurations. Each host includes:
-
+
-Those are the host-specific configurations.
+- `configuration.nix` for system-wide settings
-Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+- `home.nix` for user-level configuration
-
+- `variables.nix` for global variables
-## Installation
+- `secrets/` for sensitive data
-
+
-1. Clone the repo
+### 🖥️ /server-modules
-
+
-```sh
+This folder contains server-related nixos modules. (bitwarden, nextcloud, ...)
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+
-```
+## Installation
-
+
-2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to
-3. Add your `hardware-configuration.nix` to your new host's folder
+   your system:
-4. Add your 'nixosConfigurations' inside `flake.nix`
+
-
+```sh
-> [!Important]
+git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
+```
-> You can use `rg "CHANGEME"` to find them all with ripgrep.
+
-
+2. Copy the `hosts/laptop` folder, rename it to match your system’s hostname,
-> [!TIP]
+   and update `variables.nix` with your machine’s settings.
-> When you add new files, don't forget to run `git add .` to add them to the git repository
+3. Copy your `hardware-configuration.nix` into your new host's folder to ensure
-
+   proper hardware support.
-5. Build the system
+4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
-
+
-```sh
+> [!IMPORTANT]
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+> `# CHANGEME` comments are placed throughout the config to
-```
+> indicate necessary modifications. Use the following command to quickly locate
-
+> them:
-## Documentation
+>
-
+> ```sh
-- [THEMES](docs/THEMES.md): How themes work and how to create your own
+> rg "CHANGEME" ~/.config/nixos
-- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
+> ```
-- [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
+
-- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
+> [!TIP]
-
+> When you add new files, don't forget to run `git add .` to add them to the git
-- [TODO](docs/TODO.md): What's next (feel free to contribute)
+> repository
-- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+
-- [LICENSE](LICENSE): MIT License
+5. Build the system
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+```
+
+## Documentation
+
+- [SERVER](docs/SERVER.md): Check out the server documentation
+- [THEMES](docs/THEMES.md): How themes work and how to create your own
+- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
+  collection of wallpapers
+- [NEOVIM](docs/NEOVIM.md): How to use the Neovim config in your own flake
+- [GROUPS](docs/GROUPS.md): Reusable package groups (dev, cybersecurity)
+
+- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License
+
+---
+
+<div align="center">
+  <a href="https://github.com/anotherhadi/nixy">github</a> |
+  <a href="https://gitlab.com/anotherhadi_mirror/nixy">gitlab (mirror)</a> |
+  <a href="https://git.hadi.icu/anotherhadi/nixy">gitea (mirror)</a>
+</div

.github/scripts/create_readme.sh

@@ -10,7 +10,7 @@ table_of_content=$(markdown-table-of-contents --start-by 2 ./.github/assets/READ
 readme_content=$(cat "./.github/assets/README_template.md")
 
 # Replace variables
-readme_content=${readme_content//\{primarycolor\}/A594FD}
+readme_content=${readme_content//\{primarycolor\}/A89AD1}
 readme_content=${readme_content//\{backgroundcolor\}/0b0b0b}
 readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
 

.github/scripts/create_scripts_docs.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-DOCS_FILE="./docs/SCRIPTS.md"
-SCRIPTS_FOLDER="./home/scripts"
-
-# search for every directory in the scripts folder:
-# The docs for each scripts are in the beginning of the file prefixed by "#-" or "# -" for the title
-# Inside the folders, the scripts are stored in default.nix files
-echo "[//]: # (This file is autogenerated)" >"$DOCS_FILE"
-echo "# Scripts" >>"$DOCS_FILE"
-echo "" >>"$DOCS_FILE"
-echo "Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path." >>"$DOCS_FILE"
-echo "" >>"$DOCS_FILE"
-
-for folder in "$SCRIPTS_FOLDER"/*; do
-  script="$folder/default.nix"
-  [[ -f "$script" ]] || continue
-
-  content=$(cat "$script")
-  content=$(echo "$content" | grep -E "^#-|^# -" | sed 's/^#- //;s/^# - //;s/#-//')
-
-  echo "$content" >>"$DOCS_FILE"
-  echo "" >>"$DOCS_FILE"
-done

.github/scripts/keybindings_to_markdown.sh

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-# A script to parse the Hyprland configuration to store keybindings in a table
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-KEYBINDINGS_FILE="./docs/KEYBINDINGS-HYPRLAND.md"
-
-function getList() {
-  content=$1
-  name=$2
-  list_start=$(echo "$content" | sed "/$name = \[/!d;=;Q")
-  list=$(echo "$content" | tail +"$list_start")
-  list_end=$(echo "$list" | sed '/\]/!d;=;Q')
-  list=$(echo "$list" | head -n"$list_end")
-
-  echo "$list"
-}
-
-[[ -f "./home/system/hyprland/bindings.nix" ]] || (echo "File ./home/system/hyprland/bindings.nix not found" && exit 1)
-
-config=$(cat "./home/system/hyprland/bindings.nix")
-
-# Bind
-bind=$(getList "$config" "bind")
-# Bindm (mouse)
-bindm=$(getList "$config" "bindm")
-# Bindl (lock)
-bindl=$(getList "$config" "bindl")
-# Bindle (lock, repetition)
-bindle=$(getList "$config" "bindle")
-
-# Join the lists:
-keybindings=$(echo -e "$bind\n$bindm\n$bindl\n$bindle" | grep '"')
-
-echo "[//]: # (This file is autogenerated)" >"$KEYBINDINGS_FILE"
-echo "# Keybindings for Hyprland" >>"$KEYBINDINGS_FILE"
-echo "" >>"$KEYBINDINGS_FILE"
-echo "> [!NOTE]" >>"$KEYBINDINGS_FILE"
-echo "> SUPER is the windows key by default" >>"$KEYBINDINGS_FILE"
-echo "" >>"$KEYBINDINGS_FILE"
-
-echo "| Description | Keybinding |" >>"$KEYBINDINGS_FILE"
-echo "| -- | -- |" >>"$KEYBINDINGS_FILE"
-echo "| Switch Workspace | SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
-echo "| Move app to Workspace | SHIFT + SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
-echo "$keybindings" | while read -r line; do
-  comment=$(echo "$line" | cut -d\# -f2)
-  line=$(echo "$line" | cut -d\# -f1)
-  line=${line:1:${#line}-3}
-  mod=$(echo "$line" | cut -d, -f1)
-  key=$(echo "$line" | cut -d, -f2)
-  # dispatcher=$(echo "$line" | cut -d, -f3)
-  # params=$(echo "$line" | cut -d, -f4)
-
-  [[ $mod == '$mod' ]] && mod="SUPER + "
-  [[ $mod == '$shiftMod' ]] && mod="SHIFT + SUPER + "
-
-  echo "| ${comment:1} | $mod$key |" >>"$KEYBINDINGS_FILE"
-done

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

@@ -1,24 +0,0 @@
-on:
-  push:
-     paths:
-       - 'home/system/hyprland/bindings.nix'
-permissions:
-  contents: write
-jobs:
-  update-readme:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./
-    steps:
-      - name: Check out the repository to the runner
-        uses: actions/checkout@v4  
-      - name: Run a script
-        run: |
-          chmod +x ./.github/scripts/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 .
-          git commit -m "Update KEYBINDINGS-HYPRLAND.md (auto)" && git push
-          exit 0

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

@@ -1,24 +0,0 @@
-on:
-  push:
-     paths:
-       - 'home/scripts/**'
-permissions:
-  contents: write
-jobs:
-  update-readme:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./
-    steps:
-      - name: Check out the repository to the runner
-        uses: actions/checkout@v4  
-      - name: Run a script
-        run: |
-          chmod +x ./.github/scripts/create_scripts_docs.sh
-          ./.github/scripts/create_scripts_docs.sh
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git add .
-          git commit -m "Update SCRIPTS.md (auto)" && git push
-          exit 0

.gitignore

@@ -1,2 +1,3 @@
-todolist.md
 .sops.yaml
+.claude/
+old/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Hadi
+Copyright (c) 2026 Hadi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 [//]: # (This file is autogenerated)
 <div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
+    <img alt="nixy logo" src="./.github/assets/logo.png" width="120px" />
 </div>
 
 <br>
@@ -10,96 +10,112 @@
 <br>
 <div align="center">
     <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A594FD">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A89AD1">
     </a>
     <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A594FD">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A89AD1">
     </a>
     <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A594FD&color=A594FD">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A89AD1&color=A89AD1">
     </a>
     <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=0b0b0b&colorB=A594FD&logo=unlicense&logoColor=A594FD"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=0b0b0b&colorB=A89AD1&logo=unlicense&logoColor=A89AD1"/>
     </a>
 </div>
 <br>
 
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+**Nixy simplifies and unifies** the Hyprland ecosystem with a modular, easily
-It's a simple way to manage your system configuration and dotfiles.
+customizable setup. It provides a structured way to manage your system
+configuration and dotfiles with minimal effort. It includes _home-manager_,
+_secrets_, and _custom theming_ all in one place.
 
-I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
+**Features:**
-This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
-I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
 
-**Nixy key points:**
+- 💻 Hyprland & Caelestia: Preconfigured Hyprland ecosystem with Caelestia-shell (Ty to both projects!)
-
+- 🎨 Consistent Theming: Base16 & Stylix-powered themes
-- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
+- ⌨️ Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
-- Stylix/base16 themes
-- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
 
 ## Table of Content
 
 - [Table of Content](#table-of-content)
-- [Gallery](#gallery)
+- [Screenshots](#screenshots)
 - [Architecture](#architecture)
-  - [🏠 home](#-home)
+  - [🏠 /home (User-level configuration)](#-home-user-level-configuration)
-  - [🐧 nixos](#-nixos)
+  - [🐧 /nixos](#-nixos)
-  - [🎨 themes](#-themes)
+  - [🎨 /themes](#-themes)
-  - [💻 hosts](#-hosts)
+  - [💻 /hosts](#-hosts)
+  - [🖥️ /server-modules](#-server-modules)
 - [Installation](#installation)
 - [Documentation](#documentation)
 
-## Gallery
+## Screenshots
 
-![Nixy helper, peaclock](.github/assets/nixy/1.png)
+![Home](.github/assets/rose-pine/home.png)
-![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
+![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
-![nvim, lazygit](.github/assets/nixy/3.png)
+![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.png)
-![spotify, cava](.github/assets/nixy/4.png)
 
 ## Architecture
 
-### 🏠 home
+### 🏠 /home (User-level configuration)
 
-Those are the dotfiles and configuration files for user-level configuration
+Contains **dotfiles and settings** that apply to your user environment.
 
 **Subfolders:**
 
 - `programs` is a collection of apps configured with home-manager
-- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
 - `system` is some "desktop environment" configuration
 
-### 🐧 nixos
+### 🐧 /nixos
 
-Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
+Those are the system-level configurations. (audio, bluetooth, gpu, bootloader,
+...)
 
-### 🎨 themes
+### 🎨 /themes
 
-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.
+This folder contains all system themes. Mainly
-See avaiable themes in [THEMES.md](docs/THEMES.md)
+[stylix](https://stylix.danth.me/) configurations. Check out the available
+themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
 
-### 💻 hosts
+### 💻 /hosts
 
-Those are the host-specific configurations.
+This directory contains host-specific configurations. Each host includes:
-Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+
+- `configuration.nix` for system-wide settings
+- `home.nix` for user-level configuration
+- `variables.nix` for global variables
+- `secrets/` for sensitive data
+
+### 🖥️ /server-modules
+
+This folder contains server-related nixos modules. (bitwarden, nextcloud, ...)
 
 ## Installation
 
-1. Clone the repo
+1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to
+   your system:
 
 ```sh
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+2. Copy the `hosts/laptop` folder, rename it to match your system’s hostname,
-3. Add your `hardware-configuration.nix` to your new host's folder
+   and update `variables.nix` with your machine’s settings.
-4. Add your 'nixosConfigurations' inside `flake.nix`
+3. Copy your `hardware-configuration.nix` into your new host's folder to ensure
+   proper hardware support.
+4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
 
-> [!Important]
+> [!IMPORTANT]
-> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
+> `# CHANGEME` comments are placed throughout the config to
-> You can use `rg "CHANGEME"` to find them all with ripgrep.
+> indicate necessary modifications. Use the following command to quickly locate
+> them:
+>
+> ```sh
+> rg "CHANGEME" ~/.config/nixos
+> ```
 
 > [!TIP]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
+> When you add new files, don't forget to run `git add .` to add them to the git
+> repository
 
 5. Build the system
 
@@ -109,11 +125,20 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 
 ## Documentation
 
+- [SERVER](docs/SERVER.md): Check out the server documentation
 - [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
+- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
-- [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
+  collection of wallpapers
-- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
+- [NEOVIM](docs/NEOVIM.md): How to use the Neovim config in your own flake
+- [GROUPS](docs/GROUPS.md): Reusable package groups (dev, cybersecurity)
 
-- [TODO](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License
+
+---
+
+<div align="center">
+  <a href="https://github.com/anotherhadi/nixy">github</a> |
+  <a href="https://gitlab.com/anotherhadi_mirror/nixy">gitlab (mirror)</a> |
+  <a href="https://git.hadi.icu/anotherhadi/nixy">gitea (mirror)</a>
+</div

docs/CONTRIBUTING.md

@@ -1,16 +1,16 @@
 # Contributing to Nixy
 
-Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the [TODO.md](./TODO.md) file!
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the issues!
 
 The process is straight-forward.
 
 - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0 and 1)
 - Fork Nixy [git repository](https://github.com/anotherhadi/nixy).
-- Write your changes (new theme, bug fixes, task in to-do, ...).
+- Write your changes (new theme, bug fixes, issues fix, ...).
 - Create a Pull Request against the main branch of Nixy.
 
 > [!TIP]
-> To update the README, change the `./docs/src/README_template.md` and run `./docs/scripts/create_readme.sh`
+> To update the README, change the `./.github/assets/README_template.md`
 
 > [!IMPORTANT]
 > Don't push your host's folder

docs/GROUPS.md

@@ -0,0 +1,44 @@
+# Groups
+
+Groups are curated sets of packages exposed as flake outputs. Each group has two forms:
+
+- **`homeManagerModules.<group>`** — full home-manager module (packages + files + systemd units)
+- **`packages.<group>`** — standalone environment for `nix shell` (packages only)
+
+## Available groups
+
+- dev (go, bun, air, ...)
+- cybersecurity (nmap, john, dirb, ffuf, ...)
+
+For the Cybersecurity group, the home-manager module also sets up:
+
+- `~/Cyber/wordlists/` with SecLists, fuzz4bounty, and hashcat rules
+- `~/Cyber/tmp/` as a temporary workspace
+
+## Use in another flake
+
+Add this repo as an input:
+
+```nix
+inputs.nixy.url = "github:anotherhadi/nixy";
+```
+
+Import the home-manager module in your home configuration:
+
+```nix
+{ inputs, ... }: {
+  imports = [
+    inputs.nixy.homeManagerModules.cybersecurity
+    # inputs.nixy.homeManagerModules.dev
+  ];
+}
+```
+
+## Quick shell without installing
+
+```sh
+nix shell github:anotherhadi/nixy#cybersecurity
+nix shell github:anotherhadi/nixy#dev
+```
+
+This drops you into a shell with all tools in `PATH`. No home-manager required, no wordlists or systemd units.

docs/KEYBINDINGS-HYPRLAND.md

@@ -1,51 +0,0 @@
-[//]: # (This file is autogenerated)
-# Keybindings for Hyprland
-
-> [!NOTE]
-> SUPER is the windows key by default
-
-| Description | Keybinding |
-| -- | -- |
-| Switch Workspace | SUPER + {Number} |
-| Move app to Workspace | SHIFT + SUPER + {Number} |
-| Kitty | SUPER + RETURN |
-| Thunar | SUPER + E |
-| Zen Browser | SUPER + B |
-| Bitwarden | SUPER + K |
-| Lock | SUPER + L |
-| Powermenu | SUPER + X |
-| Launcher | SUPER + SPACE |
-| Quickmenu | SUPER + C |
-| Toggle HyprFocus | SHIFT + SUPER + SPACE |
-| Planify | SUPER + P |
-| Close window | SUPER + Q |
-| Toggle Floating | SUPER + T |
-| Toggle Fullscreen | SUPER + F |
-| Move focus left | SUPER + left |
-| Move focus Right | SUPER + right |
-| Move focus Up | SUPER + up |
-| Move focus Down | SUPER + down |
-| Focus previous monitor | SHIFT + SUPER + up |
-| Focus next monitor | SHIFT + SUPER + down |
-| Add to master | SHIFT + SUPER + left |
-| Remove from master | SHIFT + SUPER + right |
-| Screenshot region | SUPER + PRINT |
-| Screenshot monitor | PRINT |
-| Screenshot window | SHIFT + SUPER + PRINT |
-| Screenshot region then edit | ALTPRINT |
-| Toggle hyprpanel | SHIFT + SUPER + T |
-| Clipboard picker with wofi | SHIFT + SUPER + C |
-| Emoji picker with wofi | SHIFT + SUPER + E |
-| Toggle night shift | SUPER + F2 |
-| Toggle night shift | SUPER + F3 |
-| 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 |
-| Brightness Up | XF86MonBrightnessUp |
-| Brightness Down | XF86MonBrightnessDown |

docs/NEOVIM.md

@@ -0,0 +1,40 @@
+# Neovim
+
+The Neovim configuration is built with [nvf](https://github.com/notashelf/nvf) and exposed as a standalone flake output.
+It can be used in three ways: run it directly, import it into another flake's home-manager setup, or use it as part of this config.
+
+## Run directly
+
+No installation needed:
+
+```sh
+nix run github:anotherhadi/nixy#nvim
+```
+
+## Use in another flake
+
+Add this repo as an input:
+
+```nix
+inputs.nixy.url = "github:anotherhadi/nixy";
+```
+
+Then import the home-manager module in your home configuration:
+
+```nix
+{ inputs, ... }: {
+  imports = [ inputs.nixy.homeManagerModules.nvim ];
+}
+```
+
+## What's included
+
+| File            | Description                                                            |
+| --------------- | ---------------------------------------------------------------------- |
+| `options.nix`   | Core settings: theme (catppuccin mocha), clipboard, indentation, folds |
+| `languages.nix` | LSP, treesitter, formatters, diagnostics, and per-language config      |
+| `keymaps.nix`   | All key mappings (leader: `space`)                                     |
+| `picker.nix`    | Snacks picker + oil.nvim                                               |
+| `snacks.nix`    | Snacks extras: image preview, zen mode, git signs, statuscolumn        |
+| `utils.nix`     | Bufferline, lualine, copilot, lazygit, toggleterm, autocomplete        |
+| `mini.nix`      | Mini.nvim suite: pairs, comment, icons, indentscope, diff, git         |

docs/SCRIPTS.md

@@ -1,98 +0,0 @@
-[//]: # (This file is autogenerated)
-# Scripts
-
-Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path.
-
-## Brightness
-
-This module provides a set of scripts to control the brightness of the screen.
-
-- `brightness-up` increases the brightness by 5%.
-- `brightness-down` decreases the brightness by 5%.
-- `brightness-set [value]` sets the brightness to the given value.
-- `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-
-## Caffeine
-
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
-- `caffeine-status` - Check if hypridle is running. (0/1)
-- `caffeine-status-icon` - Check if hypridle is running. (icon)
-- `caffeine` - Toggle hypridle.
-
-## Hyprfocus
-
-A simple script to toggle focus on few windows in Hyprland.
-(disable gaps, border, shadow, opacity, etc.)
-
-- `hyprfocus-on` - Enable hyprfocus.
-- `hyprfocus-off` - Disable hyprfocus.
-- `hyprfocus-toggle` - Toggle hyprfocus.
-
-## Hyprpanel
-
-Quick scripts to toggle, reload, hide & show hyprpanel.
-
-- `hyprpanel-toggle` - Toggle hyprpanel (hide/show).
-- `hyprpanel-show` - Show hyprpanel.
-- `hyprpanel-hide` - Hide hyprpanel.
-- `hyprpanel-reload` - Reload hyprpanel.
-
-## Nerdfont FZF
-
-This module provides a script to search for Nerd Fonts icons using fzf.
-
-- `nerdfont-fzf` - 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.
-- `night-shift` toggles Night-Shift.
-- `night-shift-status` checks if Night-Shift is active. (0/1)
-- `night-shift-status-icon` checks if Night-Shift is active. (icon)
-
-## Nixy
-
-Nixy is a simple script that I use to manage my NixOS system. It's a simple script that provides a menu to rebuild, upgrade, update, collect garbage, clean boot menu, etc. 
-
-- `nixy` - UI wizard to manage the system.
-- `nixy rebuild` - Rebuild the system.
-- `nixy ...` - ... see the script for more commands.
-
-
-
-## 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 `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.
-
-## Sound
-
-This module provides a set of scripts to control the volume of the default audio sink using `wpctl`.
-
-- `sound-up` increases the volume by 5%.
-- `sound-down` decreases the volume by 5%.
-- `sound-set [value]` sets the volume to the given value.
-- `sound-toggle` toggles the mute state of the default audio sink.
-
-## System
-
-Usefull quick scripts
-
-- `menu` - Open wofi with drun mode. (wofi)
-- `powermenu` - Open power dropdown menu. (wofi)
-- `lock` - Lock the screen. (hyprlock)
-

docs/SERVER.md

@@ -0,0 +1,29 @@
+# SERVER
+
+## Overview
+
+This document describes the architecture and setup of the self-hosted **NixOS server**, which is securely accessible via **a Cloudflare Tunnel**.
+The server is designed for private, secure, and easily manageable self-hosting of various services.
+
+![server dashboard](../.github/assets/server_dashboard.png)
+
+## **Why This Setup?**
+
+- **Private & Secure**: Services are only accessible through Cloudflare's access control, preventing exposure to the "public internet".
+- **Domain-based Access**: A custom domain maps to the server's tunnel, making service access simple and consistent.
+- **Modular & Declarative**: Everything is managed through NixOS modules (except for access control), ensuring reproducibility and easy configuration.
+
+## **Self-Hosted Services**
+
+The server hosts several key applications:
+
+- **NGINX**: Reverse proxy for routing traffic to services via my domain name.
+- **AdGuard Home**: A self-hosted DNS ad blocker for network-wide ad and tracker filtering.
+- **Glance**: An awesome dashboard! (See the screenshot above)
+- **Arr Stack (Radarr, Sonarr, etc.)**: Automated media management tools for handling movies and TV shows. (legaly ofc)
+- **Mealie**: A self-hosted recipe manager and meal planner with a clean user interface.
+- **Stirling-PDF**: A powerful, locally hosted web application for editing, merging, and converting PDF files.
+- **CyberChef**: The "Cyber Swiss Army Knife" for data analysis, decoding, and encryption tasks.
+- **Mazanoke**: A utility service for image processing, specialized in format conversion and downgrading/optimization.
+- **SSH**: Secure remote access configuration for server management. (via browser too)
+- **Security related stuff**: Cloudflared, Fail2Ban, Firewall

docs/THEMES.md

@@ -1,21 +1,17 @@
 # Themes
 
 Themes are defined in `themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
-You can change the selected theme by changing the import statement of your host's configuration.nix file.
+You can change the selected theme by changing the import statement of your host's variables.nix file.
-
-> [!TIP]
-> To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
 
 ## Create your theme
 
 Create a copy of one of the existing themes and change the variables.
-Wallpapers are loaded from the [nixy-wallpapers](https://github.com/anotherhadi/nixy-wallpapers) repo.
+Wallpapers are loaded from the [hadi's awesome-wallpapers](https://github.com/anotherhadi/awesome-wallpapers) repo.
 
 ## Gallery
 
-### Nixy
+### Rose-pine
 
-![nixy1](../.github/assets/nixy/1.png)
+![Home](../.github/assets/rose-pine/home.png)
-![nixy2](../.github/assets/nixy/2.png)
+![Flake & Spotify](../.github/assets/rose-pine/flake-spotify.png)
-![nixy3](../.github/assets/nixy/3.png)
+![Browser and notification center](../.github/assets/rose-pine/browser-and-notifications.png)
-![nixy4](../.github/assets/nixy/4.png)

docs/TODO.md

@@ -1,5 +0,0 @@
-# Todolist
-
-feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
-
-- [ ] <https://github.com/isabelroses/dotfiles/blob/main/home/comfy/system/xdg.nix>

flake.nix

@@ -1,61 +1,83 @@
 {
   # https://github.com/anotherhadi/nixy
   description = ''
-    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+    Nixy simplifies and unifies the Hyprland ecosystem with a modular, easily customizable setup.
-    It's a simple way to manage your system configuration and dotfiles.
+    It provides a structured way to manage your system configuration and dotfiles with minimal effort.
   '';
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    stylix.url = "github:danth/stylix";
+    sops-nix.url = "github:Mic92/sops-nix";
+    nvf.url = "github:notashelf/nvf";
+    bun2nix.url = "github:nix-community/bun2nix";
+    usbguard-tui.url = "github:anotherhadi/usbguard-tui";
+    jwt-tui.url = "github:anotherhadi/jwt-tui";
+
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixvim = {
+    caelestia-shell = {
-      url = "github:nix-community/nixvim";
+      url = "github:caelestia-dots/shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    caelestia-cli = {
+      url = "github:caelestia-dots/cli";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    sops-nix = {
+    # Server
-      url = "github:Mic92/sops-nix";
+    # FIXME: Deleted repo for now
-      inputs.nixpkgs.follows = "nixpkgs";
+    # eleakxir.url = "github:anotherhadi/eleakxir";
-    };
+    nixarr.url = "github:rasmus-kirk/nixarr";
-    hyprspace = {
+    default-creds.url = "github:anotherhadi/default-creds";
-      url = "github:KZDKM/Hyprspace";
+    blog.url = "github:anotherhadi/blog";
-      inputs.hyprland.follows = "hyprland";
+    awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers";
-    };
+    iknowyou.url = "github:anotherhadi/iknowyou";
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    spilltea.url = "github:anotherhadi/spilltea";
-    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
+    helium-browser.url = "github:oxcl/nix-flake-helium-browser";
-    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
-    stylix.url = "github:danth/stylix";
-    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    nur.url = "github:nix-community/NUR";
-    zen-browser.url =
-      "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake
   };
 
-  outputs = inputs@{ nixpkgs, ... }: {
+  outputs = inputs @ {
-    nixosConfigurations = {
+    nixpkgs,
-      nixy = # CHANGEME: This should match the 'hostname' in your variables.nix file
+    nixpkgs-stable,
-        nixpkgs.lib.nixosSystem {
+    ...
-          system = "x86_64-linux";
+  }: let
-          modules = [
+    system = "x86_64-linux";
-            {
+    pkgs = nixpkgs.legacyPackages.${system};
-              nixpkgs.overlays =
+    args = {
-                [ inputs.hyprpanel.overlay inputs.nur.overlays.default ];
+      inherit
-              _module.args = { inherit inputs; };
+        inputs
-            }
+        nixpkgs
-            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
+        system
-            inputs.home-manager.nixosModules.home-manager
+        pkgs
-            inputs.stylix.nixosModules.stylix
+        ;
-            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
+      pkgs-stable = nixpkgs-stable.legacyPackages.${system};
-          ];
+    };
+    merge = nixpkgs.lib.foldl nixpkgs.lib.recursiveUpdate {};
+  in
+    merge [
+      (import ./home/programs/nvf/flake.nix args)
+      (import ./home/programs/group/flake.nix args)
+      (import ./home/programs/nixy/flake.nix args)
+      {
+        formatter.${system} = pkgs.alejandra;
+        nixosConfigurations = {
+          h-laptop = import ./hosts/laptop/flake.nix args;
+          h-work = import ./hosts/work/flake.nix args;
+          jack = import ./hosts/server/flake.nix args;
         };
-
+      }
-    };
+    ];
-  };
 }

home/programs/duckduckgo-colorscheme/default.nix

@@ -1,44 +0,0 @@
-# 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/fetch/default.nix

@@ -1 +0,0 @@
-{ imports = [ ./neofetch ./nerdfetch ]; }

home/programs/fetch/neofetch/default.nix

@@ -1,147 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ neofetch ];
-
-  xdg.configFile."neofetch/ascii.txt".text = ''
-    ''${c6}
-    ⡏⠉⠉⠉⠉⠉⠉⠋⠉⠉⠉⠉⠉⠉⠋⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠙⠉⠉⠉⢹
-    ⡇⢸⣿⡟⠛⢿⣷⠀⢸⣿⡟⠛⢿⣷⡄⢸⣿⡇⠀⢸⣿⡇⢸⣿⡇⠀⢸⣿⡇⢸
-    ⡇⢸⣿⣧⣤⣾⠿⠀⢸⣿⣇⣀⣸⡿⠃⢸⣿⡇⠀⢸⣿⡇⢸⣿⣇⣀⣸⣿⡇⢸
-    ⡇⢸⣿⡏⠉⢹⣿⡆⢸⣿⡟⠛⢻⣷⡄⢸⣿⡇⠀⢸⣿⡇⢸⣿⡏⠉⢹⣿⡇⢸
-    ⡇⢸⣿⣧⣤⣼⡿⠃⢸⣿⡇⠀⢸⣿⡇⠸⣿⣧⣤⣼⡿⠁⢸⣿⡇⠀⢸⣿⡇⢸
-    ⣇⣀⣀⣀⣀⣀⣀⣄⣀⣀⣀⣀⣀⣀⣀⣠⣀⡈⠉⣁⣀⣄⣀⣀⣀⣠⣀⣀⣀⣸
-    ⣇⣿⠘⣿⣿⣿⡿⡿⣟⣟⢟⢟⢝⠵⡝⣿⡿⢂⣼⣿⣷⣌⠩⡫⡻⣝⠹⢿⣿⣷
-    ⡆⣿⣆⠱⣝⡵⣝⢅⠙⣿⢕⢕⢕⢕⢝⣥⢒⠅⣿⣿⣿⡿⣳⣌⠪⡪⣡⢑⢝⣇
-    ⡆⣿⣿⣦⠹⣳⣳⣕⢅⠈⢗⢕⢕⢕⢕⢕⢈⢆⠟⠋⠉⠁⠉⠉⠁⠈⠼⢐⢕⢽
-    ⡗⢰⣶⣶⣦⣝⢝⢕⢕⠅⡆⢕⢕⢕⢕⢕⣴⠏⣠⡶⠛⡉⡉⡛⢶⣦⡀⠐⣕⢕
-    ⡝⡄⢻⢟⣿⣿⣷⣕⣕⣅⣿⣔⣕⣵⣵⣿⣿⢠⣿⢠⣮⡈⣌⠨⠅⠹⣷⡀⢱⢕
-    ⡝⡵⠟⠈⢀⣀⣀⡀⠉⢿⣿⣿⣿⣿⣿⣿⣿⣼⣿⢈⡋⠴⢿⡟⣡⡇⣿⡇⡀⢕
-    ⡝⠁⣠⣾⠟⡉⡉⡉⠻⣦⣻⣿⣿⣿⣿⣿⣿⣿⣿⣧⠸⣿⣦⣥⣿⡇⡿⣰⢗⢄
-    ⠁⢰⣿⡏⣴⣌⠈⣌⠡⠈⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣬⣉⣉⣁⣄⢖⢕⢕⢕
-    ⡀⢻⣿⡇⢙⠁⠴⢿⡟⣡⡆⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣵⣵⣿
-    ⡻⣄⣻⣿⣌⠘⢿⣷⣥⣿⠇⣿⣿⣿⣿⣿⣿⠛⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
-    ⣷⢄⠻⣿⣟⠿⠦⠍⠉⣡⣾⣿⣿⣿⣿⣿⣿⢸⣿⣦⠙⣿⣿⣿⣿⣿⣿⣿⣿⠟
-    ⡕⡑⣑⣈⣻⢗⢟⢞⢝⣻⣿⣿⣿⣿⣿⣿⣿⠸⣿⠿⠃⣿⣿⣿⣿⣿⣿⡿⠁⣠
-    ⡝⡵⡈⢟⢕⢕⢕⢕⣵⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⠿⠋⣀⣈⠙
-    ⡝⡵⡕⡀⠑⠳⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠛⢉⡠⡲⡫⡪⡪⡣
-  '';
-
-  xdg.configFile."neofetch/config.conf".text = ''
-    # From: https://github.com/Chick2D/neofetch-themes/
-    # Made by https://github.com/Dan1jel 
-
-    print_info() {
-        prin "\n"
-        info "\n \n OS" distro
-        info "\n \n Host" model
-        info "\n \n Kernel" kernel
-        info "\n \n Uptime" uptime
-        info "\n \n Packages" packages
-        info "\n \n Shell" shell
-        info "\n \n Resolution" resolution
-        info "\n \n DE" de
-        info "\n \n WM" wm
-        info "\n \n WM Theme" wm_theme
-        info "\n \n Theme" theme
-        info "\n \n Icons" icons
-        info "\n \n Terminal" term
-        info "\n \n Terminal Font" term_font
-        info "\n \n CPU" cpu
-        info "\n \n GPU" gpu
-        info "\n \n Memory" memory
-        info "\n \n Disk" disk
-        info "\n \n Battery" battery
-        info "\n \n Font" font
-        info "\n \n Song" song
-        [[ "$player" ]] && prin "\n \n Music Player" "$player"
-        info "\n \n Local IP" local_ip
-        prin "\n"
-
-        # prin "\n \n    ''${cl0}──''${cl1}────''${cl2}────''${cl3}────''${cl4}────''${cl5}────''${cl6}────''${cl7}──"
-        prin "\n \n \n \n \n \n ''${cl0}⬤ \n \n ''${cl1}⬤ \n \n ''${cl2}⬤ \n \n ''${cl3}⬤ \n \n ''${cl4}⬤ \n \n ''${cl5}⬤ \n \n ''${cl6}⬤ \n \n ''${cl7}⬤"
-    }
-
-    reset="\033[0m"
-    gray="\033[1;90m"
-    red="\033[1;31m"
-    green="\033[1;32m"
-    yellow="\033[1;33m"
-    blue="\033[1;34m"
-    magenta="\033[1;35m"
-    cyan="\033[1;36m"
-    white="\033[1;37m"
-
-    cl0="''${gray}"
-    cl1="''${red}"
-    cl2="''${green}"
-    cl3="''${yellow}"
-    cl4="''${blue}"
-    cl5="''${magenta}"
-    cl6="''${cyan}"
-    cl7="''${white}"
-
-    title_fqdn="off"
-    kernel_shorthand="on"
-    distro_shorthand="off"
-    os_arch="off"
-    uptime_shorthand="on"
-    memory_percent="off"
-    memory_unit="mib"
-    package_managers="on"
-    shell_path="off"
-    shell_version="on"
-    speed_type="bios_limit"
-    speed_shorthand="off"
-    cpu_brand="on"
-    cpu_speed="on"
-    cpu_cores="logical"
-    cpu_temp="off"
-    gpu_brand="on"
-    gpu_type="all"
-    refresh_rate="off"
-    gtk_shorthand="off"
-    gtk2="on"
-    gtk3="on"
-    de_version="on"
-    disk_show=('/storage/emulated' '/' '/server')
-    disk_subtitle="none"
-    disk_percent="on"
-    music_player="auto"
-    song_format="%artist% - %album% - %title%"
-    song_shorthand="off"
-    mpc_args=()
-    bold="on"
-    underline_enabled="on"
-    underline_char="-"
-    separator=":"
-    block_range=(0 15)
-    color_blocks="on"
-    block_width=3
-    block_height=1
-    col_offset="auto"
-    bar_char_elapsed="-"
-    bar_char_total="="
-    bar_border="on"
-    bar_length=15
-    bar_color_elapsed="distro"
-    bar_color_total="distro"
-    cpu_display="off"
-    memory_display="off"
-    battery_display="off"
-    disk_display="off"
-    image_backend="ascii"
-    image_source="$HOME/.config/neofetch/ascii.txt"
-    ascii_distro="auto"
-    ascii_colors=(distro)
-    ascii_bold="on"
-    image_loop="off"
-    thumbnail_dir="''${XDG_CACHE_HOME:-''${HOME}/.cache}/thumbnails/neofetch"
-    crop_mode="normal"
-    crop_offset="center"
-    image_size="auto"
-    gap=2
-    yoffset=0
-    xoffset=0
-    background_color=
-    stdout="off"
-  '';
-}

home/programs/fetch/nerdfetch/default.nix

@@ -1,369 +0,0 @@
-{ pkgs, ... }:
-let
-  nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
-          ostype="$(uname)"
-
-          version=8.1.1
-          font=nerd
-          distrotype=none
-          osi=""
-          ki=""
-          ri="󰍛"
-          pi="󰏔"
-          ui="󰅶"
-          ci=""
-
-          case $1 in
-          "-p")
-          	font=phosphor
-          	osi=""
-          	ki=""
-          	ri=""
-          	pi=""
-          	ui=""
-          	ci=""
-          	;;
-          "-c")
-          	font=cozette
-          	ki="♥"
-          	ri=""
-          	pi=""
-          	ui=""
-          	ci=""
-          	;;
-          "-e")
-          	font=emoji
-          	osi="🐧"
-          	ki="💓"
-          	ri="🐐"
-          	pi="📦"
-          	ui="☕"
-          	ci="🎨"
-          	;;
-          "-v")
-          	echo "NerdFetch $version"
-          	exit
-          	;;
-          "-h")
-          	echo "Flags:
-          -c: Cozette font
-          -p: Phosphor font
-          -e: Emoji font
-          -v: Version"
-          	exit
-          	;;
-          esac
-
-          if command -v getprop 1>/dev/null; then
-          	distrotype=android
-          fi
-          kernel="$(echo $(uname -r) | cut -d'-' -f1-1)"
-          case $ostype in
-          *"Linux"*)
-          	if [ $distrotype = android ]; then
-          		host="$(hostname)"
-          		USER="$(whoami)"
-          		os="Android $(getprop ro.build.version.release)"
-          		case $font in
-          		phosphor) osi="" ;;
-          		emoji) osi="🤖" ;;
-          		*) osi="󰀲" ;;
-          		esac
-          	else
-          		host="$(cat /proc/sys/kernel/hostname)"
-          		. /etc/os-release
-          		if [ -f /bedrock/etc/bedrock-release ]; then
-          			os="$(brl version)"
-          		else
-          			os="''${PRETTY_NAME}"
-          			if [ $font = nerd ]; then
-          				case $(echo $ID | sed 's/ .*//') in
-          				debian) osi="" ;;
-          				arch) osi="󰣇" ;;
-          				endeavouros) osi="" ;;
-          				fedora) osi="" ;;
-          				gentoo) osi="" ;;
-          				rhel) osi="" ;;
-          				slackware) osi="" ;;
-          				void) osi="" ;;
-          				alpine) osi="" ;;
-          				nixos) osi="󱄅" ;;
-          				artix) osi="" ;;
-          				exherbo) osi="󰆚" ;;
-          				mageia) osi="" ;;
-          				manjaro) osi="" ;;
-          				opensuse) osi="" ;;
-          				solus) osi="" ;;
-          				ubuntu) osi="" ;;
-          				mint) osi="󰣭" ;;
-          				trisquel) osi="" ;;
-          				puppy) osi="" ;;
-          				coreos) osi="" ;;
-          				mx) osi="" ;;
-          				vanilla) osi="" ;;
-          				pop_os) osi="" ;;
-          				raspbian) osi="" ;;
-          				deepin) osi="" ;;
-          				almalinux) osi="" ;;
-          				garuda) osi="" ;;
-          				centos) osi="" ;;
-          				rocky) osi="" ;;
-          				esac
-          			elif [ $font = cozette ]; then
-          				case $(echo $ID | sed 's/ .*//') in
-          				debian) osi="" ;;
-          				arch) osi="" ;;
-          				fedora) osi="" ;;
-          				gentoo) osi="" ;;
-          				slackware) osi="" ;;
-          				void) osi="" ;;
-          				alpine) osi="" ;;
-          				nixos) osi="" ;;
-          				mageia) osi="" ;;
-          				manjaro) osi="" ;;
-          				opensuse) osi="" ;;
-          				ubuntu) osi="" ;;
-          				mint) osi="" ;;
-          				coreos) osi="" ;;
-          				centos) osi="" ;;
-          				esac
-          			fi
-          		fi
-          	fi
-          	shell=$(basename "$SHELL")
-          	;;
-          *"Darwin"*)
-          	host="$(hostname -f | sed -e 's/^[^.]*\.//')"
-          	mac_product="$(/usr/libexec/PlistBuddy -c "Print:ProductName" /System/Library/CoreServices/SystemVersion.plist)"
-          	mac_version="$(/usr/libexec/PlistBuddy -c "Print:ProductVersion" /System/Library/CoreServices/SystemVersion.plist)"
-          	os="''${mac_product} ''${mac_version}"
-          	case $font in
-          	nerd) osi="" ;;
-          	phosphor) osi="" ;;
-          	cozette) osi="" ;;
-          	emoji) osi="🍎" ;;
-          	esac
-          	;;
-          *"FreeBSD"*)
-          	host="$(hostname)"
-          	distrotype=bsd
-          	os="FreeBSD $(freebsd-version | sed 's/-.*//')"
-          	case $font in
-          	nerd) osi="" ;;
-          	phosphor) osi="" ;;
-          	cozette) osi="" ;;
-          	emoji) osi="😈" ;;
-          	esac
-          	;;
-          *"OpenBSD"*)
-          	host="$(hostname)"
-          	distrotype=bsd
-          	os="OpenBSD $(uname -r)"
-          	case $font in
-          	nerd) osi="" ;;
-          	phosphor) osi="" ;;
-          	cozette) osi="⌘" ;;
-          	emoji) osi="🐡" ;;
-          	esac
-          	;;
-          *"NetBSD"*)
-          	host="$(hostname)"
-          	distrotype=netbsd
-          	os="NetBSD $(uname -r)"
-          	case $font in
-          	nerd) osi="󰉀" ;;
-          	phosphor) osi="" ;;
-          	cozette) osi="" ;;
-          	emoji) osi="🚩" ;;
-          	esac
-          	;;
-          *)
-          	os="Unix-like"
-          	host="host"
-          	;;
-          esac
-
-          ## PACKAGE MANAGER AND PACKAGES DETECTION
-
-          MANAGER=$(which nix-env pkg flatpak yum zypper dnf rpm dpkg-query brew port pacman xbps-query emerge cave apk kiss pmm /usr/sbin/slackpkg bulge birb yay paru pacstall cpm pmm eopkg getprop 2>/dev/null)
-          manager=$(basename "$MANAGER")
-          if [ $distrotype = netbsd ]; then
-          	manager="pkg_info-netbsd"
-          fi
-          case $manager in
-          cpm) packages="$(cpm C)" ;;
-          flatpak) packages="$(flatpak list --app | wc -l)" ;;
-          brew) packages="$(printf '%s\n' "$(brew --cellar)/"* | wc -l)" ;;
-          port) packages="$(port installed | wc -l)" ;;
-          dpkg-query) packages="$(dpkg-query -f '${
-            "binary:Package"
-          }\n' -W | wc -l)" ;;
-          rpm) packages="$(rpm -qa --last | wc -l)" ;;
-          yum) packages="$(yum list installed | wc -l)" ;;
-          dnf) packages="$(dnf list installed | wc -l)" ;;
-          zypper) packages="$(zypper se | wc -l)" ;;
-          pacman) packages="$(pacman -Q | wc -l)" ;;
-          yay) packages="$(yay -Q | wc -l)" ;;
-          paru) packages="$(paru -Q | wc -l)" ;;
-          pacstall) packages="$(pacstall -L | wc -l)" ;;
-          kiss) packages="$(kiss list | wc -l)" ;;
-          emerge) packages="$(qlist -I | wc -l)" ;;
-          pkg) packages="$(pkg info | wc -l | tr -d ' ')" ;;
-          cave) packages="$(cave show installed-slots | wc -l)" ;;
-          xbps-query) packages="$(xbps-query -l | wc -l)" ;;
-          nix-env) packages="$(nix-store -q --requisites /run/current-system/sw | wc -l)" ;;
-          apk) packages="$(apk list --installed | wc -l)" ;;
-          pmm) packages="$(/bedrock/libexec/pmm pacman pmm -Q 2>/dev/null | wc -l)" ;;
-          eopkg) packages="$(eopkg li | wc -l)" ;;
-          /usr/sbin/slackpkg) packages="$(ls /var/log/packages | wc -l)" ;;
-          bulge) packages="$(bulge list | wc -l)" ;;
-          birb) packages="$(birb --list-installed | wc -l)" ;;
-          pkg_info)
-          	packages="$(pkg_info -A | wc -l)"
-          	manager="pkg"
-          	;;
-          pkg_info-netbsd)
-          	packages="$(pkg_info -a | wc -l)"
-          	manager="pkg"
-          	;;
-          *)
-          	if [ $distrotype = android ]; then
-          		packages="$(dpkg-query -f '${"binary:Package"}\n' -W | wc -l)"
-          		manager="dpkg"
-          	else
-          		packages="$(ls /usr/bin | wc -l)"
-          		manager="bin"
-          	fi
-          	;;
-          esac
-
-          packages="''${packages#"''${packages%%[![:space:]]*}"}"
-          manager=$(echo $manager | sed "s/-query//; s/\/usr\/.*\///")
-
-          ## UPTIME DETECTION
-
-          if [ $distrotype = android ]; then
-          	uptime="$(echo $(uptime -p) | cut -c 4-)"
-          elif [ $distrotype = bsd ] || [ $distrotype = netbsd ]; then
-          	uptime="$(uptime | sed -e 's/.* up //; s/, [0-9]* user.*//')"
-          else
-          	case $ostype in
-          	*"Linux"*)
-          		IFS=. read -r s _ </proc/uptime
-          		;;
-          	*)
-          		s=$(sysctl -n kern.boottime)
-          		s=''${s#*=}
-          		s=''${s%,*}
-          		s=$(($(date +%s) - s))
-          		;;
-          	esac
-          	d="$((s / 60 / 60 / 24))"
-          	h="$((s / 60 / 60 % 24))"
-          	m="$((s / 60 % 60))"
-          	# Plurals
-          	[ "$d" -gt 1 ] && dp=s
-          	[ "$h" -gt 1 ] && hp=s
-          	[ "$m" -gt 1 ] && mp=s
-          	[ "$s" -gt 1 ] && sp=s
-          	# Hide empty fields.
-          	[ "$d" = 0 ] && d=
-          	[ "$h" = 0 ] && h=
-          	[ "$m" = 0 ] && m=
-          	[ "$m" != "" ] && s=
-          	# Make the output of uptime smaller.
-          	[ "$d" ] && uptime="$d day$dp, "
-          	[ "$h" ] && uptime="$uptime$h hour$hp, "
-          	[ "$m" ] && uptime="$uptime$m min$mp"
-          	[ "$s" ] && uptime="$uptime$s sec$sp"
-          	uptime=''${uptime%, }
-          fi
-
-          ## RAM DETECTION
-
-          case $ostype in
-          *"Linux"*)
-          	while IFS=':k ' read -r key val _; do
-          		case $key in
-          		MemTotal)
-          			mem_used=$((mem_used + val))
-          			mem_full=$val
-          			;;
-          		Shmem) mem_used=$((mem_used + val)) ;;
-          		MemFree | Buffers | Cached | SReclaimable) mem_used=$((mem_used - val)) ;;
-          		esac
-          	done </proc/meminfo
-          	mem_used=$((mem_used / 1024))
-          	mem_full=$((mem_full / 1024))
-          	;;
-          *"Darwin"*)
-          	mem_full=$(($(sysctl -n hw.memsize) / 1024 / 1024))
-          	while IFS=:. read -r key val; do
-          		case $key in
-          		*' wired'* | *' active'* | *' occupied'*)
-          			mem_used=$((mem_used + ${"val:-0"}))
-          			;;
-          		esac
-          	done <-EOF
-          		$(vm_stat)
-          	EOF
-
-          	mem_used=$((mem_used * 4 / 1024))
-          	;;
-          *"BSD"*)
-          	mem_full=$(($(sysctl -n hw.physmem) / 1024 / 1024))
-          	if [ $distrotype = netbsd ]; then
-          		mem_free=$(($(vmstat | awk 'NR==3 {print $4}') / 1024))
-          	else
-          		mem_free=$(($(sysctl -n vm.stats.vm.v_free_count) * $(sysctl -n vm.stats.vm.v_page_size) / 1024 / 1024))
-          	fi
-          	mem_used=$((mem_full - mem_free))
-          	;;
-          *)
-          	mem_full=1
-          	mem_used=0
-          	;;
-          esac
-          memstat="''${mem_used}/''${mem_full} MiB"
-          if which expr >/dev/null 2>&1; then
-          	mempercent="($(expr $(expr ''${mem_used} \* 100 / ''${mem_full}))%)"
-          fi
-
-          ## DEFINE COLORS
-
-          bold=''
-          black=''
-          red=''
-          green=''
-          yellow=''
-          blue=''
-          magenta=''
-          cyan=''
-          white=''
-          grey=''
-          reset=''
-
-          ## USER VARIABLES -- YOU CAN CHANGE THESE
-
-          lc="$reset$bold$magenta" # labels
-          nc="$reset$bold$magenta" # labels
-          hn="$reset$bold$magenta" # labels
-          ic="$reset$white"          # info
-          c0="$reset$grey"           # first color
-          c1="$reset$white"          # second color
-          c2="$reset$yellow"         # third color
-
-          ## OUTPUT
-
-    echo """
-        ''${c0}      ___     ''${nc}''${USER}''${grey}@''${reset}''${hn}''${host}''${reset} 
-        ''${c0}     (''${c1}.. ''${c0}\    ''${lc}''${osi}  ''${ic}''${os}''${reset}
-        ''${c0}     (''${c2}<> ''${c0}|    ''${lc}''${ki}  ''${ic}''${kernel}''${reset}
-        ''${c0}    /''${c1}/  \\ ''${c0}\\   ''${lc}''${ri}  ''${ic}''${RAM}''${memstat} ''${mempercent}
-        ''${c0}   ( ''${c1}|  | ''${c0}/|  ''${lc}''${pi}  ''${ic}''${packages} (''${manager})''${reset}
-        ''${c2}  _''${c0}/\\ ''${c1}__)''${c0}/''${c2}_''${c0})  ''${lc}''${ui}  ''${ic}''${uptime}''${reset}
-        ''${c2}  \/''${c0}-____''${c2}\/''${reset}   ''${lc}''${ci}  ''${red}███''${green}███''${yellow}███''${blue}███''${magenta}███''${cyan}███''${reset}
-        """
-  '';
-
-in { home.packages = [ nerdfetch ]; }

home/programs/ghostty/default.nix

@@ -0,0 +1,43 @@
+{pkgs, ...}: let
+  cursorShaders = pkgs.fetchFromGitHub {
+    owner = "sahaj-b";
+    repo = "ghostty-cursor-shaders";
+    rev = "06d4e90fb5410e9c4d0b3131584060adddf89406";
+    hash = "sha256-G/UIr1bKnxn1AcHl/4FL/jou6b7M2VeREslYVELxdmw=";
+  };
+in {
+  home.sessionVariables = {
+    TERMINAL = "ghostty";
+    TERM = "ghostty";
+    XMODIFIERS = "@im=none";
+    GTK_IM_MODULE = "simple";
+  };
+
+  programs.ghostty = {
+    enable = true;
+    installVimSyntax = true;
+    enableZshIntegration = true;
+    settings = {
+      window-padding-x = 10;
+      confirm-close-surface = false;
+      window-padding-y = 10;
+      clipboard-read = "allow";
+      clipboard-write = "allow";
+      copy-on-select = "clipboard";
+      app-notifications = false;
+      custom-shader = "${cursorShaders}/cursor_warp.glsl";
+      custom-shader-animation = "always";
+      keybind = [
+        # "ctrl+j=goto_split:left"
+        # "ctrl+i=goto_split:up"
+        # "ctrl+k=goto_split:down"
+        # "ctrl+l=goto_split:right"
+        # "shift+ctrl+h=new_split:left"
+        # "shift+ctrl+j=new_split:down"
+        # "shift+ctrl+k=new_split:up"
+        # "shift+ctrl+l=new_split:right"
+        "shift+ctrl+tab=new_tab"
+      ];
+    };
+  };
+}

home/programs/git/default.nix

@@ -1,12 +1,10 @@
-{ config, ... }:
+# Git configuration
-let
+{config, ...}: let
   username = config.var.git.username;
   email = config.var.git.email;
 in {
   programs.git = {
     enable = true;
-    userName = username;
-    userEmail = email;
     ignores = [
       ".cache/"
       ".DS_Store"
@@ -19,37 +17,37 @@ in {
       "result"
       "result-*"
     ];
-    extraConfig = {
+    settings = {
+      user.name = username;
+      user.email = email;
       init.defaultBranch = "main";
+      pull.rebase = "false";
       push.autoSetupRemote = true;
       color.ui = "1";
-    };
+      alias = {
-    aliases = {
+        essa = "push --force";
-      essa = "push --force";
+        co = "checkout";
-      co = "checkout";
+        fuck = "commit --amend -m";
-      fuck = "commit --amend -m";
+        c = "commit -m";
-      c = "commit -m";
+        ca = "commit -am";
-      ca = "commit -am";
+        forgor = "commit --amend --no-edit";
-      forgor = "commit --amend --no-edit";
+        graph = "log --all --decorate --graph --oneline";
-      graph = "log --all --decorate --graph --oneline";
+        oops = "checkout --";
-      oops = "checkout --";
+        l = "log";
-      l = "log";
+        r = "rebase";
-      r = "rebase";
+        s = "status --short";
-      s = "status --short";
+        ss = "status";
-      ss = "status";
+        d = "diff";
-      d = "diff";
+        ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
-      ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
+        pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
-      pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
+        af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
-      af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
+        st = "status";
-      st = "status";
+        br = "branch";
-      br = "branch";
+        df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
-      df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
+        hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
-      hist = ''
+        llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
-        log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
+        edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
-      llog = ''
+      };
-        log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
-      edit-unmerged =
-        "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
     };
   };
 }

home/programs/git/lazygit.nix

@@ -0,0 +1,38 @@
+# Lazygit is a simple terminal UI for git commands.
+{
+  config,
+  lib,
+  ...
+}: let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  muted = "#${config.lib.stylix.colors.base03}";
+in {
+  programs.lazygit = {
+    enable = true;
+    settings = lib.mkForce {
+      disableStartupPopups = true;
+      notARepository = "skip";
+      promptToReturnFromSubprocess = false;
+      update.method = "never";
+      git = {
+        commit.signOff = true;
+        overrideGpg = true;
+        parseEmoji = true;
+      };
+      gui = {
+        theme = {
+          activeBorderColor = [
+            accent
+            "bold"
+          ];
+          inactiveBorderColor = [muted];
+        };
+        showListFooter = false;
+        showRandomTip = false;
+        showCommandLog = false;
+        showBottomLine = false;
+        nerdFontsVersion = "3";
+      };
+    };
+  };
+}

home/programs/git/signing.nix

@@ -0,0 +1,15 @@
+# This file is used to sign git commits using an SSH key.
+{
+  # CHANGEME: change this to your own SSH key.
+  home.file.".ssh/allowed_signers".text = "* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINhWby7lUUXQNKbRu9/UOrGjWDf3fvoAwGHomWv/+lL";
+
+  programs.git = {
+    signing.format = "openpgp";
+    settings = {
+      commit.gpgsign = true;
+      gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
+      gpg.format = "ssh";
+      user.signingkey = "~/.ssh/key.pub";
+    };
+  };
+}

home/programs/group/basic-apps.nix

@@ -0,0 +1,16 @@
+{pkgs-stable, ...}: {
+  home.packages = with pkgs-stable; [
+    vlc # Video player
+    obsidian # Note taking app
+    textpieces # Manipulate texts
+    resources # Ressource monitor
+    gnome-clocks # Clocks app
+    gnome-text-editor # Basic graphic text editor
+    ticktick # Todo app
+    pinta # Image editor
+    onlyoffice-desktopeditors # Office suite
+
+    signal-desktop # Messaging app
+    librewolf
+  ];
+}

home/programs/group/cybersecurity-packages.nix

@@ -0,0 +1,39 @@
+{
+  pkgs,
+  pkgs-stable,
+  inputs,
+  system,
+}:
+(with pkgs-stable; [
+  httpie
+  trufflehog
+  sttr
+  wireshark
+  nmap
+  john
+  hashcat
+  metasploit
+  haiti
+  hydra
+  dnsrecon
+  whois
+  dig
+  nosqli
+  jwt-cli
+  nuclei
+  caido
+  gobuster
+  dirb
+  ffuf
+  sqlmap
+  katana
+  inetutils
+  samba
+  openvpn
+  mariadb
+  redis
+])
+++ [
+  inputs.spilltea.packages.${system}.default
+  inputs.jwt-tui.packages.${system}.default
+]

home/programs/group/cybersecurity.nix

@@ -0,0 +1,46 @@
+{
+  inputs,
+  pkgs-stable,
+  pkgs,
+  ...
+}: {
+  home.packages = import ./cybersecurity-packages.nix {
+    inherit pkgs pkgs-stable inputs;
+    system = pkgs.stdenv.hostPlatform.system;
+  };
+
+  systemd.user.tmpfiles.rules = [
+    "d %h/Cyber/tmp 0755 - - -"
+    "d %h/Cyber/wordlists 0755 - - -"
+    "d %h/Cyber/wordlists/rules 0755 - - -"
+  ];
+
+  home.file = {
+    "Cyber/wordlists/seclists".source = pkgs.fetchFromGitHub {
+      owner = "danielmiessler";
+      repo = "SecLists";
+      rev = "47aa98053fce8670c6489e4f6fb57dc34881d8bd";
+      hash = "sha256-ojXLB/TXap1Qi0MtV5/WJlJpjNIDYx/sLY2KHm0uFKI=";
+    };
+
+    "Cyber/wordlists/fuzz4bounty".source = pkgs.fetchFromGitHub {
+      owner = "0xPugal";
+      repo = "fuzz4bounty";
+      rev = "a805f6b434033f054312da0ddc2bc3021cc9a3b0";
+      hash = "sha256-wMhx1CcxIyw2E7gJXQxXAFc7m5nYt0FXNkoTZqFMQh4=";
+    };
+
+    # RULES
+    "Cyber/wordlists/rules/oneruletorulethemstill".source = pkgs.fetchFromGitHub {
+      owner = "stealthsploit";
+      repo = "oneruletorulethemstill";
+      rev = "4bfb7322e189305b5f35bb7fcd4e9cc233c3d3c6";
+      hash = "sha256-h7MeymIXS/6wlPRt4lzsIEqOOssP0lDx9nQip65cwZw=";
+    };
+
+    "Cyber/wordlists/rules/best64.rule".source = pkgs.fetchurl {
+      url = "https://raw.githubusercontent.com/CarlosLannister/OwadeReborn/refs/heads/master/owade/fileAnalyze/hashcatLib/best64.rule%7E";
+      hash = "sha256-T0XkMHJZQiy63/j25nGTkaiDFjc+blmgEVGTAFgVylU=";
+    };
+  };
+}

home/programs/group/dev-packages.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  pkgs-stable,
+  inputs,
+  system,
+}:
+(with pkgs; [
+  go
+  bun
+  nodejs
+  claude-code
+  inputs.bun2nix.packages.${system}.default
+])
+++ (with pkgs-stable; [
+  air
+  duckdb
+  docker
+  python3
+  jq
+  just
+  nix-prefetch-github
+])

home/programs/group/dev.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  pkgs-stable,
+  inputs,
+  ...
+}: {
+  home.packages = import ./dev-packages.nix {
+    inherit pkgs pkgs-stable inputs;
+    system = pkgs.stdenv.hostPlatform.system;
+  };
+}

home/programs/group/flake.nix

@@ -0,0 +1,21 @@
+{
+  inputs,
+  pkgs,
+  pkgs-stable,
+  system,
+  ...
+}: let
+  devPackages = import ./dev-packages.nix {inherit pkgs pkgs-stable inputs system;};
+  cyberPackages = import ./cybersecurity-packages.nix {inherit pkgs pkgs-stable inputs system;};
+in {
+  packages.${system} = {
+    dev = pkgs.buildEnv {
+      name = "dev-tools";
+      paths = devPackages;
+    };
+    cybersecurity = pkgs.buildEnv {
+      name = "cybersecurity-tools";
+      paths = cyberPackages;
+    };
+  };
+}

home/programs/group/misc.nix

@@ -0,0 +1,14 @@
+{
+  pkgs-stable,
+  inputs,
+  ...
+}: {
+  home.packages = with pkgs-stable; [
+    peaclock
+    cbonsai
+    pipes
+    cmatrix
+    fastfetch
+    inputs.usbguard-tui.packages.${system}.default
+  ];
+}

home/programs/helium/bookmarks/default.nix

@@ -0,0 +1,459 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  bookmarkList =
+    (import ./general.nix)
+    ++ (import ./tools.nix)
+    ++ (import ./entertainment.nix)
+    ++ (import ./infosec.nix)
+    ++ (import ./other.nix)
+    ++ (import ./jack.nix);
+
+  c = config.lib.stylix.colors;
+
+  stripProtocol = url: lib.removePrefix "https://" (lib.removePrefix "http://" url);
+  stripDomain = url: builtins.head (lib.splitString "/" (stripProtocol url));
+
+  mkCard = item: let
+    domain = stripDomain item.url;
+    initial = builtins.substring 0 1 item.name;
+  in ''
+    <a href="${item.url}" class="card">
+      <div class="favicon-wrapper">
+        <img class="favicon" src="https://icons.duckduckgo.com/ip3/${domain}.ico" alt="" aria-hidden="true" loading="lazy" onerror="this.style.display='none';this.nextElementSibling.style.display='flex'">
+        <span class="favicon-fallback" style="display:none">${initial}</span>
+      </div>
+      <div class="card-info">
+        <span class="card-name">${item.name}</span>
+        <span class="card-url">${stripProtocol item.url}</span>
+      </div>
+    </a>'';
+
+  mkFolderContent = items: let
+    step = acc: item:
+      if item ? url
+      then acc // {pending = acc.pending ++ [item];}
+      else {
+        chunks =
+          acc.chunks
+          ++ lib.optional (acc.pending != []) {
+            isCards = true;
+            items = acc.pending;
+          }
+          ++ [
+            {
+              isCards = false;
+              folder = item;
+            }
+          ];
+        pending = [];
+      };
+    result =
+      lib.foldl' step {
+        chunks = [];
+        pending = [];
+      }
+      items;
+    chunks =
+      result.chunks
+      ++ lib.optional (result.pending != []) {
+        isCards = true;
+        items = result.pending;
+      };
+  in
+    lib.concatMapStrings (
+      chunk:
+        if chunk.isCards
+        then ''
+          <div class="cards">
+            ${lib.concatMapStrings mkCard chunk.items}
+          </div>''
+        else mkFolder chunk.folder
+    )
+    chunks;
+
+  mkFolder = folder: let
+    iconHtml =
+      if folder ? icon
+      then ''<span class="material-symbols-outlined folder-icon" aria-hidden="true">${folder.icon}</span>''
+      else "";
+  in ''
+    <details class="folder-section" open>
+      <summary class="folder-title">
+        ${iconHtml}<span class="folder-name">${folder.name}</span>
+        <svg class="chevron" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="6 9 12 15 18 9"/></svg>
+      </summary>
+      <div class="folder-content">
+        ${mkFolderContent folder.bookmarks}
+      </div>
+    </details>'';
+
+  grouped = let
+    step = acc: item:
+      if item ? url
+      then acc // {pending = acc.pending ++ [item];}
+      else {
+        groups =
+          acc.groups
+          ++ lib.optional (acc.pending != []) {
+            isRoot = true;
+            items = acc.pending;
+          }
+          ++ [
+            {
+              isRoot = false;
+              inherit item;
+            }
+          ];
+        pending = [];
+      };
+    result =
+      lib.foldl' step {
+        groups = [];
+        pending = [];
+      }
+      bookmarkList;
+  in
+    result.groups
+    ++ lib.optional (result.pending != []) {
+      isRoot = true;
+      items = result.pending;
+    };
+
+  mkSection = group:
+    if group.isRoot
+    then ''
+      <div class="root-section">
+        <div class="cards">
+          ${lib.concatMapStrings mkCard group.items}
+        </div>
+      </div>''
+    else mkFolder group.item;
+in {
+  home.file.".local/share/helium-startpage/index.html".text = ''
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <title>Bookmarks</title>
+      <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20,300,0,0">
+      <style>
+        *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
+
+        body {
+          background-color: #${c.base00};
+          color: #${c.base05};
+          font-family: 'Source Sans Pro', sans-serif;
+          font-size: 14px;
+          min-height: 100vh;
+          padding: 2.5rem 2rem;
+        }
+
+        .header {
+          max-width: 1100px;
+          margin: 0 auto 2rem;
+          display: flex;
+          align-items: center;
+          gap: 1.5rem;
+        }
+
+        .page-title {
+          font-size: 1.3rem;
+          font-weight: 700;
+          color: #${c.base0D};
+          letter-spacing: -0.01em;
+          flex-shrink: 0;
+        }
+
+        .search-bar {
+          flex: 1;
+          background-color: #${c.base01};
+          border: 1px solid #${c.base02};
+          border-radius: 8px;
+          color: #${c.base05};
+          font-family: 'Source Sans Pro', sans-serif;
+          font-size: 0.9rem;
+          padding: 0.5rem 0.9rem;
+          outline: none;
+          transition: border-color 0.15s ease;
+        }
+
+        .search-bar::placeholder { color: #${c.base03}; }
+        .search-bar:focus { border-color: #${c.base0D}; }
+
+        .collapse-btn {
+          flex-shrink: 0;
+          background: none;
+          border: 1px solid #${c.base02};
+          border-radius: 8px;
+          color: #${c.base03};
+          cursor: pointer;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 0.47rem;
+          transition: color 0.15s ease, border-color 0.15s ease;
+        }
+
+        .collapse-btn:hover {
+          color: #${c.base0D};
+          border-color: #${c.base0D};
+        }
+
+        .collapse-btn svg { width: 16px; height: 16px; }
+
+        .bookmarks-container {
+          max-width: 1100px;
+          margin: 0 auto;
+          display: flex;
+          flex-direction: column;
+          gap: 0.75rem;
+        }
+
+        .root-section { margin-bottom: 1rem; }
+
+        details.folder-section { border-radius: 8px; }
+
+        details.folder-section > summary {
+          list-style: none;
+          cursor: pointer;
+          display: flex;
+          align-items: center;
+          gap: 0.5rem;
+          padding: 0.45rem 0.5rem;
+          border-radius: 8px;
+          user-select: none;
+          transition: background-color 0.12s ease;
+        }
+
+        details.folder-section > summary::-webkit-details-marker { display: none; }
+
+        details.folder-section > summary:hover {
+          background-color: #${c.base01};
+          color: #${c.base0D};
+        }
+
+        details.folder-section > summary:hover .folder-name { color: #${c.base0D}; }
+        details.folder-section > summary:hover .folder-icon { color: #${c.base0D}; }
+
+        .folder-icon {
+          font-size: 14px;
+          line-height: 1;
+          flex-shrink: 0;
+          color: #${c.base04};
+          user-select: none;
+        }
+
+        .folder-name {
+          font-size: 0.72rem;
+          font-weight: 700;
+          letter-spacing: 0.12em;
+          text-transform: uppercase;
+          color: #${c.base03};
+          flex: 1;
+        }
+
+        .chevron {
+          width: 13px;
+          height: 13px;
+          color: #${c.base03};
+          transition: transform 0.2s ease;
+          flex-shrink: 0;
+        }
+
+        details[open] > summary > .chevron { transform: rotate(180deg); }
+
+        .folder-content {
+          padding: 0.4rem 0 0.5rem 0;
+          display: flex;
+          flex-direction: column;
+          gap: 0.25rem;
+        }
+
+        .folder-content > details.folder-section > summary { padding-left: 1.2rem; }
+        .folder-content > details.folder-section > .folder-content { padding-left: 1rem; }
+
+        .cards {
+          display: grid;
+          grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+          gap: 0.4rem;
+        }
+
+        .card {
+          display: flex;
+          align-items: center;
+          gap: 0.7rem;
+          padding: 0.6rem 0.8rem;
+          background-color: #${c.base01};
+          border: 1px solid #${c.base02};
+          border-radius: 10px;
+          text-decoration: none;
+          transition: background-color 0.12s ease, border-color 0.12s ease;
+          overflow: hidden;
+        }
+
+        .card:hover {
+          background-color: #${c.base02};
+          border-color: #${c.base0D};
+        }
+
+        .favicon-wrapper { position: relative; width: 18px; height: 18px; flex-shrink: 0; }
+
+        .favicon {
+          position: absolute;
+          inset: 0;
+          width: 100%;
+          height: 100%;
+          object-fit: contain;
+          border-radius: 3px;
+        }
+
+        .favicon-fallback {
+          position: absolute;
+          inset: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          background-color: #${c.base02};
+          border-radius: 4px;
+          color: #${c.base04};
+          font-size: 10px;
+          font-weight: 700;
+          text-transform: uppercase;
+          user-select: none;
+        }
+
+        .card-info {
+          display: flex;
+          flex-direction: column;
+          gap: 0.05rem;
+          overflow: hidden;
+          flex: 1;
+        }
+
+        .card-name {
+          color: #${c.base05};
+          font-size: 0.86rem;
+          font-weight: 500;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          transition: color 0.12s ease;
+        }
+
+        .card:hover .card-name { color: #${c.base0D}; }
+
+        .card-url {
+          color: #${c.base03};
+          font-family: 'Maple Mono NF', monospace;
+          font-size: 0.7rem;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .no-results {
+          color: #${c.base03};
+          font-size: 0.9rem;
+          padding: 0.5rem 0.2rem;
+          display: none;
+        }
+      </style>
+    </head>
+    <body>
+      <div class="header">
+        <h1 class="page-title">Bookmarks</h1>
+        <input id="search" class="search-bar" type="text" placeholder="Search…" autocomplete="off" spellcheck="false">
+        <button id="collapse-btn" class="collapse-btn" title="Collapse all folders" aria-label="Collapse all folders">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <polyline points="4 14 10 14 10 20"/><polyline points="20 10 14 10 14 4"/><line x1="10" y1="14" x2="3" y2="21"/><line x1="21" y1="3" x2="14" y2="10"/>
+          </svg>
+        </button>
+      </div>
+      <div class="bookmarks-container">
+        <p id="no-results" class="no-results">No results</p>
+        ${lib.concatMapStrings mkSection grouped}
+      </div>
+      <script>
+        window.addEventListener('DOMContentLoaded', function () {
+          const input = document.getElementById('search');
+          const noResults = document.getElementById('no-results');
+          const collapseBtn = document.getElementById('collapse-btn');
+
+          input.focus();
+
+          collapseBtn.addEventListener('click', function () {
+            document.querySelectorAll('details.folder-section').forEach(function (d) {
+              d.open = false;
+            });
+          });
+
+          input.addEventListener('input', function () {
+            const query = this.value.toLowerCase().trim();
+            let anyVisible = false;
+
+            if (query) {
+              document.querySelectorAll('details.folder-section').forEach(function (d) {
+                d.open = true;
+              });
+            }
+
+            document.querySelectorAll('.folder-section, .root-section').forEach(function (section) {
+              let sectionVisible = false;
+              section.querySelectorAll('.card').forEach(function (card) {
+                const name = card.querySelector('.card-name').textContent.toLowerCase();
+                const url = card.querySelector('.card-url').textContent.toLowerCase();
+                const match = !query || name.includes(query) || url.includes(query);
+                card.style.display = match ? ''' : 'none';
+                if (match) { sectionVisible = true; anyVisible = true; }
+              });
+              section.style.display = sectionVisible ? ''' : 'none';
+            });
+
+            noResults.style.display = anyVisible || !query ? 'none' : 'block';
+          });
+
+          input.addEventListener('keydown', function (e) {
+            if (e.key === 'Enter') {
+              const val = this.value.trim();
+              const isUrl = /^https?:\/\//i.test(val) || /^[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})(\/.*)?$/.test(val);
+              if (isUrl) {
+                location.href = /^https?:\/\//i.test(val) ? val : 'https://' + val;
+              } else {
+                const first = document.querySelector('.card:not([style*="none"])');
+                if (first) {
+                  location.href = first.href;
+                } else {
+                  const q = encodeURIComponent(val);
+                  if (q) location.href = 'https://duckduckgo.com/?q=' + q;
+                }
+              }
+            }
+            if (e.key === 'Escape') {
+              this.value = ''';
+              this.dispatchEvent(new Event('input'));
+            }
+          });
+        });
+      </script>
+    </body>
+    </html>
+  '';
+
+  systemd.user.services.helium-startpage = {
+    Unit = {
+      Description = "Helium startpage HTTP server";
+      After = ["network.target"];
+    };
+    Service = {
+      Type = "simple";
+      ExecStart = "${pkgs.darkhttpd}/bin/darkhttpd %h/.local/share/helium-startpage --port 8888 --addr 127.0.0.1 --no-listing";
+      Restart = "on-failure";
+    };
+    Install.WantedBy = ["default.target"];
+  };
+}

home/programs/helium/bookmarks/entertainment.nix

@@ -0,0 +1,50 @@
+[
+  {
+    name = "Entertainment";
+    icon = "movie";
+    bookmarks = [
+      {
+        name = "Youtube";
+        url = "https://youtube.com";
+      }
+      {
+        name = "Jellyfin";
+        url = "https://media.hadi.icu";
+      }
+      {
+        name = "Seerr";
+        url = "https://demandemedia.hadi.icu";
+      }
+      {
+        name = "Social Media";
+        icon = "group";
+        bookmarks = [
+          {
+            name = "Medium";
+            url = "https://medium.com";
+          }
+          {
+            name = "Bluesky";
+            url = "https://bsky.app";
+          }
+          {
+            name = "Reddit";
+            url = "https://reddit.com";
+          }
+          {
+            name = "Instagram";
+            url = "https://instagram.com";
+          }
+          {
+            name = "Discord";
+            url = "https://discord.com/channels/@me/";
+          }
+          {
+            name = "Gitlab";
+            url = "https://gitlab.com/";
+          }
+        ];
+      }
+    ];
+  }
+]

home/programs/helium/bookmarks/general.nix

@@ -0,0 +1,14 @@
+[
+  {
+    name = "Proton Mail";
+    url = "https://mail.proton.me";
+  }
+  {
+    name = "Proton Drive";
+    url = "https://drive.proton.me";
+  }
+  {
+    name = "Github";
+    url = "https://github.com";
+  }
+]

home/programs/helium/bookmarks/infosec.nix

@@ -0,0 +1,48 @@
+[
+  {
+    name = "Infosec";
+    icon = "terminal";
+    bookmarks = [
+      {
+        name = "Nix 4 Cyber";
+        url = "https://n4c.hadi.icu";
+      }
+      {
+        name = "Cyberchef";
+        url = "https://cyberchef.hadi.icu";
+      }
+      {
+        name = "TryHackMe";
+        url = "https://tryhackme.com";
+      }
+      {
+        name = "Root-Me";
+        url = "https://root-me.org";
+      }
+      {
+        name = "Hack The Box";
+        url = "https://hackthebox.com";
+      }
+      {
+        name = "Iknowyou";
+        url = "https://iknowyou-prod.hadi.icu";
+      }
+      {
+        name = "Exploit-DB";
+        url = "https://exploit-db.com";
+      }
+      {
+        name = "GTFOBins";
+        url = "https://gtfobins.org/";
+      }
+      {
+        name = "Crack Station";
+        url = "https://crackstation.net";
+      }
+      {
+        name = "Osint Tracker";
+        url = "https://app.osintracker.com";
+      }
+    ];
+  }
+]

home/programs/helium/bookmarks/jack.nix

@@ -0,0 +1,80 @@
+[
+  {
+    name = "Jack";
+    icon = "dns";
+    bookmarks = [
+      {
+        name = "Glance";
+        url = "https://home.hadi.icu";
+      }
+      {
+        name = "Blog";
+        url = "https://hadi.icu";
+      }
+      {
+        name = "Gitea";
+        url = "https://git.hadi.icu";
+      }
+      {
+        name = "Mealie";
+        url = "https://mealie.hadi.icu";
+      }
+      {
+        name = "Wallpapers";
+        url = "https://wallpapers.hadi.icu";
+      }
+      {
+        name = "Default Creds";
+        url = "https://default-creds.hadi.icu";
+      }
+      {
+        name = "Media";
+        icon = "subscriptions";
+        bookmarks = [
+          {
+            name = "Radarr";
+            url = "https://radarr.hadi.icu";
+          }
+          {
+            name = "Sonarr";
+            url = "https://sonarr.hadi.icu";
+          }
+          {
+            name = "Bazarr";
+            url = "https://bazarr.hadi.icu";
+          }
+          {
+            name = "Prowlarr";
+            url = "https://prowlarr.hadi.icu";
+          }
+          {
+            name = "Transmission";
+            url = "https://transmission.hadi.icu";
+          }
+        ];
+      }
+      {
+        name = "Infrastructure";
+        icon = "construction";
+        bookmarks = [
+          {
+            name = "AdGuard";
+            url = "https://adguard.hadi.icu";
+          }
+          {
+            name = "Umami";
+            url = "https://umami.hadi.icu";
+          }
+          {
+            name = "Cloudflare";
+            url = "https://dash.cloudflare.com";
+          }
+          {
+            name = "Cloudflare Zero Trust";
+            url = "https://one.dash.cloudflare.com";
+          }
+        ];
+      }
+    ];
+  }
+]

home/programs/helium/bookmarks/other.nix

@@ -0,0 +1,46 @@
+[
+  {
+    name = "Other";
+    icon = "category";
+    bookmarks = [
+      {
+        name = "Documentation";
+        icon = "menu_book";
+        bookmarks = [
+          {
+            name = "Hyprland Wiki";
+            url = "https://wiki.hypr.land";
+          }
+          {
+            name = "Stylix Wiki";
+            url = "https://nix-community.github.io/stylix/";
+          }
+          {
+            name = "Nixpkgs";
+            url = "https://github.com/NixOS/nixpkgs";
+          }
+          {
+            name = "tldr";
+            url = "https://tldr.inbrowser.app/";
+          }
+        ];
+      }
+      {
+        name = "Startpage Config";
+        url = "https://www.startpage.com/do/mypage.pl?prfe=45d331deb05471d659dba933e7400df51d952bb103da6f6125c0e769a6be1d65610456a479f495ceeee7e97311cf227d7c1bb198de0ceeb193d8cddf9c455c19a409cc35c3e3f542ee27bd7cecd3";
+      }
+      {
+        name = "Feedly";
+        url = "https://feedly.com";
+      }
+      {
+        name = "MyNixOS";
+        url = "https://mynixos.com";
+      }
+      {
+        name = "Amazon";
+        url = "https://amazon.fr";
+      }
+    ];
+  }
+]

home/programs/helium/bookmarks/tools.nix

@@ -0,0 +1,48 @@
+[
+  {
+    name = "Tools";
+    icon = "handyman";
+    bookmarks = [
+      {
+        name = "Maps";
+        url = "https://maps.apple.com";
+      }
+      {
+        name = "Excalidraw";
+        url = "https://excalidraw.com";
+      }
+      {
+        name = "Cobalt (downloader)";
+        url = "https://cobalt.meowing.de";
+      }
+      {
+        name = "Mazanoke (image)";
+        url = "https://mazanoke.hadi.icu";
+      }
+      {
+        name = "Vert";
+        url = "https://vert.sh";
+      }
+      {
+        name = "Markdown to PDF";
+        url = "https://md2file.com";
+      }
+      {
+        name = "Image to Vector";
+        url = "https://www.vectorcascade.com/";
+      }
+      {
+        name = "PrivateBin";
+        url = "https://privatebin.net";
+      }
+      {
+        name = "Claude";
+        url = "https://claude.ai";
+      }
+      {
+        name = "Gemini";
+        url = "https://gemini.google.com";
+      }
+    ];
+  }
+]

home/programs/helium/default.nix

@@ -0,0 +1,137 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  c = config.lib.stylix.colors;
+  rgb = base: map lib.strings.toInt [c."${base}-rgb-r" c."${base}-rgb-g" c."${base}-rgb-b"];
+
+  themeId = "abcadngacjlikcpkhleafekcdjmddegk";
+  themeKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6t46VoE3mdV1QNMgybpmQLi5PtYHejnNrSj4DkBZyiTzMzs7Yyvg64f78w3QubZA5cTXSQ7FVhVHvv30I8ym/jNzsSN6reh1t4PtKsFjFRugAty8bfKJGD404HZLOFN2z3G9UPVLBBgzDH3DWbb/kcOq60Mlo/QDCIjsieZg0G3EYMl4efoThzYPWoyv0UEoiliwrE/AChxbgipQetUZ48bFhTCsmnYzCze7clssfTobzWtJJG0qFx76LauHKymRS5OTFfgsovKqHUSFJ202Q53vFdUPP/j8PjSPr1kZeg1NYc7Ba3MoA49EwtJf5ol9oYu05EEnSQ5+1AoYVmdE8QIDAQAB";
+
+  themeManifest = builtins.toJSON {
+    manifest_version = 2;
+    name = "Stylix Theme";
+    version = "1.0";
+    key = themeKey;
+    theme.colors = {
+      frame = rgb "base00";
+      frame_inactive = rgb "base00";
+      frame_incognito = rgb "base00";
+      frame_incognito_inactive = rgb "base00";
+      toolbar = rgb "base00";
+      toolbar_button_icon = rgb "base05";
+      control_background = rgb "base00";
+      tab_text = rgb "base0D";
+      background_tab = rgb "base00";
+      tab_background_text = rgb "base04";
+      tab_background_text_inactive = rgb "base04";
+      ntp_background = rgb "base00";
+      ntp_text = rgb "base05";
+    };
+  };
+
+  heliumFlags = [
+    "--ozone-platform=wayland"
+    "--enable-features=UseOzonePlatform,VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization"
+    "--disable-features=UseChromeOSDirectVideoDecoder,WaylandWpColorManagerV1"
+    "--enable-accelerated-video-decode"
+    "--enable-gpu-rasterization"
+    "--use-gl=egl"
+    "--no-default-browser-check"
+    "--show-avatar-button=never"
+  ];
+
+  originalPkg = (inputs.helium-browser.packages.${pkgs.stdenv.hostPlatform.system}.helium).override {
+    flags = heliumFlags;
+  };
+
+  patchScript = pkgs.writeShellScript "helium-patch-prefs" ''
+    PROFILE="$HOME/.config/net.imput.helium/Default"
+    THEME_DIR="$PROFILE/Extensions/${themeId}/1.0_0"
+    PREFS="$PROFILE/Preferences"
+
+    mkdir -p "$THEME_DIR"
+    rm -f "$THEME_DIR/Cached Theme.pak"
+    printf '%s' '${themeManifest}' > "$THEME_DIR/manifest.json"
+
+    if [ -f "$PREFS" ]; then
+      tmp=$(mktemp)
+      ${lib.getExe pkgs.jq} \
+        --arg       id       "${themeId}" \
+        --slurpfile manifest "$THEME_DIR/manifest.json" \
+        '
+          .helium.browser.layout                       = 3     |
+          .helium.browser.minimal_location_bar        = true  |
+          .helium.browser.show_dynamic_new_tab_button = false |
+          .bookmark_bar.show_tab_groups               = false |
+          .extensions.settings[$id] = {
+            "active_permissions": {"api": [], "explicit_host": [], "manifest_permissions": [], "scriptable_host": []},
+            "creation_flags": 0,
+            "from_webstore":  false,
+            "install_time":   "13300000000000000",
+            "location":       1,
+            "manifest":       $manifest[0],
+            "path":           ($id + "/1.0_0"),
+            "state":          1,
+            "was_installed_by_default": false,
+            "was_installed_by_oem":     false
+          } |
+          .extensions.theme = {"id": $id, "use_system": false}
+        ' "$PREFS" > "$tmp" && mv "$tmp" "$PREFS"
+    fi
+  '';
+
+  baseWrapped = pkgs.symlinkJoin {
+    name = "helium-wrapped";
+    paths = [originalPkg];
+    nativeBuildInputs = [pkgs.makeWrapper];
+    postBuild = ''
+      wrapProgram $out/bin/helium \
+        --run ${lib.escapeShellArg (toString patchScript)}
+    '';
+  };
+
+  wrappedPkg = baseWrapped // {override = _: baseWrapped;};
+in {
+  imports = [
+    inputs.helium-browser.homeModules.default
+    ./bookmarks
+  ];
+
+  programs.helium = {
+    enable = true;
+    package = lib.mkForce wrappedPkg;
+  };
+
+  home.sessionVariables.BROWSER = "${config.programs.helium.package}/bin/helium";
+
+  xdg.desktopEntries.helium = {
+    name = "Helium";
+    genericName = "Navigateur Web";
+    exec = "${config.programs.helium.package}/bin/helium %U";
+    icon = "${config.programs.helium.package}/share/icons/hicolor/256x256/apps/helium.png";
+    terminal = false;
+    categories = ["Network" "WebBrowser"];
+    mimeType = [
+      "text/html"
+      "text/xml"
+      "application/xhtml+xml"
+      "x-scheme-handler/http"
+      "x-scheme-handler/https"
+      "x-scheme-handler/ftp"
+    ];
+  };
+
+  xdg.desktopEntries.helium-private = {
+    name = "Helium (Private window)";
+    genericName = "Navigateur Web";
+    exec = "${config.programs.helium.package}/bin/helium --incognito %U";
+    icon = "${config.programs.helium.package}/share/icons/hicolor/256x256/apps/helium.png";
+    terminal = false;
+    categories = ["Network" "WebBrowser"];
+    mimeType = ["text/html" "text/xml" "application/xhtml+xml"];
+  };
+}

home/programs/helium/system.nix

@@ -0,0 +1,70 @@
+{...}: let
+  bookmarkList =
+    (import ./bookmarks/general.nix)
+    ++ (import ./bookmarks/tools.nix)
+    ++ (import ./bookmarks/entertainment.nix)
+    ++ (import ./bookmarks/infosec.nix)
+    ++ (import ./bookmarks/other.nix)
+    ++ (import ./bookmarks/jack.nix);
+
+  toChromium = items:
+    map (item:
+      if item ? url
+      then {inherit (item) name url;}
+      else {
+        name = item.name;
+        children = toChromium item.bookmarks;
+      })
+    items;
+in {
+  stylix.targets.chromium.enable = false;
+
+  programs.helium = {
+    enable = true;
+
+    policies = {
+      BrowserSignin = 0;
+      SyncDisabled = true;
+      SigninAllowed = false;
+
+      PasswordManagerEnabled = false;
+      AutofillAddressEnabled = false;
+      AutofillCreditCardEnabled = false;
+      SafeBrowsingEnabled = false;
+      MetricsReportingEnabled = false;
+      SpellCheckServiceEnabled = false;
+      DefaultCookiesSetting = 1;
+      DefaultGeolocationSetting = 2;
+      DefaultNotificationsSetting = 2;
+      DefaultPopupsSetting = 2;
+
+      DefaultBrowserSettingEnabled = false;
+      DeveloperToolsAvailability = 1;
+
+      DnsOverHttpsMode = "secure";
+      DnsOverHttpsTemplates = "https://dns.quad9.net/dns-query";
+
+      DefaultSearchProviderEnabled = true;
+      DefaultSearchProviderName = "Startpage";
+      DefaultSearchProviderSearchURL = "https://www.startpage.com/do/search?q={searchTerms}";
+      DefaultSearchProviderSuggestURL = "https://www.startpage.com/do/suggest?q={searchTerms}";
+
+      NewTabPageLocation = "http://127.0.0.1:8888";
+      HomepageIsNewTabPage = false;
+      HomepageLocation = "http://127.0.0.1:8888";
+      ShowHomeButton = false;
+      RestoreOnStartup = 4;
+
+      BookmarkBarEnabled = false;
+      ManagedBookmarks = toChromium bookmarkList;
+
+      ExtensionInstallForcelist = [
+        "dbepggeogbaibhgnhhndojpepiihcmeb" # Vimiu
+        "gcknhkkoolaabfmlnjonogaaifnjlfnp" # FoxyProxy
+        "ghmbeldphafepmbegfdlkpapadhbakde" # Proton Pass
+        "mdjildafknihdffpkfmmpnpoiajfjnjd" # Consent-O-Matic
+        "pkehgijcmpdhfbdbbnkijodmdjhbjlgp" # Privacy Badger
+      ];
+    };
+  };
+}

home/programs/kitty/default.nix

@@ -1,28 +0,0 @@
-{
-  programs.kitty = {
-    enable = true;
-    keybindings = {
-      # Reset existing mappings
-      "ctrl+alt+tab" = "next_tab";
-      "ctrl+alt+shift+tab" = "previous_tab";
-      # Send Ctrl Tab and Ctrl + Shift + Tab for Tmux navigation
-      "ctrl+tab" = "send_text all \\x1b[27;5;9~";
-      "ctrl+shift+tab" = "send_text all \\x1b[27;6;9~";
-      "alt+tab" = "send_text all \\x1b[27;3;9~";
-    };
-    settings = {
-      scrollback_lines = 10000;
-      initial_window_width = 1200;
-      initial_window_height = 600;
-      update_check_interval = 0;
-      enable_audio_bell = false;
-      confirm_os_window_close = "0";
-      remember_window_size = "no";
-      disable_ligatures = "never";
-      url_style = "curly";
-      cursor_shape = "Underline";
-      cursor_underline_thickness = 3;
-      window_padding_width = 10;
-    };
-  };
-}

home/programs/lazygit/default.nix

@@ -1,22 +0,0 @@
-{ config, lib, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  muted = "#${config.lib.stylix.colors.base03}";
-in {
-  programs.lazygit = {
-    enable = true;
-    settings = lib.mkForce {
-      gui = {
-        theme = {
-          activeBorderColor = [ accent "bold" ];
-          inactiveBorderColor = [ muted ];
-        };
-        showListFooter = false;
-        showRandomTip = false;
-        showCommandLog = false;
-        showBottomLine = false;
-        nerdFontsVersion = "3";
-      };
-    };
-  };
-}

home/programs/nextcloud/default.nix

@@ -1,7 +0,0 @@
-# Nextcloud is a suite of client-server software for creating file hosting services and using them. It is functionally similar to Dropbox, although Nextcloud is free and open-source, allowing anyone to install and operate it on a private server. In contrast to proprietary services, Nextcloud can be hosted on a private server, without additional cost.
-{
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
-}

home/programs/nightshift/default.nix

@@ -0,0 +1,19 @@
+{pkgs, ...}: let
+  nightshift-toggle =
+    pkgs.writeShellScriptBin "nightshift-toggle"
+    # bash
+    ''
+      if pidof "hyprsunset"; then
+        pkill hyprsunset
+        ${pkgs.libnotify}/bin/notify-send "Night Shift Disabled" "Returning to full spectrum light. Filter disabled."
+      else
+        ${pkgs.hyprsunset}/bin/hyprsunset -t 4500 &
+        ${pkgs.libnotify}/bin/notify-send "Night Shift Activated" "Welcome to the warm side. Blue light filtering is now active."
+      fi
+    '';
+in {
+  home.packages = with pkgs; [
+    hyprsunset
+    nightshift-toggle
+  ];
+}

home/programs/nix-utils/default.nix

@@ -0,0 +1,5 @@
+{inputs, ...}: {
+  imports = [inputs.nix-index-database.homeModules.default];
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+}

home/programs/nixy/default.nix

@@ -0,0 +1,31 @@
+# - ## Nixy
+#-
+#- Nixy is a simple script that I use to manage my NixOS system. It's a simple script that provides a menu to rebuild, test, update, collect garbage, clean boot menu, etc.
+#-
+#- - `nixy` - UI wizard to manage the system.
+#- - `nixy rebuild` - Rebuild the system.
+#- - `nixy ...` - ... see the script for more commands.
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  options.programs.nixy = {
+    enable = lib.mkEnableOption "nixy";
+    configDirectory = lib.mkOption {
+      type = lib.types.str;
+      default = "$HOME/.config/nixos";
+      description = "Path to the NixOS configuration directory";
+    };
+  };
+
+  config = lib.mkIf config.programs.nixy.enable {
+    home.packages = [
+      (import ./package.nix {
+        inherit pkgs;
+        inherit (config.programs.nixy) configDirectory;
+      })
+    ];
+  };
+}

home/programs/nixy/flake.nix

@@ -0,0 +1,14 @@
+{
+  pkgs,
+  system,
+  ...
+}: {
+  packages.${system}.nixy = import ./package.nix {
+    inherit pkgs;
+    configDirectory = "$HOME/.config/nixos";
+  };
+
+  homeManagerModules.nixy = {
+    imports = [./default.nix];
+  };
+}

home/programs/nixy/package.nix

@@ -0,0 +1,69 @@
+{
+  pkgs,
+  configDirectory,
+}:
+pkgs.writeShellScriptBin "nixy"
+# bash
+''
+  EXTRA_ARGS="''${@:2}"
+
+  function exec() {
+    $@
+  }
+
+  function ui(){
+    DEFAULT_ICON="󰘳"
+
+    # "icon;name;command"[]
+    apps=(
+      "󰑓;Rebuild;nixy rebuild"
+      "󰐊;Test;nixy test"
+      "󰚰;Update;nixy update"
+      ";Collect Garbage;nixy gc"
+      "󰍜;Clean Boot Menu;nixy cb"
+      ";List generation;nixy listgen"
+    )
+
+    # Apply default icons if empty:
+    for i in "''${!apps[@]}"; do
+      apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
+    done
+
+    fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
+    [[ -z $fzf_result ]] && exit 0
+    fzf_result=''${fzf_result/ /;}
+    line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
+    command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
+
+    exec "$command"
+    exit $?
+  }
+
+  [[ $1 == "" ]] && ui
+
+  if [[ $1 == "rebuild" ]];then
+    cd ${configDirectory} && git add . && sudo nixos-rebuild switch --flake . $EXTRA_ARGS
+  elif [[ $1 == "test" ]];then
+    cd ${configDirectory} && git add . && sudo nixos-rebuild test --flake . $EXTRA_ARGS
+  elif [[ $1 == "update" ]];then
+    cd ${configDirectory} && nix flake update $EXTRA_ARGS
+  elif [[ $1 == "gc" ]];then
+    echo "Starting Nix garbage collection..."
+    cd ${configDirectory} && \
+    echo "Cleaning up system garbage..." && \
+    sudo nix-collect-garbage -d && \
+    echo "Cleaning up user garbage..." && \
+    nix-collect-garbage -d && \
+    echo "Collecting garbage from Nix store..." && \
+    nix-store --gc && \
+    echo "Optimizing Nix store..." && \
+    nix-store --optimise
+    echo "Nix garbage collection complete."
+  elif [[ $1 == "cb" ]];then
+    sudo /run/current-system/bin/switch-to-configuration boot
+  elif [[ $1 == "listgen" ]];then
+    sudo nix-env -p /nix/var/nix/profiles/system --list-generations
+  else
+    echo "Unknown argument"
+  fi
+''

home/programs/nvf/default.nix

@@ -0,0 +1,21 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [inputs.nvf.homeManagerModules.default];
+  programs.nvf = {
+    enable = true;
+    settings = {
+      imports = [
+        ./options.nix
+        ./languages.nix
+        ./picker.nix
+        ./snacks.nix
+        ./keymaps.nix
+        ./utils.nix
+        ./mini.nix
+      ];
+    };
+  };
+}

home/programs/nvf/flake.nix

@@ -0,0 +1,37 @@
+{
+  inputs,
+  pkgs,
+  system,
+  ...
+}: let
+  nvimConfig = inputs.nvf.lib.neovimConfiguration {
+    inherit pkgs;
+    modules = [
+      ./options.nix
+      ./languages.nix
+      ./picker.nix
+      ./snacks.nix
+      ./keymaps.nix
+      ./utils.nix
+      ./mini.nix
+    ];
+  };
+in {
+  packages.${system}.nvim = nvimConfig.neovim;
+
+  apps.${system}.nvim = {
+    type = "app";
+    program = "${nvimConfig.neovim}/bin/nvim";
+  };
+  defaultApp.${system} = {
+    type = "app";
+    program = "${nvimConfig.neovim}/bin/nvim";
+  };
+
+  homeManagerModules.nvim = {
+    imports = [
+      inputs.nvf.homeManagerModules.default
+      ./default.nix
+    ];
+  };
+}

home/programs/nvf/keymaps.nix

@@ -0,0 +1,280 @@
+{
+  vim = {
+    globals.mapleader = " ";
+    keymaps = [
+      {
+        key = "s";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua MiniJump2d.start(MiniJump2d.builtin_opts.single_character)<cr>";
+        desc = "Jump2d";
+      }
+      {
+        key = "K";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua vim.lsp.buf.hover()<cr>";
+        desc = "LSP Hover";
+      }
+      {
+        key = "<C-tab>";
+        mode = "n";
+        silent = true;
+        action = "<cmd>bnext<cr>";
+        desc = "Next Buffer";
+      }
+
+      # Format
+      {
+        key = "<leader>lf";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua require('conform').format({ async = true, lsp_format = 'fallback' })<cr>";
+        desc = "Format file";
+      }
+
+      # Terminal
+      {
+        key = "<leader>tt";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.terminal.toggle()<cr>";
+        desc = "Toggle terminal";
+      }
+      {
+        key = "<leader>tf";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.terminal.toggle(nil, { style = 'float' })<cr>";
+        desc = "Toggle terminal (float)";
+      }
+      {
+        key = "<leader>tg";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.lazygit()<cr>";
+        desc = "Lazygit";
+      }
+      {
+        key = "<leader>ts";
+        mode = "v";
+        silent = true;
+        action = ":<C-u>SttrTransform<CR>";
+        desc = "String Transform";
+      }
+      {
+        key = "<leader>tj";
+        mode = "n";
+        silent = true;
+        action = ":JwtTui<CR>";
+        desc = "JWT TUI";
+      }
+      {
+        key = "<leader>tj";
+        mode = "v";
+        silent = true;
+        action = ":<C-u>JwtTuiOpen<CR>";
+        desc = "JWT TUI";
+      }
+
+      # UI
+      {
+        key = "<leader>uw";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set wrap!<cr>";
+        desc = "Toggle word wrapping";
+      }
+      {
+        key = "<leader>ul";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set linebreak!<cr>";
+        desc = "Toggle linebreak";
+      }
+      {
+        key = "<leader>us";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set spell!<cr>";
+        desc = "Toggle spellLazyGitcheck";
+      }
+      {
+        key = "<leader>uc";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set cursorline!<cr>";
+        desc = "Toggle cursorline";
+      }
+      {
+        key = "<leader>un";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set number!<cr>";
+        desc = "Toggle line numbers";
+      }
+      {
+        key = "<leader>ur";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set relativenumber!<cr>";
+        desc = "Toggle relative line numbers";
+      }
+      {
+        key = "<leader>ut";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set showtabline=2<cr>";
+        desc = "Show tabline";
+      }
+      {
+        key = "<leader>uT";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set showtabline=0<cr>";
+        desc = "Hide tabline";
+      }
+
+      # Todos
+      {
+        key = "<leader>xt";
+        mode = "n";
+        silent = true;
+        action = "<cmd>TodoTrouble<cr>";
+        desc = "Todo (Trouble)";
+      }
+
+      # QOL
+      {
+        key = ">";
+        mode = "v";
+        silent = true;
+        action = ">gv";
+        desc = "Indent and keep selection";
+      }
+      {
+        key = "<";
+        mode = "v";
+        silent = true;
+        action = "<gv";
+        desc = "Dedent and keep selection";
+      }
+
+      # Move
+      {
+        key = "<C-h>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>h";
+        desc = "Move to left window";
+      }
+      {
+        key = "<C-j>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>j";
+        desc = "Move to bottom window";
+      }
+      {
+        key = "<C-k>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>k";
+        desc = "Move to top window";
+      }
+      {
+        key = "<C-l>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>l";
+        desc = "Move to right window";
+      }
+
+      # Save
+      {
+        key = "<C-s>";
+        mode = [
+          "n"
+          "i"
+          "v"
+        ];
+        silent = true;
+        action = "<cmd>w<cr>";
+        desc = "Save file";
+      }
+
+      # Deactivate "esc"
+      {
+        key = "<Esc>";
+        mode = [
+          "n"
+          "i"
+          "v"
+        ];
+        silent = true;
+        action = "<Nop>";
+        desc = "Disable Escape";
+      }
+
+      # Disable Arrow Keys in Normal Mode and Middle click
+      {
+        key = "<Up>";
+        mode = "n";
+        silent = true;
+        action = "<Nop>";
+        desc = "Disable Up Arrow";
+      }
+      {
+        key = "<Down>";
+        mode = "n";
+        silent = true;
+        action = "<Nop>";
+        desc = "Disable Down Arrow";
+      }
+      {
+        key = "<Left>";
+        mode = "n";
+        silent = true;
+        action = "<Nop>";
+        desc = "Disable Left Arrow";
+      }
+      {
+        key = "<Right>";
+        mode = "n";
+        silent = true;
+        action = "<Nop>";
+        desc = "Disable Right Arrow";
+      }
+      {
+        key = "<MiddleMouse>";
+        mode = [
+          "n"
+          "i"
+          "v"
+        ];
+        action = "<nop>";
+        silent = true;
+      }
+      {
+        key = "<2-MiddleMouse>";
+        mode = [
+          "n"
+          "i"
+          "v"
+        ];
+        action = "<nop>";
+        silent = true;
+      }
+      {
+        key = "<3-MiddleMouse>";
+        mode = [
+          "n"
+          "i"
+          "v"
+        ];
+        action = "<nop>";
+        silent = true;
+      }
+    ];
+  };
+}

home/programs/nvf/languages.nix

@@ -0,0 +1,115 @@
+{...}: {
+  vim = {
+    diagnostics = {
+      enable = true;
+      config = {
+        signs = {
+          text = {
+            "vim.diagnostic.severity.Error" = " ";
+            "vim.diagnostic.severity.Warn" = " ";
+            "vim.diagnostic.severity.Hint" = " ";
+            "vim.diagnostic.severity.Info" = " ";
+          };
+        };
+        underline = true;
+        update_in_insert = true;
+        virtual_text = true;
+      };
+      nvim-lint = {
+        enable = true;
+      };
+    };
+    treesitter = {
+      enable = true;
+      autotagHtml = true;
+      context.enable = true;
+      highlight.enable = true;
+    };
+    lsp = {
+      enable = true;
+      presets = {
+        tailwindcss-language-server = {
+          enable = true;
+        };
+      };
+      trouble.enable = true;
+      lspSignature.enable = true;
+      lspconfig.enable = true;
+      formatOnSave = false;
+      mappings.format = null;
+      inlayHints.enable = true;
+      servers.nil.settings.nix.autoArchive = true;
+      otter-nvim = {
+        enable = true;
+        setupOpts = {
+          buffers.set_filetype = true;
+          lsp = {
+            diagnostic_update_event = [
+              "BufWritePost"
+              "InsertLeave"
+            ];
+          };
+        };
+      };
+      lspkind.enable = true;
+      lspsaga = {
+        enable = true;
+        setupOpts = {
+          ui = {
+            code_action = "";
+          };
+          lightbulb = {
+            sign = false;
+            virtual_text = true;
+          };
+          symbol_in_winbar.enable = false;
+        };
+      };
+    };
+    languages = {
+      enableExtraDiagnostics = true;
+      enableFormat = true;
+      enableTreesitter = true;
+
+      python = {
+        enable = true;
+        lsp = {
+          enable = true;
+          servers = ["pyright"];
+        };
+      };
+      astro.enable = true;
+      go.enable = true;
+      markdown = {
+        enable = true;
+        format.type = ["prettierd"];
+        extensions = {
+          markview-nvim = {
+            enable = true;
+            setupOpts = {
+              preview = {
+                hybrid_modes = ["n"];
+              };
+            };
+          };
+        };
+        extraDiagnostics.enable = true;
+      };
+      typescript.enable = true;
+      css.enable = true;
+      svelte.enable = true;
+      html.enable = true;
+      bash.enable = true;
+      nix.enable = true;
+      lua.enable = true;
+    };
+    formatter = {
+      conform-nvim = {
+        enable = true;
+        setupOpts.format_on_save = {
+          lsp_format = "fallback";
+        };
+      };
+    };
+  };
+}

home/programs/nvf/mini.nix

@@ -0,0 +1,48 @@
+{
+  vim.luaConfigRC.mini-clue = ''
+    local miniclue = require('mini.clue')
+    miniclue.setup({
+      triggers = {
+        { mode = 'n', keys = '<Leader>' },
+        { mode = 'x', keys = '<Leader>' },
+        { mode = 'n', keys = 'g' },
+        { mode = 'x', keys = 'g' },
+        { mode = 'n', keys = "'" },
+        { mode = 'n', keys = '`' },
+        { mode = 'n', keys = '"' },
+        { mode = 'i', keys = '<C-r>' },
+        { mode = 'c', keys = '<C-r>' },
+        { mode = 'n', keys = '<C-w>' },
+        { mode = 'n', keys = 'z' },
+      },
+      clues = {
+        miniclue.gen_clues.g(),
+        miniclue.gen_clues.marks(),
+        miniclue.gen_clues.registers(),
+        miniclue.gen_clues.windows({ submode_resize = true }),
+        miniclue.gen_clues.z(),
+        { mode = 'n', keys = '<Leader>f', desc = '+find' },
+        { mode = 'n', keys = '<Leader>s', desc = '+search' },
+        { mode = 'n', keys = '<Leader>t', desc = '+terminal' },
+        { mode = 'n', keys = '<Leader>u', desc = '+ui' },
+        { mode = 'n', keys = '<Leader>l', desc = '+lsp' },
+        { mode = 'n', keys = '<Leader>x', desc = '+trouble' },
+      },
+      window = { delay = 300 },
+    })
+  '';
+
+  vim.mini = {
+    ai.enable = true;
+    starter.enable = true;
+    comment.enable = true;
+    icons.enable = true;
+    indentscope.enable = true;
+    pairs.enable = true;
+    diff.enable = true;
+    git.enable = true;
+    jump2d.enable = true;
+    statusline.enable = true;
+    clue.enable = true;
+  };
+}

home/programs/nvf/options.nix

@@ -0,0 +1,45 @@
+{lib, ...}: {
+  vim = {
+    viAlias = false;
+    vimAlias = true;
+    withNodeJs = true;
+    options = {
+      autoindent = true;
+      smartindent = true;
+      shiftwidth = 2;
+      foldlevel = 99;
+      foldcolumn = "auto:1";
+      mousescroll = "ver:1,hor:1";
+      mousemoveevent = true;
+      fillchars = "eob:‿,fold: ,foldopen:▼,foldsep:⸽,foldclose:⏵";
+      signcolumn = "yes";
+      tabstop = 2;
+      softtabstop = 2;
+      wrap = false;
+    };
+    globals.navic_silence = true;
+    clipboard = {
+      enable = true;
+      registers = "unnamedplus";
+    };
+    luaConfigRC.osc52-clipboard = ''
+      vim.g.clipboard = {
+        name = 'OSC 52',
+        copy = {
+          ['+'] = require('vim.ui.clipboard.osc52').copy '+',
+          ['*'] = require('vim.ui.clipboard.osc52').copy '*',
+        },
+        paste = {
+          ['+'] = require('vim.ui.clipboard.osc52').paste '+',
+          ['*'] = require('vim.ui.clipboard.osc52').paste '*',
+        },
+      }
+    '';
+    theme = {
+      enable = true;
+      name = lib.mkForce "catppuccin";
+      style = lib.mkForce "mocha";
+      transparent = lib.mkForce true;
+    };
+  };
+}

home/programs/nvf/picker.nix

@@ -0,0 +1,162 @@
+{
+  vim = {
+    utility = {
+      snacks-nvim = {
+        setupOpts = {
+          picker.enabled = true;
+          explorer.enabled = true;
+        };
+      };
+    };
+    keymaps = [
+      # Top Pickers & Explorer
+      {
+        key = "<leader> ";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.smart()<cr>";
+        desc = "Smart Find Files";
+      }
+      {
+        key = "<leader>e";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.explorer()<cr>";
+        desc = "File Explorer";
+      }
+      {
+        key = "<leader>/";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lines()<cr>";
+        desc = "Buffer Lines";
+      }
+
+      # Find
+      {
+        key = "<leader>fb";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.buffers()<cr>";
+        desc = "Buffers";
+      }
+      {
+        key = "<leader>ff";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.files()<cr>";
+        desc = "Find Files";
+      }
+      {
+        key = "<leader>fp";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.projects()<cr>";
+        desc = "Projects";
+      }
+      {
+        key = "<leader>fr";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.recent()<cr>";
+        desc = "Recent";
+      }
+      {
+        key = "<leader>f:";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.command_history()<cr>";
+        desc = "Command History";
+      }
+      {
+        key = "<leader>fn";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.notifications()<cr>";
+        desc = "Notification History";
+      }
+
+      # Grep
+      {
+        key = "<leader>sg";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.grep()<cr>";
+        desc = "Grep";
+      }
+      {
+        key = "<leader>st";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.todo_comments()<cr>";
+        desc = "Todos";
+      }
+      {
+        key = "<leader>sw";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.grep_word()<cr>";
+        desc = "Visual selection or word";
+      }
+      {
+        key = "<leader>sr";
+        mode = "n";
+        silent = true;
+        action = "<cmd>nohlsearch<cr>";
+        desc = "Reset search";
+      }
+
+      # LSP
+      {
+        key = "gd";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lsp_definitions()<cr>";
+        desc = "Goto Definition";
+      }
+      {
+        key = "gD";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lsp_declarations()<cr>";
+        desc = "Goto Declaration";
+      }
+      {
+        key = "gr";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lsp_references()<cr>";
+        desc = "References";
+        nowait = true;
+      }
+      {
+        key = "gI";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lsp_implementations()<cr>";
+        desc = "Goto Implementation";
+      }
+      {
+        key = "gy";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lsp_type_definitions()<cr>";
+        desc = "Goto Type Definition";
+      }
+      {
+        key = "<leader>ss";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lsp_symbols()<cr>";
+        desc = "LSP Symbols";
+      }
+      {
+        key = "<leader>sS";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.lsp_workspace_symbols()<cr>";
+        desc = "LSP Workspace Symbols";
+      }
+    ];
+  };
+}

home/programs/nvf/snacks.nix

@@ -0,0 +1,18 @@
+{
+  vim.utility.snacks-nvim = {
+    enable = true;
+    setupOpts = {
+      quickfile.enabled = true;
+      statuscolumn.enabled = true;
+      zen.enabled = true;
+      bufdelete.enabled = true;
+      gitsigns.enabled = true;
+      animate.enabled = true;
+      lazygit = {
+        enabled = true;
+        configure = false;
+      };
+      terminal.enabled = true;
+    };
+  };
+}

home/programs/nvf/utils.nix

@@ -0,0 +1,68 @@
+{pkgs, ...}: {
+  vim = {
+    luaConfigRC.remove-todo-keymaps = ''
+      vim.keymap.del("n", "<leader>tdq")
+      vim.keymap.del("n", "<leader>tdt")
+    '';
+    undoFile.enable = true;
+    notes.todo-comments.enable = true;
+    assistant.copilot = {
+      enable = true;
+      cmp.enable = true;
+    };
+
+    autocomplete = {
+      nvim-cmp = {
+        enable = true;
+        sources = {
+          buffer = "[Buffer]";
+          path = "[Path]";
+        };
+        sourcePlugins = [
+          pkgs.vimPlugins.cmp-cmdline
+        ];
+      };
+    };
+
+    snippets.luasnip.enable = true;
+    ui = {
+      noice.enable = true;
+      colorizer.enable = true;
+    };
+
+    visuals = {
+      rainbow-delimiters.enable = true;
+    };
+
+    extraPlugins = {
+      sttr-nvim = {
+        package = pkgs.vimUtils.buildVimPlugin {
+          name = "sttr-nvim";
+          src = pkgs.fetchFromGitHub {
+            owner = "anotherhadi";
+            repo = "sttr.nvim";
+            rev = "b41f2f51372222e23efbe5df9d72391cd933d4d1";
+            hash = "sha256-JPv0NNNUUNPNJM5LHYjcmTvilbOKB3OxI2Q6wxVbTks=";
+          };
+        };
+        setup = ''
+          require("sttr").setup()
+        '';
+      };
+      jwt-tui-nvim = {
+        package = pkgs.vimUtils.buildVimPlugin {
+          name = "jwt-tui-nvim";
+          src = pkgs.fetchFromGitHub {
+            owner = "anotherhadi";
+            repo = "jwt-tui.nvim";
+            rev = "c5100cb2cdfaf333014076a1a5c4c6a778bf3983";
+            hash = "sha256-qnQYZuQwyWkezhuyOorM67KBtatUboubofuT9A6McJI=";
+          };
+        };
+        setup = ''
+          require("jwt-tui").setup()
+        '';
+      };
+    };
+  };
+}

home/programs/nvim/autocmds.nix

@@ -1,187 +0,0 @@
-{
-  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

@@ -1,21 +0,0 @@
-# Nixvim is a NixOS module that installs and configures Neovim
-{ inputs, ... }: {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/lsp.nix
-    ./plugins/tree.nix
-    ./plugins/telescope.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/keymaps.nix

@@ -1,310 +0,0 @@
-{
-  programs.nixvim = {
-    plugins.which-key = {
-      enable = true;
-      settings = {
-        delay = 600;
-        icons = {
-          breadcrumb = "»";
-          group = "+";
-          separator = ""; # ➜
-          mappings = false;
-        };
-        spec = [
-          # General Mappings
-          {
-            __unkeyed-1 = "<leader>c";
-            mode = [ "n" "v" ];
-            group = "+code";
-          }
-          {
-            __unkeyed-1 = "<leader>d";
-            mode = [ "n" "v" ];
-            group = "+debug";
-          }
-          {
-            __unkeyed-1 = "<leader>s";
-            mode = "n";
-            group = "+search";
-          }
-          {
-            __unkeyed-1 = "<leader>m";
-            mode = "n";
-            group = "+markdown";
-          }
-          {
-            __unkeyed-1 = "<leader>t";
-            mode = "n";
-            group = "+trouble";
-          }
-          {
-            __unkeyed-1 = "<leader>u";
-            mode = "n";
-            group = "+ui";
-          }
-          {
-            __unkeyed-1 = "<leader>w";
-            mode = "n";
-            group = "+windows";
-          }
-          {
-            __unkeyed-1 = "<leader>h";
-            mode = "n";
-            group = "+harpoon";
-          }
-        ];
-        win = {
-          border = "rounded";
-          wo.winblend = 0;
-        };
-      };
-    };
-
-    keymaps = [
-      # General Mappings
-      {
-        key = "<leader>e";
-        action = "<cmd>Oil --float<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "-";
-        action = "<cmd>Oil<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "<leader>E";
-        action = "<cmd>Neotree toggle<cr>";
-        options.desc = "Neotree";
-      }
-
-      {
-        key = "s";
-        action = "<cmd>lua require('flash').jump()<cr>";
-        options.desc = "Flash";
-      }
-      {
-        key = "K";
-        action = "<cmd>lua vim.lsp.buf.hover()<cr>";
-        options.desc = "LSP Hover";
-      }
-
-      {
-        key = "<C-h>";
-        action = "<cmd>TmuxNavigateLeft<cr>";
-      }
-      {
-        key = "<C-j>";
-        action = "<cmd>TmuxNavigateDown<cr>";
-      }
-      {
-        key = "<C-k>";
-        action = "<cmd>TmuxNavigateUp<cr>";
-      }
-      {
-        key = "<C-l>";
-        action = "<cmd>TmuxNavigateRight<cr>";
-      }
-
-      # UI
-      {
-        key = "<leader>uz";
-        action = "<cmd>ZenMode<cr>";
-        options.desc = "Toggle ZenMode";
-      }
-      {
-        key = "<leader>uw";
-        action = "<cmd>set wrap!<cr>";
-        options.desc = "Toggle word wrapping";
-      }
-      {
-        key = "<leader>ul";
-        action = "<cmd>set linebreak!<cr>";
-        options.desc = "Toggle linebreak";
-      }
-      {
-        key = "<leader>us";
-        action = "<cmd>set spell!<cr>";
-        options.desc = "Toggle spellcheck";
-      }
-      {
-        key = "<leader>uc";
-        action = "<cmd>set cursorline!<cr>";
-        options.desc = "Toggle cursorline";
-      }
-      {
-        key = "<leader>un";
-        action = "<cmd>set number!<cr>";
-        options.desc = "Toggle line numbers";
-      }
-      {
-        key = "<leader>ur";
-        action = "<cmd>set relativenumber!<cr>";
-        options.desc = "Toggle relative line numbers";
-      }
-      {
-        key = "<leader>ut";
-        action = "<cmd>set showtabline=2<cr>";
-        options.desc = "Show tabline";
-      }
-      {
-        key = "<leader>uT";
-        action = "<cmd>set showtabline=0<cr>";
-        options.desc = "Hide tabline";
-      }
-
-      # Search
-      {
-        key = "<leader> ";
-        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
-        options.desc = "Telescope";
-      }
-      {
-        key = "<leader>sg";
-        action = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
-        options.desc = "Livegrep";
-      }
-      {
-        key = "<leader>sf";
-        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
-        options.desc = "Find Files";
-      }
-      {
-        key = "<leader>sb";
-        action = "<cmd>lua require('telescope.builtin').buffers()<cr>";
-        options.desc = "Buffers";
-      }
-      {
-        key = "<leader>sh";
-        action = "<cmd>lua require('telescope.builtin').help_tags()<cr>";
-        options.desc = "Help Tags";
-      }
-      {
-        key = "<leader>sc";
-        action = "<cmd>lua require('telescope.builtin').commands()<cr>";
-        options.desc = "Commands";
-      }
-      {
-        key = "<leader>sm";
-        action = "<cmd>lua require('telescope.builtin').marks()<cr>";
-        options.desc = "Marks";
-      }
-      {
-        key = "<leader>so";
-        action = "<cmd>lua require('telescope.builtin').oldfiles()<cr>";
-        options.desc = "Oldfiles";
-      }
-      {
-        key = "<leader>ss";
-        action = "<cmd>lua require('telescope.builtin').spell_suggest()<cr>";
-        options.desc = "Spell Suggest";
-      }
-      {
-        key = "<leader>sr";
-        action = "<cmd>:noh<return><esc>";
-        options.desc = "Reset search";
-      }
-      {
-        key = "<leader>st";
-        action = "<cmd>TodoTelescope<cr>";
-        options.desc = "Todos";
-      }
-
-      # Trouble
-      {
-        key = "<leader>tx";
-        action = "<cmd>Trouble diagnostics toggle<cr>";
-        options.desc = "Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>tX";
-        action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
-        options.desc = "Buffer Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>ts";
-        action = "<cmd>Trouble symbols toggle focus=false<cr>";
-        options.desc = "Symbols (Trouble)";
-      }
-      {
-        key = "<leader>tl";
-        action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
-        options.desc = "LSP Definitions / references / ... (Trouble)";
-      }
-      {
-        key = "<leader>tL";
-        action = "<cmd>Trouble loclist toggle<cr>";
-        options.desc = "Location List (Trouble)";
-      }
-      {
-        key = "<leader>tQ";
-        action = "<cmd>Trouble qflist toggle<cr>";
-        options.desc = "Quickfix List (Trouble)";
-      }
-
-      # Windows
-      {
-        key = "<leader>ws";
-        action = "<cmd>split<cr>";
-        options.desc = "Split";
-      }
-      {
-        key = "<leader>wv";
-        action = "<cmd>vsplit<cr>";
-        options.desc = "VSplit";
-      }
-      {
-        key = "<leader>wd";
-        action = "<cmd>close<cr>";
-        options.desc = "Close";
-      }
-
-      # Code
-      {
-        key = "<leader>cd";
-        action = "<cmd>lua vim.lsp.buf.definition()<cr>";
-        options.desc = "LSP Definition";
-      }
-      {
-        key = "<leader>cr";
-        action = "<cmd>lua vim.lsp.buf.references()<cr>";
-        options.desc = "LSP References";
-      }
-      {
-        key = "<leader>ct";
-        action = "<cmd>lua vim.lsp.buf.type_definition()<cr>";
-        options.desc = "LSP Type Definition";
-      }
-      {
-        key = "<leader>ca";
-        action = "<cmd>lua vim.lsp.buf.code_action()<cr>";
-        options.desc = "LSP Code Action";
-      }
-      {
-        key = "<leader>cf";
-        action = "<cmd>lua vim.lsp.buf.formatting()<cr>";
-        options.desc = "LSP Formatting";
-      }
-      {
-        key = "<leader>cn";
-        action = "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>";
-        options.desc = "LSP Next Diagnostic";
-      }
-      {
-        key = "<leader>cp";
-        action = "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>";
-        options.desc = "LSP Previous Diagnostic";
-      }
-      {
-        key = "<leader>cu";
-        action = "<cmd>lua require('dapui').toggle()<CR>";
-        options.desc = "Toggle Dapui";
-      }
-      {
-        key = "<leader>cb";
-        action = "<cmd>lua require('dap').toggle_breakpoint()<CR>";
-        options.desc = "Toggle breakpoint";
-      }
-    ];
-  };
-}

home/programs/nvim/options.nix

@@ -1,151 +0,0 @@
-{
-  programs.nixvim = {
-    globals.mapleader = " ";
-    opts = {
-      autoindent = true;
-
-      smartindent = true;
-
-      incsearch = true;
-      hlsearch = true;
-      wildmode = "list:longest";
-      scrolloff = 8;
-
-      swapfile = false;
-      conceallevel = 3;
-      clipboard = "unnamed,unnamedplus";
-
-      # Don't stop backspace at insert
-      backspace.__raw = ''
-        vim.list_extend(vim.opt.backspace:get(), { "nostop" })
-      '';
-
-      # Keep visual indentation on wrapped lines
-      breakindent = true;
-
-      # 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

@@ -1,116 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    luasnip.enable = true;
-    cmp-buffer = { enable = true; };
-    cmp-emoji = { enable = true; };
-    cmp-nvim-lsp = { enable = true; };
-    cmp-path = { enable = true; };
-    cmp_luasnip = { enable = true; };
-
-    cmp = {
-      enable = true;
-      settings = {
-        snippet.expand =
-          "function(args) require('luasnip').lsp_expand(args.body) end";
-        sources = [
-          { name = "nvim_lsp"; }
-          { name = "luasnip"; }
-          {
-            name = "buffer";
-            option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
-          }
-          { name = "nvim_lua"; }
-          { name = "mkdnflow"; }
-          { name = "path"; }
-        ];
-
-        formatting = {
-          fields = [ "abbr" "kind" "menu" ];
-          format =
-            # lua
-            ''
-                function(_, item)
-                local icons = {
-                  Namespace = "󰌗",
-                  Text = "󰉿",
-                  Method = "󰆧",
-                  Function = "󰆧",
-                  Constructor = "",
-                  Field = "󰜢",
-                  Variable = "󰀫",
-                  Class = "󰠱",
-                  Interface = "",
-                  Module = "",
-                  Property = "󰜢",
-                  Unit = "󰑭",
-                  Value = "󰎠",
-                  Enum = "",
-                  Keyword = "󰌋",
-                  Snippet = "",
-                  Color = "󰏘",
-                  File = "󰈚",
-                  Reference = "󰈇",
-                  Folder = "󰉋",
-                  EnumMember = "",
-                  Constant = "󰏿",
-                  Struct = "󰙅",
-                  Event = "",
-                  Operator = "󰆕",
-                  TypeParameter = "󰊄",
-                  Table = "",
-                  Object = "󰅩",
-                  Tag = "",
-                  Array = "[]",
-                  Boolean = "",
-                  Number = "",
-                  Null = "󰟢",
-                  String = "󰉿",
-                  Calendar = "",
-                  Watch = "󰥔",
-                  Package = "",
-                  Copilot = "",
-                  Codeium = "",
-                  TabNine = "",
-                }
-
-              local icon = icons[item.kind] or ""
-                item.kind = string.format("%s %s", icon, item.kind or "")
-                return item
-                end
-            '';
-        };
-
-        window = {
-          completion = {
-            winhighlight =
-              "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
-            scrollbar = false;
-            sidePadding = 0;
-            border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
-          };
-
-          documentation = {
-            border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
-            winhighlight =
-              "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
-          };
-        };
-
-        mapping = {
-          "<C-n>" = "cmp.mapping.select_next_item()";
-          "<C-p>" = "cmp.mapping.select_prev_item()";
-          "<Down>" = "cmp.mapping.select_next_item()";
-          "<Up>" = "cmp.mapping.select_prev_item()";
-          "<C-j>" = "cmp.mapping.select_next_item()";
-          "<C-k>" = "cmp.mapping.select_prev_item()";
-          "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-          "<C-f>" = "cmp.mapping.scroll_docs(4)";
-          "<C-Space>" = "cmp.mapping.complete()";
-          "<C-e>" = "cmp.mapping.close()";
-          "<CR>" =
-            "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
-        };
-      };
-    };
-  };
-}

home/programs/nvim/plugins/dashboard.nix

@@ -1,223 +0,0 @@
-{ config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  muted = "#${config.lib.stylix.colors.base03}";
-  foreground = "#${config.lib.stylix.colors.base05}";
-  configDir = config.var.configDirectory;
-in {
-
-  programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = accent;
-    AlphaTextColor.fg = foreground;
-    AlphaShortcutColor.fg = muted;
-  };
-
-  programs.nixvim.plugins.alpha = {
-    enable = true;
-    layout = [
-      {
-        type = "padding";
-        val = 4;
-      }
-      {
-        type = "text";
-        opts = {
-          position = "center";
-          hl = "AlphaHeaderColor";
-        };
-        val = [
-          "                                                                     "
-          "       ████ ██████           █████      ██                     "
-          "      ███████████             █████                             "
-          "      █████████ ███████████████████ ███   ███████████   "
-          "     █████████  ███    █████████████ █████ ██████████████   "
-          "    █████████ ██████████ █████████ █████ █████ ████ █████   "
-          "  ███████████ ███    ███ █████████ █████ █████ ████ █████  "
-          " ██████  █████████████████████ ████ █████ █████ ████ ██████ "
-          "                                                                       "
-        ];
-      }
-      {
-        type = "padding";
-        val = 4;
-      }
-      {
-        type = "group";
-
-        val = [
-          {
-            type = "button";
-            val = "󰭎  Find file";
-            on_press.__raw = "function() vim.cmd[[Telescope find_files]] end";
-            opts = {
-              keymap = [
-                "n"
-                "nf"
-                ":Telescope find_files <CR>"
-                {
-                  noremap = true;
-                  silent = true;
-                  nowait = true;
-                }
-              ];
-              shortcut = "nf";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "  New file";
-            on_press.__raw = "function() vim.cmd[[ene]] end";
-            opts = {
-              keymap = [
-                "n"
-                "nn"
-                ":ene <CR>"
-                {
-                  noremap = true;
-                  silent = true;
-                  nowait = true;
-                }
-              ];
-              shortcut = "nn";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "  NixOs Config";
-            on_press.__raw = "function() vim.cmd[[Neotree ${configDir}]] end";
-            opts = {
-              keymap = [
-                "n"
-                "nc"
-                ":Neotree ${configDir} <CR>"
-                {
-                  noremap = true;
-                  silent = true;
-                  nowait = true;
-                }
-              ];
-              shortcut = "nc";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "  Keybindings";
-            on_press.__raw =
-              "function() vim.cmd[[e ${configDir}/docs/KEYBINDINGS.md]] end";
-            opts = {
-              shortcut = "nk";
-              keymap = [
-                "n"
-                "nk"
-                ":e ${configDir}/docs/KEYBINDINGS-HYPRLAND.md <CR>"
-                {
-                  noremap = true;
-                  silent = true;
-                  nowait = true;
-                }
-              ];
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "  Recently used";
-            on_press.__raw = "function() vim.cmd[[Telescope oldfiles]] end";
-            opts = {
-              shortcut = "no";
-              keymap = [
-                "n"
-                "no"
-                ":Telescope oldfiles <CR>"
-                {
-                  noremap = true;
-                  silent = true;
-                  nowait = true;
-                }
-              ];
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "󰱽  Find text";
-            on_press.__raw = "function() vim.cmd[[Telescope live_grep]] end";
-            opts = {
-              shortcut = "ng";
-              keymap = [
-                "n"
-                "ng"
-                ":Telescope live_grep <CR>"
-                {
-                  noremap = true;
-                  silent = true;
-                  nowait = true;
-                }
-              ];
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "󰩈  Quit Neovim";
-            on_press.__raw = "function() vim.cmd[[qa]] end";
-            opts = {
-              shortcut = "nq";
-              keymap = [
-                "n"
-                "nq"
-                ":qa <CR>"
-                {
-                  noremap = true;
-                  silent = true;
-                  nowait = true;
-                }
-              ];
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-        ];
-
-      }
-    ];
-  };
-
-}

home/programs/nvim/plugins/lsp.nix

@@ -1,54 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    lsp-format.enable = true;
-    lsp = {
-      enable = true;
-      servers = {
-        bashls.enable = true;
-        clangd.enable = true;
-        gopls.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;
-        marksman.enable = true;
-      };
-      keymaps.lspBuf = {
-        "gd" = "definition";
-        "gD" = "references";
-        "gt" = "type_definition";
-        "gi" = "implementation";
-        "K" = "hover";
-      };
-    };
-    none-ls = {
-      enable = true;
-      sources = {
-        diagnostics = {
-          golangci_lint.enable = true;
-          statix.enable = true;
-        };
-        formatting = {
-          gofmt.enable = true;
-          goimports.enable = true;
-          nixfmt.enable = true;
-          markdownlint.enable = true;
-          tidy.enable = true;
-          shellharden.enable = true;
-          shfmt.enable = true;
-          golines.enable = true;
-          gofumpt.enable = true;
-        };
-      };
-    };
-  };
-}

home/programs/nvim/plugins/lualine.nix

@@ -1,30 +0,0 @@
-{
-  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,243 +0,0 @@
-{ config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  muted = "#${config.lib.stylix.colors.base03}";
-in {
-  programs.nixvim = {
-    # Markdown settings
-    extraFiles."after/ftplugin/markdown.lua".text = ''
-      vim.bo.tabstop = 2
-      vim.bo.shiftwidth = 2
-      vim.bo.expandtab = true 
-    '';
-
-    # 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;
-          };
-        };
-      };
-
-      # Display images in markdown
-      image = {
-        enable = true;
-        integrations.markdown = {
-          clearInInsertMode = true;
-          onlyRenderImageAtCursor = true;
-        };
-      };
-
-      # 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/telescope.nix

@@ -1,31 +0,0 @@
-{ config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  background = "#${config.lib.stylix.colors.base00}";
-  background-alt = "#${config.lib.stylix.colors.base01}";
-in {
-  programs.nixvim = {
-    highlight = {
-      TelescopePromptPrefix.fg = accent;
-      TelescopeSelectionCaret = {
-        fg = accent;
-        bg = background-alt;
-      };
-      TelescopeSelection.bg = background-alt;
-      TelescopePromptTitle = {
-        bg = background;
-        fg = accent;
-      };
-      TelescopePromptNormal.bg = background;
-      TelescopePromptBorder = {
-        bg = background;
-        fg = accent;
-      };
-    };
-    plugins.telescope = {
-      enable = true;
-      extensions.fzf-native = { enable = true; };
-      settings.defaults = { selection_caret = "❚ "; };
-    };
-  };
-}

home/programs/nvim/plugins/tree.nix

@@ -1,49 +0,0 @@
-{
-  programs.nixvim = {
-    plugins = {
-      neo-tree.enable = true;
-      oil = {
-        enable = true;
-        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;
-            cursorcolumn = false;
-            foldcolumn = "0";
-            list = false;
-            signcolumn = "no";
-            spell = false;
-            wrap = false;
-          };
-          float = { padding = 5; };
-          keymaps = {
-            "-" = "actions.parent";
-            "b" = "actions.parent";
-            "<C-c>" = "actions.close";
-            "<C-h>" = "actions.select_split";
-            "<C-l>" = "actions.refresh";
-            "<C-p>" = "actions.preview";
-            "<C-s>" = "actions.select_vsplit";
-            "<C-t>" = "actions.select_tab";
-            "<CR>" = "actions.select";
-            _ = "actions.open_cwd";
-            "`" = "actions.cd";
-            "g." = "actions.toggle_hidden";
-            "g?" = "actions.show_help";
-            "g\\" = "actions.toggle_trash";
-            gs = "actions.change_sort";
-            gx = "actions.open_external";
-            "~" = "actions.tcd";
-          };
-        };
-      };
-    };
-  };
-}

home/programs/nvim/plugins/ui.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ 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

@@ -1,25 +0,0 @@
-{ config, ... }: {
-  programs.nixvim = {
-    highlightOverride = {
-      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
-    };
-    nixpkgs.config = { allowUnfree = true; };
-    plugins = {
-      copilot-vim.enable = true;
-      flash.enable = true;
-      tmux-navigator.enable = true;
-      comment.enable = true;
-      nvim-autopairs.enable = true;
-      todo-comments.enable = true;
-      treesitter = {
-        enable = true;
-        nixGrammars = true;
-        settings = {
-          ensure_installed = "all";
-          indent.enable = true;
-          highlight.enable = true;
-        };
-      };
-    };
-  };
-}

home/programs/proton/auto-start-vpn.nix

@@ -0,0 +1,5 @@
+{
+  wayland.windowManager.hyprland.settings.exec-once = [
+    "protonvpn-app --start-minimized &"
+  ];
+}

home/programs/proton/default.nix

@@ -0,0 +1,39 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  home.packages = with pkgs; [
+    proton-vpn
+    proton-pass
+    proton-authenticator
+  ];
+
+  # Fix Proton Authenticator desktop entry
+  xdg.desktopEntries = {
+    "Proton Authenticator" = {
+      name = "Proton Authenticator";
+      exec = "env WEBKIT_DISABLE_COMPOSITING_MODE=1 ${pkgs.proton-authenticator}/bin/proton-authenticator";
+      icon = "proton-authenticator";
+      type = "Application";
+      categories = ["Utility"];
+      terminal = false;
+    };
+    "Proton Calendar" = {
+      name = "Proton Calendar";
+      exec = ''${config.programs.helium.package}/bin/helium "https://calendar.proton.me"'';
+      icon = "proton-calendar";
+      type = "Application";
+      categories = ["Utility"];
+      terminal = false;
+    };
+    "Proton Mail" = {
+      name = "Proton Mail";
+      exec = ''${config.programs.helium.package}/bin/helium "https://mail.proton.me/"'';
+      icon = "proton-mail";
+      type = "Application";
+      categories = ["Utility"];
+      terminal = false;
+    };
+  };
+}

home/programs/qutebrowser/default.nix

@@ -1,257 +0,0 @@
-# Qutebrowser is a keyboard-focused browser with a minimal GUI.
-# 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}";
-  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 {
-
-  imports = [ ./duckduckgo-colorscheme.nix ];
-
-  programs.qutebrowser = {
-    enable = true;
-
-    searchEngines = {
-      "DEFAULT" = "https://duckduckgo.com/?q={}&ia=web";
-      "d" = "https://duckduckgo.com/?q={}&ia=web";
-      "g" = "https://google.com/search?q={}";
-      "y" = "https://youtube.com/results?search_query={}";
-      "ya" = "https://yandex.com/search/?text={}";
-      "n" = "https://mynixos.com/search?q={}";
-      "nixo" = "https://search.nixos.org/options?channel=unstable&query={}";
-      "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}";
-      "gt" = "https://github.com/search?q={}&type=repositories";
-    };
-
-    quickmarks = {
-      home = "${homepage}/build/index.html";
-      server = "https://home.anotherhadi.com";
-      jack = "https://home.anotherhadi.com";
-      mynixos = "https://mynixos.com";
-      github = "https://github.com";
-      outlook = "https://outlook.office.com/mail/";
-      office = "https://www.office.com/?auth=2";
-      teams = "https://teams.microsoft.com/_";
-      casa = "http://192.168.2.16:8081/#/";
-      proton = "https://mail.proton.me/u/0/inbox";
-      cloudflare-one = "https://one.dash.cloudflare.com/";
-      chatgpt = "https://chat.openai.com/";
-      nixvim = "https://nix-community.github.io/nixvim/";
-      hyprland = "https://wiki.hyprland.org/";
-      nerdfont = "https://www.nerdfonts.com/cheat-sheet";
-      youtube = "https://youtube.com/";
-      cloudflare = "https://dash.cloudflare.com/";
-    };
-
-    settings = {
-      url = {
-        default_page = "${homepage}/build/index.html";
-        start_pages = [ "${homepage}/build/index.html" ];
-      };
-
-      colors = {
-        webpage.preferred_color_scheme =
-          "dark"; # Enable dark mode for websites that support it
-      };
-
-      statusbar.show = "in-mode";
-
-      completion = {
-        height = "30%";
-        open_categories = [ "history" ];
-        scrollbar = {
-          padding = 0;
-          width = 0;
-        };
-        show = "always";
-        shrink = true;
-        timestamp_format = "";
-        web_history.max_items = 7;
-      };
-
-      content = {
-        autoplay = false;
-        javascript.clipboard = "access";
-        javascript.enabled = true;
-        webgl = true;
-        pdfjs = true;
-      };
-
-      downloads = {
-        position = "bottom";
-        remove_finished = 0;
-      };
-
-      hints = { radius = 1; };
-
-      scrolling = {
-        bar = "never";
-        smooth = true;
-      };
-
-      tabs = {
-        show = "multiple";
-        last_close = "close";
-        mode_on_change = "restore";
-        close_mouse_button = "right";
-      };
-
-      zoom.default = "100%";
-
-      qt.force_software_rendering = "chromium";
-    };
-
-    keyBindings = {
-      normal = {
-        "gh" = "open ${homepage}/build/index.html";
-        "gs" = "open https://home.anotherhadi.com";
-
-        " p" = "tab-move -";
-        " n" = "tab-move +";
-        " w" = "tab-close";
-
-        " 1" = "tab-focus 1";
-        " 2" = "tab-focus 2";
-        " 3" = "tab-focus 3";
-        " 4" = "tab-focus 4";
-        " 5" = "tab-focus 5";
-        " 6" = "tab-focus 6";
-        " 7" = "tab-focus 7";
-        " 8" = "tab-focus 8";
-        " 9" = "tab-focus 9";
-        " 0" = "tab-focus 10";
-
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-
-      command = {
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-
-      insert = {
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-    };
-
-    extraConfig = ''
-      config.unbind("gm")
-      config.unbind("gd")
-      config.unbind("gb")
-      config.unbind("tl")
-      config.unbind("gt")
-
-      c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
-      c.statusbar.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
-
-      config.load_autoconfig(True)
-    '';
-  };
-}

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -1,44 +0,0 @@
-# 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/shell/default.nix

@@ -1,4 +1,11 @@
+# Import all shell configurations
 {
-  imports =
+  imports = [
-    [ ./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./tmux.nix ./eza.nix ];
+    ./fzf.nix
+    ./zsh.nix
+    ./starship.nix
+    ./zoxide.nix
+    ./eza.nix
+    ./direnv.nix
+  ];
 }

home/programs/shell/direnv.nix

@@ -0,0 +1,6 @@
+{
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+}

home/programs/shell/eza.nix

@@ -7,7 +7,6 @@
     extraOptions = [
       "--group-directories-first"
       "--no-quotes"
-      "--git-ignore"
       "--icons=always"
     ];
   };

home/programs/shell/fzf.nix

@@ -1,6 +1,9 @@
 # Fzf is a general-purpose command-line fuzzy finder.
-{ config, lib, ... }:
+{
-let
+  config,
+  lib,
+  ...
+}: let
   accent = "#" + config.lib.stylix.colors.base0D;
   foreground = "#" + config.lib.stylix.colors.base05;
   muted = "#" + config.lib.stylix.colors.base03;
@@ -19,7 +22,7 @@ in {
     defaultOptions = [
       "--margin=1"
       "--layout=reverse"
-      "--border=rounded"
+      "--border=none"
       "--info='hidden'"
       "--header=''"
       "--prompt='/ '"

home/programs/shell/starship.nix

@@ -1,6 +1,9 @@
 # starship is a minimal, fast, and extremely customizable prompt for any shell!
-{ config, lib, ... }:
+{
-let
+  config,
+  lib,
+  ...
+}: let
   accent = "#${config.lib.stylix.colors.base0D}";
   background-alt = "#${config.lib.stylix.colors.base01}";
 in {
@@ -9,13 +12,17 @@ in {
     settings = {
       add_newline = true;
       format = lib.concatStrings [
+        "$nix_shell"
+        "$hostname"
         "$directory"
         "$git_branch"
         "$git_state"
         "$git_status"
         "$character"
       ];
-      directory = { style = accent; };
+      directory = {
+        style = accent;
+      };
 
       character = {
         success_symbol = "[❯](${accent})";
@@ -23,6 +30,12 @@ in {
         vimcmd_symbol = "[❮](cyan)";
       };
 
+      nix_shell = {
+        format = "[$symbol]($style) ";
+        symbol = "🐚";
+        style = "";
+      };
+
       git_branch = {
         symbol = "[](${background-alt}) ";
         style = "fg:${accent} bg:${background-alt}";
@@ -30,8 +43,7 @@ in {
       };
 
       git_status = {
-        format =
+        format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218)($ahead_behind$stashed)]($style)";
-          "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218)($ahead_behind$stashed)]($style)";
         style = "cyan";
         conflicted = "";
         renamed = "";

home/programs/shell/tmux.nix

@@ -1,58 +0,0 @@
-# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
-{ 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;
-    shell = "${pkgs.zsh}/bin/zsh";
-    prefix = "C-s";
-    terminal = "kitty";
-    keyMode = "vi";
-
-    extraConfig = ''
-      bind-key h select-pane -L
-      bind-key j select-pane -D
-      bind-key k select-pane -U
-      bind-key l select-pane -R
-
-      set -gq allow-passthrough on
-      bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt
-
-      bind-key -n C-Tab next-window
-      bind-key -n C-S-Tab previous-window
-      bind-key -n M-Tab new-window
-    '';
-
-    plugins = with pkgs; [
-      tmuxPlugins.vim-tmux-navigator
-      # tmuxPlugins.resurrect
-      tmuxPlugins.sensible
-      tmuxPlugins.tokyo-night-tmux
-    ];
-  };
-  home.packages = [ Config ];
-}

home/programs/shell/zsh.nix

@@ -1,66 +1,53 @@
 # My shell configuration
-{ pkgs, lib, config, ... }:
+{
-let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
 in {
+  home.packages = with pkgs; [
+    bat
+    ripgrep
+    tldr
+    witr
+  ];
 
-  home.packages = with pkgs; [ bat ripgrep tldr sesh ];
+  # Add go binaries to the PATH
+  home.sessionPath = ["$HOME/go/bin"];
 
-  home.sessionPath = [ "$HOME/go/bin" ];
+  home.sessionVariables = {
+    COLORTERM = "truecolor";
+  };
 
   programs.zsh = {
     enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
+    syntaxHighlighting = {
+      enable = true;
+      highlighters = [
+        "main"
+        "brackets"
+        "pattern"
+        "regexp"
+        "root"
+        "line"
+      ];
+    };
     historySubstringSearch.enable = true;
 
-    initExtraFirst = ''
-      bindkey -e
-      ${if fetch == "neofetch" then
-        pkgs.neofetch + "/bin/neofetch"
-      else if fetch == "nerdfetch" then
-        "nerdfetch"
-      else if fetch == "pfetch" then
-        "echo; ${pkgs.pfetch}/bin/pfetch"
-      else
-        ""}
-
-      function sesh-sessions() {
-        session=$(sesh list -t -c | fzf --height 70% --reverse)
-        [[ -z "$session" ]] && return
-        sesh connect $session
-      }
-
-      zle     -N             sesh-sessions
-      bindkey -M emacs '\es' sesh-sessions
-      bindkey -M vicmd '\es' sesh-sessions
-      bindkey -M viins '\es' sesh-sessions
-    '';
-
     history = {
       ignoreDups = true;
       save = 10000;
       size = 10000;
     };
 
-    profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''
+    profileExtra = lib.optionalString (config.home.sessionPath != []) ''
-      export PATH="$PATH''${PATH:+:}${
+      export PATH="$PATH''${PATH:+:}${lib.concatStringsSep ":" config.home.sessionPath}"
-        lib.concatStringsSep ":" config.home.sessionPath
-      }"
     '';
 
-    #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";
@@ -74,14 +61,17 @@ in {
       tree = "eza --icons=always --tree --no-quotes";
       sl = "ls";
       open = "${pkgs.xdg-utils}/bin/xdg-open";
-      icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+      cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
-      ssh = "kitty +kitten ssh";
+      mkdir = "mkdir -p";
 
+      obsidian-no-gpu = "env ELECTRON_OZONE_PLATFORM_HINT=auto obsidian --ozone-platform=x11";
       wireguard-import = "nmcli connection import type wireguard file";
 
-      notes =
+      notes = "nvim ~/notes/index.md --cmd 'cd ~/notes' -c ':lua Snacks.picker.smart()'";
-        "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':Telescope find_files'";
       note = "notes";
+      tmp = "nvim /tmp/$(date | sed 's/ //g;s/\\.//g').md";
+
+      nix-shell = "nix-shell --command zsh";
 
       # git
       g = "lazygit";
@@ -101,5 +91,98 @@ in {
       gaa = "git add .";
       gcm = "git commit -m";
     };
+
+    initContent =
+      # bash
+      ''
+        bindkey -e
+        ${
+          if fetch == "neofetch"
+          then pkgs.neofetch + "/bin/neofetch"
+          else if fetch == "nerdfetch"
+          then "nerdfetch"
+          else if fetch == "pfetch"
+          then "echo; ${pkgs.pfetch}/bin/pfetch"
+          else ""
+        }
+
+        function n4c() {
+          category=''${1:-all}
+          shift
+          args=''${*}
+          nix develop "github:nix4cyber/n4c#''${category}" ''${args} -c zsh
+        }
+
+        # search history based on what's typed in the prompt
+        autoload -U history-search-end
+        zle -N history-beginning-search-backward-end history-search-end
+        zle -N history-beginning-search-forward-end history-search-end
+        bindkey "^[OA" history-beginning-search-backward-end
+        bindkey "^[OB" history-beginning-search-forward-end
+
+        # General completion behavior
+        zstyle ':completion:*' completer _extensions _complete _approximate
+
+        # Use cache
+        zstyle ':completion:*' use-cache on
+        zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
+
+        # Complete the alias
+        zstyle ':completion:*' complete true
+
+        # Autocomplete options
+        zstyle ':completion:*' complete-options true
+
+        # Completion matching control
+        zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+        zstyle ':completion:*' keep-prefix true
+
+        # Group matches and describe
+        zstyle ':completion:*' menu select
+        zstyle ':completion:*' list-grouped false
+        zstyle ':completion:*' list-separator '''
+        zstyle ':completion:*' group-name '''
+        zstyle ':completion:*' verbose yes
+        zstyle ':completion:*:matches' group 'yes'
+        zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f'
+        zstyle ':completion:*:messages' format '%d'
+        zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b'
+        zstyle ':completion:*:descriptions' format '[%d]'
+
+        # Colors
+        zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
+
+        # case insensitive tab completion
+        zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
+        zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
+        zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
+        zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands
+        zstyle ':completion:*' special-dirs true
+        zstyle ':completion:*' squeeze-slashes true
+
+        # Sort
+        zstyle ':completion:*' sort false
+        zstyle ":completion:*:git-checkout:*" sort false
+        zstyle ':completion:*' file-sort modification
+        zstyle ':completion:*:eza' sort false
+        zstyle ':completion:complete:*:options' sort false
+        zstyle ':completion:files' sort false
+
+        ${lib.optionalString config.services.gpg-agent.enable ''
+          gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
+          export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"
+        ''}
+
+        # Allow foot to pipe command output
+        function precmd {
+          if ! builtin zle; then
+              print -n "\e]133;D\e\\"
+          fi
+        }
+        function preexec {
+          print -n "\e]133;C\e\\"
+        }
+
+      '';
   };
 }

home/programs/spicetify/default.nix

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

home/programs/thunar/default.nix

@@ -1,47 +1,178 @@
 # Thunar is a file explorer
-{ pkgs, ... }: {
+{
+  pkgs,
+  pkgs-stable,
+  config,
+  lib,
+  ...
+}: let
+  user = config.var.username;
+in {
   # ctrl + m to toggle the menubar
-  home.packages = with pkgs.xfce; [
+  home.packages =
-    thunar
+    (with pkgs-stable; [
-    xfconf
+      xfce.thunar
-    tumbler
+      xfce.xfconf
-    thunar-archive-plugin
+      xfce.tumbler
-    thunar-volman
+      xfce.thunar-archive-plugin
-  ];
+      xfce.thunar-volman
+      xfce.thunar-media-tags-plugin
+      p7zip
+      xarchiver
+    ])
+    ++ (with pkgs; [
+      # Icon themes: keep on global pkgs to avoid conflicts with other modules
+      papirus-icon-theme
+      material-icons
+      material-design-icons
+      material-symbols
+    ]);
 
-  home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = ''
+  gtk = {
+    enable = true;
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+
+    gtk4.theme = null;
+
+    # bookmarks for the side pane
+    gtk3.bookmarks = [
+      "file:///home/${user}/Downloads Downloads"
+      "file:///home/${user}/Pictures Pictures"
+      "file:///home/${user}/.config/nixos NixOS"
+      "file:///home/${user}/dev Development"
+    ];
+  };
+
+  qt.enable = true;
+
+  home.sessionVariables = {
+    XDG_ICON_DIR = "${pkgs.papirus-icon-theme}/share/icons/Papirus";
+    QS_ICON_THEME = "Papirus";
+    QT_STYLE_OVERRIDE = lib.mkForce "Fusion";
+  };
+
+  home.file.".config/xarchiver/xarchiverrc".text = ''
+    [xarchiver]
+    preferred_format=0
+    prefer_unzip=true
+    confirm_deletion=true
+    sort_filename_content=false
+    advanced_isearch=true
+    auto_expand=true
+    store_output=false
+    icon_size=2
+    show_archive_comment=false
+    show_sidebar=true
+    show_location_bar=true
+    show_toolbar=true
+    preferred_custom_cmd=
+    preferred_temp_dir=/tmp
+    preferred_extract_dir=./
+    allow_sub_dir=0
+    ensure_directory=true
+    overwrite=false
+    full_path=2
+    touch=false
+    fresh=false
+    update=false
+    store_path=false
+    updadd=true
+    freshen=false
+    recurse=true
+    solid_archive=false
+    remove_files=false
+  '';
+
+  home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml" = {
+    text = ''
+      <?xml version="1.1" encoding="UTF-8"?>
+
+      <channel name="thunar" version="1.0">
+        <property name="last-view" type="string" value="ThunarIconView"/>
+        <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_100_PERCENT"/>
+        <property name="last-window-maximized" type="bool" value="true"/>
+        <property name="last-separator-position" type="int" value="230"/>
+        <property name="last-statusbar-visible" type="bool" value="false"/>
+        <property name="last-menubar-visible" type="bool" value="false"/>
+        <property name="misc-single-click" type="bool" value="false"/>
+        <property name="shortcuts-icon-emblems" type="bool" value="true"/>
+        <property name="tree-icon-emblems" type="bool" value="true"/>
+        <property name="misc-file-size-binary" type="bool" value="false"/>
+        <property name="misc-thumbnail-draw-frames" type="bool" value="true"/>
+        <property name="misc-text-beside-icons" type="bool" value="false"/>
+        <property name="misc-change-window-icon" type="bool" value="false"/>
+        <property name="hidden-bookmarks" type="array">
+          <value type="string" value="computer:///"/>
+          <value type="string" value="recent:///"/>
+          <value type="string" value="network:///"/>
+        </property>
+        <property name="hidden-devices" type="array">
+          <value type="string" value="52FEA905FEA8E309"/>
+        </property>
+        <property name="last-toolbar-item-order" type="string" value="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17"/>
+        <property name="last-toolbar-visible-buttons" type="string" value="0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0"/>
+        <property name="last-location-bar" type="string" value="ThunarLocationButtons"/>
+        <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,118,111,50,50,50,50,993,50,50,84,50,151"/>
+        <property name="last-toolbar-items" type="string" value="menu:1,undo:1,back:1,forward:1,open-parent:0,open-home:0,redo:0,zoom-in:0,zoom-out:0,zoom-reset:0,location-bar:1,view-switcher:1,search:1,view-as-icons:0,view-as-detailed-list:0,view-as-compact-list:0,toggle-split-view:0,reload:0,new-tab:0,new-window:0,uca-action-1700000000000001:0"/>
+        <property name="last-side-pane" type="string" value="THUNAR_SIDEPANE_TYPE_SHORTCUTS"/>
+        <property name="last-image-preview-visible" type="bool" value="false"/>
+        <property name="misc-use-csd" type="bool" value="true"/>
+        <property name="default-view" type="string" value="ThunarIconView"/>
+        <property name="misc-thumbnail-max-file-size" type="uint64" value="1073741824"/>
+        <property name="misc-symbolic-icons-in-toolbar" type="bool" value="true"/>
+        <property name="misc-date-style" type="string" value="THUNAR_DATE_STYLE_SIMPLE"/>
+        <property name="shortcuts-icon-size" type="string" value="THUNAR_ICON_SIZE_16"/>
+        <property name="tree-icon-size" type="string" value="THUNAR_ICON_SIZE_16"/>
+        <property name="misc-symbolic-icons-in-sidepane" type="bool" value="true"/>
+        <property name="misc-open-new-window-as-tab" type="bool" value="false"/>
+        <property name="misc-full-path-in-tab-title" type="bool" value="true"/>
+        <property name="misc-show-delete-action" type="bool" value="false"/>
+      </channel>
+    '';
+    force = true;
+  };
+
+  xdg.configFile."Thunar/uca.xml".text = ''
     <?xml version="1.0" encoding="UTF-8"?>
-
+    <actions>
-    <channel name="thunar" version="1.0">
+      <action>
-      <property name="last-view" type="string" value="ThunarIconView"/>
+          <icon>utilities-terminal</icon>
-      <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_100_PERCENT"/>
+          <name>Open Terminal Here</name>
-      <property name="last-window-maximized" type="bool" value="true"/>
+          <unique-id>1700000000000001</unique-id>
-      <property name="last-separator-position" type="int" value="170"/>
+          <command>ghostty -d %f</command>
-      <property name="last-statusbar-visible" type="bool" value="false"/>
+          <description>Opens terminal in the selected folder</description>
-      <property name="last-menubar-visible" type="bool" value="false"/>
+          <patterns>*</patterns>
-      <property name="misc-single-click" type="bool" value="false"/>
+          <startup-notify/>
-      <property name="shortcuts-icon-emblems" type="bool" value="true"/>
+          <directories/>
-      <property name="tree-icon-emblems" type="bool" value="true"/>
+      </action>
-      <property name="misc-file-size-binary" type="bool" value="true"/>
+      <action>
-      <property name="misc-thumbnail-draw-frames" type="bool" value="false"/>
+          <icon></icon>
-      <property name="misc-text-beside-icons" type="bool" value="true"/>
+          <name>Extract here</name>
-      <property name="misc-change-window-icon" type="bool" value="true"/>
+          <submenu></submenu>
-      <property name="hidden-bookmarks" type="array">
+          <unique-id>1689618425925956-3</unique-id>
-        <value type="string" value="computer:///"/>
+          <command>xarchiver -x . %f</command>
-        <value type="string" value="recent:///"/>
+          <description>Extracts the archive into the directory it is located in.</description>
-        <value type="string" value="file:///"/>
+          <range>*</range>
-        <value type="string" value="network:///"/>
+          <patterns>*.tar.bz2;*.tar.gz;*.tar.xz;*.tar.Z;*.tar;*.taz;*.tb2;*.tbz;*.tbz2;*.tgz;*.txz;*.zip;*.bz2;*.docx;*.apk;*.gz;*.odt;</patterns>
-      </property>
+          <other-files/>
-      <property name="hidden-devices" type="array">
+      </action>
-        <value type="string" value="52FEA905FEA8E309"/>
+      <action>
-      </property>
+        <icon>package-x-generic</icon>
-      <property name="last-toolbar-item-order" type="string" value="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17"/>
+        <name>Compress here (tar.gz)</name>
-      <property name="last-toolbar-visible-buttons" type="string" value="0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0"/>
+        <submenu></submenu>
-      <property name="last-location-bar" type="string" value="ThunarLocationButtons"/>
+        <unique-id>1700000000000003</unique-id>
-      <property name="last-show-hidden" type="bool" value="false"/>
+        <command>tar -czvf %n.tar.gz %N</command>
-      <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_38_PERCENT"/>
+        <description>Creates a compressed archive (.tar.gz) of selected files/folders.</description>
-      <property name="last-details-view-column-widths" type="string" value="50,50,127,50,50,50,50,50,751,50,50,75,50,145"/>
+        <range>*</range>
-      <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"/>
+        <patterns>*</patterns>
-    </channel>
+        <directories/>
+        <other-files/>
+      </action>
+    </actions>
   '';
 }

home/programs/zen/default.nix

@@ -1,86 +0,0 @@
-{ 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/brightness/default.nix

@@ -1,40 +0,0 @@
-# - ## Brightness
-#- 
-#- This module provides a set of scripts to control the brightness of the screen.
-#-
-#- - `brightness-up` increases the brightness by 5%.
-#- - `brightness-down` decreases the brightness by 5%.
-#- - `brightness-set [value]` sets the brightness to the given value.
-#- - `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-
-{ pkgs, ... }:
-
-let
-  increments = "5";
-
-  brightness-change = pkgs.writeShellScriptBin "brightness-change" ''
-    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%+
-    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%-
-  '';
-
-  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
-    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
-  '';
-
-  brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
-    brightness-change up ${increments}
-  '';
-
-  brightness-down = pkgs.writeShellScriptBin "brightness-down" ''
-    brightness-change down ${increments}
-  '';
-
-in {
-  home.packages = [
-    pkgs.brightnessctl
-    brightness-change
-    brightness-up
-    brightness-down
-    brightness-set
-  ];
-}

home/scripts/caffeine/default.nix

@@ -1,33 +0,0 @@
-# - ## Caffeine
-#-
-#- Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-#-
-#- - `caffeine-status` - Check if hypridle is running. (0/1)
-#- - `caffeine-status-icon` - Check if hypridle is running. (icon)
-#- - `caffeine` - Toggle hypridle.
-
-{ pkgs, ... }:
-let
-  caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
-    [[ $(pidof "hypridle") ]] && echo "0" || echo "1"
-  '';
-
-  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
-    [[ $(pidof "hypridle") ]] && echo "󰾪" || echo "󰅶"
-  '';
-
-  caffeine = pkgs.writeShellScriptBin "caffeine" ''
-    if [[ $(pidof "hypridle") ]]; then
-      systemctl --user stop hypridle.service
-      title="󰅶  Caffeine Activated"
-      description="Caffeine is now active! Your screen will not turn off automatically."
-    else
-      systemctl --user start hypridle.service
-      title="󰾪  Caffeine Deactivated"
-      description="Caffeine is now deactivated! Your screen will turn off automatically."
-    fi
-
-    notif "caffeine" "$title" "$description"
-  '';
-
-in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }

home/scripts/default.nix

@@ -1,16 +0,0 @@
-{
-  imports = [
-    ./nixy
-    ./sounds
-    ./brightness
-    ./caffeine
-    ./hyprpanel
-    ./hyprfocus
-    ./night-shift
-    ./screenshot
-    ./nerdfont-fzf
-    ./notification
-    ./system
-    ./openvpn
-  ];
-}

home/scripts/hyprfocus/default.nix

@@ -1,47 +0,0 @@
-# - ## Hyprfocus
-#-
-#- A simple script to toggle focus on few windows in Hyprland.
-#- (disable gaps, border, shadow, opacity, etc.)
-#-
-#- - `hyprfocus-on` - Enable hyprfocus.
-#- - `hyprfocus-off` - Disable hyprfocus.
-#- - `hyprfocus-toggle` - Toggle hyprfocus.
-{ pkgs, ... }:
-let
-  hyprfocus-on = pkgs.writeShellScriptBin "hyprfocus-on"
-    # bash
-    ''
-      hyprpanel-hide
-
-      hyprctl --batch "\
-          keyword animations:enabled 0;\
-          keyword decoration:shadow:enabled 0;\
-          keyword decoration:blur:enabled 0;\
-          keyword general:gaps_in 0;\
-          keyword general:gaps_out 0;\
-          keyword general:border_size 1;\
-          keyword decoration:rounding 0;\
-          keyword decoration:inactive_opacity 1;\
-          keyword decoration:active_opacity 1"
-
-      echo "1" > /tmp/hyprfocus
-    '';
-
-  hyprfocus-off = pkgs.writeShellScriptBin "hyprfocus-off"
-    # bash
-    ''
-      hyprctl reload
-      hyprpanel-show
-      rm /tmp/hyprfocus
-    '';
-
-  hyprfocus-toggle = pkgs.writeShellScriptBin "hyprfocus-toggle"
-    # bash 
-    ''
-      if [ -f /tmp/hyprfocus ]; then
-        hyprfocus-off
-      else
-        hyprfocus-on
-      fi
-    '';
-in { home.packages = [ hyprfocus-on hyprfocus-off hyprfocus-toggle ]; }

home/scripts/hyprpanel/default.nix

@@ -1,47 +0,0 @@
-# - ## Hyprpanel
-#- 
-#- Quick scripts to toggle, reload, hide & show hyprpanel.
-#-
-#- - `hyprpanel-toggle` - Toggle hyprpanel (hide/show).
-#- - `hyprpanel-show` - Show hyprpanel.
-#- - `hyprpanel-hide` - Hide hyprpanel.
-#- - `hyprpanel-reload` - Reload hyprpanel.
-{ pkgs, ... }:
-let
-  hyprpanel-toggle = pkgs.writeShellScriptBin "hyprpanel-toggle" ''
-    hyprpanel toggleWindow bar-0
-    hyprpanel toggleWindow bar-1
-    hyprpanel toggleWindow bar-2
-    hyprpanel toggleWindow bar-3
-  '';
-
-  hyprpanel-hide = pkgs.writeShellScriptBin "hyprpanel-hide" ''
-    status=$(hyprpanel isWindowVisible bar-0)
-    if [[ $status == "true" ]]; then
-      hyprpanel toggleWindow bar-0
-    fi
-    status=$(hyprpanel isWindowVisible bar-1)
-    if [[ $status == "true" ]]; then
-      hyprpanel toggleWindow bar-1
-    fi
-  '';
-
-  hyprpanel-show = pkgs.writeShellScriptBin "hyprpanel-show" ''
-    status=$(hyprpanel isWindowVisible bar-0)
-    if [[ $status == "false" ]]; then
-      hyprpanel toggleWindow bar-0
-    fi
-    status=$(hyprpanel isWindowVisible bar-1)
-    if [[ $status == "false" ]]; then
-      hyprpanel toggleWindow bar-1
-    fi
-  '';
-
-  hyprpanel-reload = pkgs.writeShellScriptBin "hyprpanel-reload" ''
-    [ $(pgrep "hyprpanel") ] && pkill hyprpanel
-    hyprctl dispatch exec hyprpanel
-  '';
-in {
-  home.packages =
-    [ hyprpanel-toggle hyprpanel-reload hyprpanel-hide hyprpanel-show ];
-}