update

Former-commit-id: bbaf52b496

.github/FUNDING.yml

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

@@ -1,124 +0,0 @@
-<div align="center">
-    <img alt="nixy logo" 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 & Caelestia: Preconfigured Hyprland ecosystem with Caelestia-shell (Ty to both projects!)
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
-- ⌨️ Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
-
-## Table of Content
-
-{md_table_of_content}
-
-## Screenshots
-
-![Home](.github/assets/rose-pine/home.png)
-![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
-![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.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
-- `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
-
-### 🖥️ /server-modules
-
-This folder contains server-related nixos modules. (bitwarden, nextcloud, ...)
-
-## 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
-- [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

@@ -1,20 +0,0 @@
-#!/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\}/A89AD1}
-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/workflows/update-readme.yml

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

.gitignore

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

.sops.yaml

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

README.md

@@ -1,134 +1,87 @@
-[//]: # (This file is autogenerated)
+[//]: # (Title: Nixy)  
+[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Author: Hadi)  
+[//]: # (Date: 06/17/24)
+
 <div align="center">
-    <img alt="nixy logo" src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
+    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
 </div>
 
-<br>
+<br><br>
+
+<div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
+    </a>
+    <a href="https://nixos.org">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
+    </a>
+</div>
+
+<br><br>
+
+<div align="center">
+    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
+</div>
 
 # Nixy
 
-<br>
-<div align="center">
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A89AD1">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A89AD1">
-    </a>
-    <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A89AD1&color=A89AD1">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=0b0b0b&colorB=A89AD1&logo=unlicense&logoColor=A89AD1"/>
-    </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 & Caelestia: Preconfigured Hyprland ecosystem with Caelestia-shell (Ty to both projects!)
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
-- ⌨️ Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
+**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+It's a simple way to manage your system configuration and dotfiles.
 
 ## Table of Content
 
+- [Nixy](#nixy)
   - [Table of Content](#table-of-content)
-- [Screenshots](#screenshots)
+  - [Gallery](#gallery)
   - [Architecture](#architecture)
-  - [🏠 /home (User-level configuration)](#-home-user-level-configuration)
-  - [🐧 /nixos](#-nixos)
-  - [🎨 /themes](#-themes)
-  - [💻 /hosts](#-hosts)
-  - [🖥️ /server-modules](#-server-modules)
   - [Installation](#installation)
   - [Documentation](#documentation)
 
-## Screenshots
+## Gallery
 
-![Home](.github/assets/rose-pine/home.png)
-![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
-![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.png)
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.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
-- `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
-
-### 🖥️ /server-modules
-
-This folder contains server-related nixos modules. (bitwarden, nextcloud, ...)
+- 🏠 `home` are the dotfiles and configuration files for the user
+- 💻 `hosts` are the system configuration files
+  - `laptop` is mine
+  - `guest` is a template that you can copy and modify for your own system
+  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
+  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
+- 🤫 `secrets` are the secrets files encrypted with sops
 
 ## Installation
 
-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
+- Change the username in the flake.nix file
+- import the guest configuration instead of the `hosts/laptop` one
+- import your hardware-configuration.nix into the `hosts/guest` folder
 
 ```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
 ```
 
 ## Documentation
 
-- [SERVER](docs/SERVER.md): Check out the server documentation
-- [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
-  collection of wallpapers
-
-- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [APPS.md](docs/APPS.md): Which apps are installed
+- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/APPS.md

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

docs/CONTRIBUTING.md

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

docs/SCRIPTS.md

@@ -0,0 +1,51 @@
+# Scripts
+
+## Nix/NixOs shortcuts
+
+- `nixy-edit`
+- `nixy-rebuild`
+- `nixy-update`
+- `nixy-gc` # garbage collection
+- `nixy-cb` # clean boot menu
+
+## Brightness control
+
+- `brightness-up`
+- `brightness-down`
+- `brightness-change <up/down> <increment>`
+
+## Sound control
+
+- `sound-up`
+- `sound-down`
+- `sound-toggle`
+- `sound-output`
+- `sound-change <up/down/mute> <increment>`
+
+## Caffeine
+
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
+- `caffeine` # Toggle caffeine
+- `caffeine-status` # Return active/inactive
+
+## Night-Shift
+
+Blue light filter, using wlsunset
+
+- `night-shift-on`
+- `night-shift-off`
+
+## Nerdfont FZF
+
+Nerdfont fzf is a quick way to search for nerdfont icons locally.
+It will copy the selected icon to the clipboard.
+
+- `nerdfont-fzf`
+
+## Compress/Extract
+
+Some shortcut to compress and extract files.
+
+- `compress` ...
+- `extract` ...

docs/SERVER.md

@@ -1,53 +0,0 @@
-# SERVER
-
-> Update in comming. Early 2026
-
-## 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`.
-
-### **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)
-
-### **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.

docs/THEMES.md

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

@@ -0,0 +1,10 @@
+# Todolist
+
+- [ ] Installation script
+- [ ] Themes
+  - [ ] MacOS theme
+- [ ] Make hyprcursor work
+- [ ] Nixvim
+  - [ ] Telescope shortcut for file content
+  - [ ] Markdown snippets
+  - [ ] Make whichkey better

docs/scripts/compress_src_png.sh

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

docs/scripts/create_guest_config.sh

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

docs/scripts/create_readme.sh

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

docs/scripts/install.sh

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

docs/scripts/take_rice_screenshot.sh

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

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

docs/src/header.md

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

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

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

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

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

flake.nix

@@ -1,70 +1,53 @@
 {
   # https://github.com/anotherhadi/nixy
   description = ''
-    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.
+    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+    It's a simple way to manage your system configuration and dotfiles.
   '';
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    stylix.url = "github:danth/stylix";
-    nixcord.url = "github:kaylorben/nixcord";
-    sops-nix.url = "github:Mic92/sops-nix";
-    nvf.url = "github:notashelf/nvf";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    caelestia-shell = {
-      url = "github:caelestia-dots/shell";
+    nixvim = {
+      url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    caelestia-cli = {
-      url = "github:caelestia-dots/cli";
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    spicetify-nix.url = "github:the-argus/spicetify-nix";
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    spicetify-nix = {
-      url = "github:Gerg-L/spicetify-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    # Server
-    eleakxir.url = "github:anotherhadi/eleakxir";
-    nixarr.url = "github:rasmus-kirk/nixarr";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    nurpkgs.url = "github:nix-community/NUR";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs @ {nixpkgs, ...}: {
+  outputs = inputs@{ nixpkgs, nur, ... }: {
     nixosConfigurations = {
-      nixy =
-        # CHANGEME: This should match the 'hostname' in your variables.nix file
-        nixpkgs.lib.nixosSystem {
+
+      nixy = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         modules = [
+          ./hosts/laptop/configuration.nix
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
+          inputs.home-manager.nixosModules.home-manager
           {
-              nixpkgs.overlays = [];
-              _module.args = {
-                inherit inputs;
+            nixpkgs.overlays = [ nur.overlay ];
+            _module.args = { inherit inputs; };
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users."hadi" = import ./home/laptop.nix; # CHANGE ME
+              extraSpecialArgs = { inherit inputs; };
             };
           }
-            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
-            inputs.home-manager.nixosModules.home-manager
-            inputs.stylix.nixosModules.stylix
-            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
-          ];
-        };
-      # Jack is my server
-      jack = nixpkgs.lib.nixosSystem {
-        modules = [
-          {_module.args = {inherit inputs;};}
-          inputs.home-manager.nixosModules.home-manager
-          inputs.stylix.nixosModules.stylix
-          inputs.sops-nix.nixosModules.sops
-          inputs.nixarr.nixosModules.default
-          inputs.eleakxir.nixosModules.eleakxir
-          ./hosts/server/configuration.nix
         ];
       };
+
     };
   };
 }

home/laptop.nix

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

home/programs/btop/default.nix

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

home/programs/cava/default.nix

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

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

home/programs/fetch/default.nix

@@ -1,2 +0,0 @@
-# Import all fetch scripts
-{imports = [./neofetch ./nerdfetch];}

home/programs/ghostty/default.nix

@@ -1,22 +0,0 @@
-{
-  programs.ghostty = {
-    enable = true;
-    installVimSyntax = true;
-    enableZshIntegration = true;
-    settings = {
-      window-padding-x = 10;
-      window-padding-y = 10;
-      keybind = [
-        "ctrl+j=goto_split:left"
-        "ctrl+i=goto_split:up"
-        "ctrl+k=goto_split:down"
-        "ctrl+l=goto_split:right"
-        "shift+ctrl+j=new_split:left"
-        "shift+ctrl+i=new_split:up"
-        "shift+ctrl+k=new_split:down"
-        "shift+ctrl+l=new_split:right"
-        "shift+ctrl+tab=new_tab"
-      ];
-    };
-  };
-}

home/programs/git/default.nix

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

home/programs/git/lazygit.nix

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

home/programs/git/signing.nix

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

home/programs/group/cybersecurity.nix

@@ -1,15 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  home.packages = with pkgs; [
-    wireshark
-    nmap
-    john
-    hashcat
-    inputs.eleakxir.packages.${stdenv.hostPlatform.system}.leak-utils
-    caido
-    nuclei
-  ];
-}

home/programs/kitty/default.nix

@@ -0,0 +1,48 @@
+{ config, pkgs, ... }: {
+  programs.kitty = {
+    enable = true;
+    settings = {
+      scrollback_lines = 10000;
+      initial_window_width = 1200;
+      initial_window_height = 600;
+      update_check_interval = 0;
+      enable_audio_bell = false;
+      confirm_os_window_close = "0";
+      remember_window_size = "no";
+      disable_ligatures = "never";
+      shell = "${pkgs.tmux}/bin/tmux";
+      url_style = "curly";
+      cursor_shape = "Underline";
+      cursor_underline_thickness = config.var.theme.border-size;
+      window_padding_width = config.var.theme.gaps-in;
+
+      # Font
+      font_family = config.var.theme.font-mono;
+      font_size = config.var.theme.font-size;
+
+      # Colors
+      background = "#" + config.var.theme.colors.bg;
+      url_color = "#" + config.var.theme.colors.accent;
+      color0 = "#" + config.var.theme.colors.c0;
+      color8 = "#" + config.var.theme.colors.c8;
+      color1 = "#" + config.var.theme.colors.c1;
+      color9 = "#" + config.var.theme.colors.c9;
+      color2 = "#" + config.var.theme.colors.c2;
+      color10 = "#" + config.var.theme.colors.c10;
+      color3 = "#" + config.var.theme.colors.c3;
+      color11 = "#" + config.var.theme.colors.c11;
+      color4 = "#" + config.var.theme.colors.c4;
+      color12 = "#" + config.var.theme.colors.c12;
+      color5 = "#" + config.var.theme.colors.c5;
+      color13 = "#" + config.var.theme.colors.c13;
+      color6 = "#" + config.var.theme.colors.c6;
+      color14 = "#" + config.var.theme.colors.c14;
+      color7 = "#" + config.var.theme.colors.c7;
+      color15 = "#" + config.var.theme.colors.c15;
+      cursor = "#" + config.var.theme.colors.fg;
+      cursor_text_color = "#" + config.var.theme.colors.bg;
+      selection_foreground = "#" + config.var.theme.colors.accentFg;
+      selection_background = "#" + config.var.theme.colors.accent;
+    };
+  };
+}

home/programs/nightshift/default.nix

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

home/programs/nixy/default.nix

@@ -1,77 +0,0 @@
-# - ## Nixy
-#-
-#- Nixy is a simple script that I use to manage my NixOS system. It's a simple script that provides a menu to rebuild, test, update, collect garbage, clean boot menu, etc.
-#-
-#- - `nixy` - UI wizard to manage the system.
-#- - `nixy rebuild` - Rebuild the system.
-#- - `nixy ...` - ... see the script for more commands.
-{ pkgs, config, ... }:
-let
-  configDirectory = config.var.configDirectory;
-
-  nixy = pkgs.writeShellScriptBin "nixy"
-    # bash
-    ''
-      function exec() {
-        $@
-      }
-
-      function ui(){
-        DEFAULT_ICON="󰘳"
-
-        # "icon;name;command"[]
-        apps=(
-          "󰑓;Rebuild;nixy rebuild"
-          "󰐊;Test;nixy test"
-          "󰚰;Update;nixy update"
-          ";Collect Garbage;nixy gc"
-          "󰍜;Clean Boot Menu;nixy cb"
-          ";List generation;nixy listgen"
-          "󰌌;Hyprland Keybindings;nvim ${configDirectory}/docs/KEYBINDINGS-HYPRLAND.md"
-          "󰋩;Wallpapers;zen https://github.com/anotherhadi/nixy-wallpapers"
-        )
-
-        # Apply default icons if empty:
-        for i in "''${!apps[@]}"; do
-          apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
-        done
-
-        fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
-        [[ -z $fzf_result ]] && exit 0
-        fzf_result=''${fzf_result/ /;}
-        line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
-        command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
-
-        exec "$command"
-        exit $?
-      }
-
-      [[ $1 == "" ]] && ui
-
-      if [[ $1 == "rebuild" ]];then
-        cd ${configDirectory} && git add . && sudo nixos-rebuild switch --flake
-      elif [[ $1 == "test" ]];then
-        cd ${configDirectory} && git add . && sudo nixos-rebuild test --flake
-      elif [[ $1 == "update" ]];then
-        cd ${configDirectory} && nix flake update
-      elif [[ $1 == "gc" ]];then
-        echo "Starting Nix garbage collection..."
-        cd ${configDirectory} && \
-        echo "Cleaning up system garbage..." && \
-        sudo nix-collect-garbage -d && \
-        echo "Cleaning up user garbage..." && \
-        nix-collect-garbage -d && \
-        echo "Collecting garbage from Nix store..." && \
-        nix-store --gc && \
-        echo "Optimizing Nix store..." && \
-        nix-store --optimise
-        echo "Nix garbage collection complete."
-      elif [[ $1 == "cb" ]];then
-        sudo /run/current-system/bin/switch-to-configuration boot
-      elif [[ $1 == "listgen" ]];then
-        sudo nix-env -p /nix/var/nix/profiles/system --list-generations
-      else
-        echo "Unknown argument"
-      fi
-    '';
-in { home.packages = [ nixy ]; }

home/programs/nvf/default.nix

@@ -1,26 +0,0 @@
-# NVF is a Neovim configuration that provides a minimal setup with essential plugins and configurations.
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  imports = [
-    inputs.nvf.homeManagerModules.default
-    ./options.nix
-    ./languages.nix
-    ./picker.nix
-    ./snacks.nix
-    ./keymaps.nix
-    ./utils.nix
-    ./mini.nix
-  ];
-
-  programs.nvf = {
-    enable = true;
-    settings.vim = {
-      startPlugins = [
-        pkgs.vimPlugins.vim-kitty-navigator
-      ];
-    };
-  };
-}

home/programs/nvf/keymaps.nix

@@ -1,173 +0,0 @@
-{
-  programs.nvf.settings.vim = {
-    globals.mapleader = " ";
-    binds = {
-      whichKey = {
-        enable = true;
-        # TODO: registers
-        register = {};
-      };
-    };
-    keymaps = [
-      # General Mappings
-      {
-        key = "s";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua require('flash').jump()<cr>";
-        desc = "Flash";
-      }
-      {
-        key = "K";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua vim.lsp.buf.hover()<cr>";
-        desc = "LSP Hover";
-      }
-      {
-        key = "<C-tab>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>bnext<cr>";
-        desc = "Next Buffer";
-      }
-
-      # Kitty navigator
-      {
-        key = "<C-h>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateLeft<cr>";
-      }
-      {
-        key = "<C-j>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateDown<cr>";
-      }
-      {
-        key = "<C-k>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateUp<cr>";
-      }
-      {
-        key = "<C-l>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateRight<cr>";
-      }
-
-      # Disable Arrow Keys in Normal Mode
-      {
-        key = "<Up>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Up Arrow";
-      }
-      {
-        key = "<Down>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Down Arrow";
-      }
-      {
-        key = "<Left>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Left Arrow";
-      }
-      {
-        key = "<Right>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Right Arrow";
-      }
-
-      # UI
-      {
-        key = "<leader>uw";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set wrap!<cr>";
-        desc = "Toggle word wrapping";
-      }
-      {
-        key = "<leader>ul";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set linebreak!<cr>";
-        desc = "Toggle linebreak";
-      }
-      {
-        key = "<leader>us";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set spell!<cr>";
-        desc = "Toggle spellLazyGitcheck";
-      }
-      {
-        key = "<leader>uc";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set cursorline!<cr>";
-        desc = "Toggle cursorline";
-      }
-      {
-        key = "<leader>un";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set number!<cr>";
-        desc = "Toggle line numbers";
-      }
-      {
-        key = "<leader>ur";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set relativenumber!<cr>";
-        desc = "Toggle relative line numbers";
-      }
-      {
-        key = "<leader>ut";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set showtabline=2<cr>";
-        desc = "Show tabline";
-      }
-      {
-        key = "<leader>uT";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set showtabline=0<cr>";
-        desc = "Hide tabline";
-      }
-
-      # Windows
-      {
-        key = "<leader>ws";
-        mode = "n";
-        silent = true;
-        action = "<cmd>split<cr>";
-        desc = "Split";
-      }
-      {
-        key = "<leader>wv";
-        mode = "n";
-        silent = true;
-        action = "<cmd>vsplit<cr>";
-        desc = "VSplit";
-      }
-      {
-        key = "<leader>wd";
-        mode = "n";
-        silent = true;
-        action = "<cmd>close<cr>";
-        desc = "Close";
-      }
-    ];
-  };
-}

home/programs/nvf/languages.nix

@@ -1,119 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
-  programs.nvf.settings.vim = {
-    diagnostics = {
-      enable = true;
-      config = {
-        signs = {
-          text = {
-            "vim.diagnostic.severity.Error" = " ";
-            "vim.diagnostic.severity.Warn" = " ";
-            "vim.diagnostic.severity.Hint" = " ";
-            "vim.diagnostic.severity.Info" = " ";
-          };
-        };
-        underline = true;
-        update_in_insert = true;
-        virtual_text = {
-          format =
-            lib.generators.mkLuaInline
-            /*
-            lua
-            */
-            ''
-              function(diagnostic)
-                return string.format("%s", diagnostic.message)
-                --return string.format("%s (%s)", diagnostic.message, diagnostic.source)
-              end
-            '';
-        };
-      };
-      nvim-lint = {
-        enable = true;
-      };
-    };
-    syntaxHighlighting = true;
-    treesitter = {
-      enable = true;
-      autotagHtml = true;
-      context.enable = true;
-      highlight.enable = true;
-      grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-        typescript # in language settings only tsx gets enabled, not typescript
-      ];
-    };
-    lsp = {
-      enable = true;
-      trouble.enable = true;
-      lspSignature.enable = true;
-      lspconfig.enable = true;
-      formatOnSave = true;
-      inlayHints.enable = true;
-      null-ls.enable = true;
-      servers.nixd.settings.nil.nix.autoArchive = true;
-      otter-nvim = {
-        enable = true;
-        setupOpts = {
-          buffers.set_filetype = true;
-          lsp = {
-            diagnostic_update_event = [
-              "BufWritePost"
-              "InsertLeave"
-            ];
-          };
-        };
-      };
-      lspkind.enable = true;
-      lspsaga = {
-        enable = true;
-        setupOpts = {
-          ui = {
-            code_action = "";
-          };
-          lightbulb = {
-            sign = false;
-            virtual_text = true;
-          };
-          breadcrumbs.enable = false;
-        };
-      };
-    };
-    languages = {
-      enableDAP = true;
-      enableExtraDiagnostics = true;
-      enableFormat = true;
-      enableTreesitter = true;
-
-      astro.enable = true;
-      go.enable = true;
-      markdown = {
-        enable = true;
-        format.type = ["prettierd"];
-        extensions = {
-          markview-nvim = {
-            enable = true;
-          };
-        };
-        extraDiagnostics.enable = true;
-      };
-      ts = {
-        enable = true;
-        extensions.ts-error-translator.enable = true;
-      };
-      css.enable = true;
-      svelte.enable = true;
-      html.enable = true;
-      bash.enable = true;
-      nix.enable = true;
-      tailwind.enable = true;
-    };
-    formatter = {
-      conform-nvim = {
-        enable = true;
-      };
-    };
-  };
-}

home/programs/nvf/mini.nix

@@ -1,13 +0,0 @@
-{
-  programs.nvf.settings.vim.mini = {
-    starter.enable = true;
-    comment.enable = true;
-    # cursorword.enable = true;
-    icons.enable = true;
-    indentscope.enable = true;
-    notify.enable = true;
-    pairs.enable = true;
-    diff.enable = true;
-    git.enable = true;
-  };
-}

home/programs/nvf/options.nix

@@ -1,40 +0,0 @@
-{lib, ...}: {
-  programs.nvf.settings.vim = {
-    viAlias = false;
-    vimAlias = true;
-    withNodeJs = true;
-    # syntaxHighlighting = true;
-    options = {
-      autoindent = true;
-      smartindent = true;
-      shiftwidth = 2;
-      foldlevel = 99;
-      foldcolumn = "auto:1";
-      mousescroll = "ver:1,hor:1";
-      mousemoveevent = true;
-      fillchars = "eob:‿,fold: ,foldopen:▼,foldsep:⸽,foldclose:⏵";
-      signcolumn = "yes";
-      tabstop = 2;
-      softtabstop = 2;
-      wrap = false;
-    };
-    globals = {
-      navic_silence = true; # navic tries to attach multiple LSPs and fails
-      suda_smart_edit = 1; # use super user write automatically
-      neovide_scale_factor = 0.7;
-      neovide_cursor_animation_length = 0.1;
-      neovide_cursor_short_animation_length = 0;
-    };
-    clipboard = {
-      enable = true;
-      registers = "unnamedplus";
-      providers.wl-copy.enable = true;
-    };
-    theme = {
-      enable = true;
-      name = lib.mkForce "catppuccin";
-      style = lib.mkForce "mocha";
-      transparent = lib.mkForce true;
-    };
-  };
-}

home/programs/nvf/picker.nix

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

home/programs/nvf/snacks.nix

@@ -1,19 +0,0 @@
-{
-  programs.nvf.settings.vim.utility.snacks-nvim = {
-    enable = true;
-    setupOpts = {
-      image = {
-        enabled = true;
-        doc = {
-          inline = false;
-          float = true;
-        };
-      };
-      quickfile.enabled = true;
-      statuscolumn.enabled = true;
-      zen.enabled = true;
-      bufdelete.enabled = true;
-      gitsigns.enabled = true;
-    };
-  };
-}

home/programs/nvf/utils.nix

@@ -1,53 +0,0 @@
-{pkgs, ...}: {
-  programs.nvf.settings.vim = {
-    undoFile.enable = true;
-    utility = {
-      motion.flash-nvim.enable = true;
-      outline.aerial-nvim.enable = true;
-    };
-    tabline.nvimBufferline.enable = true;
-    notes.todo-comments.enable = true;
-    assistant.copilot = {
-      enable = true;
-      cmp.enable = true;
-    };
-    statusline.lualine.enable = true;
-
-    autocomplete = {
-      nvim-cmp = {
-        enable = true;
-        sources = {
-          buffer = "[Buffer]";
-          nvim-cmp = null;
-          path = "[Path]";
-        };
-        sourcePlugins = [
-          pkgs.vimPlugins.cmp-cmdline
-        ];
-      };
-    };
-
-    snippets.luasnip.enable = true;
-    ui = {
-      noice.enable = true;
-      colorizer.enable = true;
-    };
-    git = {
-      enable = true;
-      gitsigns.enable = true;
-    };
-    terminal.toggleterm = {
-      enable = true;
-      lazygit = {
-        enable = true;
-        mappings.open = "<leader>gl";
-      };
-    };
-    visuals = {
-      rainbow-delimiters.enable = true;
-      nvim-scrollbar = {
-        enable = false;
-      };
-    };
-  };
-}

home/programs/nvim/colorscheme.nix

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

home/programs/nvim/default.nix

@@ -0,0 +1,30 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    ./plugins/auto-pairs.nix
+    ./plugins/bufferline.nix
+    ./plugins/lazygit.nix
+    ./plugins/telescope.nix
+    ./plugins/nvim-tree.nix
+    ./plugins/lightline.nix
+    ./plugins/git.nix
+    ./plugins/cmp.nix
+    ./plugins/none-ls.nix
+    ./plugins/wilder.nix
+    ./plugins/lsp.nix
+    ./plugins/treesitter.nix
+    ./plugins/toggleterm.nix
+    ./plugins/copilot.nix
+    ./plugins/whichkey.nix
+    ./plugins/alpha.nix
+    ./plugins/keymaps.nix
+    ./plugins/comment.nix
+    ./plugins/oil.nix
+    ./plugins/trouble.nix
+    ./plugins/tmux-navigator.nix
+    ./plugins/noice.nix
+    ./plugins/obsidian.nix
+    ./options.nix
+    ./colorscheme.nix
+  ];
+}

home/programs/nvim/options.nix

@@ -0,0 +1,37 @@
+{
+
+  programs.nixvim.globals.mapleader = " ";
+  programs.nixvim.opts = {
+    updatetime = 50; # Faster completion
+
+    number = true;
+    relativenumber = true;
+
+    autoindent = true;
+    clipboard = "unnamed,unnamedplus";
+
+    expandtab = true;
+    tabstop = 2;
+    softtabstop = 2;
+    shiftwidth = 2;
+    smartindent = true;
+    breakindent = true;
+
+    ignorecase = true;
+    incsearch = true;
+    hlsearch = true;
+    smartcase = true;
+    wildmode = "list:longest";
+    completeopt = [ "menuone" "noselect" ];
+    signcolumn = "yes";
+    cursorline = true;
+    scrolloff = 8;
+    mouse = "a";
+
+    wrap = false;
+
+    swapfile = false;
+    undofile = true;
+    conceallevel = 2;
+  };
+}

home/programs/nvim/plugins/alpha.nix

@@ -0,0 +1,133 @@
+{ 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[[e ${config.var.configDirectory}]] 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/auto-pairs.nix

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

home/programs/nvim/plugins/bufferline.nix

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

home/programs/nvim/plugins/cmp.nix

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

home/programs/nvim/plugins/comment.nix

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

home/programs/nvim/plugins/copilot.nix

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

home/programs/nvim/plugins/git.nix

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

home/programs/nvim/plugins/keymaps.nix

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

home/programs/nvim/plugins/lazygit.nix

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

home/programs/nvim/plugins/lightline.nix

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

home/programs/nvim/plugins/lsp.nix

@@ -0,0 +1,24 @@
+{
+  programs.nixvim.plugins = {
+    lsp-format.enable = true;
+    lsp = {
+      enable = true;
+      servers = {
+        bashls.enable = true;
+        clangd.enable = true;
+        gopls.enable = true;
+        nixd.enable = true;
+        tailwindcss.enable = true;
+        html.enable = true;
+        svelte.enable = true;
+      };
+      keymaps.lspBuf = {
+        "gd" = "definition";
+        "gD" = "references";
+        "gt" = "type_definition";
+        "gi" = "implementation";
+        "K" = "hover";
+      };
+    };
+  };
+}

home/programs/nvim/plugins/noice.nix

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

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

@@ -0,0 +1,20 @@
+{
+  programs.nixvim.plugins.none-ls = {
+    enable = true;
+    sources = {
+      diagnostics = {
+        golangci_lint.enable = true;
+        statix.enable = true;
+      };
+      formatting = {
+        gofmt.enable = true;
+        goimports.enable = true;
+        nixfmt.enable = true;
+        markdownlint.enable = true;
+        tidy.enable = true;
+        shellharden.enable = true;
+        shfmt.enable = true;
+      };
+    };
+  };
+}

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

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

home/programs/nvim/plugins/obsidian.nix

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

home/programs/nvim/plugins/oil.nix

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

home/programs/nvim/plugins/telescope.nix

@@ -0,0 +1,13 @@
+{
+  programs.nixvim.plugins.telescope = {
+    enable = true;
+    keymaps = {
+      "<leader>fg" = "live_grep";
+      #"<C-p>" = {
+      #  action = "git_files";
+      #  desc = "Telescope Git Files";
+      #};
+    };
+    extensions.fzf-native = { enable = true; };
+  };
+}

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

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

home/programs/nvim/plugins/toggleterm.nix

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

home/programs/nvim/plugins/treesitter.nix

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

home/programs/nvim/plugins/trouble.nix

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

home/programs/nvim/plugins/whichkey.nix

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

home/programs/nvim/plugins/wilder.nix

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

home/programs/proton/default.nix

@@ -1,19 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    protonvpn-gui
-    proton-pass
-    proton-authenticator
-  ];
-
-  # Fix Proton Authenticator desktop entry
-  xdg.desktopEntries = {
-    "Proton Authenticator" = {
-      name = "Proton Authenticator";
-      exec = "env WEBKIT_DISABLE_COMPOSITING_MODE=1 ${pkgs.proton-authenticator}/bin/proton-authenticator";
-      icon = "proton-authenticator";
-      type = "Application";
-      categories = ["Utility"];
-      terminal = false;
-    };
-  };
-}

home/programs/qutebrowser/default.nix

@@ -0,0 +1,263 @@
+{ config, ... }: {
+
+  imports = [ ./duckduckgo-colorscheme.nix ./homepage ];
+
+  programs.qutebrowser = {
+    enable = true;
+
+    searchEngines = {
+      "DEFAULT" = "https://duckduckgo.com/?q={}&ia=web";
+      "d" = "https://duckduckgo.com/?q={}&ia=web";
+      "g" = "https://google.com/search?q={}";
+      "y" = "https://youtube.com/results?search_query={}";
+      "ya" = "https://yandex.com/search/?text={}";
+      "n" = "https://mynixos.com/search?q={}";
+      "nixo" = "https://search.nixos.org/options?channel=unstable&query={}";
+      "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}";
+      "gt" = "https://github.com/search?q={}&type=repositories";
+    };
+
+    quickmarks = {
+      home = "${config.var.homeDirectory}/.config/startpage/index.html";
+      server = "${config.var.homeDirectory}/.config/serverpage/index.html";
+      mynixos = "https://mynixos.com";
+      github = "https://github.com";
+      outlook = "https://outlook.office.com/mail/";
+      office = "https://www.office.com/?auth=2";
+      teams = "https://teams.microsoft.com/_";
+      casa = "http://192.168.2.16:8081/#/";
+      proton = "https://mail.proton.me/u/0/inbox";
+      cloudflare-one = "https://one.dash.cloudflare.com/";
+      chatgpt = "https://chat.openai.com/";
+      nixvim = "https://nix-community.github.io/nixvim/";
+      hyprland = "https://wiki.hyprland.org/";
+      nerdfont = "https://www.nerdfonts.com/cheat-sheet";
+      youtube = "https://youtube.com/";
+      cloudflare = "https://dash.cloudflare.com/";
+    };
+
+    settings = {
+      url = {
+        default_page =
+          "${config.var.homeDirectory}/.config/startpage/index.html";
+        start_pages =
+          [ "${config.var.homeDirectory}/.config/startpage/index.html" ];
+      };
+
+      colors = {
+        tabs = {
+          odd.bg = "#${config.var.theme.colors.bg}";
+          odd.fg = "#${config.var.theme.colors.fg}";
+          even.bg = "#${config.var.theme.colors.bg}";
+          even.fg = "#${config.var.theme.colors.fg}";
+          selected = {
+            odd = {
+              bg = "#${config.var.theme.colors.accent}";
+              fg = "#${config.var.theme.colors.accentFg}";
+            };
+            even = {
+              bg = "#${config.var.theme.colors.accent}";
+              fg = "#${config.var.theme.colors.accentFg}";
+            };
+          };
+          indicator = {
+            error = "#${config.var.theme.colors.c1}";
+            start = "#${config.var.theme.colors.bgalt}";
+            stop = "#${config.var.theme.colors.bgalt}";
+          };
+        };
+
+        hints = {
+          bg = "#${config.var.theme.colors.bgalt}";
+          fg = "#${config.var.theme.colors.fgalt}";
+          match.fg = "#${config.var.theme.colors.bg}";
+        };
+
+        completion = {
+          category = {
+            bg = "#${config.var.theme.colors.bg}";
+            fg = "#${config.var.theme.colors.fg}";
+            border = {
+              top = "#${config.var.theme.colors.bg}";
+              bottom = "#${config.var.theme.colors.bg}";
+            };
+          };
+
+          odd.bg = "#${config.var.theme.colors.bg}";
+          even.bg = "#${config.var.theme.colors.bg}";
+
+          fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
+
+          match.fg = "#${config.var.theme.colors.accent}";
+
+          item.selected = {
+            bg = "#${config.var.theme.colors.accent}";
+            border.top = "#${config.var.theme.colors.accent}";
+            border.bottom = "#${config.var.theme.colors.accent}";
+            fg = "#${config.var.theme.colors.accentFg}";
+            match.fg = "#${config.var.theme.colors.accentFg}";
+          };
+        };
+
+        statusbar = {
+          normal.bg = "#${config.var.theme.colors.bg}";
+          normal.fg = "#${config.var.theme.colors.fg}";
+          private.bg = "#${config.var.theme.colors.bg}";
+          private.fg = "#${config.var.theme.colors.fg}";
+          insert.bg = "#${config.var.theme.colors.accent}";
+          insert.fg = "#${config.var.theme.colors.accentFg}";
+          command = {
+            bg = "#${config.var.theme.colors.bgalt}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            private.bg = "#${config.var.theme.colors.bgalt}";
+            private.fg = "#${config.var.theme.colors.fgalt}";
+          };
+        };
+
+        messages = {
+          info = {
+            bg = "#${config.var.theme.colors.bgalt}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            border = "#${config.var.theme.colors.bgalt}";
+          };
+
+          error = {
+            bg = "#${config.var.theme.colors.c1}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            border = "#${config.var.theme.colors.c1}";
+          };
+        };
+
+        #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
+        webpage.preferred_color_scheme =
+          "dark"; # Enable dark mode for websites that support it
+      };
+
+      fonts = { default_family = "${config.var.theme.font}"; };
+
+      completion = {
+        height = "30%";
+        open_categories = [ "history" ];
+        scrollbar = {
+          padding = 0;
+          width = 0;
+        };
+        show = "always";
+        shrink = true;
+        timestamp_format = "";
+        web_history.max_items = 7;
+      };
+
+      content = {
+        autoplay = false;
+        javascript.clipboard = "access";
+        javascript.enabled = true;
+        pdfjs = true;
+      };
+
+      downloads = {
+        position = "bottom";
+        remove_finished = 0;
+      };
+
+      hints = {
+        border = "none";
+        radius = 1;
+      };
+
+      scrolling = {
+        bar = "never";
+        smooth = true;
+      };
+
+      tabs = {
+        show = "multiple";
+        last_close = "close";
+        mode_on_change = "restore";
+        close_mouse_button = "right";
+      };
+
+      zoom.default = "100%";
+
+      qt.force_software_rendering = "chromium";
+    };
+
+    keyBindings = {
+      normal = {
+        "gh" = "open ${config.var.homeDirectory}/.config/startpage/index.html";
+        "gs" = "open ${config.var.homeDirectory}/.config/serverpage/index.html";
+
+        " p" = "tab-move -";
+        " n" = "tab-move +";
+        " w" = "tab-close";
+
+        " 1" = "tab-focus 1";
+        " 2" = "tab-focus 2";
+        " 3" = "tab-focus 3";
+        " 4" = "tab-focus 4";
+        " 5" = "tab-focus 5";
+        " 6" = "tab-focus 6";
+        " 7" = "tab-focus 7";
+        " 8" = "tab-focus 8";
+        " 9" = "tab-focus 9";
+        " 0" = "tab-focus 10";
+
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      command = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      insert = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+    };
+
+    extraConfig = ''
+      config.unbind("gm")
+      config.unbind("gd")
+      config.unbind("gb")
+      config.unbind("tl")
+      config.unbind("gt")
+
+      c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+
+      config.load_autoconfig(True)
+    '';
+  };
+}

home/programs/qutebrowser/duckduckgo-colorscheme.nix

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

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

home/programs/shell/default.nix

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

home/programs/shell/eza.nix

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

home/programs/shell/fzf.nix

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

home/programs/shell/starship.nix

@@ -1,58 +0,0 @@
-# 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 = accent;};
-
-      character = {
-        success_symbol = "[❯](${accent})";
-        error_symbol = "[❯](red)";
-        vimcmd_symbol = "[❮](cyan)";
-      };
-
-      nix_shell = {
-        format = "[$symbol]($style) ";
-        symbol = "🐚";
-        style = "";
-      };
-
-      git_branch = {
-        symbol = "[](${background-alt}) ";
-        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)";
-        style = "cyan";
-        conflicted = "";
-        renamed = "";
-        deleted = "";
-        stashed = "≡";
-      };
-
-      git_state = {
-        format = "([$state( $progress_current/$progress_total)]($style)) ";
-        style = "bright-black";
-      };
-    };
-  };
-}

