fix package panel

Former-commit-id: 6ce19fb663

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: anotherhadi
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/assets/README_template.md

@@ -0,0 +1,115 @@
+<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 simplifies and unifies** the Hyprland ecosystem with a modular, easily customizable setup. It provides a structured way to manage your system configuration and dotfiles with minimal effort.
+It includes *home-manager*, *secrets*, and *custom theming* all in one place.
+
+**Features:**
+
+- 💻 Hyprland-centric: Preconfigured Hyprland ecosystem (Hyprlock, Hyprpanel, etc.)
+- 🎨 Consistent Theming: Base16 & Stylix-powered themes
+- ⌨️  Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
+
+## 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 (User-level configuration)
+
+Contains **dotfiles and settings** that apply to your user environment.
+
+**Subfolders:**
+
+- `programs` is a collection of apps configured with home-manager
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+- `system` is some "desktop environment" configuration
+
+### 🐧 /nixos
+
+Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
+
+### 🎨 /themes
+
+This folder contains all system themes. Mainly [stylix](https://stylix.danth.me/) configurations.
+Check out the available themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
+
+### 💻 /hosts
+
+This directory contains host-specific configurations.
+Each host includes:
+
+- `configuration.nix` for system-wide settings
+- `home.nix` for user-level configuration
+- `variables.nix` for global variables
+- `secrets/` for sensitive data
+
+## Installation
+
+1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to your system:
+
+```sh
+git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+```
+
+2. Copy the `hosts/laptop` folder, rename it to match your system’s hostname, and update `variables.nix` with your machine’s settings.
+3. Copy your `hardware-configuration.nix` into your new host's folder to ensure proper hardware support.
+4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
+
+> [!Important]
+> `# CHANGEME` comments are placed throughout the config to indicate necessary modifications.
+> Use the following command to quickly locate them:
+>
+> ```sh
+> rg "CHANGEME" ~/.config/nixos
+> ```
+
+> [!TIP]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
+
+5. Build the system
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+```
+
+## Documentation
+
+- [SERVER](docs/SERVER.md): Check out the server documentation
+- [THEMES](docs/THEMES.md): How themes work and how to create your own
+- [SCRIPTS](docs/SCRIPTS.md): A list of available scripts and their usage
+- [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
+- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome collection of wallpapers
+
+- [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

@@ -4,7 +4,7 @@
 
 [[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
 
-KEYBINDINGS_FILE="./docs/KEYBINDINGS.md"
+KEYBINDINGS_FILE="./docs/KEYBINDINGS-HYPRLAND.md"
 
 function getList() {
   content=$1
@@ -17,9 +17,9 @@ function getList() {
   echo "$list"
 }
 
-[[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1)
+[[ -f "./home/system/hyprland/bindings.nix" ]] || (echo "File ./home/system/hyprland/bindings.nix not found" && exit 1)
 
-config=$(cat "./home/system/hyprland/default.nix")
+config=$(cat "./home/system/hyprland/bindings.nix")
 
 # Bind
 bind=$(getList "$config" "bind")
@@ -33,29 +33,28 @@ bindle=$(getList "$config" "bindle")
 # Join the lists:
 keybindings=$(echo -e "$bind\n$bindm\n$bindl\n$bindle" | grep '"')
 
-echo "# Keybindings" >"$KEYBINDINGS_FILE"
+echo "[//]: # (This file is autogenerated)" >"$KEYBINDINGS_FILE"
+echo "# Keybindings for Hyprland" >>"$KEYBINDINGS_FILE"
 echo "" >>"$KEYBINDINGS_FILE"
-echo "The list of the keybindings working on Hyprland:" >>"$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 line; do
+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)
+  # dispatcher=$(echo "$line" | cut -d, -f3)
-  params=$(echo "$line" | cut -d, -f4)
+  # params=$(echo "$line" | cut -d, -f4)
 
   [[ $mod == '$mod' ]] && mod="SUPER + "
   [[ $mod == '$shiftMod' ]] && mod="SHIFT + SUPER + "
 
-  echo "| $comment | $mod$key |" >>"$KEYBINDINGS_FILE"
+  echo "| ${comment:1} | $mod$key |" >>"$KEYBINDINGS_FILE"
 done
-
-pandoc -t commonmark_x "$KEYBINDINGS_FILE" -o "/tmp/keybindings.md"
-mv "/tmp/keybindings.md" "$KEYBINDINGS_FILE"

.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
+          ./.github/scripts/keybindings_to_markdown.sh
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git add .
+          git commit -m "Update KEYBINDINGS-HYPRLAND.md (auto)" && git push
+          exit 0

.github/workflows/update-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
+          exit 0

.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
+          exit 0

.gitignore

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

.sops.yaml

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

README.md

@@ -1,11 +1,6 @@
-[//]: # (Title: Nixy)  
+[//]: # (This file is autogenerated)
-[//]: # (Description: 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.)  
-[//]: # (Author: Hadi)  
-[//]: # (Date: 08/18/24)
-[//]: # (Version: v2.0.1)
-
 <div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
 </div>
 
 <br>
@@ -14,79 +9,116 @@
 
 <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=v2.0.1&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
-    </a>
     <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A594FD">
     </a>
     <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A594FD">
     </a>
     <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A594FD&color=A594FD">
     </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=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
+        <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"/>
     </a>
 </div>
 <br>
 
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+**Nixy simplifies and unifies** the Hyprland ecosystem with a modular, easily customizable setup. It provides a structured way to manage your system configuration and dotfiles with minimal effort.
-It's a simple way to manage your system configuration and dotfiles.
+It includes *home-manager*, *secrets*, and *custom theming* all in one place.
+
+**Features:**
+
+- 💻 Hyprland-centric: Preconfigured Hyprland ecosystem (Hyprlock, Hyprpanel, etc.)
+- 🎨 Consistent Theming: Base16 & Stylix-powered themes
+- ⌨️  Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
 
 ## Table of Content
 
-  - [Table of Content](#table-of-content)
+- [Table of Content](#table-of-content)
-  - [Gallery](#gallery)
+- [Gallery](#gallery)
-  - [Architecture](#architecture)
+- [Architecture](#architecture)
-  - [Installation](#installation)
+  - [🏠 /home (User-level configuration)](#-home-user-level-configuration)
-  - [Documentation](#documentation)
+  - [🐧 /nixos](#-nixos)
+  - [🎨 /themes](#-themes)
+  - [💻 /hosts](#-hosts)
+- [Installation](#installation)
+- [Documentation](#documentation)
 
 ## Gallery
 
-![catppuccin1](docs/src/catppuccin/1.png)
+![Nixy helper, peaclock](.github/assets/nixy/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
+![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
+![nvim, lazygit](.github/assets/nixy/3.png)
+![spotify, cava](.github/assets/nixy/4.png)
 
 ## Architecture
 
-- 🏠 `home` are the dotfiles and configuration files for the users
+### 🏠 /home (User-level configuration)
-  - 'programs' is a collection of apps configured with home-manager
+
-  - 'scripts' is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+Contains **dotfiles and settings** that apply to your user environment.
-  - 'system' is some desktop environment like configuration
+
-  - 'wallpapers' are... wallpapers
+**Subfolders:**
-- 💻 `hosts` are the system configuration files
+
-  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
+- `programs` is a collection of apps configured with home-manager
-  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
+- `system` is some "desktop environment" configuration
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
+
+### 🐧 /nixos
+
+Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
+
+### 🎨 /themes
+
+This folder contains all system themes. Mainly [stylix](https://stylix.danth.me/) configurations.
+Check out the available themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
+
+### 💻 /hosts
+
+This directory contains host-specific configurations.
+Each host includes:
+
+- `configuration.nix` for system-wide settings
+- `home.nix` for user-level configuration
+- `variables.nix` for global variables
+- `secrets/` for sensitive data
 
 ## Installation
 
+1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to your system:
+
 ```sh
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+2. Copy the `hosts/laptop` folder, rename it to match your system’s hostname, and update `variables.nix` with your machine’s settings.
-- Add your `hardware-configuration.nix` to your new host's folder
+3. Copy your `hardware-configuration.nix` into your new host's folder to ensure proper hardware support.
-- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
 
-> [!NOTE]
+> [!Important]
+> `# CHANGEME` comments are placed throughout the config to indicate necessary modifications.
+> Use the following command to quickly locate them:
+>
+> ```sh
+> rg "CHANGEME" ~/.config/nixos
+> ```
+
+> [!TIP]
 > When you add new files, don't forget to run `git add .` to add them to the git repository
 
+5. Build the system
+
 ```sh
 sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 ```
 
 ## Documentation
 
-- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [SERVER](docs/SERVER.md): Check out the server documentation
-- [APPS.md](docs/APPS.md): Which apps are installed
+- [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [SCRIPTS](docs/SCRIPTS.md): A list of available scripts and their usage
-- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome collection of wallpapers
 
-- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
-- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/APPS.md

@@ -1,56 +0,0 @@
-# Apps and services
-
-*non-exhaustive lists*
-
-## Laptop
-
-The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
-The configurations files can be found in the `hosts/laptop` directory.
-
-| Category                                | Name           |
-|-----------------------------------------|----------------|
-| 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           |
-| See [hosts/laptop](../hosts/laptop/)... |                |
-
-## Server
-
-The server configuration is used by a home server running NixOS.
-The configurations files can be found in the `hosts/server` directory.
-I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, ...
-I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
-
-### Apps
-
-- Nextcloud
-- Vaultwarden
-- Adguard Home
-- Unifi Controler
-- Uptime Kuma
-- "Jackflix"
-  - Jellyfin, Transmission, *arr
-- See [hosts/server](../hosts/server/)...

docs/CONTRIBUTING.md

@@ -1,19 +1,16 @@
 # Contributing to Nixy
 
-Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the [TODO.md](./TODO.md) file!
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the issues!
 
 The process is straight-forward.
 
 - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0 and 1)
 - Fork Nixy [git repository](https://github.com/anotherhadi/nixy).
-- Write your changes (new theme, bug fixes, task in to-do, ...).
+- Write your changes (new theme, bug fixes, issues fix, ...).
 - Create a Pull Request against the main branch of Nixy.
 
 > [!TIP]
-> When wallpapers are added, run `./docs/scripts/compress_png.sh` and `./docs/scripts/create_preview_wallpapers.sh`
+> To update the README, change the `./.github/assets/README_template.md`
-
-> [!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,51 @@
+[//]: # (This file is autogenerated)
+# Keybindings for Hyprland
+
+> [!NOTE]
+> SUPER is the windows key by default
+
+| Description | Keybinding |
+| -- | -- |
+| Switch Workspace | SUPER + {Number} |
+| Move app to Workspace | SHIFT + SUPER + {Number} |
+| Kitty | SUPER + RETURN |
+| Thunar | SUPER + E |
+| Zen Browser | SUPER + B |
+| Bitwarden | SUPER + K |
+| Lock | SUPER + L |
+| Powermenu | SUPER + X |
+| Launcher | SUPER + SPACE |
+| Quickmenu | SUPER + C |
+| Toggle HyprFocus | SHIFT + SUPER + SPACE |
+| Planify | SUPER + P |
+| Close window | SUPER + Q |
+| Toggle Floating | SUPER + T |
+| Toggle Fullscreen | SUPER + F |
+| Move focus left | SUPER + left |
+| Move focus Right | SUPER + right |
+| Move focus Up | SUPER + up |
+| Move focus Down | SUPER + down |
+| Focus previous monitor | SHIFT + SUPER + up |
+| Focus next monitor | SHIFT + SUPER + down |
+| Add to master | SHIFT + SUPER + left |
+| Remove from master | SHIFT + SUPER + right |
+| Screenshot region | SUPER + PRINT |
+| Screenshot monitor | PRINT |
+| Screenshot window | SHIFT + SUPER + PRINT |
+| Screenshot region then edit | ALTPRINT |
+| Toggle hyprpanel | SHIFT + SUPER + T |
+| Clipboard picker with wofi | SHIFT + SUPER + C |
+| Emoji picker with wofi | SHIFT + SUPER + E |
+| Toggle night shift | SUPER + F2 |
+| Toggle night shift | SUPER + F3 |
+| Move Window (mouse) | SUPER + mouse:272 |
+| Resize Window (mouse) | SUPER + R |
+| Toggle Mute | XF86AudioMute |
+| Play/Pause Song | XF86AudioPlay |
+| Next Song | XF86AudioNext |
+| Previous Song | XF86AudioPrev |
+| Lock when closing Lid | switch:Lid Switch |
+| Sound Up | XF86AudioRaiseVolume |
+| Sound Down | XF86AudioLowerVolume |
+| Brightness Up | XF86MonBrightnessUp |
+| Brightness Down | XF86MonBrightnessDown |

docs/KEYBINDINGS.md

@@ -1,38 +0,0 @@
-# Keybindings
-
-The list of the keybindings working on Hyprland:
-
-| Description                 | Keybinding             | Command                                                            |
-| --------------------------- | ---------------------- | ------------------------------------------------------------------ |
-| Switch Workspace            | SUPER + {Number}       | workspace {Number}                                                 |
-| Move app to Workspace       | SUPER SHIFT + {Number} | movetoworkspace {Number}                                           |
-| Kitty                       | SUPER + RETURN         | exec \${pkgs.kitty}/bin/kitty                                      |
-| Thunar                      | SUPER + E              | exec \${pkgs.xfce.thunar}/bin/thunar                               |
-| Qutebrowser                 | SUPER + B              | exec \${pkgs.qutebrowser}/bin/qutebrowser                          |
-| Bitwarden                   | SUPER + K              | exec \${pkgs.bitwarden}/bin/bitwarden                              |
-| Peaclock                    | SUPER + C              | exec \${pkgs.kitty}/bin/kitty --class peaclock peaclock            |
-| Lock                        | SUPER + L              | exec \${pkgs.hyprlock}/bin/hyprlock                                |
-| Powermenu                   | SUPER + X              | exec powermenu                                                     |
-| Launcher                    | SUPER + SPACE          | exec menu                                                          |
-| Close window                | SUPER + Q              | killactive                                                         |
-| Toggle Floating             | SUPER + T              | togglefloating                                                     |
-| Toggle Fullscreen           | SUPER + F              | fullscreen                                                         |
-| Move focus left             | SUPER + left           | movefocus l                                                        |
-| Move focus Right            | SUPER + right          | movefocus r                                                        |
-| Move focus Up               | SUPER + up             | movefocus u                                                        |
-| Move focus Down             | SUPER + down           | movefocus d                                                        |
-| Screenshot window           | SUPER + PRINT          | exec screenshot window                                             |
-| Screenshot monitor          | PRINT                  | exec screenshot monitor                                            |
-| Screenshot region           | SUPER SHIFT + PRINT    | exec screenshot region                                             |
-| Screenshot region then edit | ALT PRINT              | exec screenshot region swappy                                      |
-| Turn off night shift        | SUPER + F2             | exec night-shift-off                                               |
-| Turn on night shift         | SUPER + F3             | exec night-shift-on                                                |
-| Choose sound output         | SUPER + F5             | exec \${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output |
-| Move Window (mouse)         | SUPER + mouse:272      | movewindow                                                         |
-| Resize Window (mouse)       | SUPER + R              | resizewindow                                                       |
-| Toggle Mute                 | XF86AudioMute          | exec sound-toggle                                                  |
-| Lock when closing Lid       | switch:Lid Switch      | exec \${pkgs.hyprlock}/bin/hyprlock                                |
-| Sound Up                    | XF86AudioRaiseVolume   | exec sound-up                                                      |
-| Sound Down                  | XF86AudioLowerVolume   | exec sound-down                                                    |
-| Brightness Up               | XF86MonBrightnessUp    | exec brightness-up                                                 |
-| Brightness Down             | XF86MonBrightnessDown  | exec brightness-down                                               |

docs/SCRIPTS.md

@@ -1,59 +1,99 @@
-# Scripts
+[//]: # (This file is autogenerated)
-
+# Scripts
-Scripts are located in the `home/scripts` folder. Home-manager add those in the path.
+
-
+Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path.
-## Nix/NixOs shortcuts
+
-
+## Brightness
-> [!TIP]
+
-> The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
+This module provides a set of scripts to control the brightness of the screen.
-
+
-- `nixy` # UI
+- `brightness-up` increases the brightness by 5%.
-- `nixy rebuild`
+- `brightness-down` decreases the brightness by 5%.
-- `nixy update`
+- `brightness-set [value]` sets the brightness to the given value.
-- `nixy upgrade`
+- `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-- `nixy gc` # garbage collection
+
-- `nixy cb` # clean boot menu
+## Caffeine
-
+
-## Brightness control
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
+
-- `brightness-up`
+- `caffeine-status` - Check if hypridle is running. (0/1)
-- `brightness-down`
+- `caffeine-status-icon` - Check if hypridle is running. (icon)
-- `brightness-change <up/down> <increment>`
+- `caffeine` - Toggle hypridle.
-
+
-## Sound control
+## Hyprfocus
-
+
-- `sound-up`
+A simple script to toggle focus on few windows in Hyprland.
-- `sound-down`
+(disable gaps, border, shadow, opacity, etc.)
-- `sound-toggle`
+
-- `sound-output`
+- `hyprfocus-on` - Enable hyprfocus.
-- `sound-change [up/down/mute] <increment>`
+- `hyprfocus-off` - Disable hyprfocus.
-
+- `hyprfocus-toggle` - Toggle hyprfocus.
-## Caffeine
+
-
+## Hyprpanel
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
-
+Quick scripts to toggle, reload, hide & show hyprpanel.
-- `caffeine` # Toggle caffeine
+
-- `caffeine-status` # Return active/inactive
+- `hyprpanel-toggle` - Toggle hyprpanel (hide/show).
-
+- `hyprpanel-show` - Show hyprpanel.
-## Night-Shift
+- `hyprpanel-hide` - Hide hyprpanel.
-
+- `hyprpanel-reload` - Reload hyprpanel.
-Blue light filter, using wlsunset
+
-
+## Nerdfont FZF
-- `night-shift` # Toggle night shift
+
-- `night-shift-status` # Return active/inactive
+This module provides a script to search for Nerd Fonts icons using fzf.
-- `night-shift-on`
+
-- `night-shift-off`
+- `nerdfont-fzf` - Search for Nerd Fonts icons using fzf.
-
+
-## Nerdfont FZF
+## Night-Shift
-
+
-Nerdfont fzf is a quick way to search for nerdfont icons locally.
+Night-Shift is a feature that reduces the amount of blue light emitted by your screen, which can help reduce eye strain and improve sleep quality. This module provides a set of scripts to control Night-Shift on your system.
-It will copy the selected icon to the clipboard.
+It use hyprsunset to control the screen temperature.
-
+
-- `nerdfont-fzf`
+- `night-shift-on` activates Night-Shift.
-
+- `night-shift-off` deactivates Night-Shift.
-## Compress/Extract
+- `night-shift` toggles Night-Shift.
-
+- `night-shift-status` checks if Night-Shift is active. (0/1)
-Some shortcuts to compress and extract files.
+- `night-shift-status-icon` checks if Night-Shift is active. (icon)
-
+
-- `compress` ...
+## Nixy
-- `extract` ...
+
+Nixy is a simple script that I use to manage my NixOS system. It's a simple script that provides a menu to rebuild, upgrade, update, collect garbage, clean boot menu, etc. 
+
+- `nixy` - UI wizard to manage the system.
+- `nixy rebuild` - Rebuild the system.
+- `nixy ...` - ... see the script for more commands.
+
+
+
+## OpenVPN
+
+OpenVPN allows you to connect/disconnect quickly to a openVPN server
+
+- `openvpn-up` turn on the vpn
+- `openvpn-down` turn down the vpn
+- `openvpn-toggle` toggle the vpn
+
+## Screenshot
+
+This module provides a script to take screenshots using `grimblast` and `swappy`.
+
+- `screenshot [region|window|monitor] [swappy]` - Take a screenshot of the region, window, or monitor. Optionally, use `swappy` to copy the screenshot to the clipboard.
+
+## Sound
+
+This module provides a set of scripts to control the volume of the default audio sink using `wpctl`.
+
+- `sound-up` increases the volume by 5%.
+- `sound-down` decreases the volume by 5%.
+- `sound-set [value]` sets the volume to the given value.
+- `sound-toggle` toggles the mute state of the default audio sink.
+
+## System
+
+Usefull quick scripts
+
+- `menu` - Open wofi with drun mode. (wofi)
+- `powermenu` - Open power dropdown menu. (wofi)
+- `quickmenu` - Open a dropdown menu with shortcuts and scripts. (wofi)
+- `lock` - Lock the screen. (hyprlock)
+

docs/SERVER.md

@@ -0,0 +1,62 @@
+# SERVER
+
+## Overview  
+
+This document describes the architecture and setup of the self-hosted **NixOS server**, which is securely accessible via **Tailscale**. The server is designed for private, secure, and easily manageable self-hosting of various services.
+
+![server dashboard](../.github/assets/server_dashboard.png)
+
+## **Why This Setup?**  
+
+- **Private & Secure**: Services are only accessible through Tailscale, preventing exposure to the public internet.  
+- **Domain-based Access**: A custom domain (`example.org`) maps to the server's Tailscale IP, making service access simple and consistent.  
+- **Automatic SSL Certificates**: Using DNS-01 challenges, valid SSL certificates are generated even though the services are not publicly exposed.  
+- **Modular & Declarative**: Everything is managed through NixOS modules, ensuring reproducibility and easy configuration.  
+
+## **Self-Hosted Services**  
+
+The server hosts several key applications:  
+
+### **Core Infrastructure**  
+
+- **NGINX**: Reverse proxy for routing traffic to services via `example.org`.  
+- **Bitwarden**: A self-hosted password manager for secure credential storage.  
+- **Nextcloud**: A private cloud solution for file synchronization and collaboration.  
+
+### **Networking & Security**  
+
+- **AdGuard Home**: A self-hosted DNS ad blocker for network-wide ad and tracker filtering.  
+
+### **Monitoring & Storage**  
+
+- **Glance**: An awesome dashboard! (See the screenshot above)
+- **Hoarder**: A self-hostable bookmark-everything app (links, notes and images)
+
+### **Media & Content Management**  
+
+- **Arr Stack (Radarr, Sonarr, etc.)**: Automated media management tools for handling movies and TV shows. (legaly ofc)
+
+## **How It Works**  
+
+1. **Domain Configuration**  
+   - `example.org` is pointed to the Tailscale IP of the server. (cloudflare A record, not proxied)
+   - This allows for easy access without exposing services to the internet.  
+
+2. **SSL Certificate Generation**  
+   - Certificates are obtained using a **DNS-01 challenge**, verifying domain ownership without requiring public access.
+
+3. **NGINX Reverse Proxy**  
+   - Routes incoming requests from `*.example.org` to the correct internal service.  
+   - Ensures SSL termination and secure connections.  
+
+4. **Access Control**  
+   - Only devices within the Tailscale network can reach the services.  
+   - Firewall rules restrict access further based on necessity.
+
+## What's Next?
+
+I want to self-host:
+
+- **A great todolist app**: One that is compatible with markdown & IOS
+- **Cyberchef**
+- **Maybe**: An app to manage finances

docs/THEMES.md

@@ -1,6 +1,6 @@
 # Themes
 
-Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs 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 of your host's variables.nix file.
 
 > [!TIP]
@@ -9,24 +9,13 @@ You can change the selected theme by changing the import statement of your host'
 ## Create your theme
 
 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,44 +0,0 @@
-# Todolist
-
-feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
-
-- [ ] Jackflix V2
-  - Backup Radarr, Prowlarr, Sonarr config
-
-- [ ] Nixy
-  - [~] Installation script ([install.sh](./scripts/install.sh) to test on a fresh install)
-  - [~] Variables-template with defaults
-  - [ ] Themes
-    - [ ] macOS theme
-  - [ ] Tofi (Wofi, but terminal based)
-
-- [ ] Qutebrowser
-  - [ ] !!! Bitwarden integration (I need this.)
-
-- [ ] Hyprland
-  - [-] Implement Hyprcursor (see home/system/hyprland/hyprcursor.nix: Not working, small cursor on some apps, big one on others)
-  - [ ] Animations based on app name
-    - [ ] Wofi: popin
-    - [ ] Wlogout: fade in
-  - [ ] Fix screenshots
-  - [ ] Fix hyprlock
-  - [ ] Hyprlock tty theme
-
-- [ ] Nixvim
-  - [ ] Keymaps:
-    - Trouble
-    - Tagbar
-  - [ ] Disable background color for headlines.nvim for titles
-
-- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
-  - [ ] Exclude file pattern (nodes modules, ...)
-  - [ ] Auto backup when a specific usb key is plugged
-  - [ ] Pika backup?
-
-- [ ] Markdown to pdf tool
-
-- [ ] Server
-  - [ ] Bitcoin-git
-  - [ ] ServerFetch: Neofetch like, but for server: CPU, RAM, Disk, Network, Uptime, status (check with uptime kuma API)
-  - [ ] Ntfy auth file
-  - [ ] Launch transmission-openvpn on boot (see hosts/server/modules/jackflix/transmission.nix)

docs/WALLPAPERS.md

@@ -1,39 +0,0 @@
-# Wallpapers
-
-Wallpapers can be found in the `/home/wallpapers` folder.
-
-| Name                | Preview                                                        |
-|---------------------|----------------------------------------------------------------|
-| astronaut.png       | ![astronaut.png](../home/wallpapers/astronaut.png)             |
-| aurore.png          | ![aurore.png](../home/wallpapers/aurore.png)                   |
-| barcode.png         | ![barcode.png](../home/wallpapers/barcode.png)                 |
-| cat-leaves.png      | ![cat-leaves.png](../home/wallpapers/cat-leaves.png)           |
-| city.png            | ![city.png](../home/wallpapers/city.png)                       |
-| cloud.png           | ![cloud.png](../home/wallpapers/cloud.png)                     |
-| clouds2.png         | ![clouds2.png](../home/wallpapers/clouds2.png)                 |
-| clouds.png          | ![clouds.png](../home/wallpapers/clouds.png)                   |
-| coffee.png          | ![coffee.png](../home/wallpapers/coffee.png)                   |
-| dark_cloud.png      | ![dark_cloud.png](../home/wallpapers/dark_cloud.png)           |
-| dark.png            | ![dark.png](../home/wallpapers/dark.png)                       |
-| fuji-dark.png       | ![fuji-dark.png](../home/wallpapers/fuji-dark.png)             |
-| fuji-light.png      | ![fuji-light.png](../home/wallpapers/fuji-light.png)           |
-| galaxy.png          | ![galaxy.png](../home/wallpapers/galaxy.png)                   |
-| house-cloud.png     | ![house-cloud.png](../home/wallpapers/house-cloud.png)         |
-| key.png             | ![key.png](../home/wallpapers/key.png)                         |
-| lavender-cat.png    | ![lavender-cat.png](../home/wallpapers/lavender-cat.png)       |
-| lofi-computer.png   | ![lofi-computer.png](../home/wallpapers/lofi-computer.png)     |
-| lofi-urban.png      | ![lofi-urban.png](../home/wallpapers/lofi-urban.png)           |
-| magma.png           | ![magma.png](../home/wallpapers/magma.png)                     |
-| mountains-black.png | ![mountains-black.png](../home/wallpapers/mountains-black.png) |
-| mountains.png       | ![mountains.png](../home/wallpapers/mountains.png)             |
-| nix.png             | ![nix.png](../home/wallpapers/nix.png)                         |
-| problems.png        | ![problems.png](../home/wallpapers/problems.png)               |
-| sea.png             | ![sea.png](../home/wallpapers/sea.png)                         |
-| see.png             | ![see.png](../home/wallpapers/see.png)                         |
-| space2.png          | ![space2.png](../home/wallpapers/space2.png)                   |
-| space.png           | ![space.png](../home/wallpapers/space.png)                     |
-| street.png          | ![street.png](../home/wallpapers/street.png)                   |
-| sun.png             | ![sun.png](../home/wallpapers/sun.png)                         |
-| tokyo.png           | ![tokyo.png](../home/wallpapers/tokyo.png)                     |
-| train.png           | ![train.png](../home/wallpapers/train.png)                     |
-| windows.png         | ![windows.png](../home/wallpapers/windows.png)                 |

docs/scripts/compress_png.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-# Compress png files in ./docs/src and ./home/wallpapers
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-# Main images
-for file in ./docs/src/*.png; do
-  optipng "$file"
-done
-
-# Theme's images
-for file in ./docs/src/*/*.png; do
-  optipng "$file"
-done
-
-# Wallpapers
-for file in ./home/wallpapers/*.png; do
-  optipng "$file"
-done

docs/scripts/create_preview_wallpapers.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-# Create WALLPAPERS.md to preview wallpapers in ./home/wallpapers
-
-WALLPAPERS_FOLDER="./home/wallpapers"
-WALLPAPERS_MD="./docs/WALLPAPERS.md"
-[[ -d "$WALLPAPERS_FOLDER" ]] || (echo "Wallpapers folder not found" && exit 1)
-
-echo "# Wallpapers" >"$WALLPAPERS_MD"
-echo "" >>"$WALLPAPERS_MD"
-echo "Wallpapers can be found in the \`/home/wallpapers\` folder." >>"$WALLPAPERS_MD"
-echo "" >>"$WALLPAPERS_MD"
-echo "| Name | Preview |" >>"$WALLPAPERS_MD"
-echo "| -- | -- |" >>"$WALLPAPERS_MD"
-
-for file in "$WALLPAPERS_FOLDER"/*.png; do
-  filename=$(basename "$file")
-  echo "| $filename | ![$filename](../home/wallpapers/$filename) |" >>"$WALLPAPERS_MD"
-done
-
-pandoc -t commonmark_x "$WALLPAPERS_MD" -o "/tmp/wallpapers.md"
-mv "/tmp/wallpapers.md" "$WALLPAPERS_MD"

docs/scripts/create_readme.sh

@@ -1,27 +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=$(md-table-of-contents ./docs/src/README_template.md) # https://github.com/anotherhadi/md-table-of-contents
-version=$(git describe --tags --abbrev=0)
-readme_content=$(cat "./docs/src/README_template.md")
-description=$(curl -s https://api.github.com/repos/anotherhadi/nixy | jq .description)
-description="${description%\"}"
-description="${description#\"}"
-
-header=${header//\{date\}/$(date '+%D')}
-header=${header//\{primarycolor\}/89b4fa}
-header=${header//\{backgroundcolor\}/181825}
-header=${header//\{version\}/$version}
-header=${header//\{description\}/$description}
-readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
-
-echo "$header" >"$README_FILE"
-echo "$readme_content" >>"$README_FILE"
-sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
-mv "/tmp/readme.md" "$README_FILE"

docs/scripts/new_tag.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-TAG=$(git describe --tags --abbrev=0)
-echo "Current tag: $TAG"
-
-read -rp "Enter the new tag name: " NEW_TAG
-
-echo "Compresing png files..."
-bash ./docs/scripts/compress_png.sh
-echo "Creating wallpapers preview..."
-bash ./docs/scripts/create_preview_wallpapers.sh
-echo "Creating README.md..."
-bash ./docs/scripts/create_readme.sh
-echo "Creating keybindings.md..."
-bash ./docs/scripts/create_keybindings.sh
-
-git add .
-git commit -m "Release $NEW_TAG"
-git tag -a "$NEW_TAG" -m "Release $NEW_TAG"
-git push origin "$NEW_TAG"

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,55 +0,0 @@
-
-**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.
-
-## Table of Content
-
-{md_table_of_content}
-
-## Gallery
-
-![catppuccin1](docs/src/catppuccin/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
-
-## Architecture
-
-- 🏠 `home` are the dotfiles and configuration files for the users
-  - '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 like configuration
-  - 'wallpapers' are... wallpapers
-- 💻 `hosts` are the system configuration files
-  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
-  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
-
-## Installation
-
-```sh
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-```
-
-- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-- Add your `hardware-configuration.nix` to your new host's folder
-- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
-
-> [!NOTE]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
-
-```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
-```
-
-## 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
-- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
-- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers 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,33 +0,0 @@
-[//]: # (Title: Nixy)  
-[//]: # (Description: {description})  
-[//]: # (Author: Hadi)  
-[//]: # (Date: {date})
-[//]: # (Version: {version})
-
-<div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
-</div>
-
-<br>
-
-# Nixy
-
-<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={version}&colorA={backgroundcolor}&colorB={primarycolor}&logo=githubactions&logoColor={primarycolor}"/>
-    </a>
-    <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>

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

@@ -1,72 +1,72 @@
 {
   # https://github.com/anotherhadi/nixy
   description = ''
-    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+    Nixy simplifies and unifies the Hyprland ecosystem with a modular, easily customizable setup.
-    It's a simple way to manage your system configuration and dotfiles.
+    It provides a structured way to manage your system configuration and dotfiles with minimal effort. 
   '';
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+    stylix.url = "github:danth/stylix";
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
+    nixcord.url = "github:kaylorben/nixcord";
+    sops-nix.url = "github:Mic92/sops-nix";
+    nixarr.url = "github:rasmus-kirk/nixarr";
+    anyrun.url = "github:fufexan/anyrun/launch-prefix";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixvim = {
-      url = "github:nix-community/nixvim";
+      url =
+        "github:nix-community/nixvim/d81f37256d0a8691b837b74979d27bf89be8ecdd";
       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";
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprspace = {
-    nurpkgs.url = "github:nix-community/NUR";
+      url = "github:KZDKM/Hyprspace";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+      inputs.hyprland.follows = "hyprland";
+    };
+    search-nixos-api.url = "github:anotherhadi/search-nixos-api";
   };
 
   outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-
+      nixy =
-      nixy = nixpkgs.lib.nixosSystem { # CHANGE ME
+        # CHANGEME: This should match the 'hostname' in your variables.nix file
-        system = "x86_64-linux";
+        nixpkgs.lib.nixosSystem {
-        modules = [
+          system = "x86_64-linux";
-          ./hosts/laptop/configuration.nix # CHANGE ME
+          modules = [
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGE ME
+            {
-          inputs.home-manager.nixosModules.home-manager
+              nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
-          {
+              _module.args = { inherit inputs; };
-            nixpkgs.overlays = [ inputs.nurpkgs.overlay ];
+            }
-            _module.args = { inherit inputs; };
+            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
-            home-manager = {
+            inputs.home-manager.nixosModules.home-manager
-              useGlobalPkgs = true;
+            inputs.stylix.nixosModules.stylix
-              useUserPackages = true;
+            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
-              users."hadi" = import ./hosts/laptop/home.nix; # CHANGE ME
+          ];
-              extraSpecialArgs = { inherit inputs; };
+        };
-            };
+      # Jack is my server
-          }
-        ];
-      };
-
       jack = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          inputs.sops-nix.nixosModules.sops
+          { _module.args = { inherit inputs; }; }
-          ./hosts/server/configuration.nix
           inputs.home-manager.nixosModules.home-manager
-          {
+          inputs.stylix.nixosModules.stylix
-            nixpkgs.overlays = [ inputs.nurpkgs.overlay ];
+          inputs.sops-nix.nixosModules.sops
-            _module.args = { inherit inputs; };
+          inputs.nixarr.nixosModules.default
-            home-manager = {
+          inputs.search-nixos-api.nixosModules.search-nixos-api
-              useGlobalPkgs = true;
+          ./hosts/server/configuration.nix
-              useUserPackages = true;
-              users."hadi" = import ./hosts/server/home.nix;
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
         ];
       };
-
     };
   };
 }

home/programs/anyrun/default.nix

@@ -0,0 +1,87 @@
+{ pkgs, inputs, ... }: {
+  programs.anyrun = {
+    enable = true;
+    config = {
+      plugins = with inputs.anyrun.packages.${pkgs.system}; [
+        applications
+        shell
+        randr
+        rink
+        symbols
+        translate
+      ];
+
+      width.fraction = 0.25;
+      y.fraction = 0.3;
+      hidePluginInfo = true;
+      closeOnClick = true;
+    };
+
+    extraCss = ''
+      * {
+        all: unset;
+        font-size: 1.2rem;
+      }
+
+      #window,
+      #match,
+      #entry,
+      #plugin,
+      #main {
+        background: transparent;
+      }
+
+      #match.activatable {
+        border-radius: 8px;
+        margin: 4px 0;
+        padding: 4px;
+        /* transition: 100ms ease-out; */
+      }
+      #match.activatable:first-child {
+        margin-top: 12px;
+      }
+      #match.activatable:last-child {
+        margin-bottom: 0;
+      }
+
+      #match:hover {
+        background: rgba(255, 255, 255, 0.05);
+      }
+      #match:selected {
+        background: rgba(255, 255, 255, 0.1);
+      }
+
+      #entry {
+        background: rgba(255, 255, 255, 0.05);
+        border: 1px solid rgba(255, 255, 255, 0.1);
+        border-radius: 8px;
+        padding: 4px 8px;
+      }
+
+      box#main {
+        background: rgba(0, 0, 0, 0.5);
+        box-shadow:
+          inset 0 0 0 1px rgba(255, 255, 255, 0.1),
+          0 30px 30px 15px rgba(0, 0, 0, 0.5);
+        border-radius: 20px;
+        padding: 12px;
+      }
+    '';
+
+    extraConfigFiles = {
+      "applications.ron".text = ''
+        Config(
+          desktop_actions: false,
+          max_entries: 5,
+          terminal: Some("foot"),
+        )
+      '';
+
+      "shell.ron".text = ''
+        Config(
+          prefix: ">"
+        )
+      '';
+    };
+  };
+}

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/discord/default.nix

@@ -0,0 +1,9 @@
+# Discord is a popular chat application.
+{ inputs, ... }: {
+  imports = [ inputs.nixcord.homeManagerModules.nixcord ];
+
+  programs.nixcord = {
+    enable = true;
+    config = { frameless = true; };
+  };
+}

home/programs/duckduckgo-colorscheme/default.nix

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

home/programs/fetch/neofetch/default.nix

@@ -1,4 +1,5 @@
-{ pkgs, config, ... }: {
+# Legacy
+{ pkgs, ... }: {
   home.packages = with pkgs; [ neofetch ];
 
   xdg.configFile."neofetch/ascii.txt".text = ''
@@ -109,9 +110,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,6 @@
-{ pkgs, config, ... }:
+# Nerdfetch, a simple system info script written in bash
+# Source: https://github.com/ThatOneCalculator/NerdFetch
+{ pkgs, ... }:
 let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
           ostype="$(uname)"
@@ -345,9 +347,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,13 @@
-{ config, ... }: {
+# Git configuration
+{ 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"
@@ -17,7 +22,9 @@
     ];
     extraConfig = {
       init.defaultBranch = "main";
+      pull.rebase = "false";
       push.autoSetupRemote = true;
+      color.ui = "1";
     };
     aliases = {
       essa = "push --force";

home/programs/kitty/default.nix

@@ -1,6 +1,16 @@
-{ config, pkgs, ... }: {
+# Kitty is a fast, featureful, GPU based terminal emulator
+{
   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 +20,14 @@
       confirm_os_window_close = "0";
       remember_window_size = "no";
       disable_ligatures = "never";
-      shell = "${pkgs.tmux}/bin/tmux";
       url_style = "curly";
+      copy_on_select = "clipboard";
       cursor_shape = "Underline";
-      cursor_underline_thickness = config.var.theme.border-size;
+      cursor_underline_thickness = 3;
-      window_padding_width = config.var.theme.gaps-in;
+      cursor_trail = 3;
-
+      cursor_trail_decay = "0.1 0.4";
-      # Font
+      window_padding_width = 10;
-      font_family = config.var.theme.font-mono;
+      open_url_with = "default";
-      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,23 @@
+# Lazygit is a simple terminal UI for git commands.
+{ config, lib, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  muted = "#${config.lib.stylix.colors.base03}";
+in {
+  programs.lazygit = {
+    enable = true;
+    settings = lib.mkForce {
+      gui = {
+        theme = {
+          activeBorderColor = [ accent "bold" ];
+          inactiveBorderColor = [ muted ];
+        };
+        showListFooter = false;
+        showRandomTip = false;
+        showCommandLog = false;
+        showBottomLine = false;
+        nerdFontsVersion = "3";
+      };
+    };
+  };
+}

home/programs/lf/config/colors

@@ -1,174 +0,0 @@
-# vim:ft=dircolors
-# (This is not a dircolors file but it helps to highlight colors and comments)
-
-# default values from dircolors
-# (entries with a leading # are not implemented in lf)
-# #no     00              # NORMAL
-# fi      00              # FILE
-# #rs     0               # RESET
-# di      01;34           # DIR
-# ln      01;36           # LINK
-# #mh     00              # MULTIHARDLINK
-# pi      40;33           # FIFO
-# so      01;35           # SOCK
-# #do     01;35           # DOOR
-# bd      40;33;01        # BLK
-# cd      40;33;01        # CHR
-# or      40;31;01        # ORPHAN
-# #mi     00              # MISSING
-# su      37;41           # SETUID
-# sg      30;43           # SETGID
-# #ca     30;41           # CAPABILITY
-# tw      30;42           # STICKY_OTHER_WRITABLE
-# ow      34;42           # OTHER_WRITABLE
-# st      37;44           # STICKY
-# ex      01;32           # EXEC
-
-# default values from lf (with matching order)
-# ln      01;36   # LINK
-# or      31;01   # ORPHAN
-# tw      01;34   # STICKY_OTHER_WRITABLE
-# ow      01;34   # OTHER_WRITABLE
-# st      01;34   # STICKY
-# di      01;34   # DIR
-# pi      33      # FIFO
-# so      01;35   # SOCK
-# bd      33;01   # BLK
-# cd      33;01   # CHR
-# su      01;32   # SETUID
-# sg      01;32   # SETGID
-# ex      01;32   # EXEC
-# fi      00      # FILE
-
-# file types (with matching order)
-ln      01;36   # LINK
-or      31;01   # ORPHAN
-tw      34      # STICKY_OTHER_WRITABLE
-ow      34      # OTHER_WRITABLE
-st      01;34   # STICKY
-di      01;34   # DIR
-pi      33      # FIFO
-so      01;35   # SOCK
-bd      33;01   # BLK
-cd      33;01   # CHR
-su      01;32   # SETUID
-sg      01;32   # SETGID
-ex      01;32   # EXEC
-fi      00      # FILE
-
-# archives or compressed (dircolors defaults)
-*.tar   01;31
-*.tgz   01;31
-*.arc   01;31
-*.arj   01;31
-*.taz   01;31
-*.lha   01;31
-*.lz4   01;31
-*.lzh   01;31
-*.lzma  01;31
-*.tlz   01;31
-*.txz   01;31
-*.tzo   01;31
-*.t7z   01;31
-*.zip   01;31
-*.z     01;31
-*.dz    01;31
-*.gz    01;31
-*.lrz   01;31
-*.lz    01;31
-*.lzo   01;31
-*.xz    01;31
-*.zst   01;31
-*.tzst  01;31
-*.bz2   01;31
-*.bz    01;31
-*.tbz   01;31
-*.tbz2  01;31
-*.tz    01;31
-*.deb   01;31
-*.rpm   01;31
-*.jar   01;31
-*.war   01;31
-*.ear   01;31
-*.sar   01;31
-*.rar   01;31
-*.alz   01;31
-*.ace   01;31
-*.zoo   01;31
-*.cpio  01;31
-*.7z    01;31
-*.rz    01;31
-*.cab   01;31
-*.wim   01;31
-*.swm   01;31
-*.dwm   01;31
-*.esd   01;31
-
-# image formats (dircolors defaults)
-*.jpg   01;35
-*.jpeg  01;35
-*.mjpg  01;35
-*.mjpeg 01;35
-*.gif   01;35
-*.bmp   01;35
-*.pbm   01;35
-*.pgm   01;35
-*.ppm   01;35
-*.tga   01;35
-*.xbm   01;35
-*.xpm   01;35
-*.tif   01;35
-*.tiff  01;35
-*.png   01;35
-*.svg   01;35
-*.svgz  01;35
-*.mng   01;35
-*.pcx   01;35
-*.mov   01;35
-*.mpg   01;35
-*.mpeg  01;35
-*.m2v   01;35
-*.mkv   01;35
-*.webm  01;35
-*.ogm   01;35
-*.mp4   01;35
-*.m4v   01;35
-*.mp4v  01;35
-*.vob   01;35
-*.qt    01;35
-*.nuv   01;35
-*.wmv   01;35
-*.asf   01;35
-*.rm    01;35
-*.rmvb  01;35
-*.flc   01;35
-*.avi   01;35
-*.fli   01;35
-*.flv   01;35
-*.gl    01;35
-*.dl    01;35
-*.xcf   01;35
-*.xwd   01;35
-*.yuv   01;35
-*.cgm   01;35
-*.emf   01;35
-*.ogv   01;35
-*.ogx   01;35
-
-# audio formats (dircolors defaults)
-*.aac   00;36
-*.au    00;36
-*.flac  00;36
-*.m4a   00;36
-*.mid   00;36
-*.midi  00;36
-*.mka   00;36
-*.mp3   00;36
-*.mpc   00;36
-*.ogg   00;36
-*.ra    00;36
-*.wav   00;36
-*.oga   00;36
-*.opus  00;36
-*.spx   00;36
-*.xspf  00;36

home/programs/lf/config/icons

@@ -1,361 +0,0 @@
-# vim:ft=conf
-
-# These examples require Nerd Fonts or a compatible font to be used.
-# See https://www.nerdfonts.com for more information.
-
-# default values from lf (with matching order)
-# ln      l       # LINK
-# or      l       # ORPHAN
-# tw      t       # STICKY_OTHER_WRITABLE
-# ow      d       # OTHER_WRITABLE
-# st      t       # STICKY
-# di      d       # DIR
-# pi      p       # FIFO
-# so      s       # SOCK
-# bd      b       # BLK
-# cd      c       # CHR
-# su      u       # SETUID
-# sg      g       # SETGID
-# ex      x       # EXEC
-# fi      -       # FILE
-
-# file types (with matching order)
-ln             # LINK
-or             # ORPHAN
-tw      t       # STICKY_OTHER_WRITABLE
-ow             # OTHER_WRITABLE
-st      t       # STICKY
-di             # DIR
-pi      p       # FIFO
-so      s       # SOCK
-bd      b       # BLK
-cd      c       # CHR
-su      u       # SETUID
-sg      g       # SETGID
-ex             # EXEC
-fi             # FILE
-
-# file extensions (vim-devicons)
-*.styl          
-*.sass          
-*.scss          
-*.htm           
-*.html          
-*.slim          
-*.haml          
-*.ejs           
-*.css           
-*.less          
-*.md            
-*.mdx           
-*.markdown      
-*.rmd           
-*.json          
-*.webmanifest   
-*.js            
-*.mjs           
-*.jsx           
-*.rb            
-*.gemspec       
-*.rake          
-*.php           
-*.py            
-*.pyc           
-*.pyo           
-*.pyd           
-*.coffee        
-*.mustache      
-*.hbs           
-*.conf          
-*.ini           
-*.yml           
-*.yaml          
-*.toml          
-*.bat           
-*.mk            
-*.jpg           
-*.jpeg          
-*.bmp           
-*.png           
-*.webp          
-*.gif           
-*.ico           
-*.twig          
-*.cpp           
-*.c++           
-*.cxx           
-*.cc            
-*.cp            
-*.c             
-*.cs            󰌛
-*.h             
-*.hh            
-*.hpp           
-*.hxx           
-*.hs            
-*.lhs           
-*.nix           
-*.lua           
-*.java          
-*.sh            
-*.fish          
-*.bash          
-*.zsh           
-*.ksh           
-*.csh           
-*.awk           
-*.ps1           
-*.ml            λ
-*.mli           λ
-*.diff          
-*.db            
-*.sql           
-*.dump          
-*.clj           
-*.cljc          
-*.cljs          
-*.edn           
-*.scala         
-*.go            
-*.dart          
-*.xul           
-*.sln           
-*.suo           
-*.pl            
-*.pm            
-*.t             
-*.rss           
-'*.f#'          
-*.fsscript      
-*.fsx           
-*.fs            
-*.fsi           
-*.rs            
-*.rlib          
-*.d             
-*.erl           
-*.hrl           
-*.ex            
-*.exs           
-*.eex           
-*.leex          
-*.heex          
-*.vim           
-*.ai            
-*.psd           
-*.psb           
-*.ts            
-*.tsx           
-*.jl            
-*.pp            
-*.vue           
-*.elm           
-*.swift         
-*.xcplayground  
-*.tex           󰙩
-*.r             󰟔
-*.rproj         󰗆
-*.sol           󰡪
-*.pem           
-
-# file names (vim-devicons) (case-insensitive not supported in lf)
-*gruntfile.coffee       
-*gruntfile.js           
-*gruntfile.ls           
-*gulpfile.coffee        
-*gulpfile.js            
-*gulpfile.ls            
-*mix.lock               
-*dropbox                
-*.ds_store              
-*.gitconfig             
-*.gitignore             
-*.gitattributes         
-*.gitlab-ci.yml         
-*.bashrc                
-*.zshrc                 
-*.zshenv                
-*.zprofile              
-*.vimrc                 
-*.gvimrc                
-*_vimrc                 
-*_gvimrc                
-*.bashprofile           
-*favicon.ico            
-*license                
-*node_modules           
-*react.jsx              
-*procfile               
-*dockerfile             
-*docker-compose.yml     
-*docker-compose.yaml    
-*compose.yml            
-*compose.yaml           
-*rakefile               
-*config.ru              
-*gemfile                
-*makefile               
-*cmakelists.txt         
-*robots.txt             󰚩
-
-# file names (case-sensitive adaptations)
-*Gruntfile.coffee       
-*Gruntfile.js           
-*Gruntfile.ls           
-*Gulpfile.coffee        
-*Gulpfile.js            
-*Gulpfile.ls            
-*Dropbox                
-*.DS_Store              
-*LICENSE                
-*React.jsx              
-*Procfile               
-*Dockerfile             
-*Docker-compose.yml     
-*Docker-compose.yaml    
-*Rakefile               
-*Gemfile                
-*Makefile               
-*CMakeLists.txt         
-
-# file patterns (vim-devicons) (patterns not supported in lf)
-# .*jquery.*\.js$         
-# .*angular.*\.js$        
-# .*backbone.*\.js$       
-# .*require.*\.js$        
-# .*materialize.*\.js$    
-# .*materialize.*\.css$   
-# .*mootools.*\.js$       
-# .*vimrc.*               
-# Vagrantfile$            
-
-# file patterns (file name adaptations)
-*jquery.min.js          
-*angular.min.js         
-*backbone.min.js        
-*require.min.js         
-*materialize.min.js     
-*materialize.min.css    
-*mootools.min.js        
-*vimrc                  
-Vagrantfile             
-
-# archives or compressed (extensions from dircolors defaults)
-*.tar   
-*.tgz   
-*.arc   
-*.arj   
-*.taz   
-*.lha   
-*.lz4   
-*.lzh   
-*.lzma  
-*.tlz   
-*.txz   
-*.tzo   
-*.t7z   
-*.zip   
-*.z     
-*.dz    
-*.gz    
-*.lrz   
-*.lz    
-*.lzo   
-*.xz    
-*.zst   
-*.tzst  
-*.bz2   
-*.bz    
-*.tbz   
-*.tbz2  
-*.tz    
-*.deb   
-*.rpm   
-*.jar   
-*.war   
-*.ear   
-*.sar   
-*.rar   
-*.alz   
-*.ace   
-*.zoo   
-*.cpio  
-*.7z    
-*.rz    
-*.cab   
-*.wim   
-*.swm   
-*.dwm   
-*.esd   
-
-# image formats (extensions from dircolors defaults)
-*.jpg   
-*.jpeg  
-*.mjpg  
-*.mjpeg 
-*.gif   
-*.bmp   
-*.pbm   
-*.pgm   
-*.ppm   
-*.tga   
-*.xbm   
-*.xpm   
-*.tif   
-*.tiff  
-*.png   
-*.svg   
-*.svgz  
-*.mng   
-*.pcx   
-*.mov   
-*.mpg   
-*.mpeg  
-*.m2v   
-*.mkv   
-*.webm  
-*.ogm   
-*.mp4   
-*.m4v   
-*.mp4v  
-*.vob   
-*.qt    
-*.nuv   
-*.wmv   
-*.asf   
-*.rm    
-*.rmvb  
-*.flc   
-*.avi   
-*.fli   
-*.flv   
-*.gl    
-*.dl    
-*.xcf   
-*.xwd   
-*.yuv   
-*.cgm   
-*.emf   
-*.ogv   
-*.ogx   
-
-# audio formats (extensions from dircolors defaults)
-*.aac   
-*.au    
-*.flac  
-*.m4a   
-*.mid   
-*.midi  
-*.mka   
-*.mp3   
-*.mpc   
-*.ogg   
-*.ra    
-*.wav   
-*.oga   
-*.opus  
-*.spx   
-*.xspf  
-
-# other formats
-*.pdf   

home/programs/lf/default.nix

@@ -1,80 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ pistol ];
-
-  programs.lf = {
-    enable = true;
-
-    commands = {
-      dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"'';
-      editor-open = "$$EDITOR $f";
-      mkdir = ''
-        ''${{
-          printf "Directory Name: "
-          read DIR
-          mkdir $DIR
-        }}
-      '';
-    };
-
-    keybindings = {
-      d = "delete";
-      x = "cut";
-      "<enter>" = "open";
-      "<c-g>" = "quit";
-      "<esc>" = "quit";
-      "H" = "set hidden!";
-      "\\\"" = "";
-      o = "";
-      c = "mkdir";
-      "." = "set hidden!";
-      "`" = "mark-load";
-      "\\'" = "mark-load";
-      "g~" = "cd";
-      do = "dragon-out";
-      gh = "cd";
-      "g/" = "/";
-      ee = "editor-open";
-      V = ''$''${pkgs.bat}/bin/bat --paging=always "$f"'';
-    };
-
-    settings = {
-      ratios = [ 1 1 2 ];
-      preview = true;
-      hidden = true;
-      drawbox = true;
-      icons = true;
-      ignorecase = true;
-      incsearch = true;
-    };
-
-    previewer.source = "${pkgs.pistol}/bin/pistol";
-
-    extraConfig = let
-      previewer = pkgs.writeShellScriptBin "pv.sh" ''
-        file=$1
-        w=$2
-        h=$3
-        x=$4
-        y=$5
-
-        if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then
-            ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty
-            exit 1
-        fi
-
-        ${pkgs.pistol}/bin/pistol "$file"
-      '';
-      cleaner = pkgs.writeShellScriptBin "clean.sh" ''
-        ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty
-      '';
-    in ''
-      set cleaner ${cleaner}/bin/clean.sh
-      set previewer ${previewer}/bin/pv.sh
-    '';
-  };
-
-  xdg.configFile."lf" = {
-    recursive = true;
-    source = ./config;
-  };
-}

home/programs/nextcloud/default.nix

@@ -1,6 +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 = {
+  services.nextcloud-client = {
-        enable = true;
+    enable = true;
-        startInBackground = true;
+    startInBackground = true;
-    };
+  };
-}
+}

home/programs/nvim/autocmds.nix

@@ -0,0 +1,46 @@
+{
+  programs.nixvim = {
+    autoGroups = {
+      highlightyank.clear = true;
+      q_close_windows.clear = true;
+    };
+
+    autoCmd = [
+      # highlightyank
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L206-L211
+      {
+        desc = "Highlight yanked text";
+        event = "TextYankPost";
+        group = "highlightyank";
+        pattern = "*";
+
+        callback.__raw = ''
+          function()
+            vim.highlight.on_yank()
+          end
+        '';
+      }
+
+      # q_close_windows
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L242-L255
+      {
+        desc = "Make q close help, man, quickfix, dap floats";
+        event = "BufWinEnter";
+        group = "q_close_windows";
+
+        callback.__raw = ''
+          function(event)
+            if vim.tbl_contains({ "help", "nofile", "quickfix" }, vim.bo[event.buf].buftype) then
+              vim.keymap.set("n", "q", "<Cmd>close<CR>", {
+                desc = "Close window",
+                buffer = event.buf,
+                silent = true,
+                nowait = true,
+              })
+            end
+          end
+        '';
+      }
+    ];
+  };
+}

home/programs/nvim/colorscheme.nix

@@ -1,12 +0,0 @@
-{
-  programs.nixvim = {
-    enable = true;
-    colorschemes.catppuccin = {
-      enable = true;
-      settings = {
-        transparent_background = true;
-        flavour = "mocha";
-      };
-    };
-  };
-}

home/programs/nvim/default.nix

@@ -1,17 +1,22 @@
+# Nixvim is a NixOS module that installs and configures Neovim
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
     ./plugins/cmp.nix
-    ./plugins/dashboard.nix
+    ./plugins/floaterm.nix
+    ./plugins/git.nix
     ./plugins/lsp.nix
     ./plugins/markdown.nix
-    ./plugins/tree.nix
+    ./plugins/mini.nix
-    ./plugins/ui.nix
+    ./plugins/picker.nix
+    ./plugins/snacks.nix
+    ./plugins/trouble.nix
     ./plugins/utils.nix
-    ./plugins/zen-mode.nix
 
     ./options.nix
-    ./colorscheme.nix
     ./keymaps.nix
+    ./autocmds.nix
   ];
