update todos

Former-commit-id: f760d9b564

.github/assets/README_template.md

@@ -0,0 +1,111 @@
+<div align="center">
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
+</div>
+
+<br>
+
+# Nixy
+
+<br>
+<div align="center">
+    <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}">
+    </a>
+    <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}">
+    </a>
+    <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}">
+    </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={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
+    </a>
+</div>
+<br>
+
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+It's a simple way to manage your system configuration and dotfiles.
+
+I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
+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:**
+
+- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
+- Stylix/base16 themes
+- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
+
+## Table of Content
+
+{md_table_of_content}
+
+## Gallery
+
+![Nixy helper, peaclock](.github/assets/nixy/1.png)
+![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
+![nvim, lazygit](.github/assets/nixy/3.png)
+![spotify, cava](.github/assets/nixy/4.png)
+
+## Architecture
+
+### 🏠 home
+
+Those are the dotfiles and configuration files for user-level configuration
+
+**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
+
+Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
+
+### 🎨 themes
+
+Those are the themes used in the system configuration.
+Those themes are based on [stylix](https://github.com/danth/stylix).
+See avaiable themes in [THEMES.md](docs/THEMES.md)
+
+### 💻 hosts
+
+Those are the host-specific configurations.
+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.
+
+## Installation
+
+1. Clone the repo
+
+```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
+3. Add your `hardware-configuration.nix` to your new host's folder
+4. Add your 'nixosConfigurations' inside `flake.nix`
+
+> [!Important]
+> 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.
+
+> [!TIP]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
+
+5. Build the system
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+```
+
+## Documentation
+
+- [THEMES](docs/THEMES.md): How themes work and how to create your own
+- [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.
+
+- [TODO](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License

.github/scripts/create_readme.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Create the README.md file from the .github/assets/README_template.md file
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+README_FILE="./README.md"
+
+table_of_content=$(markdown-table-of-contents --start-by 2 ./.github/assets/README_template.md) # https://github.com/anotherhadi/markdown-table-of-contents
+readme_content=$(cat "./.github/assets/README_template.md")
+
+# Replace variables
+readme_content=${readme_content//\{primarycolor\}/A594FD}
+readme_content=${readme_content//\{backgroundcolor\}/0b0b0b}
+readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
+
+echo "[//]: # (This file is autogenerated)" >"$README_FILE"
+echo "$readme_content" >>"$README_FILE"
+sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
+mv "/tmp/readme.md" "$README_FILE"

.github/scripts/create_scripts_docs.sh

@@ -0,0 +1,26 @@
+#!/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

@@ -0,0 +1,60 @@
+#!/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

@@ -0,0 +1,24 @@
+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
+          ./docs/.github/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

.github/workflows/update-readme.yml

@@ -0,0 +1,31 @@
+on:
+  push:
+     paths:
+       - '.github/assets/README_template.md'
+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: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '^1.23'
+      - name: Install required dependencies
+        run: |
+          go install github.com/anotherhadi/markdown-table-of-contents@latest
+      - name: Run a script
+        run: |
+          chmod +x ./.github/scripts/create_readme.sh
+          ./.github/scripts/create_readme.sh
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git add .
+          git commit -m "Update README.md (auto)"
+          git push

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

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

.sops.yaml

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

README.md

@@ -1,87 +1,120 @@
-[//]: # (Title: Nixy)  
+[//]: # (This file is autogenerated)
-[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+<div align="center">
-[//]: # (Author: Hadi)  
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
-[//]: # (Date: 06/17/24)
+</div>
-
+
-<div align="center">
+<br>
-    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+
-</div>
+# Nixy
-
+
-<br><br>
+<br>
-
+<div align="center">
-<div align="center">
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
-    <a href="https://github.com/anotherhadi/nixy">
+        <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/static/v1.svg?style=for-the-badge&label=Version&message=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
+    </a>
-    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <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/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+    </a>
-    </a>
+    <a href="https://nixos.org">
-    <a href="https://github.com/anotherhadi/nixy/">
+        <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/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
+    </a>
-    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-    <a href="https://nixos.org">
+        <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/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
+    </a>
-    </a>
+</div>
-    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+<br>
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
+
-    </a>
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-</div>
+It's a simple way to manage your system configuration and dotfiles.
-
+
-<br><br>
+I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
-
+This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
-<div align="center">
+I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
-    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
+
-</div>
+**Nixy key points:**
-
+
-# Nixy
+- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
-
+- Stylix/base16 themes
-**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
-It's a simple way to manage your system configuration and dotfiles.
+
-
+## Table of Content
-## Table of Content
+
-
+- [Table of Content](#table-of-content)
-- [Nixy](#nixy)
+- [Gallery](#gallery)
-  - [Table of Content](#table-of-content)
+- [Architecture](#architecture)
-  - [Gallery](#gallery)
+  - [🏠 home](#-home)
-  - [Architecture](#architecture)
+  - [🐧 nixos](#-nixos)
-  - [Installation](#installation)
+  - [🎨 themes](#-themes)
-  - [Documentation](#documentation)
+  - [💻 hosts](#-hosts)
-
+- [Installation](#installation)
-## Gallery
+- [Documentation](#documentation)
-
+
-![nixy1](docs/src/nixy/1.png)
+## Gallery
-![nixy2](docs/src/nixy/2.png)
+
-![nixy3](docs/src/nixy/3.png)
+![Nixy helper, peaclock](.github/assets/nixy/1.png)
-
+![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
-## Architecture
+![nvim, lazygit](.github/assets/nixy/3.png)
-
+![spotify, cava](.github/assets/nixy/4.png)
-- 🏠 `home` are the dotfiles and configuration files for the user
+
-- 💻 `hosts` are the system configuration files
+## Architecture
-  - `laptop` is mine
+
-  - `guest` is a template that you can copy and modify for your own system
+### 🏠 home
-  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
+
-  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
+Those are the dotfiles and configuration files for user-level configuration
-- 🤫 `secrets` are the secrets files encrypted with sops
+
-
+**Subfolders:**
-## Installation
+
-
+- `programs` is a collection of apps configured with home-manager
-```sh
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+- `system` is some "desktop environment" configuration
-```
+
-
+### 🐧 nixos
-- Change the username in the flake.nix file
+
-- import the guest configuration instead of the `hosts/laptop` one
+Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
-- import your hardware-configuration.nix into the `hosts/guest` folder
+
-
+### 🎨 themes
-```sh
+
-sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
+Those are the themes used in the system configuration.
-```
+Those themes are based on [stylix](https://github.com/danth/stylix).
-
+See avaiable themes in [THEMES.md](docs/THEMES.md)
-## Documentation
+
-
+### 💻 hosts
-- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+
-- [APPS.md](docs/APPS.md): Which apps are installed
+Those are the host-specific configurations.
-- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+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.
-- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+
-- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
+## Installation
-- [LICENSE](LICENSE): MIT License
+
+1. Clone the repo
+
+```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
+3. Add your `hardware-configuration.nix` to your new host's folder
+4. Add your 'nixosConfigurations' inside `flake.nix`
+
+> [!Important]
+> 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.
+
+> [!TIP]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
+
+5. Build the system
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+```
+
+## Documentation
+
+- [THEMES](docs/THEMES.md): How themes work and how to create your own
+- [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.
+
+- [TODO](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License

docs/APPS.md

@@ -1,33 +0,0 @@
-# APPS
-
-*non-exhaustive list*
-
-| Category       | Software      |
-|----------------|---------------|
-| WM             | Hyprland      |
-|                | hyprlock      |
-|                | hyprpaper     |
-|                | hypridle      |
-|                | wlogout       |
-| Bar            | waybar        |
-| Terminal       | kitty         |
-| Shell          | zsh           |
-|                | tmux          |
-|                | starship      |
-|                | bat           |
-|                | eza           |
-|                | zoxide        |
-|                | fzf           |
-| Editor         | neovim(nixvim)|
-| File manager   | lf            |
-|                | thunar        |
-| Browser        | qutebrowser   |
-| Music          | spicetify     |
-| Notifications  | dunst         |
-| Launcher       | wofi          |
-| DM             | tuigreet      |
-| Secrets        | sops-nix      |
-| Misc           | lazygit       |
-|                | neofetch      |
-|                | cava          |
-|                | ...           |

docs/CONTRIBUTING.md

@@ -1,10 +1,16 @@
 # Contributing to Nixy
 
-Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the `docs/TODO.md` file!
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the [TODO.md](./TODO.md) file!
 
 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, ...).
+- Write your changes (new theme, bug fixes, task in to-do, ...).
 - 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`
+
+> [!IMPORTANT]
+> Don't push your host's folder

docs/KEYBINDINGS-HYPRLAND.md

@@ -0,0 +1,46 @@
+[//]: # (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 |
+| Qutebrowser | SUPER + B |
+| Bitwarden | SUPER + K |
+| Lock | SUPER + L |
+| Powermenu | SUPER + X |
+| Launcher | SUPER + SPACE |
+| Toggle HyprFocus | SHIFT + SUPER + SPACE |
+| 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 window | SUPER + PRINT |
+| Screenshot monitor | PRINT |
+| Screenshot region | SHIFT + SUPER + PRINT |
+| Screenshot region then edit | ALTPRINT |
+| Search on internet with wofi | SHIFT + SUPER + S |
+| 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 |
+| Lock when closing Lid | switch:Lid Switch |
+| Sound Up | XF86AudioRaiseVolume |
+| Sound Down | XF86AudioLowerVolume |
+| Brightness Up | XF86MonBrightnessUp |
+| Brightness Down | XF86MonBrightnessDown |

docs/SCRIPTS.md

@@ -1,51 +1,88 @@
-# Scripts
+[//]: # (This file is autogenerated)
-
+# Scripts
-## Nix/NixOs shortcuts
+
-
+Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path.
-- `nixy-edit`
+
-- `nixy-rebuild`
+## Brightness
-- `nixy-update`
+
-- `nixy-gc` # garbage collection
+This module provides a set of scripts to control the brightness of the screen.
-- `nixy-cb` # clean boot menu
+
-
+- `brightness-up` increases the brightness by 5%.
-## Brightness control
+- `brightness-down` decreases the brightness by 5%.
-
+- `brightness-set [value]` sets the brightness to the given value.
-- `brightness-up`
+- `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-- `brightness-down`
+
-- `brightness-change <up/down> <increment>`
+## Caffeine
-
+
-## Sound control
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
+
-- `sound-up`
+- `caffeine-status` - Check if hypridle is running. (0/1)
-- `sound-down`
+- `caffeine-status-icon` - Check if hypridle is running. (icon)
-- `sound-toggle`
+- `caffeine` - Toggle hypridle.
-- `sound-output`
+
-- `sound-change <up/down/mute> <increment>`
+## Hyprfocus
-
+
-## Caffeine
+A simple script to toggle focus on few windows in Hyprland.
-
+(disable gaps, border, shadow, opacity, etc.)
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
-
+- `hyprfocus-on` - Enable hyprfocus.
-- `caffeine` # Toggle caffeine
+- `hyprfocus-off` - Disable hyprfocus.
-- `caffeine-status` # Return active/inactive
+- `hyprfocus-toggle` - Toggle hyprfocus.
-
+
-## Night-Shift
+## Hyprpanel
-
+
-Blue light filter, using wlsunset
+Quick scripts to toggle, reload and kill hyprpanel.
-
+
-- `night-shift-on`
+- `hyprpanel-toggle` - Toggle hyprpanel.
-- `night-shift-off`
+- `hyprpanel-reload` - Reload hyprpanel.
-
+- `hyprpanel-kill` - Kill hyprpanel.
-## Nerdfont FZF
+
-
+## Nerdfont FZF
-Nerdfont fzf is a quick way to search for nerdfont icons locally.
+
-It will copy the selected icon to the clipboard.
+This module provides a script to search for Nerd Fonts icons using fzf.
-
+
-- `nerdfont-fzf`
+- `nerdfont-fzf` - Search for Nerd Fonts icons using fzf.
-
+
-## Compress/Extract
+## Night-Shift
-
+
-Some shortcut to compress and extract files.
+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.
-
+
-- `compress` ...
+- `night-shift-on` activates Night-Shift.
-- `extract` ...
+- `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.
+
+
+
+## Screenshot
+
+This module provides a script to take screenshots using `hyprshot` 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.
+- `powermenu` - Open power dropdown menu.
+- `lock` - Lock the screen.
+

docs/THEMES.md

@@ -1,31 +1,21 @@
 # Themes
 
-Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps installed.
+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 at the top of your host's variables file.
+You can change the selected theme by changing the import statement of your host's configuration.nix file.
 
-*To apply the theme to duckduckgo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`.*
+> [!TIP]
+> To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
 
-## Create your own theme
+## Create your theme
 
-Create a copy of one of the existing theme and change the variables.
+Create a copy of one of the existing themes and change the variables.
-Wallpapers are loaded from the `home/wallpapers` folder.
+Wallpapers are loaded from the [nixy-wallpapers](https://github.com/anotherhadi/nixy-wallpapers) repo.
 
 ## Gallery
 
 ### Nixy
 
-![nixy1](src/nixy/1.png)
+![nixy1](../.github/assets/nixy/1.png)
-![nixy2](src/nixy/2.png)
+![nixy2](../.github/assets/nixy/2.png)
-![nixy3](src/nixy/3.png)
+![nixy3](../.github/assets/nixy/3.png)
-
+![nixy4](../.github/assets/nixy/4.png)
-### Catppuccin
-
-![catppuccin1](src/catppuccin/1.png)
-![catppuccin2](src/catppuccin/2.png)
-![catppuccin3](src/catppuccin/3.png)
-
-### Windows
-
-![windows1](src/windows/1.png)
-![windows2](src/windows/2.png)
-![windows3](src/windows/3.png)

docs/TODO.md

@@ -1,10 +1,13 @@
-# Todolist
+# Todolist
-
+
-- [ ] Installation script
+feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
-- [ ] Themes
+
-  - [ ] MacOS theme
+- [!] Qutebrowser Bitwarden integration (I need this.)
-- [ ] Make hyprcursor work
+
-- [ ] Nixvim
+- [ ] Nixvim
-  - [ ] Telescope shortcut for file content
+  - [ ] Change headings foreground
-  - [ ] Markdown snippets
+  - [ ] neotest golang
-  - [ ] Make whichkey better
+  - [ ] nvim dap
+
+- [ ] Tofi configuration
+- [ ] OS Hardening with nix-mineral

docs/scripts/compress_src_png.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Compress png files in ./docs/src
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-for file in ./docs/src/*/*.png; do
-  optipng "$file"
-done

docs/scripts/create_guest_config.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is used to copy my own configuration to the `./hosts/guest` one, and changing some settings
-
-[[ -d "./hosts" ]] || (
-  echo "Folder ./hosts not found"
-  exit 1
-)
-
-LAPTOP_CONFIG="./hosts/laptop"
-GUEST_CONFIG="./hosts/guest"
-
-cp "$LAPTOP_CONFIG/configuration.nix" "$GUEST_CONFIG/configuration.nix"
-cp "$LAPTOP_CONFIG/variables.nix" "$GUEST_CONFIG/variables.nix"
-
-# Remove the NVIDIA driver import
-config=$(cat "$LAPTOP_CONFIG/configuration.nix")
-config=$(echo "$config" | sed 's/..\/shared\/nvidia/# ..\/shared\/nvidia/')
-config=$(echo "$config" | sed 's/..\/shared\/prime/# ..\/shared\/prime/')
-echo "$config" >"$GUEST_CONFIG/configuration.nix"
-
-variables=$(cat "$LAPTOP_CONFIG/variables.nix")
-variables=$(echo "$variables" | sed 's/112569860+anotherhadi@users.noreply.github.com/your_email/')
-variables=$(echo "$variables" | sed 's/hadi/your_username/')
-variables=$(echo "$variables" | sed 's/Hadi/your_username/')
-variables=$(echo "$variables" | sed 's/sops = true/sops = false/')
-variables=$(echo "$variables" | sed 's/nextcloud = true/nextcloud = false/')
-variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/')
-echo "$variables" >"$GUEST_CONFIG/variables.nix"

docs/scripts/create_readme.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Create the README.md file from the docs/src/README_template.md file
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-README_FILE="./README.md"
-
-header=$(cat "./docs/src/header.md")
-table_of_content=$(~/go/bin/md-table-of-contents ./docs/src/README_template.md)
-readme_content=$(cat "./docs/src/README_template.md")
-
-echo "${header//\{date\}/$(date '+%D')}" >"$README_FILE"
-echo "${readme_content//\{md_table_of_content\}/$table_of_content}" >>"$README_FILE"

docs/scripts/install.sh

@@ -1,10 +0,0 @@
-# installation script...
-
-# check if on nixos
-# check if ./hosts exist
-# check if gum is installed (dependencie)
-# save path
-# remove .git
-# git init and initial commit
-# create custom configuration
-# save it to ./hosts

docs/scripts/take_rice_screenshot.sh

@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-[ "$1" = "" ] && echo "Usage: $0 <theme_name>" && exit 1
-theme_name=$1
-
-# Switch to workspace 1
-sleep 2
-
-# Step 1
-kitty --class peaclock peaclock &
-sleep 1
-menu &
-sleep 1
-hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "1.png" -d
-sleep 2
-pkill peaclock
-menu
-sleep 2
-
-# Step 2
-kitty cmatrix &
-sleep 1
-kitty &
-sleep 1
-qutebrowser &
-sleep 3
-hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "2.png" -d
-sleep 2
-pkill cmatrix
-pkill --newest qutebrowser ""
-pkill --newest kitty
-sleep 2
-
-# Step 3
-kitty cava &
-sleep 1
-spotify &
-sleep 10
-brightness-down
-sleep 1
-hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "3.png" -d
-sleep 2

docs/src/README_template.md

@@ -1,48 +0,0 @@
-
-# Nixy
-
-**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
-It's a simple way to manage your system configuration and dotfiles.
-
-## Table of Content
-
-{md_table_of_content}
-
-## Gallery
-
-![nixy1](docs/src/nixy/1.png)
-![nixy2](docs/src/nixy/2.png)
-![nixy3](docs/src/nixy/3.png)
-
-## Architecture
-
-- 🏠 `home` are the dotfiles and configuration files for the user
-- 💻 `hosts` are the system configuration files
-  - `laptop` is mine
-  - `guest` is a template that you can copy and modify for your own system
-  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
-  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
-- 🤫 `secrets` are the secrets files encrypted with sops
-
-## Installation
-
-```sh
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-```
-
-- Change the username in the flake.nix file
-- import the guest configuration instead of the `hosts/laptop` one
-- import your hardware-configuration.nix into the `hosts/guest` folder
-
-```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
-```
-
-## Documentation
-
-- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
-- [APPS.md](docs/APPS.md): Which apps are installed
-- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
-- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
-- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
-- [LICENSE](LICENSE): MIT License

docs/src/header.md

@@ -1,34 +0,0 @@
-[//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
-[//]: # (Author: Hadi)  
-[//]: # (Date: {date})
-
-<div align="center">
-    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
-</div>
-
-<br><br>
-
-<div align="center">
-    <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
-    </a>
-    <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
-    </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=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
-    </a>
-</div>
-
-<br><br>
-
-<div align="center">
-    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
-</div>

docs/src/nixy/1.png.REMOVED.git-id

@@ -1 +0,0 @@
-8c00e379ddd7f89e4bbf9f381a5721d980c8026f

docs/src/windows/1.png.REMOVED.git-id

@@ -1 +0,0 @@
-62b52ad02a886c19a8cfe1ea17e8aaad50f23632

flake.nix

@@ -7,6 +7,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -15,39 +16,41 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    spicetify-nix = {
-    spicetify-nix.url = "github:the-argus/spicetify-nix";
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    nurpkgs.url = "github:nix-community/NUR";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixy-wallpapers = {
+      url = "github:anotherhadi/nixy-wallpapers";
+      flake = false;
+    };
+    stylix.url = "github:danth/stylix";
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    hyprswitch.url = "github:h3rmt/hyprswitch/release";
   };
 
-  outputs = inputs@{ nixpkgs, nur, ... }: {
+  outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-
+      nixy = # CHANGEME
-      nixy = nixpkgs.lib.nixosSystem {
+        nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+          system = "x86_64-linux";
-        modules = [
+          modules = [
-          ./hosts/laptop/configuration.nix
+            {
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
+              nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
-          inputs.home-manager.nixosModules.home-manager
+              _module.args = { inherit inputs; };
-          {
+            }
-            nixpkgs.overlays = [ nur.overlay ];
+            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
-            _module.args = { inherit inputs; };
+            inputs.home-manager.nixosModules.home-manager
-            home-manager = {
+            inputs.stylix.nixosModules.stylix
-              useGlobalPkgs = true;
+            ./hosts/laptop/configuration.nix # CHANGEME
-              useUserPackages = true;
+          ];
-              users."hadi" = import ./home/laptop.nix; # CHANGE ME
+        };
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
-        ];
-      };
-
     };
   };
 }

home/laptop.nix

@@ -1,90 +0,0 @@
-{ pkgs, config, ... }: {
-
-  imports = [
-    ../hosts/laptop/variables.nix
-
-    # Programs
-    ./programs/btop
-    ./programs/cava
-    ./programs/kitty
-    ./programs/nvim
-    ./programs/qutebrowser
-    ./programs/spicetify
-
-    # Scripts
-    ./scripts # All scripts
-
-    # System
-    ./system/dunst
-    ./system/git
-    ./system/gtk
-    ./system/hyprland
-    ./system/shell
-    ./system/sops/laptop.nix
-    ./system/waybar
-    ./system/wlogout
-    ./system/wofi
-  ];
-
-  home = {
-    inherit (config.var) username;
-    inherit (config.var) homeDirectory;
-
-    packages = with pkgs; [
-      swappy
-      imv
-      discord
-      obsidian
-      xfce.thunar
-      bitwarden
-      vlc
-
-      # Dev
-      go
-      cargo
-      nodejs
-      python3
-      jq
-
-      # Utils
-      fd
-      bc
-      gcc
-      blueman
-      zip
-      unzip
-      xdg_utils
-      wget
-      curl
-      wf-recorder
-      glow
-      nwg-displays
-      wireguard-tools
-      bitwarden-cli
-      optipng
-
-      # Just cool
-      peaclock
-      cbonsai
-      pipes
-      cmatrix
-
-      # Backup
-      vscode
-      tor-browser
-      firefox
-      neovide
-    ];
-
-    # Import wallpapers into $HOME/wallpapers
-    file."wallpapers" = {
-      recursive = true;
-      source = ./wallpapers;
-    };
-
-    stateVersion = "24.05";
-  };
-
-  programs.home-manager.enable = true;
-
-}

home/programs/btop/default.nix

@@ -1,9 +0,0 @@
-{
-  programs.btop = {
-    enable = true;
-    settings = {
-      color_theme = "Default";
-      theme_background = false;
-    };
-  };
-}

home/programs/cava/default.nix

@@ -1,13 +0,0 @@
-{ config, ... }: {
-  programs.cava = {
-    enable = true;
-    settings = {
-      general.framerate = 60;
-      smoothing.noise_reduction = 88;
-      color = {
-        background = "'#${config.var.theme.colors.bg}'";
-        foreground = "'#${config.var.theme.colors.accent}'";
-      };
-    };
-  };
-}

home/programs/fetch/neofetch/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [ neofetch ];
 
   xdg.configFile."neofetch/ascii.txt".text = ''
@@ -109,9 +109,6 @@
     song_format="%artist% - %album% - %title%"
     song_shorthand="off"
     mpc_args=()
-    colors=(${toString config.var.theme.colors.accentNumber} 1 ${
-      toString config.var.theme.colors.accentNumber
-    } ${toString config.var.theme.colors.accentNumber} 7)
     bold="on"
     underline_enabled="on"
     underline_char="-"

home/programs/fetch/nerdfetch/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
           ostype="$(uname)"
@@ -345,9 +345,9 @@ let
 
           ## USER VARIABLES -- YOU CAN CHANGE THESE
 
-          lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          lc="$reset$bold$magenta" # labels
-          nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          nc="$reset$bold$magenta" # labels
-          hn="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          hn="$reset$bold$magenta" # labels
           ic="$reset$white"          # info
           c0="$reset$grey"           # first color
           c1="$reset$white"          # second color

home/programs/git/default.nix

@@ -1,8 +1,12 @@
-{ config, ... }: {
+{ config, ... }:
+let
+  username = config.var.git.username;
+  email = config.var.git.email;
+in {
   programs.git = {
     enable = true;
-    userName = config.var.git.username;
+    userName = username;
-    userEmail = config.var.git.email;
+    userEmail = email;
     ignores = [
       ".cache/"
       ".DS_Store"

home/programs/kitty/default.nix

@@ -1,6 +1,15 @@
-{ config, pkgs, ... }: {
+{
   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;
@@ -10,39 +19,10 @@
       confirm_os_window_close = "0";
       remember_window_size = "no";
       disable_ligatures = "never";
-      shell = "${pkgs.tmux}/bin/tmux";
       url_style = "curly";
       cursor_shape = "Underline";
-      cursor_underline_thickness = config.var.theme.border-size;
+      cursor_underline_thickness = 3;
-      window_padding_width = config.var.theme.gaps-in;
+      window_padding_width = 10;
-
-      # Font
-      font_family = config.var.theme.font-mono;
-      font_size = config.var.theme.font-size;
-
-      # Colors
-      background = "#" + config.var.theme.colors.bg;
-      url_color = "#" + config.var.theme.colors.accent;
-      color0 = "#" + config.var.theme.colors.c0;
-      color8 = "#" + config.var.theme.colors.c8;
-      color1 = "#" + config.var.theme.colors.c1;
-      color9 = "#" + config.var.theme.colors.c9;
-      color2 = "#" + config.var.theme.colors.c2;
-      color10 = "#" + config.var.theme.colors.c10;
-      color3 = "#" + config.var.theme.colors.c3;
-      color11 = "#" + config.var.theme.colors.c11;
-      color4 = "#" + config.var.theme.colors.c4;
-      color12 = "#" + config.var.theme.colors.c12;
-      color5 = "#" + config.var.theme.colors.c5;
-      color13 = "#" + config.var.theme.colors.c13;
-      color6 = "#" + config.var.theme.colors.c6;
-      color14 = "#" + config.var.theme.colors.c14;
-      color7 = "#" + config.var.theme.colors.c7;
-      color15 = "#" + config.var.theme.colors.c15;
-      cursor = "#" + config.var.theme.colors.fg;
-      cursor_text_color = "#" + config.var.theme.colors.bg;
-      selection_foreground = "#" + config.var.theme.colors.accentFg;
-      selection_background = "#" + config.var.theme.colors.accent;
     };
   };
 }

home/programs/lazygit/default.nix

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

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

home/programs/nextcloud/default.nix

@@ -0,0 +1,7 @@
+# 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/nvim/colorscheme.nix

@@ -1,9 +0,0 @@
-{
-  programs.nixvim = {
-    enable = true;
-    colorschemes.catppuccin = {
-      enable = true;
-      settings = { transparent_background = true; };
-    };
-  };
-}

home/programs/nvim/default.nix

@@ -1,30 +1,21 @@
+# Nixvim is a NixOS module that installs and configures Neovim
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/auto-pairs.nix
-    ./plugins/bufferline.nix
-    ./plugins/lazygit.nix
-    ./plugins/telescope.nix
-    ./plugins/nvim-tree.nix
-    ./plugins/lightline.nix
-    ./plugins/git.nix
     ./plugins/cmp.nix
-    ./plugins/none-ls.nix
+    ./plugins/dashboard.nix
-    ./plugins/wilder.nix
     ./plugins/lsp.nix
-    ./plugins/treesitter.nix
+    ./plugins/markdown.nix
-    ./plugins/toggleterm.nix
+    ./plugins/tree.nix
-    ./plugins/copilot.nix
+    ./plugins/ui.nix
-    ./plugins/whichkey.nix
+    ./plugins/utils.nix
-    ./plugins/alpha.nix
+    ./plugins/dap.nix
-    ./plugins/keymaps.nix
+    ./plugins/telescope.nix
-    ./plugins/comment.nix
+    ./plugins/zenmode.nix
-    ./plugins/oil.nix
+
-    ./plugins/trouble.nix
-    ./plugins/tmux-navigator.nix
-    ./plugins/noice.nix
-    ./plugins/obsidian.nix
     ./options.nix
-    ./colorscheme.nix
+    ./keymaps.nix
   ];
+
+  programs.nixvim.enable = true;
 }

home/programs/nvim/keymaps.nix

@@ -0,0 +1,310 @@
+{
+  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,5 +1,4 @@
 {
-
   programs.nixvim.globals.mapleader = " ";
   programs.nixvim.opts = {
     updatetime = 50; # Faster completion
@@ -22,16 +21,18 @@
     hlsearch = true;
     smartcase = true;
     wildmode = "list:longest";
-    completeopt = [ "menuone" "noselect" ];
+    completeopt = [ "menuone" "noselect" "noinsert" ];
     signcolumn = "yes";
-    cursorline = true;
+    cursorline = false;
     scrolloff = 8;
     mouse = "a";
+    termguicolors = true;
+    showmode = false;
 
     wrap = false;
 
     swapfile = false;
     undofile = true;
-    conceallevel = 2;
+    conceallevel = 3;
   };
 }

home/programs/nvim/plugins/auto-pairs.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.nvim-autopairs = { enable = true; }; }

home/programs/nvim/plugins/bufferline.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.bufferline = { enable = true; }; }

home/programs/nvim/plugins/cmp.nix

@@ -15,8 +15,12 @@
         sources = [
           { name = "nvim_lsp"; }
           { name = "luasnip"; }
-          { name = "buffer"; }
+          {
+            name = "buffer";
+            option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
+          }
           { name = "nvim_lua"; }
+          { name = "mkdnflow"; }
           { name = "path"; }
         ];
 
@@ -80,7 +84,7 @@
           completion = {
             winhighlight =
               "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
-            scrollbar = true;
+            scrollbar = false;
             sidePadding = 0;
             border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
           };

home/programs/nvim/plugins/comment.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.comment = { enable = true; }; }

home/programs/nvim/plugins/copilot.nix

@@ -1,5 +0,0 @@
-{
-  programs.nixvim.plugins.copilot-vim = {
-    enable = true;
-  };
-}

home/programs/nvim/plugins/dap.nix

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

home/programs/nvim/plugins/dashboard.nix

@@ -1,9 +1,15 @@
-{ config, ... }: {
+{ 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 = "#${config.var.theme.colors.accent}";
+    AlphaHeaderColor.fg = accent;
-    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
+    AlphaTextColor.fg = foreground;
-    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
+    AlphaShortcutColor.fg = muted;
   };
 
   programs.nixvim.plugins.alpha = {
@@ -70,8 +76,22 @@
           {
             type = "button";
             val = "  NixOs Config";
+            on_press.__raw = "function() vim.cmd[[Neotree ${configDir}]] end";
+            opts = {
+              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 ${config.var.configDirectory}]] end";
+              "function() vim.cmd[[e ${configDir}/docs/KEYBINDINGS.md]] end";
             opts = {
               shortcut = "nc";
               position = "center";

home/programs/nvim/plugins/git.nix

@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.gitsigns = {
-    enable = true;
-    settings = { current_line_blame = false; };
-  };
-}

home/programs/nvim/plugins/keymaps.nix

@@ -1,71 +0,0 @@
-{
-  programs.nixvim.keymaps = [
-    {
-      key = "<leader>e";
-      action = "<CMD>Neotree toggle<CR>";
-    }
-    {
-      key = "<space>fm";
-      action = "<CMD>lua vim.lsp.buf.format()<CR>";
-    }
-
-    {
-      key = "<leader>ot";
-      action = "<cmd>lua require('obsidian').util.toggle_checkbox()<cr>";
-    }
-
-    {
-      key = "<leader>oo";
-      action = "<cmd>ObsidianQuickSwitch<cr>";
-    }
-
-    {
-      key = "<leader>on";
-      action = "<cmd>ObsidianNew<cr>";
-    }
-
-    {
-      key = "<leader>of";
-      action = "<cmd>ObsidianSearch<cr>";
-    }
-
-    {
-      key = "<leader>oi";
-      action = "<cmd>ObsidianPasteImg<cr>";
-    }
-
-    {
-      key = "<leader>E";
-      action = "<cmd>Oil<cr>";
-    }
-
-    {
-      key = "<leader>t";
-      action = "<cmd>TroubleToggle<cr>";
-    }
-
-    {
-      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>";
-    }
-
-    # Terminal Mappings
-    {
-      mode = "t";
-      key = "<esc>";
-      action = "<C-\\><C-n>";
-    }
-  ];
-}

home/programs/nvim/plugins/lazygit.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.lazygit = { enable = true; }; }

home/programs/nvim/plugins/lightline.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.lualine = { enable = true; }; }

home/programs/nvim/plugins/lsp.nix

@@ -11,6 +11,7 @@
         tailwindcss.enable = true;
         html.enable = true;
         svelte.enable = true;
+        marksman.enable = true;
       };
       keymaps.lspBuf = {
         "gd" = "definition";
@@ -20,5 +21,25 @@
         "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/markdown.nix

@@ -0,0 +1,172 @@
+# The render-markdown.nvim plugin is a plugin that renders markdown files in a neovim in a more readable way.
+{ config, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  muted = "#${config.lib.stylix.colors.base03}";
+  background = "#${config.lib.stylix.colors.base00}";
+in {
+
+  programs.nixvim = {
+    plugins.mkdnflow = {
+      enable = true;
+      modules = { conceal = false; };
+
+      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";
+        };
+      };
+    };
+    extraFiles = {
+      "after/ftplugin/markdown.lua".text = ''
+        vim.bo.tabstop = 2
+        vim.bo.shiftwidth = 2
+        vim.bo.expandtab = true 
+      '';
+    };
+    highlight = {
+      RenderMarkdownBg.bg = background;
+      RenderMarkdownH1.fg = accent;
+      RenderMarkdownH2.fg = muted;
+      RenderMarkdownH3.fg = muted;
+      RenderMarkdownH4.fg = muted;
+      RenderMarkdownH5.fg = muted;
+      RenderMarkdownH6.fg = muted;
+      RenderMarkdownTodo.fg = muted;
+      RenderMarkdownWarning.fg = accent;
+    };
+    plugins.render-markdown = {
+      enable = true;
+      settings = {
+        heading = {
+          icons = [ "# " "󰲣 " "󰲥 " "󰲧 " "󰲩 " "󰲫 " ];
+          backgrounds = [ "RenderMarkdownBg" ];
+          foregrounds = [
+            "RenderMarkdownH1"
+            "RenderMarkdownH2"
+            "RenderMarkdownH3"
+            "RenderMarkdownH4"
+            "RenderMarkdownH5"
+            "RenderMarkdownH6"
+          ];
+        };
+        checkbox = {
+          unchecked = { highlight = "RenderMarkdownTodo"; };
+          checked = { highlight = "RenderMarkdownTodo"; };
+          custom = {
+            pending = {
+              raw = "[-]";
+              rendered = "󰥔 ";
+              highlight = "RenderMarkdownTodo";
+            };
+            important = {
+              raw = "[!]";
+              rendered = " ";
+              highlight = "RenderMarkdownWarning";
+            };
+            cancel = {
+              raw = "[/]";
+              rendered = "󱋬 ";
+              highlight = "RenderMarkdownTodo";
+            };
+          };
+        };
+      };
+    };
+  };
+}

home/programs/nvim/plugins/noice.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.noice = { enable = true; }; }

home/programs/nvim/plugins/none-ls.nix

@@ -1,20 +0,0 @@
-{
-  programs.nixvim.plugins.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;
-      };
-    };
-  };
-}

home/programs/nvim/plugins/nvim-tree.nix

@@ -1,5 +0,0 @@
-{
-  programs.nixvim.plugins.neo-tree = {
-    enable = true;
-  };
-}

home/programs/nvim/plugins/obsidian.nix

@@ -1,9 +0,0 @@
-{ config, ... }: {
-  programs.nixvim.plugins.obsidian = {
-    enable = config.var.obsidian;
-    settings = {
-      dir = "~/nextcloud/Notes";
-      disable_frontmatter = true;
-    };
-  };
-}

home/programs/nvim/plugins/oil.nix

@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.oil = {
-    enable = true;
-    settings = { default_file_explorer = false; };
-  };
-}

home/programs/nvim/plugins/telescope.nix

@@ -1,13 +1,31 @@
-{
+{ config, ... }:
-  programs.nixvim.plugins.telescope = {
+let
-    enable = true;
+  accent = "#${config.lib.stylix.colors.base0D}";
-    keymaps = {
+  background = "#${config.lib.stylix.colors.base00}";
-      "<leader>fg" = "live_grep";
+  background-alt = "#${config.lib.stylix.colors.base01}";
-      #"<C-p>" = {
+in {
-      #  action = "git_files";
+  programs.nixvim = {
-      #  desc = "Telescope Git Files";
+    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 = "❚ "; };
     };
-    extensions.fzf-native = { enable = true; };
   };
 }

home/programs/nvim/plugins/tmux-navigator.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.tmux-navigator = { enable = true; }; }

home/programs/nvim/plugins/toggleterm.nix

@@ -1,9 +0,0 @@
-{
-  programs.nixvim.plugins.toggleterm = {
-    enable = true;
-    settings = {
-      open_mapping = "[[<c-t>]]";
-      direction = "horizontal";
-    };
-  };
-}

home/programs/nvim/plugins/tree.nix

@@ -0,0 +1,44 @@
+{
+  programs.nixvim = {
+    plugins = {
+      neo-tree.enable = true;
+      oil = {
+        enable = true;
+        settings = {
+          default_file_explorer = false;
+          skip_confirm_for_simple_edits = true;
+          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/treesitter.nix

@@ -1,10 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    treesitter = {
-      enable = true;
-      nixGrammars = true;
-      indent = true;
-    };
-    treesitter-context.enable = true;
-  };
-}

home/programs/nvim/plugins/trouble.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.trouble = { enable = true; }; }

home/programs/nvim/plugins/ui.nix

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

home/programs/nvim/plugins/utils.nix

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

home/programs/nvim/plugins/whichkey.nix

@@ -1,3 +0,0 @@
-{
-  programs.nixvim.plugins.which-key.enable=true;
-}

home/programs/nvim/plugins/wilder.nix

@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.wilder = {
-    enable = true;
-    modes = [ ":" "/" "?" ];
-  };
-}

home/programs/nvim/plugins/zenmode.nix

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

home/programs/qutebrowser/default.nix

@@ -1,6 +1,87 @@
-{ config, ... }: {
+# Qutebrowser is a keyboard-focused browser with a minimal GUI.
+# My homepage is generated using https://github.com/anotherhadi/homepage
+{ pkgs, config, ... }:
+let
 
-  imports = [ ./duckduckgo-colorscheme.nix ./homepage ];
+  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;
@@ -18,8 +99,9 @@
     };
 
     quickmarks = {
-      home = "${config.var.homeDirectory}/.config/startpage/index.html";
+      home = "${homepage}/build/index.html";
-      server = "${config.var.homeDirectory}/.config/serverpage/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/";
@@ -38,102 +120,16 @@
 
     settings = {
       url = {
-        default_page =
+        default_page = "${homepage}/build/index.html";
-          "${config.var.homeDirectory}/.config/startpage/index.html";
+        start_pages = [ "${homepage}/build/index.html" ];
-        start_pages =
-          [ "${config.var.homeDirectory}/.config/startpage/index.html" ];
       };
 
       colors = {
-        tabs = {
-          odd.bg = "#${config.var.theme.colors.bg}";
-          odd.fg = "#${config.var.theme.colors.fg}";
-          even.bg = "#${config.var.theme.colors.bg}";
-          even.fg = "#${config.var.theme.colors.fg}";
-          selected = {
-            odd = {
-              bg = "#${config.var.theme.colors.accent}";
-              fg = "#${config.var.theme.colors.accentFg}";
-            };
-            even = {
-              bg = "#${config.var.theme.colors.accent}";
-              fg = "#${config.var.theme.colors.accentFg}";
-            };
-          };
-          indicator = {
-            error = "#${config.var.theme.colors.c1}";
-            start = "#${config.var.theme.colors.bgalt}";
-            stop = "#${config.var.theme.colors.bgalt}";
-          };
-        };
-
-        hints = {
-          bg = "#${config.var.theme.colors.bgalt}";
-          fg = "#${config.var.theme.colors.fgalt}";
-          match.fg = "#${config.var.theme.colors.bg}";
-        };
-
-        completion = {
-          category = {
-            bg = "#${config.var.theme.colors.bg}";
-            fg = "#${config.var.theme.colors.fg}";
-            border = {
-              top = "#${config.var.theme.colors.bg}";
-              bottom = "#${config.var.theme.colors.bg}";
-            };
-          };
-
-          odd.bg = "#${config.var.theme.colors.bg}";
-          even.bg = "#${config.var.theme.colors.bg}";
-
-          fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
-
-          match.fg = "#${config.var.theme.colors.accent}";
-
-          item.selected = {
-            bg = "#${config.var.theme.colors.accent}";
-            border.top = "#${config.var.theme.colors.accent}";
-            border.bottom = "#${config.var.theme.colors.accent}";
-            fg = "#${config.var.theme.colors.accentFg}";
-            match.fg = "#${config.var.theme.colors.accentFg}";
-          };
-        };
-
-        statusbar = {
-          normal.bg = "#${config.var.theme.colors.bg}";
-          normal.fg = "#${config.var.theme.colors.fg}";
-          private.bg = "#${config.var.theme.colors.bg}";
-          private.fg = "#${config.var.theme.colors.fg}";
-          insert.bg = "#${config.var.theme.colors.accent}";
-          insert.fg = "#${config.var.theme.colors.accentFg}";
-          command = {
-            bg = "#${config.var.theme.colors.bgalt}";
-            fg = "#${config.var.theme.colors.fgalt}";
-            private.bg = "#${config.var.theme.colors.bgalt}";
-            private.fg = "#${config.var.theme.colors.fgalt}";
-          };
-        };
-
-        messages = {
-          info = {
-            bg = "#${config.var.theme.colors.bgalt}";
-            fg = "#${config.var.theme.colors.fgalt}";
-            border = "#${config.var.theme.colors.bgalt}";
-          };
-
-          error = {
-            bg = "#${config.var.theme.colors.c1}";
-            fg = "#${config.var.theme.colors.fgalt}";
-            border = "#${config.var.theme.colors.c1}";
-          };
-        };
-
-        #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
         webpage.preferred_color_scheme =
           "dark"; # Enable dark mode for websites that support it
       };
 
-      fonts = { default_family = "${config.var.theme.font}"; };
+      statusbar.show = "in-mode";
 
       completion = {
         height = "30%";
@@ -152,6 +148,7 @@
         autoplay = false;
         javascript.clipboard = "access";
         javascript.enabled = true;
+        webgl = true;
         pdfjs = true;
       };
 
@@ -160,10 +157,7 @@
         remove_finished = 0;
       };
 
-      hints = {
+      hints = { radius = 1; };
-        border = "none";
-        radius = 1;
-      };
 
       scrolling = {
         bar = "never";
@@ -184,8 +178,8 @@
 
     keyBindings = {
       normal = {
-        "gh" = "open ${config.var.homeDirectory}/.config/startpage/index.html";
+        "gh" = "open ${homepage}/build/index.html";
-        "gs" = "open ${config.var.homeDirectory}/.config/serverpage/index.html";
+        "gs" = "open https://home.anotherhadi.com";
 
         " p" = "tab-move -";
         " n" = "tab-move +";
@@ -256,6 +250,7 @@
       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,36 +1,44 @@
-{ config, ... }: {
+# A duckduckgo colorscheme generated for the Stylix theme used.
-  home.file.".duckduckgo-colorscheme.js".text = ''
+{ config, ... }:
-    // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
+let
-    // based on https://ddg.codingcodax.dev/
+  accent = config.lib.stylix.colors.base0D;
-    // Cookies string for your theme
+  background = config.lib.stylix.colors.base00;
-    const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};';
+  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
+      // Converts cookie string into formatted JSON
-    const cookieToJSON = (cookieRaw) => {
+      const cookieToJSON = (cookieRaw) => {
-      const cookieJson = {};
+        const cookieJson = {};
-      const items = cookieRaw.split(/[ ,]+/);
+        const items = cookieRaw.split(/[ ,]+/);
 
-      items.forEach((item) => {
+        items.forEach((item) => {
-        const parts = item.split('=');
+          const parts = item.split('=');
-        cookieJson[parts[0]] = parts[1];
+          cookieJson[parts[0]] = parts[1];
-      });
+        });
 
-      return cookieJson;
+        return cookieJson;
-    };
+      };
 
-    // Iterates over JSON, and adds to browser cookie store
+      // Iterates over JSON, and adds to browser cookie store
-    const setCookies = (cookieJson) => {
+      const setCookies = (cookieJson) => {
-      Object.keys(cookieJson).forEach((key) => {
+        Object.keys(cookieJson).forEach((key) => {
-        document.cookie = `''${key}=''${cookieJson [ key ]}`;
+          document.cookie = `''${key}=''${cookieJson [ key ]}`;
-      });
+        });
-    };
+      };
 
-    alert('The Nixy theme will be applied.');
+      // Call set cookies, passing in formated cookie data
+      setCookies(cookieToJSON(cookie));
 
-    // Call set cookies, passing in formated cookie data
+      // All done, reload page for changes to take effect :)
-    setCookies(cookieToJSON(cookie));
+      location.reload();
-
+    '';
-    // All done, reload page for changes to take effect :)
-    location.reload();
-  '';
 }

home/programs/qutebrowser/homepage/default.nix

@@ -1,297 +0,0 @@
-{ config, ... }:
-let
-  bookmarks = ''
-    Bookmarks: [
-      {text: "MyNixOs", url: "https://mynixos.com", icon: "󱄅"},
-      {text: "Github", url: "https://github.com", icon: ""},
-      {text: "Proton", url: "https://mail.proton.me/u/0/inbox", icon: ""},
-      {text: "Cloudflare One", url: "https://one.dash.cloudflare.com/", icon: ""},
-      {text: "Chat GPT", url: "https://chat.openai.com/", icon: "󰭹"},
-      {text: "Nixvim", url: "https://nix-community.github.io/nixvim/", icon: ""},
-      {text: "Hyprland Wiki", url: "https://wiki.hyprland.org/", icon: "󰖬"},
-      {text: "Nerdfont", url: "https://www.nerdfonts.com/cheat-sheet", icon: ""},
-      {text: "Youtube", url: "https://youtube.com", icon: "󰗃"},
-    ],
-    Home: [
-      {text: "Casa", url: "http://192.168.2.16:8081/#/", icon: "󰋜"},
-      {text: "Plex", url: "http://192.168.2.16:32400", icon: "󰚺"},
-      {text: "Nextcloud", url: "http://192.168.2.16:10081", icon: ""},
-    ],
-    Work: [
-      {text: "Outlook", url: "https://outlook.office.com/mail/", icon: "󰴢"},
-      {text: "Office", url: "https://www.office.com/?auth=2", icon: "󰏆"},
-      {text: "Teams", url: "https://teams.microsoft.com/_", icon: "󰊻"},
-    ],
-  '';
-in {
-
-  xdg.configFile."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>Homepage</title>
-      <style>
-        h1,
-        h2,
-        h3,
-        p {
-          margin: 0;
-          padding: 0;
-          font-family: '${config.var.theme.font}', sans-serif;
-        }
-
-        .w-screen {
-          width: 100vw;
-        }
-
-        .overflow-hidden {
-          overflow: hidden;
-        }
-
-        .max-w-7xl {
-          max-width: 80rem;
-        }
-
-        .mx-auto {
-          margin-left: auto;
-          margin-right: auto;
-        }
-
-        .justify-between {
-          justify-content: space-between;
-        }
-
-        .items-center {
-          align-items: center;
-        }
-
-        .py-12 {
-          padding-top: 3rem;
-          padding-bottom: 3rem;
-        }
-
-        .px-2 {
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-        }
-
-        .text-5xl {
-          font-size: 3rem;
-          line-height: 1;
-        }
-
-        .font-bold {
-          font-weight: 700;
-        }
-
-        .mb-4 {
-          margin-bottom: 1rem;
-        }
-
-        .flex {
-          display: flex;
-        }
-
-        .flex-wrap {
-          flex-wrap: wrap;
-        }
-
-        .flex-col {
-          flex-direction: column;
-        }
-
-        .flex-grow {
-          flex-grow: 1;
-        }
-
-        .gap-5 {
-          gap: 1.25rem;
-        }
-
-        .gap-05 {
-          gap: 0.125rem;
-        }
-
-        .justify-start {
-          justify-content: flex-start;
-        }
-
-        .items-start {
-          align-items: flex-start;
-        }
-
-        .hover\:opacity-60:hover {
-          opacity: 0.6;
-        }
-
-        .pb-10 {
-          padding-bottom: 2.5rem;
-        }
-
-        .p-10 {
-          padding: 2.5rem;
-        }
-
-        .text-xl {
-          font-size: 1.25rem;
-          line-height: 1.75rem;
-        }
-
-        .text-lg {
-          font-size: 1.125rem;
-          line-height: 1.75rem;
-        }
-
-        .text-sm {
-          font-size: 0.875rem;
-          line-height: 1.25rem;
-        }
-
-        .text-4xl {
-          font-size: 2.25rem;
-          line-height: 2.5rem;
-        }
-
-        .px-5 {
-          padding-left: 1.25rem;
-          padding-right: 1.25rem;
-        }
-
-        .py-2 {
-          padding-top: 0.5rem;
-          padding-bottom: 0.5rem;
-        }
-
-        a {
-          text-decoration: none;
-        }
-
-        a, a:visited, a:hover, a:active {
-          color: inherit;
-        }
-        </style>
-    </head>
-
-    <body class="w-screen" style="background-color: #${config.var.theme.colors.bg}; color: #${config.var.theme.colors.fg};">
-      <div class="max-w-7xl mx-auto p-10">
-        <div class="w-full flex justify-between" id="date-time">
-          <p class="text-xl"></p>
-          <p class="text-xl"></p>
-        </div>
-        <div class="w-full py-12 px-2" id="greeting">
-          <h1 class="text-5xl font-bold mb-4" style="color: #${config.var.theme.colors.accent};"></h1>
-        </div>
-        <div id="link-list" class="flex gap-5 flex-col justify-start items-start"></div>
-      </div>
-      <script defer>
-        const linkLists = {
-          ${bookmarks}
-        };
-
-        function getDomainFromUrl(url) {
-          let domain = url.replace(/(^\w+:|^)\/\//, "");
-          domain = domain.split('/')[0];
-          return domain;
-        }
-
-        const linkListContainer = document.getElementById('link-list');
-
-        for (const key in linkLists) {
-          if (Object.hasOwnProperty.call(linkLists, key)) {
-            const linkList = linkLists[key];
-            const title = document.createElement('h2');
-            title.textContent = key.charAt(0).toUpperCase() + key.slice(1);
-            title.className = "text-3xl font-bold"
-            linkListContainer.appendChild(title);
-
-            const list = document.createElement('div');
-            list.className = 'flex flex-wrap gap-5 justify-start';
-            linkList.forEach(link => {
-              const anchor = document.createElement('a');
-              anchor.href = link.url;
-              anchor.className = "px-5 py-2 hover:opacity-60 flex-grow"
-
-              const div = document.createElement('div');
-              div.className = 'flex flex-row gap-5 items-center';
-
-              let icon = document.createElement('p');
-              icon.textContent = link.icon || "";
-              icon.className = "text-4xl";
-              div.appendChild(icon);
-
-              const divNameUrl = document.createElement('div');
-              divNameUrl.className = 'flex flex-col gap-05';
-
-              const name = document.createElement('p');
-              name.textContent = link.text;
-              name.className = 'text-lg font-medium';
-
-              const url = document.createElement('p');
-              url.textContent = link.url;
-              url.className = 'text-sm';
-              url.style = "color: #${config.var.theme.colors.fgalt};"
-
-              divNameUrl.appendChild(name);
-              divNameUrl.appendChild(url);
-              div.appendChild(divNameUrl);
-              anchor.appendChild(div);
-              list.appendChild(anchor);
-            });
-
-            linkListContainer.appendChild(list);
-            const spacer = document.createElement('div');
-            spacer.className = "pb-10"
-            linkListContainer.appendChild(spacer);
-          }
-        }
-
-        function updateDateTime() {
-          const dateTimeContainer = document.getElementById('date-time');
-          const currentDate = new Date();
-          const dateOptions = {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'};
-          const timeOptions = {hour: '2-digit', minute: '2-digit'};
-          const formattedDate = currentDate.toLocaleDateString('en-US', dateOptions);
-          const formattedTime = currentDate.toLocaleTimeString('en-US', timeOptions);
-          const dateParagraph = dateTimeContainer.querySelector('p:nth-child(1)');
-          const timeParagraph = dateTimeContainer.querySelector('p:nth-child(2)');
-          dateParagraph.textContent = formattedDate;
-          timeParagraph.textContent = formattedTime;
-        }
-
-        updateDateTime();
-        setInterval(updateDateTime, 60000);
-
-        function updateGreeting() {
-          const greetingContainer = document.getElementById('greeting');
-          const currentDate = new Date();
-          const currentHour = currentDate.getHours();
-          let greetingText;
-
-          if (currentHour < 2) {
-            greetingText = "Good night! ";
-          } else if (currentHour < 5) {
-            greetingText = "Hello, night owl! 󰏒";
-          } else if (currentHour < 12) {
-            greetingText = "Good morning! ";
-          } else if (currentHour < 17) {
-            greetingText = "Good afternoon! ️";
-          } else if (currentHour < 20) {
-            greetingText = "Good evening! ";
-          } else {
-            greetingText = "Good night! ";
-          }
-
-          const greetingHeader = greetingContainer.querySelector('h1');
-          greetingHeader.textContent = greetingText;
-        }
-
-        updateGreeting();
-      </script>
-    </body>
-
-    </html>
-  '';
-}

home/programs/shell/default.nix

@@ -0,0 +1,4 @@
+{
+  imports =
+    [ ./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./tmux.nix ./eza.nix ];
+}

home/programs/shell/eza.nix

@@ -0,0 +1,14 @@
+# Eza is a ls replacement
+{
+  programs.eza = {
+    enable = true;
+    icons = true;
+
+    extraOptions = [
+      "--group-directories-first"
+      "--no-quotes"
+      "--git-ignore"
+      "--icons=always"
+    ];
+  };
+}

home/programs/shell/fzf.nix

@@ -0,0 +1,30 @@
+# Fzf is a general-purpose command-line fuzzy finder.
+{ config, lib, ... }:
+let
+  accent = "#" + config.lib.stylix.colors.base0D;
+  foreground = "#" + config.lib.stylix.colors.base05;
+  muted = "#" + config.lib.stylix.colors.base03;
+in {
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+    colors = lib.mkForce {
+      "fg+" = accent;
+      "bg+" = "-1";
+      "fg" = foreground;
+      "bg" = "-1";
+      "prompt" = muted;
+      "pointer" = accent;
+    };
+    defaultOptions = [
+      "--margin=1"
+      "--layout=reverse"
+      "--border=rounded"
+      "--info='hidden'"
+      "--header=''"
+      "--prompt='/ '"
+      "-i"
+      "--no-bold"
+    ];
+  };
+}

home/programs/shell/starship.nix

@@ -1,4 +1,9 @@
-{ config, lib, ... }: {
+# starship is a minimal, fast, and extremely customizable prompt for any shell!
+{ config, lib, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  background-alt = "#${config.lib.stylix.colors.base01}";
+in {
   programs.starship = {
     enable = true;
     settings = {
@@ -10,22 +15,23 @@
         "$git_status"
         "$character"
       ];
-      directory = { style = "#${config.var.theme.colors.accent}"; };
+      directory = { style = accent; };
 
       character = {
-        success_symbol = "[❯](#${config.var.theme.colors.accent})";
+        success_symbol = "[❯](${accent})";
         error_symbol = "[❯](red)";
         vimcmd_symbol = "[❮](cyan)";
       };
 
       git_branch = {
-        format = "[$branch]($style)";
+        symbol = "[](${background-alt}) ";
-        style = "bright-black";
+        style = "fg:${accent} bg:${background-alt}";
+        format = "on [$symbol$branch]($style)[](${background-alt}) ";
       };
 
       git_status = {
         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

@@ -0,0 +1,33 @@
+# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
+{ pkgs, ... }: {
+  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
+      set -g detach-on-destroy off  # don't exit from tmux when closing a session
+
+      bind-key -n C-Tab next-window
+      bind-key -n C-S-Tab previous-window
+      bind-key -n M-Tab new-window
+    '';
+
+    plugins = with pkgs; [
+      tmuxPlugins.vim-tmux-navigator
+      tmuxPlugins.resurrect
+      tmuxPlugins.sensible
+      tmuxPlugins.tokyo-night-tmux
+    ];
+  };
+}

home/programs/shell/zoxide.nix

@@ -0,0 +1,7 @@
+# Zoxide is a cd replacement
+{
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+}

home/programs/shell/zsh.nix

@@ -0,0 +1,90 @@
+# My shell configuration
+{ pkgs, lib, config, ... }:
+let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch
+in {
+
+  home.packages = with pkgs; [ bat ripgrep tldr sesh ];
+
+  home.sessionPath = [ "$HOME/go/bin" ];
+
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    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 != [ ]) ''
+      export PATH="$PATH''${PATH:+:}${
+        lib.concatStringsSep ":" config.home.sessionPath
+      }"
+    '';
+
+    shellAliases = {
+      vim = "nvim";
+      vi = "nvim";
+      v = "nvim";
+      c = "clear";
+      clera = "clear";
+      celar = "clear";
+      e = "exit";
+      cd = "z";
+      ls = "eza --icons=always --no-quotes";
+      tree = "eza --icons=always --tree --no-quotes";
+      sl = "ls";
+      open = "${pkgs.xdg_utils}/bin/xdg-open";
+      icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+
+      wireguard-import = "nmcli connection import type wireguard file";
+
+      notes =
+        "nvim ~/nextcloud/Notes/index.md --cmd 'cd ~/nextcloud/Notes' -c ':Telescope find_files'";
+      note = "notes";
+
+      # git
+      g = "lazygit";
+      ga = "git add";
+      gc = "git commit";
+      gcu = "git add . && git commit -m 'Update'";
+      gp = "git push";
+      gpl = "git pull";
+      gs = "git status";
+      gd = "git diff";
+      gco = "git checkout";
+      gcb = "git checkout -b";
+      gbr = "git branch";
+
+      gaa = "git add .";
+      gcm = "git commit -m";
+    };
+  };
+}

home/programs/spicetify/default.nix

@@ -1,31 +1,26 @@
+# Spicetify is a spotify client customizer
 { pkgs, config, lib, inputs, ... }:
-let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
+let
+  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+  accent = "${config.lib.stylix.colors.base0D}";
 in {
-
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
+
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [ "spotify" ];
+
+  stylix.targets.spicetify.enable = false;
+
   programs.spicetify = {
     enable = true;
-    theme = spicePkgs.themes.text;
+    theme = lib.mkForce spicePkgs.themes.text;
+
     colorScheme = "custom";
 
     customColorScheme = {
-      text = "${config.var.theme.colors.fg}";
+      button = accent;
-      subtext = "${config.var.theme.colors.fgalt}";
+      button-active = accent;
-      sidebar-text = "${config.var.theme.colors.fgalt}";
+      tab-active = accent;
-      main = "${config.var.theme.colors.bg}";
-      sidebar = "${config.var.theme.colors.bg}";
-      background = "${config.var.theme.colors.bg}";
-      player = "${config.var.theme.colors.bg}";
-      card = "${config.var.theme.colors.bg}";
-      shadow = "000000";
-      selected-row = "${config.var.theme.colors.bgalt}";
-      button = "${config.var.theme.colors.accent}";
-      button-active = "${config.var.theme.colors.accent}";
-      button-disabled = "${config.var.theme.colors.bgalt}";
-      tab-active = "${config.var.theme.colors.accent}";
-      misc = "${config.var.theme.colors.fgalt}";
     };
 
     enabledExtensions = with spicePkgs.extensions; [
@@ -33,6 +28,7 @@ in {
       lastfm
       historyShortcut
       hidePodcasts
+      adblock
       fullAppDisplay
       shuffle
     ];

home/programs/thunar/default.nix

@@ -0,0 +1,46 @@
+# Thunar is a file explorer
+{ pkgs, ... }: {
+  # ctrl + m to toggle the menubar
+  home.packages = with pkgs.xfce; [
+    thunar
+    xfconf
+    tumbler
+    thunar-archive-plugin
+    thunar-volman
+  ];
+
+  home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = ''
+    <?xml version="1.0" 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="170"/>
+      <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="true"/>
+      <property name="misc-thumbnail-draw-frames" type="bool" value="false"/>
+      <property name="misc-text-beside-icons" type="bool" value="true"/>
+      <property name="misc-change-window-icon" type="bool" value="true"/>
+      <property name="hidden-bookmarks" type="array">
+        <value type="string" value="computer:///"/>
+        <value type="string" value="recent:///"/>
+        <value type="string" value="file:///"/>
+        <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,127,50,50,50,50,50,751,50,50,75,50,145"/>
+    </channel>
+  '';
+}

home/programs/yazi/default.nix

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

home/scripts/brightness/default.nix

@@ -1,21 +1,24 @@
+# - ## 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" ''
-    sleep 0.05
+    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%+
+    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%-
+  '';
 
-    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%+
+  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
-    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%-
+    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
-
-    brightness_level=$(${pkgs.brightnessctl}/bin/brightnessctl get)
-
-    message="󰃠  Brightness: $brightness_level%"
-
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-                -h int:value:"$brightness_level" \
-                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
   brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -27,9 +30,11 @@ let
   '';
 
 in {
-  home.packages = with pkgs; [
+  home.packages = [
+    pkgs.brightnessctl
     brightness-change
     brightness-up
     brightness-down
+    brightness-set
   ];
 }

home/scripts/caffeine/default.nix

@@ -1,23 +1,33 @@
-{ pkgs, config, ... }:
+# - ## Caffeine
-let
+#-
-  homedir = config.home.homeDirectory;
+#- 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" ''
-    [[ -f /tmp/caffeine ]] && echo "active" || echo "inactive"
+    [[ $(pidof "hypridle") ]] && echo "0" || echo "1"
+  '';
+
+  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
+    [[ $(pidof "hypridle") ]] && echo "󰾪" || echo "󰅶"
   '';
 
   caffeine = pkgs.writeShellScriptBin "caffeine" ''
-    if [[ -f /tmp/caffeine ]]; then
+    if [[ $(pidof "hypridle") ]]; then
-      rm /tmp/caffeine
+      systemctl --user stop hypridle.service
-      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
+      title="󰅶  Caffeine Activated"
-      message="󰾪  Caffeine Deactivated"
+      description="Caffeine is now active! Your screen will not turn off automatically."
     else
-      touch /tmp/caffeine
+      systemctl --user start hypridle.service
-      pkill hypridle
+      title="󰾪  Caffeine Deactivated"
-      message="󰅶  Caffeine Activated"
+      description="Caffeine is now deactivated! Your screen will turn off automatically."
     fi
-    ${pkgs.libnotify}/bin/notify-send "$message" \
+
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+    notif "caffeine" "$title" "$description"
   '';
 
-in { home.packages = with pkgs; [ caffeine-status caffeine ]; }
+in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }

home/scripts/compress/default.nix

@@ -1,21 +0,0 @@
-# From https://github.com/Frost-Phoenix/nixos-config
-{ pkgs, ... }:
-let
-  compress = pkgs.writeShellScriptBin "compress" ''
-    if (( $# == 1 )) then
-        # echo -ne "Archive name: "
-        # read name
-        # tar -cvzf "$name.tar.gz" $1
-        tar -cvzf "$1.tar.gz" $1
-    else
-        echo "Wrong number of arguments..."
-    fi
-  '';
-  extract = pkgs.writeShellScriptBin "extract" ''
-     for i in "$@" ; do
-        tar -xvzf $i
-        break
-    done 
-  '';
-
-in { home.packages = with pkgs; [ compress extract ]; }

home/scripts/default.nix

@@ -4,12 +4,12 @@
     ./sounds
     ./brightness
     ./caffeine
+    ./hyprpanel
+    ./hyprfocus
     ./night-shift
     ./screenshot
-    ./startup
     ./nerdfont_fzf
+    ./notification
     ./system
-    ./compress
-    ./misc
   ];
 }