home/programs/shell/zoxide.nix

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

home/programs/shell/zsh.nix

@@ -1,203 +0,0 @@
-# My shell configuration
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: let
-  fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
-in {
-  home.packages = with pkgs; [bat ripgrep tldr sesh];
-
-  # Add go binaries to the PATH
-  home.sessionPath = ["$HOME/go/bin"];
-
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting = {
-      enable = true;
-      highlighters = ["main" "brackets" "pattern" "regexp" "root" "line"];
-    };
-    historySubstringSearch.enable = true;
-
-    history = {
-      ignoreDups = true;
-      save = 10000;
-      size = 10000;
-    };
-
-    profileExtra = lib.optionalString (config.home.sessionPath != []) ''
-      export PATH="$PATH''${PATH:+:}${
-        lib.concatStringsSep ":" config.home.sessionPath
-      }"
-    '';
-
-    shellAliases = {
-      vim = "nvim";
-      vi = "nvim";
-      v = "nvim";
-      c = "clear";
-      clera = "clear";
-      celar = "clear";
-      e = "exit";
-      cd = "z";
-      ls = "eza --icons=always --no-quotes";
-      tree = "eza --icons=always --tree --no-quotes";
-      sl = "ls";
-      open = "${pkgs.xdg-utils}/bin/xdg-open";
-      icat = "${pkgs.kitty}/bin/kitty +kitten icat";
-      cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
-      mkdir = "mkdir -p";
-
-      obsidian-no-gpu = "env ELECTRON_OZONE_PLATFORM_HINT=auto obsidian --ozone-platform=x11";
-      wireguard-import = "nmcli connection import type wireguard file";
-
-      notes = "nvim ~/notes/index.md --cmd 'cd ~/notes' -c ':lua Snacks.picker.smart()'";
-      note = "notes";
-      tmp = "nvim /tmp/$(date | sed 's/ //g;s/\\.//g').md";
-
-      nix-shell = "nix-shell --command zsh";
-
-      # git
-      g = "lazygit";
-      ga = "git add";
-      gc = "git commit";
-      gcu = "git add . && git commit -m 'Update'";
-      gp = "git push";
-      gpl = "git pull";
-      gs = "git status";
-      gd = "git diff";
-      gco = "git checkout";
-      gcb = "git checkout -b";
-      gbr = "git branch";
-      grs = "git reset HEAD~1";
-      grh = "git reset --hard HEAD~1";
-
-      gaa = "git add .";
-      gcm = "git commit -m";
-    };
-
-    initContent =
-      # bash
-      ''
-        bindkey -e
-        ${
-          if fetch == "neofetch"
-          then pkgs.neofetch + "/bin/neofetch"
-          else if fetch == "nerdfetch"
-          then "nerdfetch"
-          else if fetch == "pfetch"
-          then "echo; ${pkgs.pfetch}/bin/pfetch"
-          else ""
-        }
-
-        function sesh-sessions() {
-          session=$(sesh list -t -c | fzf --height 70% --reverse)
-          [[ -z "$session" ]] && return
-          sesh connect $session
-        }
-
-        function chatgptfolder(){
-          echo "################################"
-          echo "###         TREE             ###"
-          echo "################################"
-          ${pkgs.eza}/bin/eza --tree -aF --icons never
-          echo -e "\n\n"
-          echo "##############################"
-          echo "###        CONTENT         ###"
-          echo "##############################"
-          find . -type f -not -path '*/.git/*' -print0 | while IFS= read -r -d "" file; do
-              echo -e "\n--- DEBUT: $file ---\n"
-              cat "$file"
-              echo -e "\n--- FIN: $file ---\n"
-          done
-        }
-
-
-        function n4c() {
-          category=''${1:-all}
-          shift
-          args=''${*}
-          nix develop "github:nix4cyber/n4c#''${category}" ''${args} -c zsh
-        }
-
-        zle     -N             sesh-sessions
-        bindkey -M emacs '\es' sesh-sessions
-        bindkey -M vicmd '\es' sesh-sessions
-        bindkey -M viins '\es' sesh-sessions
-
-        # 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,32 +1,31 @@
-# Spicetify is a spotify client customizer
-{
-  pkgs,
-  config,
-  lib,
-  inputs,
-  ...
-}: let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-  accent = "${config.lib.stylix.colors.base0D}";
-  background = "${config.lib.stylix.colors.base00}";
+{ pkgs, config, lib, inputs, ... }:
+let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
 in {
+
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
-
-  stylix.targets.spicetify.enable = false;
-
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "spotify" ];
   programs.spicetify = {
     enable = true;
-    theme = lib.mkForce spicePkgs.themes.dribbblish;
-
+    theme = spicePkgs.themes.text;
     colorScheme = "custom";
 
     customColorScheme = {
-      button = accent;
-      button-active = accent;
-      tab-active = accent;
-      player = background;
-      main = background;
-      sidebar = background;
+      text = "${config.var.theme.colors.fg}";
+      subtext = "${config.var.theme.colors.fgalt}";
+      sidebar-text = "${config.var.theme.colors.fgalt}";
+      main = "${config.var.theme.colors.bg}";
+      sidebar = "${config.var.theme.colors.bg}";
+      background = "${config.var.theme.colors.bg}";
+      player = "${config.var.theme.colors.bg}";
+      card = "${config.var.theme.colors.bg}";
+      shadow = "000000";
+      selected-row = "${config.var.theme.colors.bgalt}";
+      button = "${config.var.theme.colors.accent}";
+      button-active = "${config.var.theme.colors.accent}";
+      button-disabled = "${config.var.theme.colors.bgalt}";
+      tab-active = "${config.var.theme.colors.accent}";
+      misc = "${config.var.theme.colors.fgalt}";
     };
 
     enabledExtensions = with spicePkgs.extensions; [
@@ -34,9 +33,8 @@ in {
       lastfm
       historyShortcut
       hidePodcasts
-      adblock
       fullAppDisplay
-      keyboardShortcut
+      shuffle
     ];
   };
 }