+
+  programs.nixvim.enable = true;
 }

home/programs/nvim/keymaps.nix

@@ -1,24 +1,156 @@
 {
-  programs.nixvim.keymaps = [
+  programs.nixvim = {
-    {
+    plugins.which-key = {
-      key = "<leader>fm";
+      enable = true;
-      action = "<cmd>lua vim.lsp.buf.format()<cr>";
+      settings = {
-      options.desc = "LSP Format";
+        delay = 600;
-    }
+        icons = {
-    {
+          breadcrumb = "»";
-      key = "<leader>w";
+          group = "+";
-      action = "<cmd>set wrap!<cr>";
+          separator = ""; # ➜
-      options.desc = "Toggle word wrapping";
+          mappings = false;
-    }
+        };
-    {
+        spec = [
-      key = "<leader>W";
+          # General Mappings
-      action = "<cmd>set linebreak!<cr>";
+          {
-      options.desc = "Toggle linebreak";
+            __unkeyed-1 = "<leader>u";
-    }
+            mode = "n";
-    {
+            group = "+ui";
-      key = "<leader>z";
+          }
-      action = "<cmd>ZenMode<cr>";
+          {
-      options.desc = "ZenMode";
+            __unkeyed-1 = "<leader>w";
-    }
+            mode = "n";
-  ];
+            group = "+windows";
+          }
+          {
+            __unkeyed-1 = "<leader>c";
+            mode = "n";
+            group = "+code";
+          }
+        ];
+        win = {
+          border = "rounded";
+          wo.winblend = 0;
+        };
+      };
+    };
+
+    keymaps = [
+      # General Mappings
+      {
+        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-tab>";
+        action = "<cmd>bnext<cr>";
+        options.desc = "Next Buffer";
+      }
+
+      # Tmux
+      {
+        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>";
+      }
+
+      # Disable Arrow Keys in Normal Mode
+      {
+        key = "<Up>";
+        action = "<Nop>";
+        options.desc = "Disable Up Arrow";
+      }
+      {
+        key = "<Down>";
+        action = "<Nop>";
+        options.desc = "Disable Down Arrow";
+      }
+      {
+        key = "<Left>";
+        action = "<Nop>";
+        options.desc = "Disable Left Arrow";
+      }
+      {
+        key = "<Right>";
+        action = "<Nop>";
+        options.desc = "Disable Right Arrow";
+      }
+
+      # UI
+      {
+        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 spellLazyGitcheck";
+      }
+      {
+        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";
+      }
+
+      # 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";
+      }
+    ];
+  };
 }

home/programs/nvim/options.nix

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

home/programs/nvim/plugins/cmp.nix

@@ -15,8 +15,13 @@
         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 = "render-markdown"; }
           { name = "path"; }
         ];
 
@@ -80,7 +85,7 @@
           completion = {
             winhighlight =
               "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
-            scrollbar = true;
+            scrollbar = false;
             sidePadding = 0;
             border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
           };
@@ -108,6 +113,5 @@
         };
       };
     };
-
   };
 }

home/programs/nvim/plugins/dashboard.nix

@@ -1,148 +0,0 @@
-{ config, ... }: {
-
-  programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
-    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
-    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
-  };
-
-  programs.nixvim.plugins.alpha = {
-    enable = true;
-    layout = [
-      {
-        type = "padding";
-        val = 4;
-      }
-      {
-        type = "text";
-        opts = {
-          position = "center";
-          hl = "AlphaHeaderColor";
-        };
-        val = [
-          "                                                                     "
-          "       ████ ██████           █████      ██                     "
-          "      ███████████             █████                             "
-          "      █████████ ███████████████████ ███   ███████████   "
-          "     █████████  ███    █████████████ █████ ██████████████   "
-          "    █████████ ██████████ █████████ █████ █████ ████ █████   "
-          "  ███████████ ███    ███ █████████ █████ █████ ████ █████  "
-          " ██████  █████████████████████ ████ █████ █████ ████ ██████ "
-          "                                                                       "
-        ];
-      }
-      {
-        type = "padding";
-        val = 4;
-      }
-      {
-        type = "group";
-
-        val = [
-          {
-            type = "button";
-            val = "󰭎  Find file";
-            on_press.__raw = "function() vim.cmd[[Telescope find_files]] end";
-            opts = {
-              shortcut = "nf";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "  New file";
-            on_press.__raw = "function() vim.cmd[[ene]] end";
-            opts = {
-              shortcut = "nn";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "  NixOs Config";
-            on_press.__raw =
-              "function() vim.cmd[[Neotree ${config.var.configDirectory}]] 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}/docs/KEYBINDINGS.md]] end";
-            opts = {
-              shortcut = "nc";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "  Recently used";
-            on_press.__raw = "function() vim.cmd[[Telescope oldfiles]] end";
-            opts = {
-              shortcut = "no";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "󰱽  Find text";
-            on_press.__raw = "function() vim.cmd[[Telescope live_grep]] end";
-            opts = {
-              shortcut = "nt";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-          {
-            type = "button";
-            val = "󰩈  Quit Neovim";
-            on_press.__raw = "function() vim.cmd[[qa]] end";
-            opts = {
-              shortcut = "nq";
-              position = "center";
-              cursor = 3;
-              width = 50;
-              align_shortcut = "right";
-              hl_shortcut = "AlphaShortcutColor";
-              hl = "AlphaTextColor";
-            };
-          }
-        ];
-
-      }
-    ];
-  };
-
-}

home/programs/nvim/plugins/floaterm.nix

@@ -0,0 +1,13 @@
+{ config, ... }: {
+  programs.nixvim = {
+    plugins.floaterm.enable = true;
+    highlightOverride = {
+      FloatermBorder.fg = "#${config.lib.stylix.colors.base01}";
+    };
+    keymaps = [{
+      key = "<leader>cn";
+      action = "<cmd>FloatermNew --title=nixy nixy || sleep 10<cr>";
+      options.desc = "Nixy";
+    }];
+  };
+}

home/programs/nvim/plugins/git.nix

@@ -0,0 +1,13 @@
+{
+  programs.nixvim = {
+    plugins = {
+      gitsigns.enable = true;
+      snacks.settings = { lazygit.enable = true; };
+    };
+    keymaps = [{
+      key = "<leader>gl";
+      action = "<cmd>lua Snacks.lazygit()<cr>";
+      options.desc = "LazyGit";
+    }];
+  };
+}

home/programs/nvim/plugins/lsp.nix

@@ -3,34 +3,21 @@
     lsp-format.enable = true;
     lsp = {
       enable = true;
+      inlayHints = true;
       servers = {
         bashls.enable = true;
-        clangd.enable = true;
         gopls.enable = true;
+        ts_ls.enable = true;
         nixd.enable = true;
         tailwindcss.enable = true;
         html.enable = true;
         svelte.enable = true;
-        marksman.enable = true;
-        ltex = {
-          enable = false;
-          settings = {
-            enabled = false;
-            language = "en";
-          };
-        };
-      };
-      keymaps.lspBuf = {
-        "gd" = "definition";
-        "gD" = "references";
-        "gt" = "type_definition";
-        "gi" = "implementation";
-        "K" = "hover";
       };
     };
     none-ls = {
       enable = true;
       sources = {
+        completion = { luasnip.enable = true; };
         diagnostics = {
           golangci_lint.enable = true;
           statix.enable = true;
@@ -43,6 +30,8 @@
           tidy.enable = true;
           shellharden.enable = true;
           shfmt.enable = true;
+          golines.enable = true;
+          gofumpt.enable = true;
         };
       };
     };

home/programs/nvim/plugins/markdown.nix

@@ -1,131 +1,32 @@
-{
+{ config, ... }:
-  programs.nixvim.plugins = {
+let
-    mkdnflow = {
+  accent = "#${config.lib.stylix.colors.base0D}";
-      enable = true;
+  muted = "#${config.lib.stylix.colors.base03}";
-      mappings = {
+in {
+  programs.nixvim = {
+    extraFiles."after/ftplugin/markdown.lua".text = ''
+      vim.bo.tabstop = 2
+      vim.bo.shiftwidth = 2
+      vim.bo.expandtab = true 
+      vim.wo.cursorline = false
+    '';
 
-        # Main
+    # Plugins
-        MkdnEnter = {
+    plugins = {
-          key = "<CR>";
+      # Render UI elements
-          modes = [ "n" "v" "i" ];
+      render-markdown = {
-        };
+        enable = true;
+        settings = { completions.lsp.enabled = true; };
+      };
 
-        # Links
+      mkdnflow = {
-        MkdnCreateLink = false;
+        enable = true;
-        MkdnCreateLinkFromClipboard = {
+        mappings = {
-          key = "<leader>lc";
+          MkdnTableNextCell = {
-          modes = [ "n" "v" ];
+            key = "<S-Tab>";
-        };
+            modes = "i";
-        MkdnDestroyLink = {
+          };
-          key = "<leader>dl";
+          MkdnTablePrevCell = false;
-          modes = "n";
-        };
-        MkdnFollowLink = false;
-        MkdnNextLink = {
-          key = "<Tab>";
-          modes = "n";
-        };
-        MkdnYankAnchorLink = {
-          key = "ya";
-          modes = "n";
-        };
-        MkdnYankFileAnchorLink = {
-          key = "yfa";
-          modes = "n";
-        };
-        MkdnPrevLink = {
-          key = "<S-Tab>";
-          modes = "n";
-        };
-
-        MkdnDecreaseHeading = {
-          key = "-";
-          modes = "n";
-        };
-        MkdnExtendList = false;
-        MkdnFoldSection = {
-          key = "<leader>ff";
-          modes = "n";
-        };
-        MkdnUnfoldSection = {
-          key = "<leader>fu";
-          modes = "n";
-        };
-        MkdnGoBack = {
-          key = "<BS>";
-          modes = "n";
-        };
-        MkdnGoForward = {
-          key = "<Del>";
-          modes = "n";
-        };
-        MkdnIncreaseHeading = {
-          key = "+";
-          modes = "n";
-        };
-        MkdnMoveSource = {
-          key = "<F2>";
-          modes = "n";
-        };
-        MkdnNewListItem = false;
-        MkdnNewListItemAboveInsert = {
-          key = "O";
-          modes = "n";
-        };
-        MkdnNewListItemBelowInsert = {
-          key = "o";
-          modes = "n";
-        };
-        MkdnNextHeading = {
-          key = "]]";
-          modes = "n";
-        };
-        MkdnPrevHeading = {
-          key = "[[";
-          modes = "n";
-        };
-        MkdnSTab = false;
-        MkdnTab = false;
-        MkdnTableFormat = {
-          key = "<leader>ft";
-          modes = "n";
-        };
-        MkdnTableNewColAfter = {
-          key = "<leader>ic";
-          modes = "n";
-        };
-        MkdnTableNewColBefore = {
-          key = "<leader>iC";
-          modes = "n";
-        };
-        MkdnTableNewRowAbove = {
-          key = "<leader>iR";
-          modes = "n";
-        };
-        MkdnTableNewRowBelow = {
-          key = "<leader>ir";
-          modes = "n";
-        };
-        MkdnTableNextCell = {
-          key = "<S-Tab>";
-          modes = "i";
-        };
-        MkdnTableNextRow = false;
-        MkdnTablePrevCell = {
-          key = "<M-Tab>";
-          modes = "i";
-        };
-        MkdnTablePrevRow = {
-          key = "<M-CR>";
-          modes = "i";
-        };
-        MkdnToggleToDo = {
-          key = "<C-Space>";
-          modes = [ "n" "v" ];
-        };
-        MkdnUpdateNumbering = {
-          key = "<leader>nn";
-          modes = "n";
         };
       };
     };

home/programs/nvim/plugins/mini.nix

@@ -0,0 +1,22 @@
+{ config, ... }: {
+  programs.nixvim = {
+    plugins.mini = {
+      enable = true;
+      mockDevIcons = true;
+      modules = {
+        icons = { };
+        # TODO: Learn how to use this
+        bracketed = { };
+        git = { };
+        diff = { };
+        starter = { };
+        pairs = { };
+        notify = { lsp_progress.enable = false; };
+        indentscope = { };
+        cursorword = { };
+        comment = { };
+        starter = { };
+      };
+    };
+  };
+}

home/programs/nvim/plugins/picker.nix

@@ -0,0 +1,222 @@
+{ config, ... }: {
+  programs.nixvim = {
+    highlightOverride = {
+      SnacksPicker = {
+        bg = "none";
+        nocombine = true;
+      };
+      SnacksPickerBorder = {
+        bg = "none";
+        fg = "#${config.lib.stylix.colors.base0D}";
+      };
+      SnacksPickerTree = { bg = "#${config.lib.stylix.colors.base00}"; };
+      FloatBorder = {
+        bg = "#${config.lib.stylix.colors.base00}";
+        fg = "#${config.lib.stylix.colors.base0D}";
+      };
+      NormalFloat = { bg = "#${config.lib.stylix.colors.base00}"; };
+    };
+    plugins = {
+      snacks.settings = {
+        picker.enable = true;
+        explorer.enable = true;
+      };
+      oil.enable = true;
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>f";
+          mode = "n";
+          group = "+find";
+        }
+        {
+          __unkeyed-1 = "<leader>g";
+          mode = "n";
+          group = "+git";
+        }
+        {
+          __unkeyed-1 = "<leader>s";
+          mode = "n";
+          group = "+search";
+        }
+      ];
+    };
+    keymaps = [
+      # Top Pickers & Explorer
+      {
+        key = "<leader> ";
+        action = "<cmd>lua Snacks.picker.smart()<cr>";
+        options.desc = "Smart Find Files";
+      }
+      {
+        key = "<leader>,";
+        action = "<cmd>lua Snacks.picker.buffers()<cr>";
+        options.desc = "Buffers";
+      }
+      {
+        key = "<leader>/";
+        action = "<cmd>lua Snacks.picker.grep()<cr>";
+        options.desc = "Grep";
+      }
+      {
+        key = "<leader>:";
+        action = "<cmd>lua Snacks.picker.command_history()<cr>";
+        options.desc = "Command History";
+      }
+      {
+        key = "<leader>e";
+        action = "<cmd>lua Snacks.explorer()<cr>";
+        options.desc = "File Explorer";
+      }
+      {
+        key = "-";
+        action = "<cmd>Oil<cr>";
+        options.desc = "Oil";
+      }
+
+      # Find
+      {
+        key = "<leader>fb";
+        action = "<cmd>lua Snacks.picker.buffers()<cr>";
+        options.desc = "Buffers";
+      }
+      {
+        key = "<leader>fc";
+        action = ''
+          <cmd>lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>'';
+        options.desc = "Find Config File";
+      }
+      {
+        key = "<leader>ff";
+        action = "<cmd>lua Snacks.picker.files()<cr>";
+        options.desc = "Find Files";
+      }
+      {
+        key = "<leader>fg";
+        action = "<cmd>lua Snacks.picker.git_files()<cr>";
+        options.desc = "Find Git Files";
+      }
+      {
+        key = "<leader>fp";
+        action = "<cmd>lua Snacks.picker.projects()<cr>";
+        options.desc = "Projects";
+      }
+      {
+        key = "<leader>fr";
+        action = "<cmd>lua Snacks.picker.recent()<cr>";
+        options.desc = "Recent";
+      }
+      {
+        key = "<leader>fn";
+        action = "<cmd>lua Snacks.picker.notifications()<cr>";
+        options.desc = "Notification History";
+      }
+      {
+        key = "<leader>fe";
+        action = "<cmd>lua Snacks.picker.icons()<cr>";
+        options.desc = "Emoji";
+      }
+
+      # Git
+      {
+        key = "<leader>gb";
+        action = "<cmd>lua Snacks.picker.git_branches()<cr>";
+        options.desc = "Git Branches";
+      }
+      {
+        key = "<leader>gL";
+        action = "<cmd>lua Snacks.picker.git_log()<cr>";
+        options.desc = "Git Log Line";
+      }
+      {
+        key = "<leader>gs";
+        action = "<cmd>lua Snacks.picker.git_status()<cr>";
+        options.desc = "Git Status";
+      }
+      {
+        key = "<leader>gS";
+        action = "<cmd>lua Snacks.picker.git_stash()<cr>";
+        options.desc = "Git Stash";
+      }
+      {
+        key = "<leader>gd";
+        action = "<cmd>lua Snacks.picker.git_diff()<cr>";
+        options.desc = "Git Diff (Hunks)";
+      }
+      {
+        key = "<leader>gf";
+        action = "<cmd>lua Snacks.picker.git_log_file()<cr>";
+        options.desc = "Git Log File";
+      }
+
+      # Grep
+      {
+        key = "<leader>sb";
+        action = "<cmd>lua Snacks.picker.lines()<cr>";
+        options.desc = "Buffer Lines";
+      }
+      {
+        key = "<leader>st";
+        action = "<cmd>lua Snacks.picker.todo_comments()<cr>";
+        options.desc = "Todos";
+      }
+      {
+        key = "<leader>sB";
+        action = "<cmd>lua Snacks.picker.grep_buffers()<cr>";
+        options.desc = "Grep Open Buffers";
+      }
+      {
+        key = "<leader>sg";
+        action = "<cmd>lua Snacks.picker.grep()<cr>";
+        options.desc = "Grep";
+      }
+      {
+        key = "<leader>sw";
+        action = "<cmd>lua Snacks.picker.grep_word()<cr>";
+        options.desc = "Visual selection or word";
+      }
+      {
+        key = "<leader>sr";
+        action = "<cmd>nohlsearch<cr>";
+        options.desc = "Reset search";
+      }
+
+      # LSP
+      {
+        key = "gd";
+        action = "<cmd>lua Snacks.picker.lsp_definitions()<cr>";
+        options.desc = "Goto Definition";
+      }
+      {
+        key = "gD";
+        action = "<cmd>lua Snacks.picker.lsp_declarations()<cr>";
+        options.desc = "Goto Declaration";
+      }
+      {
+        key = "gr";
+        action = "<cmd>lua Snacks.picker.lsp_references()<cr>";
+        options.desc = "References";
+        options.nowait = true;
+      }
+      {
+        key = "gI";
+        action = "<cmd>lua Snacks.picker.lsp_implementations()<cr>";
+        options.desc = "Goto Implementation";
+      }
+      {
+        key = "gy";
+        action = "<cmd>lua Snacks.picker.lsp_type_definitions()<cr>";
+        options.desc = "Goto Type Definition";
+      }
+      {
+        key = "<leader>ss";
+        action = "<cmd>lua Snacks.picker.lsp_symbols()<cr>";
+        options.desc = "LSP Symbols";
+      }
+      {
+        key = "<leader>sS";
+        action = "<cmd>lua Snacks.picker.lsp_workspace_symbols()<cr>";
+        options.desc = "LSP Workspace Symbols";
+      }
+    ];
+  };
+}

home/programs/nvim/plugins/snacks.nix

@@ -0,0 +1,40 @@
+{
+  programs.nixvim = {
+    plugins.snacks = {
+      enable = true;
+      settings = {
+        image = {
+          enable = true;
+          doc = { inline = false; };
+        };
+        quickfile.enable = true;
+        statuscolumn.enable = true;
+        zen.enable = true;
+        bufdelete.enable = true;
+      };
+    };
+
+    keymaps = [
+      {
+        key = "<leader>uz";
+        action = "<cmd>lua Snacks.zen()<cr>";
+        options.desc = "Zen";
+      }
+      {
+        key = "<leader>ud";
+        action = "<cmd>lua Snacks.dim.enable()<cr>";
+        options.desc = "Dim";
+      }
+      {
+        key = "<leader>uD";
+        action = "<cmd>lua Snacks.dim.disable()<cr>";
+        options.desc = "Undim";
+      }
+      {
+        key = "<leader>wc";
+        action = "<cmd>lua Snacks.bufdelete.all()<cr>";
+        options.desc = "Close all buffers";
+      }
+    ];
+  };
+}

home/programs/nvim/plugins/tree.nix

@@ -1,61 +0,0 @@
-{
-  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";
-          };
-        };
-      };
-    };
-    keymaps = [
-      {
-        key = "-";
-        action = "<cmd>Oil<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "<leader>e";
-        action = "<cmd>Oil --float<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "<leader>E";
-        action = "<cmd>Neotree toggle<cr>";
-        options.desc = "Neotree";
-      }
-    ];
-  };
-}

home/programs/nvim/plugins/trouble.nix

@@ -0,0 +1,46 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ ctags ];
+
+  programs.nixvim = {
+    plugins = {
+      trouble.enable = true;
+      which-key.settings.spec = [{
+        __unkeyed-1 = "<leader>t";
+        mode = "n";
+        group = "+trouble";
+      }];
+    };
+    keymaps = [
+      {
+        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)";
+      }
+    ];
+  };
+}

home/programs/nvim/plugins/ui.nix

@@ -1,31 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ ctags ];
-  programs.nixvim = {
-    plugins = {
-      lualine.enable = true;
-      noice.enable = true;
-      gitsigns = {
-        enable = true;
-        settings.current_line_blame = false;
-      };
-      bufferline.enable = true;
-      trouble.enable = true;
-      which-key.enable = true;
-      headlines = {
-        enable = true;
-        settings = {
-          markdown = {
-            codeblock_highlight = false;
-          };
-        };
-      };
-      nvim-colorizer.enable = true;
-      # tagbar.enable = true;
-    };
-    keymaps = [{
-      key = "<leader>t";
-      action = "<cmd>TroubleToggle<cr>";
-      options.desc = "Trouble";
-    }];
-  };
-}