home/programs/thunar/default.nix

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

home/programs/vivaldi/default.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  programs.vivaldi = {
-    enable = true;
-    commandLineArgs = [
-      "--no-default-browser-check"
-    ];
-  };
-
-  home.sessionVariables = {
-    DEFAULT_BROWSER = "${pkgs.vivaldi}/bin/vivaldi";
-  };
-}

home/programs/zathura/default.nix

@@ -1,15 +0,0 @@
-# TODO: Misc section with VLC, Zathura etc
-# Zathura is a PDF viewer
-{
-  programs.zathura = {
-    enable = true;
-
-    options = {
-      guioptions = "v";
-      adjust-open = "width";
-      statusbar-basename = true;
-      render-loading = false;
-      scroll-step = 120;
-    };
-  };
-}

home/scripts/brightness/default.nix

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

home/scripts/caffeine/default.nix

@@ -0,0 +1,23 @@
+{ pkgs, config, ... }:
+let
+  homedir = config.home.homeDirectory;
+
+  caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
+    [[ -f /tmp/caffeine ]] && echo "active" || echo "inactive"
+  '';
+
+  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
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+  '';
+
+in { home.packages = with pkgs; [ caffeine-status caffeine ]; }

home/scripts/compress/default.nix

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

home/scripts/default.nix

@@ -0,0 +1,15 @@
+{
+  imports = [
+    ./nixy
+    ./sounds
+    ./brightness
+    ./caffeine
+    ./night-shift
+    ./screenshot
+    ./startup
+    ./nerdfont_fzf
+    ./system
+    ./compress
+    ./misc
+  ];
+}

home/scripts/misc/default.nix

@@ -0,0 +1,30 @@
+{ pkgs, config, ... }:
+
+let
+  homedir = config.home.homeDirectory;
+
+  menu = pkgs.writeShellScriptBin "menu" ''
+    if pgrep wofi; then
+    	pkill wofi
+    else
+    	wofi --show drun
+    fi
+  '';
+
+  powermenu = pkgs.writeShellScriptBin "powermenu" ''
+    if pgrep wlogout; then
+    	pkill wlogout
+    else
+      ${pkgs.wlogout}/bin/wlogout
+    fi
+  '';
+
+  wireguard-import = pkgs.writeShellScriptBin "wireguard-import" ''
+    nmcli connection import type wireguard file "$1"
+  '';
+
+  vault = pkgs.writeShellScriptBin "vault" ''
+    nvim $HOME/Nextcloud/obsidian
+  '';
+
+in { home.packages = with pkgs; [ menu wireguard-import powermenu vault ]; }