home/programs/nvim/plugins/utils.nix

@@ -1,50 +1,36 @@
-{ config, ... }: {
+{ config, lib, pkgs, ... }: {
   programs.nixvim = {
+    nixpkgs.config.allowUnfree = true; # For copilot
     highlightOverride = {
-      FloatBorder.fg = "#${config.var.theme.colors.accent}";
+      WhichKeySeparator.bg = "#${config.lib.stylix.colors.base00}";
     };
     plugins = {
-      copilot-vim.enable = true;
+      bufferline.enable = true;
-      flash.enable = true;
+      copilot-vim = {
-      # image.enable = true;
-      tmux-navigator.enable = true;
-      comment.enable = true;
-      nvim-autopairs.enable = true;
-      friendly-snippets.enable = true;
-      telescope = {
         enable = true;
-        keymaps = {
+        # FIXME: Temp issue solving
-          "<leader>fg" = "live_grep";
+        settings.node_command = lib.getExe pkgs.nodejs_20;
-          "<leader> " = "find_files";
-        };
-        extensions.fzf-native = { enable = true; };
       };
+      flash.enable = true;
+      tmux-navigator.enable = true;
+      todo-comments.enable = true;
+      lualine = { enable = true; };
+      aerial.enable = true;
       treesitter = {
         enable = true;
         nixGrammars = true;
         settings = {
+          ensure_installed = "all";
           indent.enable = true;
           highlight.enable = true;
         };
       };
-      treesitter-context.enable = true;
     };
     keymaps = [
       {
-        key = "<C-h>";
+        key = "<leader>ct";
-        action = "<cmd>TmuxNavigateLeft<cr>";
+        action = "<cmd>AerialToggle<cr>";
-      }
+        options.desc = "Aerial (tags)";
-      {
-        key = "<C-j>";
-        action = "<cmd>TmuxNavigateDown<cr>";
-      }
-      {
-        key = "<C-k>";
-        action = "<cmd>TmuxNavigateUp<cr>";
-      }
-      {
-        key = "<C-l>";
-        action = "<cmd>TmuxNavigateRight<cr>";
       }
     ];
   };

home/programs/nvim/plugins/zen-mode.nix

@@ -1,31 +0,0 @@
-{
-  programs.nixvim.plugins.zen-mode = {
-    enable = true;
-    settings = {
-      on_open = ''
-        function()
-          require("gitsigns.actions").toggle_current_line_blame()
-          vim.opt.relativenumber = false
-          vim.opt.signcolumn = "no"
-          vim.opt.wrap = true
-          vim.opt.linebreak = true
-        end
-      '';
-      plugins = {
-        gitsigns = { enabled = true; };
-        options = {
-          enabled = true;
-          ruler = false;
-          showcmd = false;
-        };
-        tmux = { enabled = true; };
-      };
-      window = {
-        backdrop = 0.95;
-        height = 1;
-        options = { signcolumn = "no"; };
-        width = 0.9;
-      };
-    };
-  };
-}

home/programs/qutebrowser/default.nix

@@ -1,5 +1,12 @@
+# Qutebrowser is a keyboard-focused browser with a minimal GUI.
+# My homepage is generated using https://github.com/anotherhadi/homepage
 { pkgs, config, ... }:
 let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  background = "#${config.lib.stylix.colors.base00}";
+  foreground = "#${config.lib.stylix.colors.base05}";
+  muted = "#${config.lib.stylix.colors.base03}";
+
   settings = ''
     {
       "config": {
@@ -7,10 +14,10 @@ let
         "openLinksInNewTab": false,
         "locale": "fr-FR",
         "colors": {
-          "primary": "#${config.var.theme.colors.accent}",
+          "primary": "${accent}",
-          "background": "#${config.var.theme.colors.bg}",
+          "background": "${background}",
-          "foreground": "#${config.var.theme.colors.fg}",
+          "foreground": "${foreground}",
-          "muted": "#${config.var.theme.colors.c8}"
+          "muted": "#${muted}"
         },
         "folders": [
           {
@@ -73,10 +80,7 @@ let
 
 in {
 
-  imports = [
+  imports = [ ../duckduckgo-colorscheme ];
-    ./duckduckgo-colorscheme.nix
-    # ./userscripts.nix
-  ];
 
   programs.qutebrowser = {
     enable = true;
@@ -120,98 +124,12 @@ in {
       };
 
       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
       };
 
       statusbar.show = "in-mode";
 
-      fonts = { default_family = "${config.var.theme.font}"; };
-
       completion = {
         height = "30%";
         open_categories = [ "history" ];
@@ -238,10 +156,7 @@ in {
         remove_finished = 0;
       };
 
-      hints = {
+      hints = { radius = 1; };
-        border = "none";
-        radius = 1;
-      };
 
       scrolling = {
         bar = "never";

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -1,36 +0,0 @@
-{ config, ... }: {
-  home.file.".duckduckgo-colorscheme.js".text = ''
-    // 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=${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};';
-
-    // Converts cookie string into formatted JSON
-    const cookieToJSON = (cookieRaw) => {
-      const cookieJson = {};
-      const items = cookieRaw.split(/[ ,]+/);
-
-      items.forEach((item) => {
-        const parts = item.split('=');
-        cookieJson[parts[0]] = parts[1];
-      });
-
-      return cookieJson;
-    };
-
-    // Iterates over JSON, and adds to browser cookie store
-    const setCookies = (cookieJson) => {
-      Object.keys(cookieJson).forEach((key) => {
-        document.cookie = `''${key}=''${cookieJson [ key ]}`;
-      });
-    };
-
-    alert('The Nixy theme will be applied.');
-
-    // Call set cookies, passing in formated cookie data
-    setCookies(cookieToJSON(cookie));
-
-    // All done, reload page for changes to take effect :)
-    location.reload();
-  '';
-}

home/programs/qutebrowser/userscripts.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    keyutils
-    python3
-    python311Packages.pyperclip
-    python312Packages.tldextract
-  ];
-
-  xdg.configFile."qutebrowser/userscripts/bitwarden" = {
-    source = ./userscripts/qute-bitwarden.py;
-    executable = true;
-  };
-}

home/programs/qutebrowser/userscripts/qute-bitwarden.py

@@ -1,291 +0,0 @@
-#!/usr/bin/env python3
-
-# SPDX-FileCopyrightText: Chris Braun (cryzed) <cryzed@googlemail.com>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""
-Insert login information using Bitwarden CLI and a dmenu-compatible application
-(e.g. dmenu, rofi -dmenu, ...).
-"""
-
-USAGE = """The domain of the site has to be in the name of the Bitwarden entry, for example: "github.com/cryzed" or
-"websites/github.com".  The login information is inserted by emulating key events using qutebrowser's fake-key command in this manner:
-[USERNAME]<Tab>[PASSWORD], which is compatible with almost all login forms.
-
-If enabled, with the `--totp` flag, it will also move the TOTP code to the
-clipboard, much like the Firefox add-on.
-
-You must log into Bitwarden CLI using `bw login` prior to use of this script.
-The session key will be stored using keyctl for the number of seconds passed to
-the --auto-lock option.
-
-To use in qutebrowser, run: `spawn --userscript qute-bitwarden`
-"""
-
-EPILOG = """Dependencies: tldextract (Python 3 module), pyperclip (optional
-Python module, used for TOTP codes), Bitwarden CLI (1.7.4 is known to work
-but older versions may well also work)
-
-WARNING: The login details are viewable as plaintext in qutebrowser's debug log
-(qute://log) and might be shared if you decide to submit a crash report!"""
-
-import argparse
-import enum
-import functools
-import os
-import shlex
-import subprocess
-import sys
-import json
-import tldextract
-
-argument_parser = argparse.ArgumentParser(
-    description=__doc__,
-    usage=USAGE,
-    epilog=EPILOG,
-)
-argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL'))
-argument_parser.add_argument('--dmenu-invocation', '-d', default='wofi --dmenu -i',
-                             help='Invocation used to execute a dmenu-provider')
-argument_parser.add_argument('--password-prompt-invocation', '-p', default='rofi -dmenu -p "Master Password" -password -lines 0',
-                             help='Invocation used to prompt the user for their Bitwarden password')
-argument_parser.add_argument('--no-insert-mode', '-n', dest='insert_mode', action='store_false',
-                             help="Don't automatically enter insert mode")
-argument_parser.add_argument('--totp', '-t', action='store_true',
-                             help="Copy TOTP key to clipboard")
-argument_parser.add_argument('--io-encoding', '-i', default='UTF-8',
-                             help='Encoding used to communicate with subprocesses')
-argument_parser.add_argument('--merge-candidates', '-m', action='store_true',
-                             help='Merge pass candidates for fully-qualified and registered domain name')
-argument_parser.add_argument('--auto-lock', type=int, default=900,
-                             help='Automatically lock the vault after this many seconds')
-group = argument_parser.add_mutually_exclusive_group()
-group.add_argument('--username-only', '-e',
-                   action='store_true', help='Only insert username')
-group.add_argument('--password-only', '-w',
-                   action='store_true', help='Only insert password')
-group.add_argument('--totp-only', '-T',
-                   action='store_true', help='Only insert totp code')
-
-stderr = functools.partial(print, file=sys.stderr)
-
-
-class ExitCodes(enum.IntEnum):
-    SUCCESS = 0
-    FAILURE = 1
-    # 1 is automatically used if Python throws an exception
-    NO_PASS_CANDIDATES = 2
-    COULD_NOT_MATCH_USERNAME = 3
-    COULD_NOT_MATCH_PASSWORD = 4
-
-
-def qute_command(command):
-    with open(os.environ['QUTE_FIFO'], 'w') as fifo:
-        fifo.write(command + '\n')
-        fifo.flush()
-
-
-def ask_password(password_prompt_invocation):
-    process = subprocess.run(
-        shlex.split(password_prompt_invocation),
-        text=True,
-        stdout=subprocess.PIPE,
-    )
-    if process.returncode > 0:
-        raise Exception('Could not unlock vault')
-    master_pass = process.stdout.strip()
-    return subprocess.check_output(
-        ['bw', 'unlock', '--raw', master_pass],
-        text=True,
-    ).strip()
-
-
-def get_session_key(auto_lock, password_prompt_invocation):
-    if auto_lock == 0:
-        subprocess.call(['keyctl', 'purge', 'user', 'bw_session'])
-        return ask_password(password_prompt_invocation)
-    else:
-        process = subprocess.run(
-            ['keyctl', 'request', 'user', 'bw_session'],
-            text=True,
-            stdout=subprocess.PIPE,
-        )
-        key_id = process.stdout.strip()
-        if process.returncode > 0:
-            session = ask_password(password_prompt_invocation)
-            if not session:
-                raise Exception('Could not unlock vault')
-            key_id = subprocess.check_output(
-                ['keyctl', 'add', 'user', 'bw_session', session, '@u'],
-                text=True,
-            ).strip()
-
-        if auto_lock > 0:
-            subprocess.call(['keyctl', 'timeout', str(key_id), str(auto_lock)])
-        return subprocess.check_output(
-            ['keyctl', 'pipe', str(key_id)],
-            text=True,
-        ).strip()
-
-
-def pass_(domain, encoding, auto_lock, password_prompt_invocation):
-    session_key = get_session_key(auto_lock, password_prompt_invocation)
-    process = subprocess.run(
-        ['bw', 'list', 'items', '--session', session_key, '--url', domain],
-        capture_output=True,
-    )
-
-    err = process.stderr.decode(encoding).strip()
-    if err:
-        msg = 'Bitwarden CLI returned for {:s} - {:s}'.format(domain, err)
-        stderr(msg)
-
-    if process.returncode:
-        return '[]'
-
-    out = process.stdout.decode(encoding).strip()
-
-    return out
-
-
-def get_totp_code(selection_id, domain_name, encoding, auto_lock, password_prompt_invocation):
-    session_key = get_session_key(auto_lock, password_prompt_invocation)
-    process = subprocess.run(
-        ['bw', 'get', 'totp', '--session', session_key, selection_id],
-        capture_output=True,
-    )
-
-    err = process.stderr.decode(encoding).strip()
-    if err:
-        # domain_name instead of selection_id to make it more user-friendly
-        msg = 'Bitwarden CLI returned for {:s} - {:s}'.format(domain_name, err)
-        stderr(msg)
-
-    if process.returncode:
-        return '[]'
-
-    out = process.stdout.decode(encoding).strip()
-
-    return out
-
-
-def dmenu(items, invocation, encoding):
-    command = shlex.split(invocation)
-    process = subprocess.run(command, input='\n'.join(
-        items).encode(encoding), stdout=subprocess.PIPE)
-    return process.stdout.decode(encoding).strip()
-
-
-def fake_key_raw(text):
-    for character in text:
-        # Escape all characters by default, space requires special handling
-        sequence = '" "' if character == ' ' else r'\{}'.format(character)
-        qute_command('fake-key {}'.format(sequence))
-
-
-def main(arguments):
-    if not arguments.url:
-        argument_parser.print_help()
-        return ExitCodes.FAILURE
-
-    extract_result = tldextract.extract(arguments.url)
-
-    # Try to find candidates using targets in the following order: fully-qualified domain name (includes subdomains),
-    # the registered domain name and finally: the IPv4 address if that's what
-    # the URL represents
-    candidates = []
-    for target in filter(None, [
-                extract_result.fqdn,
-                extract_result.registered_domain,
-                extract_result.subdomain + '.' + extract_result.domain,
-                extract_result.domain,
-                extract_result.ipv4]):
-        target_candidates = json.loads(
-            pass_(
-                target,
-                arguments.io_encoding,
-                arguments.auto_lock,
-                arguments.password_prompt_invocation,
-            )
-        )
-        if not target_candidates:
-            continue
-
-        candidates = candidates + target_candidates
-        if not arguments.merge_candidates:
-            break
-    else:
-        if not candidates:
-            stderr('No pass candidates for URL {!r} found!'.format(
-                arguments.url))
-            return ExitCodes.NO_PASS_CANDIDATES
-
-    if len(candidates) == 1:
-        selection = candidates.pop()
-    else:
-        choices = ['{:s} | {:s}'.format(c['name'], c['login']['username']) for c in candidates]
-        choice = dmenu(choices, arguments.dmenu_invocation, arguments.io_encoding)
-        choice_tokens = choice.split('|')
-        choice_name = choice_tokens[0].strip()
-        choice_username = choice_tokens[1].strip()
-        selection = next((c for (i, c) in enumerate(candidates)
-                          if c['name'] == choice_name
-                          and c['login']['username'] == choice_username),
-                         None)
-
-    # Nothing was selected, simply return
-    if not selection:
-        return ExitCodes.SUCCESS
-
-    username = selection['login']['username']
-    password = selection['login']['password']
-    totp = selection['login']['totp']
-
-    if arguments.username_only:
-        fake_key_raw(username)
-    elif arguments.password_only:
-        fake_key_raw(password)
-    elif arguments.totp_only:
-        # No point in moving it to the clipboard in this case
-        fake_key_raw(
-            get_totp_code(
-                selection['id'],
-                selection['name'],
-                arguments.io_encoding,
-                arguments.auto_lock,
-                arguments.password_prompt_invocation,
-            )
-        )
-    else:
-        # Enter username and password using fake-key and <Tab> (which seems to work almost universally), then switch
-        # back into insert-mode, so the form can be directly submitted by
-        # hitting enter afterwards
-        fake_key_raw(username)
-        qute_command('fake-key <Tab>')
-        fake_key_raw(password)
-
-    if arguments.insert_mode:
-        qute_command('mode-enter insert')
-
-    # If it finds a TOTP code, it copies it to the clipboard,
-    # which is the same behavior as the Firefox add-on.
-    if not arguments.totp_only and totp and arguments.totp:
-        # The import is done here, to make pyperclip an optional dependency
-        import pyperclip
-        pyperclip.copy(
-            get_totp_code(
-                selection['id'],
-                selection['name'],
-                arguments.io_encoding,
-                arguments.auto_lock,
-                arguments.password_prompt_invocation,
-            )
-        )
-
-    return ExitCodes.SUCCESS
-
-
-if __name__ == '__main__':
-    arguments = argument_parser.parse_args()
-    sys.exit(main(arguments))

home/programs/shell/default.nix

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

home/programs/shell/eza.nix

@@ -1,7 +1,8 @@
+# Eza is a ls replacement
 {
   programs.eza = {
     enable = true;
-    icons = true;
+    icons = "auto";
 
     extraOptions = [
       "--group-directories-first"

home/programs/shell/fzf.nix

@@ -1,19 +1,25 @@
-{ config, ... }: {
+# 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 = {
+    colors = lib.mkForce {
-      "fg+" = config.var.theme.colors.accentName;
+      "fg+" = accent;
       "bg+" = "-1";
-      "fg" = "white";
+      "fg" = foreground;
       "bg" = "-1";
-      "prompt" = "grey";
+      "prompt" = muted;
-      "pointer" = config.var.theme.colors.accentName;
+      "pointer" = accent;
     };
     defaultOptions = [
       "--margin=1"
       "--layout=reverse"
-      "--border=rounded"
+      "--border=none"
       "--info='hidden'"
       "--header=''"
       "--prompt='/ '"

home/programs/shell/lazygit.nix

@@ -1,13 +0,0 @@
-{ config, ... }: {
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      gui.theme = {
-        ligthTheme = false;
-        activeBorderColor = [ "${config.var.theme.colors.accentName}" "bold" ];
-        inactiveBorderColor = [ "black" ];
-        selectedLineBgColor = [ "default" ];
-      };
-    };
-  };
-}

home/programs/shell/starship.nix

@@ -1,31 +1,39 @@
-{ 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 = {
       add_newline = true;
       format = lib.concatStrings [
+        "$nix_shell"
+        "$hostname"
         "$directory"
         "$git_branch"
         "$git_state"
         "$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

@@ -1,4 +1,30 @@
-{ pkgs, ... }: {
+# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
+{ pkgs, ... }:
+let
+  Config = pkgs.writeShellScriptBin "Config" ''
+    SESSION="Nixy Config"
+
+    tmux has-session -t "$SESSION" 2>/dev/null
+
+    if [ $? == 0 ]; then
+      tmux attach -t "$SESSION"
+      exit 0
+    fi
+
+    tmux new-session -d -s "$SESSION"
+    tmux send-keys -t "$SESSION" "sleep 0.2 && clear && cd ~/.config/nixos/ && vim" C-m
+
+    tmux new-window -t "$SESSION" -n "nixy"
+    tmux send-keys -t "$SESSION":1 "sleep 0.2 && clear && cd ~/.config/nixos/ && nixy loop" C-m
+
+    tmux new-window -t "$SESSION" -n "lazygit"
+    tmux send-keys -t "$SESSION":2 "sleep 0.2 && clear && cd ~/.config/nixos/ && lazygit" C-m
+
+    tmux select-window -t "$SESSION":0
+    tmux select-pane -t 0
+    tmux attach -t "$SESSION"
+  '';
+in {
   programs.tmux = {
     enable = true;
     mouse = true;
@@ -12,37 +38,21 @@
       bind-key j select-pane -D
       bind-key k select-pane -U
       bind-key l select-pane -R
+
       set -gq allow-passthrough on
+      bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt
+
+      bind-key -n C-Tab next-window
+      bind-key -n C-S-Tab previous-window
+      bind-key -n M-Tab new-window
     '';
 
     plugins = with pkgs; [
       tmuxPlugins.vim-tmux-navigator
-      {
+      # tmuxPlugins.resurrect
-        plugin = tmuxPlugins.catppuccin;
+      tmuxPlugins.sensible
-        extraConfig = ''
+      tmuxPlugins.tokyo-night-tmux
-          set-option -g status-position top
-          set -g @catppuccin_window_left_separator ""
-          set -g @catppuccin_window_right_separator " "
-          set -g @catppuccin_window_middle_separator " █"
-          set -g @catppuccin_window_number_position "right"
-
-          set -g @catppuccin_window_default_fill "number"
-          set -g @catppuccin_window_default_text "#W"
-
-          set -g @catppuccin_window_current_fill "number"
-          set -g @catppuccin_window_current_text "#W"
-
-          set -g @catppuccin_status_modules_right ""
-          set -g @catppuccin_status_left_separator  " "
-          set -g @catppuccin_status_right_separator ""
-          set -g @catppuccin_status_fill "icon"
-          set -g @catppuccin_status_connect_separator "no"
-
-          set -g @catppuccin_directory_text "#{pane_current_path}"
-          set -g @catppuccin_status_background "default"
-          set-option -g default-terminal "screen-256color"
-        '';
-      }
     ];
   };
+  home.packages = [ Config ];
 }

home/programs/shell/zoxide.nix

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

home/programs/shell/zsh.nix

@@ -1,6 +1,9 @@
-{ pkgs, lib, config, ... }: {
+# My shell configuration
+{ pkgs, lib, config, ... }:
+let fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
+in {
 
-  home.packages = with pkgs; [ bat ripgrep tldr ];
+  home.packages = with pkgs; [ bat ripgrep tldr sesh ];
 
   home.sessionPath = [ "$HOME/go/bin" ];
 
@@ -8,25 +11,56 @@
     enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
+    syntaxHighlighting = {
+      enable = true;
+      highlighters = [ "main" "brackets" "pattern" "regexp" "root" "line" ];
+    };
     historySubstringSearch.enable = true;
 
-    initExtraFirst = ''
+    initExtraFirst =
-      bindkey -e
+      #bash 
-      ${if config.var.theme.fetch == "neofetch" then
+      ''
-        pkgs.neofetch + "/bin/neofetch"
+        bindkey -e
-      else if config.var.theme.fetch == "nerdfetch" then
+        ${if fetch == "neofetch" then
-        "nerdfetch"
+          pkgs.neofetch + "/bin/neofetch"
-      else if config.var.theme.fetch == "pfetch" then
+        else if fetch == "nerdfetch" then
-        "echo; ${pkgs.pfetch}/bin/pfetch"
+          "nerdfetch"
-      else
+        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
+        }
+
+        function chatgptlist(){
+          for arg in "$@"; do 
+              echo "$arg:"
+              echo "\`\`\`"
+              cat "$arg"
+              echo "\`\`\`" 
+              echo 
+          done
+        }
+
+
+        function n4c() {
+          nix develop --no-write-lock-file --refresh "github:anotherhadi/nix4cyber#''${1:-all}"
+        }
+
+        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 = 1000000;
+      save = 10000;
-      size = 1000000;
+      size = 10000;
     };
 
     profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''
@@ -35,6 +69,18 @@
       }"
     '';
 
+    #NOTE- for btop to show gpu usage 
+    #may want to check the driver version with:
+    #nix path-info -r /run/current-system | grep nvidia-x11
+    #and 
+    #nix search nixpkgs nvidia_x11
+    sessionVariables = {
+      LD_LIBRARY_PATH = lib.concatStringsSep ":" [
+        "${pkgs.linuxPackages_latest.nvidia_x11_beta}/lib" # change the package name according to nix search result
+        "$LD_LIBRARY_PATH"
+      ];
+    };
+
     shellAliases = {
       vim = "nvim";
       vi = "nvim";
@@ -47,20 +93,27 @@
       ls = "eza --icons=always --no-quotes";
       tree = "eza --icons=always --tree --no-quotes";
       sl = "ls";
-      open = "${pkgs.xdg_utils}/bin/xdg-open";
+      open = "${pkgs.xdg-utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+      ssh = "kitty +kitten ssh";
+      cat =
+        "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
+
+      obsidian-no-gpu =
+        "env ELECTRON_OZONE_PLATFORM_HINT=auto obsidian --ozone-platform=x11";
       wireguard-import = "nmcli connection import type wireguard file";
-      neorg =
+
-        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
       notes =
-        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
+        "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':Telescope find_files'";
       note = "notes";
 
+      nix-shell = "nix-shell --command zsh";
+
       # git
+      g = "lazygit";
       ga = "git add";
       gc = "git commit";
-      gcm = "git commit -m";
+      gcu = "git add . && git commit -m 'Update'";
-      gcu = "git commit -am 'Update'";
       gp = "git push";
       gpl = "git pull";
       gs = "git status";
@@ -68,6 +121,84 @@
       gco = "git checkout";
       gcb = "git checkout -b";
       gbr = "git branch";
+      grs = "git reset HEAD~1";
+      grh = "git reset --hard HEAD~1";
+
+      gaa = "git add .";
+      gcm = "git commit -m";
     };
+
+    initExtra = ''
+      # search history based on what's typed in the prompt
+      autoload -U history-search-end
+      zle -N history-beginning-search-backward-end history-search-end
+      zle -N history-beginning-search-forward-end history-search-end
+      bindkey "^[OA" history-beginning-search-backward-end
+      bindkey "^[OB" history-beginning-search-forward-end
+
+      # General completion behavior
+      zstyle ':completion:*' completer _extensions _complete _approximate
+
+      # Use cache
+      zstyle ':completion:*' use-cache on
+      zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
+
+      # Complete the alias
+      zstyle ':completion:*' complete true
+
+      # Autocomplete options
+      zstyle ':completion:*' complete-options true
+
+      # Completion matching control
+      zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+      zstyle ':completion:*' keep-prefix true
+
+      # Group matches and describe
+      zstyle ':completion:*' menu select
+      zstyle ':completion:*' list-grouped false
+      zstyle ':completion:*' list-separator '''
+      zstyle ':completion:*' group-name '''
+      zstyle ':completion:*' verbose yes
+      zstyle ':completion:*:matches' group 'yes'
+      zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f'
+      zstyle ':completion:*:messages' format '%d'
+      zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b'
+      zstyle ':completion:*:descriptions' format '[%d]'
+
+      # Colors
+      zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
+
+      # case insensitive tab completion
+      zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
+      zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
+      zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
+      zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands
+      zstyle ':completion:*' special-dirs true
+      zstyle ':completion:*' squeeze-slashes true
+
+      # Sort
+      zstyle ':completion:*' sort false
+      zstyle ":completion:*:git-checkout:*" sort false
+      zstyle ':completion:*' file-sort modification
+      zstyle ':completion:*:eza' sort false
+      zstyle ':completion:complete:*:options' sort false
+      zstyle ':completion:files' sort false
+
+      ${lib.optionalString config.services.gpg-agent.enable ''
+        gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
+        export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"
+      ''}
+
+      # Allow foot to pipe command output
+      function precmd {
+        if ! builtin zle; then
+            print -n "\e]133;D\e\\"
+        fi
+      }
+      function preexec {
+        print -n "\e]133;C\e\\"
+      }
+
+    '';
   };
 }

home/programs/spicetify/default.nix

@@ -1,31 +1,27 @@
+# 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}";
+  background = "${config.lib.stylix.colors.base00}";
 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.dribbblish;
+
     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}";
+      player = background;
-      sidebar = "${config.var.theme.colors.bg}";
+      main = background;
-      background = "${config.var.theme.colors.bg}";
+      sidebar = background;
-      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,8 +29,9 @@ in {
       lastfm
       historyShortcut
       hidePodcasts
+      adblock
       fullAppDisplay
-      shuffle
+      keyboardShortcut
     ];
   };
 }

home/programs/tailscale/default.nix

@@ -0,0 +1,8 @@
+# Tailscale is a VPN service that works on top of WireGuard.
+# It allows me to access my servers and devices from anywhere.
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ tailscale tailscale-systray ];
+
+  wayland.windowManager.hyprland.settings.exec-once =
+    [ "${pkgs.tailscale-systray}/bin/tailscale-systray" ];
+}

home/programs/thunar/default.nix

@@ -0,0 +1,75 @@
+# Thunar is a file explorer
+{ pkgs, config, ... }:
+let user = config.var.username;
+in {
+  # ctrl + m to toggle the menubar
+  home.packages = with pkgs; [
+    xfce.thunar
+    xfce.xfconf
+    xfce.tumbler
+    xfce.thunar-archive-plugin
+    xfce.thunar-volman
+    xfce.thunar-media-tags-plugin
+    p7zip
+    unar
+  ];
+
+  gtk = {
+    iconTheme = {
+      name = "WhiteSur";
+      package = pkgs.whitesur-icon-theme.override {
+        boldPanelIcons = true;
+        alternativeIcons = true;
+      };
+    };
+  };
+
+  home.sessionVariables = {
+    XDG_ICON_DIR = "${pkgs.whitesur-icon-theme}/share/icons/WhiteSur";
+  };
+
+  # bookmarks for the side pane
+  gtk.gtk3.bookmarks = [
+    "file:///home/${user}/Downloads Downloads"
+    "file:///home/${user}/Pictures Pictures"
+    "file:///home/${user}/nextcloud Nextcloud"
+    "file:///home/${user}/.config/nixos NixOS"
+    "file:///home/${user}/dev Development"
+  ];
+
+  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"/>
+      <property name="last-toolbar-items" type="string" value="menu:1,back:1,forward:0,open-parent:0,open-home:0,undo:0,redo:0,zoom-in:0,zoom-out:0,zoom-reset:0,view-as-icons:0,view-as-detailed-list:0,view-as-compact-list:0,toggle-split-view:0,location-bar:1,reload:0,search:1,uca-action-1710183590071525-1:0,new-tab:0,new-window:0,view-switcher:0"/>
+    </channel>
+  '';
+}

home/programs/yazi/default.nix

@@ -1,39 +0,0 @@
-{
-  programs.yazi = {
-    enable = true;
-    enableZshIntegration = true;
-
-    settings = {
-      log = { enabled = false; };
-      manager = {
-        show_hidden = false;
-        sort_by = "modified";
-        sort_dir_first = true;
-        sort_reverse = true;
-      };
-    };
-
-    theme = {
-      filetype = {
-        rules = [
-          {
-            fg = "#7AD9E5";
-            mime = "image/*";
-          }
-          {
-            fg = "#F3D398";
-            mime = "video/*";
-          }
-          {
-            fg = "#F3D398";
-            mime = "audio/*";
-          }
-          {
-            fg = "#CD9EFC";
-            mime = "application/x-bzip";
-          }
-        ];
-      };
-    };
-  };
-}

home/programs/zen/default.nix

@@ -0,0 +1,14 @@
+# Zen is a minimalistic web browser.
+{ pkgs, inputs, ... }:
+let
+  # Create a wrapper script for zen-browser with Wayland enabled
+  zenWithWayland = pkgs.symlinkJoin {
+    name = "zen-browser-wayland";
+    paths = [ inputs.zen-browser.packages."${pkgs.system}".default ];
+    buildInputs = [ pkgs.makeWrapper ];
+    postBuild = ''
+      wrapProgram $out/bin/zen \
+        --set MOZ_ENABLE_WAYLAND 1
+    '';
+  };
+in { home.packages = [ zenWithWayland ]; }

home/scripts/battery/default.nix

@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-let
-  battery-watch = pkgs.writeShellScriptBin "battery-watch" ''
-    while true;do
-      battery-plugged &
-      battery-level &
-      sleep 60
-    done
-  '';
-
-  battery-plugged = pkgs.writeShellScriptBin "battery-plugged" ''
-    BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
-    OLD_BATTERY_STATUS=$(cat /tmp/old_battery_status 2>/dev/null || echo "Unknown")
-    if [[ $BATTERY_STATUS != $OLD_BATTERY_STATUS && $OLD_BATTERY_STATUS != "Unknown" ]]; then
-      if [[ $BATTERY_STATUS == "Discharging" ]]; then
-        notif "battery" "󰚦 Battery is unplugged"
-      else
-        notif "battery" "󰚥 Battery is plugged in"
-      fi
-    fi
-    echo $BATTERY_STATUS > /tmp/old_battery_status
-  '';
-
-  battery-level = pkgs.writeShellScriptBin "battery-level" ''
-    BATTERY_LEVEL=$(cat /sys/class/power_supply/BAT*/capacity | head -n1)
-    BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
-    if [[ $BATTERY_LEVEL -le 20 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      notif "battery" "󰁻  Low battery" "Battery level is $BATTERY_LEVEL%"
-    elif [[ $BATTERY_LEVEL -le 10 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      notif "battery" "󰁺  Very low battery" "Battery level is $BATTERY_LEVEL%"
-    # elif [[ $BATTERY_LEVEL -eq 100 ]] && [[ $BATTERY_STATUS -ne "Discharging" ]]; then
-    #   notif "battery" "󰁹 Fully charged"
-    fi
-  '';
-
-in { home.packages = [ battery-watch battery-plugged battery-level ]; }

home/scripts/brightness/default.nix

@@ -1,19 +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%"
-
-    notif "brightness" "$message" "extraargs=-h int:value:$brightness_level"
   '';
 
   brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -24,4 +29,12 @@ let
     brightness-change down ${increments}
   '';
 
-in { home.packages = [ brightness-change brightness-up brightness-down ]; }
+in {
+  home.packages = [
+    pkgs.brightnessctl
+    brightness-change
+    brightness-up
+    brightness-down
+    brightness-set
+  ];
+}

home/scripts/caffeine/default.nix

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