home/scripts/nerdfont_fzf/default.nix

@@ -0,0 +1,35 @@
+{ pkgs, config, ... }:
+let
+  homedir = config.home.homeDirectory;
+
+  nerdfont-fzf = pkgs.writeShellScriptBin "nerdfont-fzf" ''
+    # Dependencies: jq, fzf, wl-copy, wget
+    icons=$(jq -r 'to_entries[] | "\(.key):\(.value.char)"' "${homedir}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
+    fzf_result=$(echo "$icons" | fzf --ansi --border none | awk '{print $1}')
+    if [ -z "$fzf_result" ]; then
+      echo "No icon selected"
+      exit 1
+    fi
+
+    echo "Copied to clipboard: $fzf_result"
+    echo "Paste it to close the window"
+    ${pkgs.wl-clipboard}/bin/wl-copy -o "$fzf_result" # wait for paste before exiting.. not cool
+  '';
+
+  nerdfont-fzf-fetch = pkgs.writeShellScriptBin "nerdfont-fzf-fetch" ''
+    wget "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/glyphnames.json" -O "glyphnames.json" || exit 1
+    jq 'del(.METADATA)' "glyphnames.json"
+  '';
+
+  nerdfont-popup = pkgs.writeShellScriptBin "nerdfont-popup" ''
+    ${pkgs.kitty}/bin/kitty --class floating -o font_size=18 zsh -c nerdfont-fzf 2>/dev/null
+  '';
+
+in {
+  home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+
+  xdg.configFile."nerdfont_glyphnames.json" = {
+    source = ./nerdfont_glyphnames.json;
+  };
+
+}

home/scripts/night-shift/default.nix

@@ -0,0 +1,20 @@
+{ pkgs, config, ... }:
+
+let
+  homedir = config.home.homeDirectory;
+  default = "4000";
+
+  night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.wlsunset}/bin/wlsunset -t ${default}"
+    message="󰖔  Night-Shift Activated"
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+  '';
+  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
+    pkill wlsunset
+    message="󰖔  Night-Shift Deactivated"
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+  '';
+
+in { home.packages = with pkgs; [ night-shift-on night-shift-off ]; }

home/scripts/nixy/default.nix

@@ -0,0 +1,32 @@
+{ pkgs, config, ... }:
+
+let
+  nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" ''
+    sudo nixos-rebuild switch --flake ${config.var.configDirectory}#nixy
+  '';
+
+  nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" ''
+    sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#nixy
+  '';
+
+  nixy-update = pkgs.writeShellScriptBin "nixy-update" ''
+    cd ${config.var.configDirectory} && sudo nix flake update
+  '';
+
+  nixy-gc = pkgs.writeShellScriptBin "nixy-gc" ''
+    cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
+  '';
+
+  nixy-cb = pkgs.writeShellScriptBin "nixy-cb" ''
+    sudo /run/current-system/bin/switch-to-configuration boot
+  '';
+
+in {
+  home.packages = with pkgs; [
+    nixy-rebuild
+    nixy-upgrade
+    nixy-update
+    nixy-gc
+    nixy-cb
+  ];
+}

home/scripts/screenshot/default.nix

@@ -0,0 +1,33 @@
+{ pkgs, ... }:
+
+let
+  # TODO: Broken - hypshot not working (jq error)
+  screenshot = pkgs.writeShellScriptBin "screenshot" ''
+    if [[ $2 == "swappy" ]];then
+      folder="/tmp"
+    else
+      folder="$HOME/Pictures/screenshots"
+    fi
+    filename="$(date +%Y-%m-%d_%H:%M:%S).png"
+    mode="region" # Default to region
+
+    if [[ $1 == "window" ]];then
+      mode="window"
+    elif [[ $1 == "monitor" ]];then
+      mode="output"
+    fi
+
+    ${pkgs.hyprshot}/bin/hyprshot -m $mode -o $folder -f $filename -s || exit 1
+
+    if [[ $2 == "swappy" ]];then
+      ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/screenshots/$filename"
+      exit 0
+    fi
+
+    message="  Screenshot saved"
+
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+                --icon="$folder/$filename" \
+                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+  '';
+in { home.packages = with pkgs; [ hyprshot screenshot ]; }