update todos

Former-commit-id: f760d9b564

.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

@@ -23,14 +23,18 @@
 </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.
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It includes *home-manager*, *secrets*, and *custom theming* all in one place.
+It's a simple way to manage your system configuration and dotfiles.
 
-**Features:**
+I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
+This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
+I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
 
-- 💻 Hyprland-centric: Preconfigured Hyprland ecosystem (Hyprlock, Hyprpanel, etc.)
+**Nixy key points:**
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
+
-- ⌨️  Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
+- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
+- Stylix/base16 themes
+- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
 
 ## Table of Content
 
@@ -45,9 +49,9 @@ It includes *home-manager*, *secrets*, and *custom theming* all in one place.
 
 ## Architecture
 
-### 🏠 /home (User-level configuration)
+### 🏠 home
 
-Contains **dotfiles and settings** that apply to your user environment.
+Those are the dotfiles and configuration files for user-level configuration
 
 **Subfolders:**
 
@@ -55,44 +59,36 @@ Contains **dotfiles and settings** that apply to your user environment.
 - `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
 - `system` is some "desktop environment" configuration
 
-### 🐧 /nixos
+### 🐧 nixos
 
 Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
 
-### 🎨 /themes
+### 🎨 themes
 
-This folder contains all system themes. Mainly [stylix](https://stylix.danth.me/) configurations.
+Those are the themes used in the system configuration.
-Check out the available themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
+Those themes are based on [stylix](https://github.com/danth/stylix).
+See avaiable themes in [THEMES.md](docs/THEMES.md)
 
-### 💻 /hosts
+### 💻 hosts
 
-This directory contains host-specific configurations.
+Those are the host-specific configurations.
-Each host includes:
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-- `configuration.nix` for system-wide settings
-- `home.nix` for user-level configuration
-- `variables.nix` for global variables
-- `secrets/` for sensitive data
 
 ## Installation
 
-1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to your system:
+1. Clone the repo
 
 ```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.
+2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-3. Copy your `hardware-configuration.nix` into your new host's folder to ensure proper hardware support.
+3. Add your `hardware-configuration.nix` to your new host's folder
-4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
+4. Add your 'nixosConfigurations' inside `flake.nix`
 
 > [!Important]
-> `# CHANGEME` comments are placed throughout the config to indicate necessary modifications.
+> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
-> Use the following command to quickly locate them:
+> You can use `rg "CHANGEME"` to find them all with ripgrep.
->
-> ```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
@@ -105,11 +101,11 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 
 ## Documentation
 
-- [SERVER](docs/SERVER.md): Check out the server documentation
 - [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS](docs/SCRIPTS.md): A list of available scripts and their usage
+- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
 - [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome collection of wallpapers
+- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
 
+- [TODO](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

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

@@ -16,9 +16,9 @@ jobs:
       - name: Run a script
         run: |
           chmod +x ./.github/scripts/keybindings_to_markdown.sh
-          ./.github/scripts/keybindings_to_markdown.sh
+          ./docs/.github/keybindings_to_markdown.sh
           git config user.name github-actions
           git config user.email github-actions@github.com
           git add .
-          git commit -m "Update KEYBINDINGS-HYPRLAND.md (auto)" && git push
+          git commit -m "Update KEYBINDINGS-HYPRLAND.md (auto)"
-          exit 0
+          git push

.github/workflows/update-readme.yml

@@ -27,5 +27,5 @@ jobs:
           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
+          git commit -m "Update README.md (auto)"
-          exit 0
+          git push

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

@@ -1,7 +1,7 @@
 on:
   push:
      paths:
-       - 'home/scripts/**'
+       - 'home/scripts'
 permissions:
   contents: write
 jobs:
@@ -20,5 +20,5 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git add .
-          git commit -m "Update SCRIPTS.md (auto)" && git push
+          git commit -m "Update SCRIPTS.md (auto)"
-          exit 0
+          git push

.gitignore

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

.sops.yaml

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

README.md

@@ -24,24 +24,28 @@
 </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.
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It includes *home-manager*, *secrets*, and *custom theming* all in one place.
+It's a simple way to manage your system configuration and dotfiles.
 
-**Features:**
+I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
+This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
+I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
 
-- 💻 Hyprland-centric: Preconfigured Hyprland ecosystem (Hyprlock, Hyprpanel, etc.)
+**Nixy key points:**
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
+
-- ⌨️  Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
+- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
+- Stylix/base16 themes
+- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
 
 ## Table of Content
 
 - [Table of Content](#table-of-content)
 - [Gallery](#gallery)
 - [Architecture](#architecture)
-  - [🏠 /home (User-level configuration)](#-home-user-level-configuration)
+  - [🏠 home](#-home)
-  - [🐧 /nixos](#-nixos)
+  - [🐧 nixos](#-nixos)
-  - [🎨 /themes](#-themes)
+  - [🎨 themes](#-themes)
-  - [💻 /hosts](#-hosts)
+  - [💻 hosts](#-hosts)
 - [Installation](#installation)
 - [Documentation](#documentation)
 
@@ -54,9 +58,9 @@ It includes *home-manager*, *secrets*, and *custom theming* all in one place.
 
 ## Architecture
 
-### 🏠 /home (User-level configuration)
+### 🏠 home
 
-Contains **dotfiles and settings** that apply to your user environment.
+Those are the dotfiles and configuration files for user-level configuration
 
 **Subfolders:**
 
@@ -64,44 +68,36 @@ Contains **dotfiles and settings** that apply to your user environment.
 - `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
 - `system` is some "desktop environment" configuration
 
-### 🐧 /nixos
+### 🐧 nixos
 
 Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
 
-### 🎨 /themes
+### 🎨 themes
 
-This folder contains all system themes. Mainly [stylix](https://stylix.danth.me/) configurations.
+Those are the themes used in the system configuration.
-Check out the available themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
+Those themes are based on [stylix](https://github.com/danth/stylix).
+See avaiable themes in [THEMES.md](docs/THEMES.md)
 
-### 💻 /hosts
+### 💻 hosts
 
-This directory contains host-specific configurations.
+Those are the host-specific configurations.
-Each host includes:
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-- `configuration.nix` for system-wide settings
-- `home.nix` for user-level configuration
-- `variables.nix` for global variables
-- `secrets/` for sensitive data
 
 ## Installation
 
-1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to your system:
+1. Clone the repo
 
 ```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.
+2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-3. Copy your `hardware-configuration.nix` into your new host's folder to ensure proper hardware support.
+3. Add your `hardware-configuration.nix` to your new host's folder
-4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
+4. Add your 'nixosConfigurations' inside `flake.nix`
 
 > [!Important]
-> `# CHANGEME` comments are placed throughout the config to indicate necessary modifications.
+> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
-> Use the following command to quickly locate them:
+> You can use `rg "CHANGEME"` to find them all with ripgrep.
->
-> ```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
@@ -114,11 +110,11 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 
 ## Documentation
 
-- [SERVER](docs/SERVER.md): Check out the server documentation
 - [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS](docs/SCRIPTS.md): A list of available scripts and their usage
+- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
 - [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome collection of wallpapers
+- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
 
+- [TODO](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/CONTRIBUTING.md

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

docs/KEYBINDINGS-HYPRLAND.md

@@ -10,14 +10,12 @@
 | Move app to Workspace | SHIFT + SUPER + {Number} |
 | Kitty | SUPER + RETURN |
 | Thunar | SUPER + E |
-| Zen Browser | SUPER + B |
+| Qutebrowser | SUPER + B |
 | Bitwarden | SUPER + K |
 | Lock | SUPER + L |
 | Powermenu | SUPER + X |
 | Launcher | SUPER + SPACE |
-| Quickmenu | SUPER + C |
 | Toggle HyprFocus | SHIFT + SUPER + SPACE |
-| Planify | SUPER + P |
 | Close window | SUPER + Q |
 | Toggle Floating | SUPER + T |
 | Toggle Fullscreen | SUPER + F |
@@ -29,11 +27,11 @@
 | Focus next monitor | SHIFT + SUPER + down |
 | Add to master | SHIFT + SUPER + left |
 | Remove from master | SHIFT + SUPER + right |
-| Screenshot region | SUPER + PRINT |
+| Screenshot window | SUPER + PRINT |
 | Screenshot monitor | PRINT |
-| Screenshot window | SHIFT + SUPER + PRINT |
+| Screenshot region | SHIFT + SUPER + PRINT |
 | Screenshot region then edit | ALTPRINT |
-| Toggle hyprpanel | SHIFT + SUPER + T |
+| Search on internet with wofi | SHIFT + SUPER + S |
 | Clipboard picker with wofi | SHIFT + SUPER + C |
 | Emoji picker with wofi | SHIFT + SUPER + E |
 | Toggle night shift | SUPER + F2 |
@@ -41,9 +39,6 @@
 | Move Window (mouse) | SUPER + mouse:272 |
 | Resize Window (mouse) | SUPER + R |
 | Toggle Mute | XF86AudioMute |
-| Play/Pause Song | XF86AudioPlay |
-| Next Song | XF86AudioNext |
-| Previous Song | XF86AudioPrev |
 | Lock when closing Lid | switch:Lid Switch |
 | Sound Up | XF86AudioRaiseVolume |
 | Sound Down | XF86AudioLowerVolume |

docs/SCRIPTS.md

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

docs/SERVER.md

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

docs/THEMES.md

@@ -1,7 +1,7 @@
 # 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.
+You can change the selected theme by changing the import statement of your host's configuration.nix file.
 
 > [!TIP]
 > To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`

docs/TODO.md

@@ -0,0 +1,13 @@
+# Todolist
+
+feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
+
+- [!] Qutebrowser Bitwarden integration (I need this.)
+
+- [ ] Nixvim
+  - [ ] Change headings foreground
+  - [ ] neotest golang
+  - [ ] nvim dap
+
+- [ ] Tofi configuration
+- [ ] OS Hardening with nix-mineral

flake.nix

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

home/programs/anyrun/default.nix

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

home/programs/discord/default.nix

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

home/programs/fetch/neofetch/default.nix

@@ -1,4 +1,3 @@
-# Legacy
 { pkgs, ... }: {
   home.packages = with pkgs; [ neofetch ];
 

home/programs/fetch/nerdfetch/default.nix

@@ -1,5 +1,3 @@
-# Nerdfetch, a simple system info script written in bash
-# Source: https://github.com/ThatOneCalculator/NerdFetch
 { pkgs, ... }:
 let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''

home/programs/git/default.nix

@@ -1,4 +1,3 @@
-# Git configuration
 { config, ... }:
 let
   username = config.var.git.username;
@@ -22,9 +21,7 @@ in {
     ];
     extraConfig = {
       init.defaultBranch = "main";
-      pull.rebase = "false";
       push.autoSetupRemote = true;
-      color.ui = "1";
     };
     aliases = {
       essa = "push --force";

home/programs/kitty/default.nix

@@ -1,4 +1,3 @@
-# Kitty is a fast, featureful, GPU based terminal emulator
 {
   programs.kitty = {
     enable = true;
@@ -21,13 +20,9 @@
       remember_window_size = "no";
       disable_ligatures = "never";
       url_style = "curly";
-      copy_on_select = "clipboard";
       cursor_shape = "Underline";
       cursor_underline_thickness = 3;
-      cursor_trail = 3;
-      cursor_trail_decay = "0.1 0.4";
       window_padding_width = 10;
-      open_url_with = "default";
     };
   };
 }

home/programs/lazygit/default.nix

@@ -1,4 +1,3 @@
-# Lazygit is a simple terminal UI for git commands.
 { config, lib, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";

home/programs/markdown/default.nix

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

home/programs/nvim/autocmds.nix

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

home/programs/nvim/default.nix

@@ -3,19 +3,18 @@
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
     ./plugins/cmp.nix
-    ./plugins/floaterm.nix
+    ./plugins/dashboard.nix
-    ./plugins/git.nix
     ./plugins/lsp.nix
     ./plugins/markdown.nix
-    ./plugins/mini.nix
+    ./plugins/tree.nix
-    ./plugins/picker.nix
+    ./plugins/ui.nix
-    ./plugins/snacks.nix
-    ./plugins/trouble.nix
     ./plugins/utils.nix
+    ./plugins/dap.nix
+    ./plugins/telescope.nix
+    ./plugins/zenmode.nix
 
     ./options.nix
     ./keymaps.nix
-    ./autocmds.nix
   ];
 
   programs.nixvim.enable = true;

home/programs/nvim/keymaps.nix

@@ -12,6 +12,31 @@
         };
         spec = [
           # General Mappings
+          {
+            __unkeyed-1 = "<leader>c";
+            mode = [ "n" "v" ];
+            group = "+code";
+          }
+          {
+            __unkeyed-1 = "<leader>d";
+            mode = [ "n" "v" ];
+            group = "+debug";
+          }
+          {
+            __unkeyed-1 = "<leader>s";
+            mode = "n";
+            group = "+search";
+          }
+          {
+            __unkeyed-1 = "<leader>m";
+            mode = "n";
+            group = "+markdown";
+          }
+          {
+            __unkeyed-1 = "<leader>t";
+            mode = "n";
+            group = "+trouble";
+          }
           {
             __unkeyed-1 = "<leader>u";
             mode = "n";
@@ -23,9 +48,9 @@
             group = "+windows";
           }
           {
-            __unkeyed-1 = "<leader>c";
+            __unkeyed-1 = "<leader>h";
             mode = "n";
-            group = "+code";
+            group = "+harpoon";
           }
         ];
         win = {
@@ -37,6 +62,22 @@
 
     keymaps = [
       # General Mappings
+      {
+        key = "<leader>e";
+        action = "<cmd>Oil --float<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "-";
+        action = "<cmd>Oil<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "<leader>E";
+        action = "<cmd>Neotree toggle<cr>";
+        options.desc = "Neotree";
+      }
+
       {
         key = "s";
         action = "<cmd>lua require('flash').jump()<cr>";
@@ -47,13 +88,7 @@
         action = "<cmd>lua vim.lsp.buf.hover()<cr>";
         options.desc = "LSP Hover";
       }
-      {
-        key = "<C-tab>";
-        action = "<cmd>bnext<cr>";
-        options.desc = "Next Buffer";
-      }
 
-      # Tmux
       {
         key = "<C-h>";
         action = "<cmd>TmuxNavigateLeft<cr>";
@@ -71,29 +106,12 @@
         action = "<cmd>TmuxNavigateRight<cr>";
       }
 
-      # Disable Arrow Keys in Normal Mode
-      {
-        key = "<Up>";
-        action = "<Nop>";
-        options.desc = "Disable Up Arrow";
-      }
-      {
-        key = "<Down>";
-        action = "<Nop>";
-        options.desc = "Disable Down Arrow";
-      }
-      {
-        key = "<Left>";
-        action = "<Nop>";
-        options.desc = "Disable Left Arrow";
-      }
-      {
-        key = "<Right>";
-        action = "<Nop>";
-        options.desc = "Disable Right Arrow";
-      }
-
       # UI
+      {
+        key = "<leader>uz";
+        action = "<cmd>ZenMode<cr>";
+        options.desc = "Toggle ZenMode";
+      }
       {
         key = "<leader>uw";
         action = "<cmd>set wrap!<cr>";
@@ -107,7 +125,7 @@
       {
         key = "<leader>us";
         action = "<cmd>set spell!<cr>";
-        options.desc = "Toggle spellLazyGitcheck";
+        options.desc = "Toggle spellcheck";
       }
       {
         key = "<leader>uc";
@@ -135,6 +153,95 @@
         options.desc = "Hide tabline";
       }
 
+      # Search
+      {
+        key = "<leader> ";
+        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
+        options.desc = "Telescope";
+      }
+      {
+        key = "<leader>sg";
+        action = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
+        options.desc = "Livegrep";
+      }
+      {
+        key = "<leader>sf";
+        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
+        options.desc = "Find Files";
+      }
+      {
+        key = "<leader>sb";
+        action = "<cmd>lua require('telescope.builtin').buffers()<cr>";
+        options.desc = "Buffers";
+      }
+      {
+        key = "<leader>sh";
+        action = "<cmd>lua require('telescope.builtin').help_tags()<cr>";
+        options.desc = "Help Tags";
+      }
+      {
+        key = "<leader>sc";
+        action = "<cmd>lua require('telescope.builtin').commands()<cr>";
+        options.desc = "Commands";
+      }
+      {
+        key = "<leader>sm";
+        action = "<cmd>lua require('telescope.builtin').marks()<cr>";
+        options.desc = "Marks";
+      }
+      {
+        key = "<leader>so";
+        action = "<cmd>lua require('telescope.builtin').oldfiles()<cr>";
+        options.desc = "Oldfiles";
+      }
+      {
+        key = "<leader>ss";
+        action = "<cmd>lua require('telescope.builtin').spell_suggest()<cr>";
+        options.desc = "Spell Suggest";
+      }
+      {
+        key = "<leader>sr";
+        action = "<cmd>:noh<return><esc>";
+        options.desc = "Reset search";
+      }
+      {
+        key = "<leader>st";
+        action = "<cmd>TodoTelescope<cr>";
+        options.desc = "Todos";
+      }
+
+      # Trouble
+      {
+        key = "<leader>tx";
+        action = "<cmd>Trouble diagnostics toggle<cr>";
+        options.desc = "Diagnostics (Trouble)";
+      }
+      {
+        key = "<leader>tX";
+        action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
+        options.desc = "Buffer Diagnostics (Trouble)";
+      }
+      {
+        key = "<leader>ts";
+        action = "<cmd>Trouble symbols toggle focus=false<cr>";
+        options.desc = "Symbols (Trouble)";
+      }
+      {
+        key = "<leader>tl";
+        action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
+        options.desc = "LSP Definitions / references / ... (Trouble)";
+      }
+      {
+        key = "<leader>tL";
+        action = "<cmd>Trouble loclist toggle<cr>";
+        options.desc = "Location List (Trouble)";
+      }
+      {
+        key = "<leader>tQ";
+        action = "<cmd>Trouble qflist toggle<cr>";
+        options.desc = "Quickfix List (Trouble)";
+      }
+
       # Windows
       {
         key = "<leader>ws";
@@ -151,6 +258,53 @@
         action = "<cmd>close<cr>";
         options.desc = "Close";
       }
+
+      # Code
+      {
+        key = "<leader>cd";
+        action = "<cmd>lua vim.lsp.buf.definition()<cr>";
+        options.desc = "LSP Definition";
+      }
+      {
+        key = "<leader>cr";
+        action = "<cmd>lua vim.lsp.buf.references()<cr>";
+        options.desc = "LSP References";
+      }
+      {
+        key = "<leader>ct";
+        action = "<cmd>lua vim.lsp.buf.type_definition()<cr>";
+        options.desc = "LSP Type Definition";
+      }
+      {
+        key = "<leader>ca";
+        action = "<cmd>lua vim.lsp.buf.code_action()<cr>";
+        options.desc = "LSP Code Action";
+      }
+      {
+        key = "<leader>cf";
+        action = "<cmd>lua vim.lsp.buf.formatting()<cr>";
+        options.desc = "LSP Formatting";
+      }
+      {
+        key = "<leader>cn";
+        action = "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>";
+        options.desc = "LSP Next Diagnostic";
+      }
+      {
+        key = "<leader>cp";
+        action = "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>";
+        options.desc = "LSP Previous Diagnostic";
+      }
+      {
+        key = "<leader>cu";
+        action = "<cmd>lua require('dapui').toggle()<CR>";
+        options.desc = "Toggle Dapui";
+      }
+      {
+        key = "<leader>cb";
+        action = "<cmd>lua require('dap').toggle_breakpoint()<CR>";
+        options.desc = "Toggle breakpoint";
+      }
     ];
   };
 }

home/programs/nvim/options.nix

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

home/programs/nvim/plugins/cmp.nix

@@ -21,7 +21,6 @@
           }
           { name = "nvim_lua"; }
           { name = "mkdnflow"; }
-          { name = "render-markdown"; }
           { name = "path"; }
         ];
 
@@ -113,5 +112,6 @@
         };
       };
     };
+
   };
 }

home/programs/nvim/plugins/dap.nix

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

home/programs/nvim/plugins/dashboard.nix

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

home/programs/nvim/plugins/floaterm.nix

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

home/programs/nvim/plugins/git.nix

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

home/programs/nvim/plugins/lsp.nix

@@ -3,21 +3,27 @@
     lsp-format.enable = true;
     lsp = {
       enable = true;
-      inlayHints = true;
       servers = {
         bashls.enable = true;
+        clangd.enable = true;
         gopls.enable = true;
-        ts_ls.enable = true;
         nixd.enable = true;
         tailwindcss.enable = true;
         html.enable = true;
         svelte.enable = true;
+        marksman.enable = true;
+      };
+      keymaps.lspBuf = {
+        "gd" = "definition";
+        "gD" = "references";
+        "gt" = "type_definition";
+        "gi" = "implementation";
+        "K" = "hover";
       };
     };
     none-ls = {
       enable = true;
       sources = {
-        completion = { luasnip.enable = true; };
         diagnostics = {
           golangci_lint.enable = true;
           statix.enable = true;

home/programs/nvim/plugins/markdown.nix

@@ -1,32 +1,170 @@
+# The render-markdown.nvim plugin is a plugin that renders markdown files in a neovim in a more readable way.
 { config, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";
   muted = "#${config.lib.stylix.colors.base03}";
+  background = "#${config.lib.stylix.colors.base00}";
 in {
+
   programs.nixvim = {
-    extraFiles."after/ftplugin/markdown.lua".text = ''
+    plugins.mkdnflow = {
-      vim.bo.tabstop = 2
+      enable = true;
-      vim.bo.shiftwidth = 2
+      modules = { conceal = false; };
-      vim.bo.expandtab = true 
-      vim.wo.cursorline = false
-    '';
 
-    # Plugins
+      toDo.symbols = [ " " "-" "x" "!" "/" ];
-    plugins = {
+      mappings = {
-      # Render UI elements
+        MkdnCreateLink = false;
-      render-markdown = {
+        MkdnCreateLinkFromClipboard = {
-        enable = true;
+          key = "<leader>ml";
-        settings = { completions.lsp.enabled = true; };
+          modes = [ "n" "v" ];
+        };
+        MkdnDecreaseHeading = {
+          key = "<leader>m-";
+          modes = "n";
+        };
+        MkdnDestroyLink = false;
+        MkdnEnter = {
+          key = "<CR>";
+          modes = [ "v" ];
+        };
+        MkdnExtendList = false;
+        MkdnFoldSection = {
+          key = "<leader>mf";
+          modes = "n";
+        };
+        MkdnUnfoldSection = {
+          key = "<leader>mF";
+          modes = "n";
+        };
+        MkdnFollowLink = {
+          key = "gd";
+          modes = "n";
+        };
+        MkdnGoBack = false;
+        MkdnGoForward = false;
+        MkdnIncreaseHeading = {
+          key = "<leader>m+";
+          modes = "n";
+        };
+        MkdnMoveSource = false;
+        MkdnNewListItem = false;
+        MkdnNewListItemAboveInsert = {
+          key = "O";
+          modes = "n";
+        };
+        MkdnNewListItemBelowInsert = {
+          key = "o";
+          modes = "n";
+        };
+        MkdnNextHeading = {
+          key = "<leader>m#";
+          modes = "n";
+        };
+        MkdnNextLink = false;
+        MkdnPrevLink = false;
+        MkdnPrevHeading = {
+          key = "<leader>m*";
+          modes = "n";
+        };
+        MkdnSTab = false;
+        MkdnTab = false;
+        MkdnTableNewColAfter = {
+          key = "<leader>mc";
+          modes = "n";
+        };
+        MkdnTableNewColBefore = {
+          key = "<leader>mC";
+          modes = "n";
+        };
+        MkdnTableNewRowAbove = {
+          key = "<leader>mR";
+          modes = "n";
+        };
+        MkdnTableNewRowBelow = {
+          key = "<leader>mr";
+          modes = "n";
+        };
+        MkdnTableNextCell = {
+          key = "<S-Tab>";
+          modes = "n";
+        };
+        MkdnTableNextRow = false;
+        MkdnTablePrevCell = {
+          key = "<S-Tab>";
+          modes = "n";
+        };
+        MkdnTablePrevRow = false;
+        MkdnToggleToDo = {
+          key = "<C-Space>";
+          modes = [ "n" "v" ];
+        };
+        MkdnUpdateNumbering = {
+          key = "<leader>mn";
+          modes = "n";
+        };
+        MkdnYankAnchorLink = {
+          key = "ya";
+          modes = "n";
+        };
+        MkdnYankFileAnchorLink = {
+          key = "yfa";
+          modes = "n";
+        };
       };
-
+    };
-      mkdnflow = {
+    extraFiles = {
-        enable = true;
+      "after/ftplugin/markdown.lua".text = ''
-        mappings = {
+        vim.bo.tabstop = 2
-          MkdnTableNextCell = {
+        vim.bo.shiftwidth = 2
-            key = "<S-Tab>";
+        vim.bo.expandtab = true 
-            modes = "i";
+      '';
+    };
+    highlight = {
+      RenderMarkdownBg.bg = background;
+      RenderMarkdownH1.fg = accent;
+      RenderMarkdownH2.fg = muted;
+      RenderMarkdownH3.fg = muted;
+      RenderMarkdownH4.fg = muted;
+      RenderMarkdownH5.fg = muted;
+      RenderMarkdownH6.fg = muted;
+      RenderMarkdownTodo.fg = muted;
+      RenderMarkdownWarning.fg = accent;
+    };
+    plugins.render-markdown = {
+      enable = true;
+      settings = {
+        heading = {
+          icons = [ "# " "󰲣 " "󰲥 " "󰲧 " "󰲩 " "󰲫 " ];
+          backgrounds = [ "RenderMarkdownBg" ];
+          foregrounds = [
+            "RenderMarkdownH1"
+            "RenderMarkdownH2"
+            "RenderMarkdownH3"
+            "RenderMarkdownH4"
+            "RenderMarkdownH5"
+            "RenderMarkdownH6"
+          ];
+        };
+        checkbox = {
+          unchecked = { highlight = "RenderMarkdownTodo"; };
+          checked = { highlight = "RenderMarkdownTodo"; };
+          custom = {
+            pending = {
+              raw = "[-]";
+              rendered = "󰥔 ";
+              highlight = "RenderMarkdownTodo";
+            };
+            important = {
+              raw = "[!]";
+              rendered = " ";
+              highlight = "RenderMarkdownWarning";
+            };
+            cancel = {
+              raw = "[/]";
+              rendered = "󱋬 ";
+              highlight = "RenderMarkdownTodo";
+            };
           };
-          MkdnTablePrevCell = false;
         };
       };
     };

home/programs/nvim/plugins/mini.nix

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

home/programs/nvim/plugins/picker.nix

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

home/programs/nvim/plugins/snacks.nix

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

home/programs/nvim/plugins/telescope.nix

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

home/programs/nvim/plugins/tree.nix

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

home/programs/nvim/plugins/trouble.nix

@@ -1,46 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ ctags ];
-
-  programs.nixvim = {
-    plugins = {
-      trouble.enable = true;
-      which-key.settings.spec = [{
-        __unkeyed-1 = "<leader>t";
-        mode = "n";
-        group = "+trouble";
-      }];
-    };
-    keymaps = [
-      {
-        key = "<leader>tx";
-        action = "<cmd>Trouble diagnostics toggle<cr>";
-        options.desc = "Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>tX";
-        action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
-        options.desc = "Buffer Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>ts";
-        action = "<cmd>Trouble symbols toggle focus=false<cr>";
-        options.desc = "Symbols (Trouble)";
-      }
-      {
-        key = "<leader>tl";
-        action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
-        options.desc = "LSP Definitions / references / ... (Trouble)";
-      }
-      {
-        key = "<leader>tL";
-        action = "<cmd>Trouble loclist toggle<cr>";
-        options.desc = "Location List (Trouble)";
-      }
-      {
-        key = "<leader>tQ";
-        action = "<cmd>Trouble qflist toggle<cr>";
-        options.desc = "Quickfix List (Trouble)";
-      }
-    ];
-  };
-}

home/programs/nvim/plugins/ui.nix

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

home/programs/nvim/plugins/utils.nix

@@ -1,37 +1,49 @@
-{ config, lib, pkgs, ... }: {
+{ config, ... }: {
   programs.nixvim = {
-    nixpkgs.config.allowUnfree = true; # For copilot
     highlightOverride = {
-      WhichKeySeparator.bg = "#${config.lib.stylix.colors.base00}";
+      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
     };
     plugins = {
-      bufferline.enable = true;
+      copilot-vim.enable = true;
-      copilot-vim = {
-        enable = true;
-        # FIXME: Temp issue solving
-        settings.node_command = lib.getExe pkgs.nodejs_20;
-      };
       flash.enable = true;
+      image = {
+        enable = true;
+        integrations.markdown = {
+          clearInInsertMode = true;
+          onlyRenderImageAtCursor = true;
+        };
+      };
       tmux-navigator.enable = true;
+      comment.enable = true;
+      nvim-autopairs.enable = true;
+      friendly-snippets.enable = true;
       todo-comments.enable = true;
-      lualine = { enable = true; };
-      aerial.enable = true;
       treesitter = {
         enable = true;
         nixGrammars = true;
         settings = {
-          ensure_installed = "all";
           indent.enable = true;
           highlight.enable = true;
         };
       };
+      harpoon = {
+        enable = true;
+        enableTelescope = true;
+        keymapsSilent = true;
+        keymaps = {
+          addFile = "<leader>ha";
+          toggleQuickMenu = "<leader>hu";
+          navNext = "<leader>hl";
+          navPrev = "<leader>hh";
+          navFile = {
+            "1" = "<leader>h1";
+            "2" = "<leader>h2";
+            "3" = "<leader>h3";
+            "4" = "<leader>h4";
+          };
+        };
+      };
+      treesitter-context.enable = true;
     };
-    keymaps = [
-      {
-        key = "<leader>ct";
-        action = "<cmd>AerialToggle<cr>";
-        options.desc = "Aerial (tags)";
-      }
-    ];
   };
 }

home/programs/nvim/plugins/zenmode.nix

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

home/programs/qutebrowser/default.nix

@@ -2,6 +2,7 @@
 # My homepage is generated using https://github.com/anotherhadi/homepage
 { pkgs, config, ... }:
 let
+
   accent = "#${config.lib.stylix.colors.base0D}";
   background = "#${config.lib.stylix.colors.base00}";
   foreground = "#${config.lib.stylix.colors.base05}";
@@ -80,7 +81,7 @@ let
 
 in {
 
-  imports = [ ../duckduckgo-colorscheme ];
+  imports = [ ./duckduckgo-colorscheme.nix ];
 
   programs.qutebrowser = {
     enable = true;

home/programs/shell/eza.nix

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

home/programs/shell/fzf.nix

@@ -19,7 +19,7 @@ in {
     defaultOptions = [
       "--margin=1"
       "--layout=reverse"
-      "--border=none"
+      "--border=rounded"
       "--info='hidden'"
       "--header=''"
       "--prompt='/ '"

home/programs/shell/starship.nix

@@ -9,8 +9,6 @@ in {
     settings = {
       add_newline = true;
       format = lib.concatStrings [
-        "$nix_shell"
-        "$hostname"
         "$directory"
         "$git_branch"
         "$git_state"

home/programs/shell/tmux.nix

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

home/programs/shell/zsh.nix

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

home/programs/spicetify/default.nix

@@ -3,15 +3,17 @@
 let
   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
   accent = "${config.lib.stylix.colors.base0D}";
-  background = "${config.lib.stylix.colors.base00}";
 in {
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
 
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "spotify" ];
+
   stylix.targets.spicetify.enable = false;
 
   programs.spicetify = {
     enable = true;
-    theme = lib.mkForce spicePkgs.themes.dribbblish;
+    theme = lib.mkForce spicePkgs.themes.text;
 
     colorScheme = "custom";
 
@@ -19,9 +21,6 @@ in {
       button = accent;
       button-active = accent;
       tab-active = accent;
-      player = background;
-      main = background;
-      sidebar = background;
     };
 
     enabledExtensions = with spicePkgs.extensions; [
@@ -31,7 +30,7 @@ in {
       hidePodcasts
       adblock
       fullAppDisplay
-      keyboardShortcut
+      shuffle
     ];
   };
 }

home/programs/tailscale/default.nix

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

home/programs/thunar/default.nix

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

home/programs/yazi/default.nix

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

home/programs/zen/default.nix

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

home/scripts/default.nix

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

home/scripts/hyprfocus/default.nix

@@ -11,19 +11,14 @@ let
   hyprfocus-on = pkgs.writeShellScriptBin "hyprfocus-on"
     # bash
     ''
+      hyprctl keyword "general:gaps_in" 0
+      hyprctl keyword "general:gaps_out" 0
       hyprpanel-hide
-
+      hyprctl keyword "general:border_size" 1
-      hyprctl --batch "\
+      hyprctl keyword "decoration:rounding" 0
-          keyword animations:enabled 0;\
+      hyprctl keyword "decoration:drop_shadow" false
-          keyword decoration:shadow:enabled 0;\
+      hyprctl keyword "decoration:inactive_opacity" 0.98
-          keyword decoration:blur:enabled 0;\
+      hyprctl keyword "decoration:active_opacity" 1
-          keyword general:gaps_in 0;\
-          keyword general:gaps_out 0;\
-          keyword general:border_size 1;\
-          keyword decoration:rounding 0;\
-          keyword decoration:inactive_opacity 1;\
-          keyword decoration:active_opacity 1"
-
       echo "1" > /tmp/hyprfocus
     '';
 

home/scripts/hyprpanel/default.nix

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

home/scripts/night-shift/default.nix

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

home/scripts/nixy/default.nix

@@ -28,9 +28,8 @@ let
           "󰚰;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"
+          "󰋩;Wallpapers;nvim ${inputs.nixy-wallpapers}/docs/MOBILE-VIEW.md"
         )
 
         # Apply default icons if empty:
@@ -45,24 +44,24 @@ let
         command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
 
         exec "$command"
-        exit $?
+        exit 0
       }
 
       [[ $1 == "" ]] && ui
 
       if [[ $1 == "rebuild" ]];then
-        cd ${configDirectory} && git add .
         sudo nixos-rebuild switch --flake ${configDirectory}#${hostname}
       elif [[ $1 == "upgrade" ]];then
-        sudo nixos-rebuild switch --upgrade --flake '${configDirectory}#${hostname}'
+        sudo nixos-rebuild switch --upgrade --flake ${configDirectory}#${hostname}
       elif [[ $1 == "update" ]];then
         cd ${configDirectory} && nix flake update
       elif [[ $1 == "gc" ]];then
         cd ${configDirectory} && sudo nix-collect-garbage -d
       elif [[ $1 == "cb" ]];then
         sudo /run/current-system/bin/switch-to-configuration boot
-      elif [[ $1 == "listgen" ]];then
+      elif [[ $1 == "remote" ]];then
-        sudo nix-env -p /nix/var/nix/profiles/system --list-generations
+        cd ~/.config/nixos && git add . && git commit -m "update" && git push
+        ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
       else
         echo "Unknown argument"
       fi

home/scripts/openvpn/default.nix

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

home/scripts/screenshot/default.nix

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

home/scripts/system/default.nix

@@ -4,7 +4,6 @@
 #-
 #- - `menu` - Open wofi with drun mode. (wofi)
 #- - `powermenu` - Open power dropdown menu. (wofi)
-#- - `quickmenu` - Open a dropdown menu with shortcuts and scripts. (wofi)
 #- - `lock` - Lock the screen. (hyprlock)
 { pkgs, ... }:
 
@@ -15,17 +14,7 @@ let
       if pgrep wofi; then
       	pkill wofi
       else
-      	wofi -p " Apps" --show drun &
+      	wofi --show drun
-      	# Quit when not focused anymore
-      	sleep 0.2
-      	while true; do
-      		window=$(hyprctl activewindow | grep "wofi")
-      		if [[ ! $window ]]; then
-      			pkill wofi
-      			break
-      		fi
-      		sleep 0.2
-      	done
       fi
     '';
 
@@ -34,8 +23,6 @@ let
     ''
       if pgrep wofi; then
       	pkill wofi
-      # if pgrep tofi; then
-      #   pkill tofi
       else
         options=(
           "󰌾 Lock"
@@ -45,8 +32,7 @@ let
           "󰿅 Shutdown"
         )
 
-        selected=$(printf '%s\n' "''${options[@]}" | wofi -p " Powermenu" --dmenu)
+        selected=$(printf '%s\n' "''${options[@]}" | wofi --dmenu)
-        # selected=$(printf '%s\n' "''${options[@]}" | tofi --prompt-text "> ")
         selected=''${selected:2}
 
         case $selected in
@@ -69,50 +55,10 @@ let
       fi
     '';
 
-  quickmenu = pkgs.writeShellScriptBin "quickmenu"
-    # bash
-    ''
-      if pgrep wofi; then
-      	pkill wofi
-      # if pgrep tofi; then
-      #   pkill tofi
-      else
-        options=(
-          "󰅶 Caffeine"
-          "󰖔 Night-shift"
-          " Nixy"
-          "󰈊 Hyprpicker"
-          "󰖂 Toggle VPN"
-        )
-
-        selected=$(printf '%s\n' "''${options[@]}" | wofi -p " Quickmenu" --dmenu)
-        # selected=$(printf '%s\n' "''${options[@]}" | tofi --prompt-text "> ")
-        selected=''${selected:2}
-
-        case $selected in
-          "Caffeine")
-            caffeine
-            ;;
-          "Night-shift")
-            night-shift
-            ;;
-          "Nixy")
-            kitty zsh -c nixy
-            ;;
-          "Hyprpicker")
-            sleep 0.2 && ${pkgs.hyprpicker}/bin/hyprpicker -a
-            ;;
-          "Toggle VPN")
-            openvpn-toggle
-            ;;
-        esac
-      fi
-    '';
-
   lock = pkgs.writeShellScriptBin "lock"
     # bash
     ''
       ${pkgs.hyprlock}/bin/hyprlock
     '';
 
-in { home.packages = [ menu powermenu lock quickmenu ]; }
+in { home.packages = [ menu powermenu lock ]; }

home/system/batsignal/default.nix

@@ -0,0 +1,7 @@
+# Batsignal is a simple utility to send battery notifications.
+{
+  services.batsignal = {
+    enable = true;
+    extraArgs = [ "-c 10" "-w 30" "-f disabled" ];
+  };
+}

home/system/gtk/default.nix

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

home/system/hypridle/default.nix

@@ -1,5 +1,5 @@
 # Hypridle is a daemon that listens for user activity and runs commands when the user is idle.
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   services.hypridle = {
     enable = true;
     settings = {
@@ -24,6 +24,4 @@
       ];
     };
   };
-  systemd.user.services.hypridle.Unit.After =
-    lib.mkForce "graphical-session.target";
 }

home/system/hyprland/animations.nix

@@ -1,6 +1,6 @@
 { config, ... }:
 let
-  animationSpeed = config.theme.animation-speed;
+  animationSpeed = config.var.theme.animation-speed;
 
   animationDuration = if animationSpeed == "slow" then
     "4"

home/system/hyprland/bindings.nix

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

home/system/hyprland/default.nix

@@ -1,30 +1,22 @@
 # So best window tiling manager
-{ pkgs, config, inputs, lib, ... }:
+{ pkgs, config, inputs, ... }:
 let
-  border-size = config.theme.border-size;
+  border-size = config.var.theme.border-size;
-  gaps-in = config.theme.gaps-in;
+  gaps-in = config.var.theme.gaps-in;
-  gaps-out = config.theme.gaps-out;
+  gaps-out = config.var.theme.gaps-out;
-  active-opacity = config.theme.active-opacity;
+  active-opacity = config.var.theme.active-opacity;
-  inactive-opacity = config.theme.inactive-opacity;
+  inactive-opacity = config.var.theme.inactive-opacity;
-  rounding = config.theme.rounding;
+  rounding = config.var.theme.rounding;
-  blur = config.theme.blur;
+  blur = config.var.theme.blur;
   keyboardLayout = config.var.keyboardLayout;
-  background = "rgb(" + config.lib.stylix.colors.base00 + ")";
 in {
 
-  imports = [
+  imports = [ ./animations.nix ./bindings.nix ];
-    ./animations.nix
-    ./bindings.nix
-    ./polkitagent.nix
-    ./keyboard-backlight.nix # CHANGEME: This is for my laptop only
-    # FIXME: Broken on unstable
-    # ./hyprspace.nix
-  ];
 
   home.packages = with pkgs; [
     qt5.qtwayland
     qt6.qtwayland
-    libsForQt5.qt5ct
+    qt5ct
     qt6ct
     hyprshot
     hyprpicker
@@ -47,34 +39,23 @@ in {
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
-    systemd = {
+    systemd.enable = true;
-      enable = false;
+    package = inputs.hyprland.packages."${pkgs.system}".hyprland;
-      variables = [
-        "--all"
-      ]; # https://wiki.hyprland.org/Nix/Hyprland-on-Home-Manager/#programs-dont-work-in-systemd-services-but-do-on-the-terminal
-    };
-    package = null;
-    portalPackage = null;
 
     settings = {
       "$mod" = "SUPER";
       "$shiftMod" = "SUPER_SHIFT";
 
-      exec-once = [
+      exec-once = [ "${pkgs.bitwarden}/bin/bitwarden" ];
-        "dbus-update-activation-environment --systemd --all &"
-        "systemctl --user enable --now hyprpaper.service &"
-        "systemctl --user enable --now hypridle.service &"
-        "systemctl --user enable --now nextcloud-client.service  &"
-      ];
 
       monitor = [
-        "eDP-2,highres,0x0,1" # My internal laptop screen
+        "eDP-2,highres,0x0,1"
-        "desc:AOC U34G2G1 0x00000E06,3440x1440@99.98,auto,1" # My external monitor
+        "HDMI-A-1,3440x1440@99.98,auto,1"
-        "desc:United Microelectr Corporation UMC SHARP,3840x2160,auto,2" # TV
+        ",prefered,auto,1"
-        ",prefered,auto,1" # default
       ];
 
       env = [
+        "XDG_SESSION_TYPE,wayland"
         "XDG_CURRENT_DESKTOP,Hyprland"
         "MOZ_ENABLE_WAYLAND,1"
         "ANKI_WAYLAND,1"
@@ -86,6 +67,8 @@ in {
         "QT_QPA_PLATFORM=wayland,xcb"
         "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
         "ELECTRON_OZONE_PLATFORM_HINT,auto"
+        "GTK_THEME,FlatColor:dark"
+        "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
         "__GL_GSYNC_ALLOWED,0"
         "__GL_VRR_ALLOWED,0"
         "DISABLE_QT5_COMPAT,0"
@@ -94,9 +77,10 @@ in {
         "WLR_BACKEND,vulkan"
         "WLR_RENDERER,vulkan"
         "WLR_NO_HARDWARE_CURSORS,1"
+        "XDG_SESSION_TYPE,wayland"
         "SDL_VIDEODRIVER,wayland"
         "CLUTTER_BACKEND,wayland"
-        "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU
+        "AQ_DRM_DEVICES,/dev/dri/card2" # CHANGEME: Related to the GPU
       ];
 
       cursor = {
@@ -109,23 +93,18 @@ in {
         gaps_in = gaps-in;
         gaps_out = gaps-out;
         border_size = border-size;
+        border_part_of_window = true;
         layout = "master";
-        "col.inactive_border" = lib.mkForce background;
       };
 
       decoration = {
         active_opacity = active-opacity;
         inactive_opacity = inactive-opacity;
         rounding = rounding;
-        shadow = {
+        drop_shadow = true;
-          enabled = true;
+        shadow_range = 20;
-          range = 20;
+        shadow_render_power = 3;
-          render_power = 3;
+        blur = { enabled = if blur then "true" else "false"; };
-        };
-        blur = {
-          enabled = if blur then "true" else "false";
-          size = 18;
-        };
       };
 
       master = {
@@ -145,42 +124,6 @@ in {
         new_window_takes_over_fullscreen = 2;
       };
 
-      windowrulev2 = [
-        "float, tag:modal"
-        "pin, tag:modal"
-        "center, tag:modal"
-        # telegram media viewer
-        "float, title:^(Media viewer)$"
-
-        # Bitwarden extension
-        "float, title:^(.*Bitwarden Password Manager.*)$"
-
-        # gnome calculator
-        "float, class:^(org.gnome.Calculator)$"
-        "size 360 490, class:^(org.gnome.Calculator)$"
-
-        # make Firefox/Zen PiP window floating and sticky
-        "float, title:^(Picture-in-Picture)$"
-        "pin, title:^(Picture-in-Picture)$"
-
-        # idle inhibit while watching videos
-        "idleinhibit focus, class:^(mpv|.+exe|celluloid)$"
-        "idleinhibit focus, class:^(zen)$, title:^(.*YouTube.*)$"
-        "idleinhibit fullscreen, class:^(zen)$"
-
-        "dimaround, class:^(gcr-prompter)$"
-        "dimaround, class:^(xdg-desktop-portal-gtk)$"
-        "dimaround, class:^(polkit-gnome-authentication-agent-1)$"
-        "dimaround, class:^(zen)$, title:^(File Upload)$"
-
-        # fix xwayland apps
-        "rounding 0, xwayland:1"
-        "center, class:^(.*jetbrains.*)$, title:^(Confirm Exit|Open Project|win424|win201|splash)$"
-        "size 640 400, class:^(.*jetbrains.*)$, title:^(splash)$"
-      ];
-
-      layerrule = [ "noanim, launcher" "noanim, ^ags-.*" ];
-
       input = {
         kb_layout = keyboardLayout;
 
@@ -199,4 +142,6 @@ in {
 
     };
   };
+  systemd.user.targets.hyprland-session.Unit.Wants =
+    [ "xdg-desktop-autostart.target" ];
 }

home/system/hyprland/hyprspace.nix

@@ -1,20 +0,0 @@
-# Hyprspace is a hyprland plugin that provides a workspaces overview (three-finger swipe up) and a workspace switcher (three-finger down).
-{ inputs, pkgs, ... }: {
-  wayland.windowManager.hyprland = {
-    plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ];
-    settings = {
-      plugin = {
-        overview = {
-          centerAligned = true;
-          hideTopLayers = true;
-          hideOverlayLayers = true;
-          showNewWorkspace = true;
-          exitOnClick = true;
-          exitOnSwitch = true;
-          drawActiveWorkspace = true;
-          autoDrag = false;
-        };
-      };
-    };
-  };
-}

home/system/hyprland/keyboard-backlight.nix

@@ -1,32 +0,0 @@
-# Turn the keyboard red/off when the battery is low
-{ pkgs, config, ... }:
-let
-  keyboard-backlight = pkgs.writeShellScriptBin "keyboard-backlight" ''
-    function set_keyboard_backlight {
-      local color=$1
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone00
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone01
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone02
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone03
-    }
-    state="white"
-    while true; do
-      BATTERY_LEVEL=$(cat /sys/class/power_supply/BAT*/capacity)
-      if [[ $BATTERY_LEVEL -le 10 ]]; then
-        if [[ $state == "red" ]];then
-          state="white"
-          set_keyboard_backlight "000000"
-        else
-          state="red"
-          set_keyboard_backlight "FF0000"
-        fi
-      else
-        state="white"
-        set_keyboard_backlight ${config.lib.stylix.colors.base0D}
-      fi
-      sleep 2
-    done
-  '';
-in {
-  wayland.windowManager.hyprland.settings.exec-once = [ keyboard-backlight ];
-}

home/system/hyprland/polkitagent.nix

@@ -1,7 +0,0 @@
-# HyprPolkitAgent is a simple polkit agent for wayland compositors
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ hyprpolkitagent ];
-
-  wayland.windowManager.hyprland.settings.exec-once =
-    [ "systemctl --user start hyprpolkitagent" ];
-}

home/system/hyprlock/default.nix

@@ -1,7 +1,8 @@
 # Hyprlock is a lockscreen for Hyprland
-{ config, lib, ... }:
+{ config, ... }:
 let
-  foreground = "rgba(${config.theme.textColorOnWallpaper}ee)";
+  foreground = "rgba(216, 222, 233, 0.70)";
+  imageStr = toString config.stylix.image;
   font = config.stylix.fonts.serif.name;
 in {
   programs.hyprlock = {
@@ -16,6 +17,7 @@ in {
       # BACKGROUND
       background = {
         monitor = "";
+        path = imageStr;
         blur_passes = 0;
         contrast = 0.8916;
         brightness = 0.7172;
@@ -64,15 +66,15 @@ in {
       ];
 
       # INPUT FIELD
-      input-field = lib.mkForce {
+      input-field = [{
         monitor = "";
         size = "300, 60";
         outline_thickness = 2;
         dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
         dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
         dots_center = true;
-        outer_color = "rgba(25, 25, 25, 0)";
+        outer_color = "rgba(255, 255, 255, 0)";
-        inner_color = "rgba(25, 25, 25, 0.1)";
+        inner_color = "rgba(255, 255, 255, 0.1)";
         font_color = foreground;
         fade_on_empty = false;
         font_family = font + " Bold";
@@ -81,7 +83,7 @@ in {
         position = "0, -250";
         halign = "center";
         valign = "center";
-      };
+      }];
     };
   };
 }

home/system/hyprpanel/default.nix

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

home/system/hyprpaper/default.nix

@@ -1,5 +1,5 @@
 # Hyprpaper is used to set the wallpaper on the system
-{ lib, ... }: {
+{
   # The wallpaper is set by stylix
   services.hyprpaper = {
     enable = true;
@@ -9,6 +9,4 @@
       splash_offset = 2.0;
     };
   };
-  systemd.user.services.hyprpaper.Unit.After =
-    lib.mkForce "graphical-session.target";
 }

home/system/kdeconnect/default.nix

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

home/system/mime/default.nix

@@ -1,93 +1,33 @@
-{ pkgs, lib, ... }:
+# Mime allows us to configure the default applications for each file type
-with lib;
+{
-let
+  xdg.mimeApps = {
-  defaultApps = {
+    enable = true;
-    browser = [ "zen-beta.desktop" ];
+    defaultApplications = {
-    text = [ "org.gnome.TextEditor.desktop" ];
+      "text/markdown" = "nvim.desktop";
-    image = [ "imv-dir.desktop" ];
+      "text/plain" = "nvim.desktop";
-    audio = [ "mpv.desktop" ];
+      "text/x-shellscript" = "nvim.desktop";
-    video = [ "mpv.desktop" ];
+      "text/x-python" = "nvim.desktop";
-    directory = [ "thunar.desktop" ];
+      "text/x-go" = "nvim.desktop";
-    office = [ "libreoffice.desktop" ];
+      "text/css" = "nvim.desktop";
-    pdf = [ "zathura.desktop" ];
+      "text/javascript" = "nvim.desktop";
-    terminal = [ "kitty.desktop" ];
+      "text/x-c" = "nvim.desktop";
-    discord = [ "discord.desktop" ];
+      "text/x-c++" = "nvim.desktop";
-  };
+      "text/x-java" = "nvim.desktop";
-
+      "text/x-rust" = "nvim.desktop";
-  mimeMap = {
+      "text/x-yaml" = "nvim.desktop";
-    text = [ "text/plain" ];
+      "text/x-toml" = "nvim.desktop";
-    image = [
+      "text/x-dockerfile" = "nvim.desktop";
-      "image/bmp"
+      "text/x-xml" = "nvim.desktop";
-      "image/gif"
+      "text/x-php" = "nvim.desktop";
-      "image/jpeg"
+      "image/png" = "imv.desktop";
-      "image/jpg"
+      "image/jpeg" = "imv.desktop";
-      "image/png"
+      "image/jpg" = "imv.desktop";
-      "image/svg+xml"
+      "image/webp" = "imv.desktop";
-      "image/tiff"
+      "image/gif" = "org.qutebrowser.qutebrowser.desktop";
-      "image/vnd.microsoft.icon"
+      "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
-      "image/webp"
+      "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
-    ];
+      "text/html" = "org.qutebrowser.qutebrowser.desktop";
-    audio = [
+      "application/pdf" = "zathura.desktop";
-      "audio/aac"
-      "audio/mpeg"
-      "audio/ogg"
-      "audio/opus"
-      "audio/wav"
-      "audio/webm"
-      "audio/x-matroska"
-    ];
-    video = [
-      "video/mp2t"
-      "video/mp4"
-      "video/mpeg"
-      "video/ogg"
-      "video/webm"
-      "video/x-flv"
-      "video/x-matroska"
-      "video/x-msvideo"
-    ];
-    directory = [ "inode/directory" ];
-    browser = [
-      "text/html"
-      "x-scheme-handler/about"
-      "x-scheme-handler/http"
-      "x-scheme-handler/https"
-      "x-scheme-handler/unknown"
-    ];
-    office = [
-      "application/vnd.oasis.opendocument.text"
-      "application/vnd.oasis.opendocument.spreadsheet"
-      "application/vnd.oasis.opendocument.presentation"
-      "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
-      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-      "application/vnd.openxmlformats-officedocument.presentationml.presentation"
-      "application/msword"
-      "application/vnd.ms-excel"
-      "application/vnd.ms-powerpoint"
-      "application/rtf"
-    ];
-    pdf = [ "application/pdf" ];
-    terminal = [ "terminal" ];
-    # archive = [
-    #   "application/zip"
-    #   "application/rar"
-    #   "application/7z"
-    #   "application/*tar"
-    # ];
-    discord = [ "x-scheme-handler/discord" ];
-  };
-
-  associations = with lists;
-    listToAttrs (flatten (mapAttrsToList
-      (key: map (type: attrsets.nameValuePair type defaultApps."${key}"))
-      mimeMap));
-in {
-  xdg = {
-    configFile."mimeapps.list".force = true;
-    mimeApps = {
-      enable = true;
-      associations.added = associations;
-      defaultApplications = associations;
     };
   };
 }

home/system/tofi/default.nix

@@ -0,0 +1,23 @@
+# Tofi is a dmeny-like application launcher
+{ config, lib, ... }:
+let
+  background = "#${config.lib.stylix.colors.base00}70";
+  accent = "#${config.lib.stylix.colors.base0D}";
+in {
+  programs.tofi = lib.mkForce {
+    enable = true;
+    settings = {
+      border-width = 0;
+      background-color = background;
+      prompt-color = accent;
+      selection-color = accent;
+      height = "100%";
+      num-results = 5;
+      outline-width = 0;
+      padding-left = "35%";
+      padding-top = "35%";
+      result-spacing = 25;
+      width = "100%";
+    };
+  };
+}

home/system/wofi/default.nix

@@ -6,7 +6,7 @@ let
   background-alt = "#${config.lib.stylix.colors.base01}";
   foreground = "#${config.lib.stylix.colors.base05}";
   font = config.stylix.fonts.serif.name;
-  rounding = config.theme.rounding;
+  rounding = config.var.theme.rounding;
   font-size = config.stylix.fonts.sizes.popups;
 in {
 
@@ -17,12 +17,13 @@ in {
 
     settings = {
       allow_markup = true;
-      width = 650;
+      width = 450;
       show = "drun";
       prompt = "Apps";
       normal_window = true;
       layer = "top";
-      height = "325px";
+      term = "foot";
+      height = "305px";
       orientation = "vertical";
       halign = "fill";
       line_wrap = "off";
@@ -47,7 +48,7 @@ in {
       ''
         * {
           font-family: "${font}";
-          font-weight: 600;
+          font-weight: 500;
           font-size: ${toString font-size}px;
         }
 

hosts/laptop/configuration.nix

@@ -1,28 +1,40 @@
 { config, ... }: {
   imports = [
-    # Mostly system related configuration
     ../../nixos/nvidia.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
+    ../../nixos/prime.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
+
     ../../nixos/audio.nix
+    ../../nixos/auto-upgrade.nix
     ../../nixos/bluetooth.nix
     ../../nixos/fonts.nix
     ../../nixos/home-manager.nix
+    ../../nixos/network-manager.nix
     ../../nixos/nix.nix
     ../../nixos/systemd-boot.nix
-    ../../nixos/sddm.nix
+    ../../nixos/timezone.nix
+    ../../nixos/tuigreet.nix
     ../../nixos/users.nix
     ../../nixos/utils.nix
-    ../../nixos/tailscale.nix
+    ../../nixos/xdg-portal.nix
-    ../../nixos/hyprland.nix
+    ../../nixos/variables-config.nix
 
-    ../../nixos/omen.nix # For my laptop only
+    ../../themes/nixy.nix
 
-    # You should let those lines as is
     ./hardware-configuration.nix
     ./variables.nix
   ];
 
   home-manager.users."${config.var.username}" = import ./home.nix;
 
+  # For KDEConnect (Remove this if not needed)
+  networking.firewall = rec {
+    allowedTCPPortRanges = [{
+      from = 1714;
+      to = 1764;
+    }];
+    allowedUDPPortRanges = allowedTCPPortRanges;
+  };
+
   # Don't touch this
   system.stateVersion = "24.05";
 }

hosts/laptop/hardware-configuration.nix

@@ -1,28 +1,26 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }: {
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-{
+  boot = {
-  imports =
+    initrd.availableKernelModules =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+      [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-    ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+  };
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "uas" "usbhid" "sd_mod" ];
+  fileSystems."/" = {
-  boot.initrd.kernelModules = [ ];
+    device = "/dev/disk/by-uuid/6c2487ec-20ff-4ce3-9396-281c2094aba1";
-  boot.kernelModules = [ "kvm-amd" ];
+    fsType = "ext4";
-  boot.extraModulePackages = [ ];
+  };
 
-  fileSystems."/" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/6320d3c6-0231-45ec-817a-c6f0e39aab73";
+    device = "/dev/disk/by-uuid/B4EA-C54F";
-      fsType = "ext4";
+    fsType = "vfat";
-    };
+  };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/5251-9B85";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
 
   swapDevices = [ ];
 
@@ -32,9 +30,9 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp7s0f4u1u4.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/laptop/home.nix

@@ -1,24 +1,21 @@
 { pkgs, config, ... }: {
 
   imports = [
-    # Mostly user-specific configuration
     ./variables.nix
 
     # Programs
     ../../home/programs/kitty
     ../../home/programs/nvim
+    ../../home/programs/qutebrowser
     ../../home/programs/shell
     ../../home/programs/fetch
     ../../home/programs/git
     ../../home/programs/spicetify
     ../../home/programs/nextcloud
+    ../../home/programs/yazi
+    ../../home/programs/markdown
     ../../home/programs/thunar
     ../../home/programs/lazygit
-    ../../home/programs/zen
-    ../../home/programs/duckduckgo-colorscheme
-    ../../home/programs/discord
-    ../../home/programs/tailscale
-    ../../home/programs/anyrun
 
     # Scripts
     ../../home/scripts # All scripts
@@ -29,11 +26,15 @@
     ../../home/system/hyprlock
     ../../home/system/hyprpanel
     ../../home/system/hyprpaper
+    ../../home/system/gtk
     ../../home/system/wofi
+    ../../home/system/batsignal
     ../../home/system/zathura
     ../../home/system/mime
     ../../home/system/udiskie
     ../../home/system/clipman
+    ../../home/system/kdeconnect
+    ../../home/system/tofi
 
     ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
@@ -44,51 +45,41 @@
 
     packages = with pkgs; [
       # Apps
+      discord # Chat
       bitwarden # Password manager
       vlc # Video player
       blanket # White-noise app
-      obsidian # Note taking app
-      planify # Todolists
-      gnome-calendar # Calendar
-      textpieces # Manipulate texts
-      curtail # Compress images
-      resources
-      gnome-clocks
-      gnome-text-editor
-      mpv # Video player
-      figma-linux
 
       # Dev
       go
       nodejs
       python3
       jq
-      just
+      figlet
-      pnpm
-      air
 
       # Utils
       zip
       unzip
       optipng
-      jpegoptim
       pfetch
+      pandoc
       btop
-      fastfetch
 
       # Just cool
       peaclock
       cbonsai
       pipes
       cmatrix
+      cava
 
       # Backup
-      brave
       vscode
+      firefox
+      neovide
     ];
 
     # Import my profile picture, used by the hyprpanel dashboard
-    file.".face.icon" = { source = ./profile_picture.png; };
+    file.".profile_picture.png" = { source = ./profile_picture.png; };
 
     # Don't touch this
     stateVersion = "24.05";

hosts/laptop/secrets/default.nix

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

hosts/laptop/secrets/secrets.yaml

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

hosts/laptop/variables.nix

@@ -1,8 +1,5 @@
-{ config, lib, ... }: {
+{ config, ... }: {
-  imports = [
+  imports = [ ../../nixos/variables-config.nix ];
-    # Choose your theme here:
-    ../../themes/nixy.nix
-  ];
 
   config.var = {
     hostname = "nixy";
@@ -23,14 +20,24 @@
     };
 
     autoUpgrade = false;
-    autoGarbageCollector = true;
+    autoGarbageCollector = false;
-  };
 
-  # Let this here
+    theme = {
-  options = {
+      rounding = 15;
-    var = lib.mkOption {
+      gaps-in = 10;
-      type = lib.types.attrs;
+      gaps-out = 10 * 2;
-      default = { };
+      active-opacity = 1;
+      inactive-opacity = 0.89;
+      blur = true;
+      border-size = 3;
+      animation-speed = "medium"; # "fast" | "medium" | "slow"
+      fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+      bar = {
+        transparent = true;
+        transparentButtons = false;
+        floating = true;
+      };
     };
   };
 }

hosts/server/configuration.nix

@@ -1,35 +0,0 @@
-{ config, ... }: {
-  imports = [
-    ../../nixos/home-manager.nix
-    ../../nixos/nix.nix
-    ../../nixos/systemd-boot.nix
-    ../../nixos/users.nix
-    ../../nixos/utils.nix
-    ../../nixos/docker.nix
-    ../../nixos/tailscale.nix
-
-    ../../server-modules/ssh.nix
-    ../../server-modules/bitwarden.nix
-    ../../server-modules/firewall.nix
-    ../../server-modules/nginx.nix
-    ../../server-modules/nextcloud.nix
-    ../../server-modules/glance.nix
-    ../../server-modules/adguardhome.nix
-    ../../server-modules/hoarder.nix
-    ../../server-modules/arr.nix
-    ../../server-modules/mealie.nix
-    ../../server-modules/meilisearch.nix
-    ../../server-modules/search-nixos-api.nix
-
-    # You should let those lines as is
-    ./hardware-configuration.nix
-    ./variables.nix
-
-    ./secrets
-  ];
-
-  home-manager.users."${config.var.username}" = import ./home.nix;
-
-  # Don't touch this
-  system.stateVersion = "24.05";
-}

hosts/server/hardware-configuration.nix

@@ -1,30 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }: {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/350cf109-5380-4982-8a9e-279a9275ee18";
-    fsType = "ext4";
-  };
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/DD15-1125";
-    fsType = "vfat";
-    options = [ "fmask=0077" "dmask=0077" ];
-  };
-  swapDevices = [ ];
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/server/home.nix

@@ -1,47 +0,0 @@
-{ pkgs, config, ... }: {
-
-  imports = [
-    # Mostly user-specific configuration
-    ./variables.nix
-
-    # Programs
-    ../../home/programs/nvim
-    ../../home/programs/shell
-    ../../home/programs/fetch
-    ../../home/programs/git
-    ../../home/programs/lazygit
-
-    # Scripts
-    ../../home/scripts # All scripts
-  ];
-
-  home = {
-    inherit (config.var) username;
-    homeDirectory = "/home/" + config.var.username;
-
-    packages = with pkgs; [
-      # Dev
-      go
-      nodejs
-      python3
-      jq
-      just
-      pnpm
-      wireguard-tools
-
-      # Utils
-      zip
-      unzip
-      optipng
-      pfetch
-      btop
-      fastfetch
-      tailscale
-    ];
-
-    # Don't touch this
-    stateVersion = "24.05";
-  };
-
-  programs.home-manager.enable = true;
-}

hosts/server/secrets/default.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }: {
-  sops = {
-    age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
-    defaultSopsFile = ./secrets.yaml;
-    secrets = {
-      sshconfig = {
-        owner = "hadi";
-        path = "/home/hadi/.ssh/config";
-        mode = "0600";
-      };
-      github-key = {
-        owner = "hadi";
-        path = "/home/hadi/.ssh/github";
-        mode = "0600";
-      };
-      cloudflare-dns-token = { path = "/etc/cloudflare/dnskey.txt"; };
-      nextcloud-pwd = { path = "/etc/nextcloud/pwd.txt"; };
-      adguard-pwd = { };
-      hoarder = { };
-      recyclarr = {
-        owner = "recyclarr";
-        mode = "0777";
-      };
-      wireguard-pia = { };
-    };
-  };
-
-  environment.systemPackages = with pkgs; [ sops age ];
-}

hosts/server/secrets/secrets.yaml

@@ -1,28 +0,0 @@
-sshconfig: ENC[AES256_GCM,data:R54HVxqAyj9yGO/AYL8p6cnXgYxkQKW9XveHlBMTnDXBJ7r/4HgnefdymprnXmdlbNWcWrRqmaLEuzJs/0BfixXfMvmGTUrmJ0ASVuDrz9k6rOLADAKFikQh0dib7NU4JmPgmUzMncXc2WuCd3BCG3kwBQ==,iv:Ro9FA+MzTAp+ERQMT88z8ioCox/dTj2vWcqCDOSLag4=,tag:5XiXIyz5/pjGFOB5ZjdOVg==,type:str]
-github-key: ENC[AES256_GCM,data:NRYhcBIwGJEV13+YECLR+2IErsn/7clbnkx0Mltr7dQajSb5WHZ3QDH0KQPylEHhplE5IVS0h4I0z+Pb1B0UteCxFmJ5wZq+2BKZkvE7G3dojqBpgHcVqJV2GLEJkRjlHfRgsbq/OBe8xcsPh20P1KUyP0WIwVbpt+9dFWGxEGYkp2uSyuBIJ98kElt0zuVgl7WcYoDO7v5WmGzZfla+yZwURvMk8zcM3gopo+4KL6YnYUs+UA3VlBBn6VK4Nvbqy6X0R0+ZA5HHAXg+OFgGmfWnENZmsyQJHXEchGGgEldzThkQ4r8yMkgN/ax+AGouLyzbITapGE4sE11FFgL6Hmp4pSXxl3UAGF+cvV5pIujbb28CXmSPRMyYpoNxI93PSYz/txAzE6Cr2dgwxR4zpMelv4i6IaGnY8NgpY8jp2Y6C0uuJxJCN0RtnjQw1rM2uRnm7vMGyU7XXz9DEVfGnYpTWnykXsEjHE5DVGy80ejYQlc6dtmf3vdTWpt+YYdCPw8/cd0PIx2D6geh1c28,iv:wl+RG24mXYMklD8CBGXVD36DMhlWT/7zh8ZMvr7vgOk=,tag:OJhqF8PoXotr7IsyFW6q1g==,type:str]
-cloudflare-dns-token: ENC[AES256_GCM,data:JIXUtVDpYS9B74W0ooj50kd4v2+PX+FdF218gvgaS04rYATu4N6w9KEFPfdQqLjUmVihzV6s/IR1fg==,iv:AlbQ86kvFQbetvmFwt/hEyUcqKTI+XzL/NvSMXW9wm4=,tag:1JQeK4KrTDa6Kz+JhWxkxQ==,type:str]
-nextcloud-pwd: ENC[AES256_GCM,data:2oqsNceKuwGscBN2VxAK,iv:FoSfHItgeB91fG38zqtuQzayvNjNPFQyZjZlpUq/eic=,tag:MoEpAmTj+zqVu6OLasD4kQ==,type:str]
-adguard-pwd: ENC[AES256_GCM,data:QavwLWENAURnRrFwiLntkiM=,iv:bxdQfBxNL5rwUr7CEKbwXtv5mUUXZHhvyqQL2KoPwEY=,tag:T+cSyzbGeo7E5smSsuFlHw==,type:str]
-hoarder: ENC[AES256_GCM,data:8A3eGqIlHJ2XpC2OdMNBXPm+5BdfMlOfTSgiibPtM+SFyiPtGhjWQNmVCD9REf0P2C4pikZ3R7vtwyKpjrraaoSAY7ztAk9eqqikorIzD8hn8wbHz/y+Eko=,iv:ngoVgF348IxokWGQVpbpTGhdIwjOOA6T8qLb1wX6GEU=,tag:+v9HLUksQJ1e2vRR/5fzEg==,type:str]
-recyclarr: ENC[AES256_GCM,data:XgQ5ZQHY/OKucvJGb6NQND9/zzi2E+W3y9gtQJEUL9uIUWbiZdEt9XHB7dMXl9MIjOjAlCNKIzUMXkgccKA3PbVgbaKUMh3oXmTVHVqmRHrFwCwZMAUTQeOvwgeYYHkw,iv:Fyb16m+E6ToRzC5JGKTxhPzFwhdqaZ9liWUtMGpQ9O8=,tag:fdlpq40dAU2UzOJTVNuHSg==,type:str]
-wireguard-pia: ENC[AES256_GCM,data:TBbhTqKvnjSQu8Tc2QieLrIeP36JEcKMeJ2xMzsTrGSgKnyrnm4CUjSsluYpD5TXpt5z2BSQVG0K5XqT0c5q7N16jk6KyDAjZEHm9gMCWlywh2oQWxpjw8G3jFiiHkH055Me8jVtTUF4d+gpMu/LMA4TZlaCMjVEkcYoHsdhWRpKZWDs98D35oSVX7BEUgc8WIWtyDc1QjJ0Chi6Mw1+C9h3njLoLe/esdS/KV9nJSBB9OsSt11V5Dl5NQDnr+cV0CytC9vHDoYX9+s6ZASom13MBjs8SHQBsteQcboSB/WglO93NIA1VQ/hwDZnCQ25u89Z7oMVMR+NNQ==,iv:1AGrXUDY55wc60t489Vf+YUreiFeo77aAtj29EBnPi4=,tag:djY1xJqSCoIth7++ZokwhA==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5Z3MzZmoyVDRtRmd3amFJ
-            MWVvWlA1c3RFeVMrbHJQQmNTcG9ZN2tXSWxjClJ0L1psd1RFM1EreG1yNHdOYzZF
-            aXphL0lvcGNFTFFMbkNocGNXY00xdW8KLS0tIFh2YjN0aTlRazBXSktnQWx0L3BY
-            TEc5d01RaVFGNXc3dlljM0FTTHpENjQKOqwI+pl8UxVIVl43glnOYvW660/PsDGY
-            yefODJGVtHrOm3yeXC2xlTi3sFW+c5wUl2yPqddbvcBt5Ud/yd4iXQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-03-24T12:14:53Z"
-    mac: ENC[AES256_GCM,data:iIQADIb6T/D7Zmq+3egSQKqsEuCP66E9EO98IMgxLBc7trR8VFjHX6vZWkcOVQYUXaOq/LyYMtgwdQ+zfxmiu1/sfflRFDeYpvSjC2pxXARSTfsYq18BwJo8rnQmMm7A8NyQjzmpAjo8bCTgFlNXhQd54vJCIeJGmsZKeXDGHg0=,iv:XBtl+1ssfkuR3P1pQ6Q7k+neuzam9UdTAS+UJcvQqB4=,tag:5YITncXhThWIOMK7NLsv0Q==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.9.4

hosts/server/variables.nix

@@ -1,36 +0,0 @@
-{ config, lib, ... }: {
-  imports = [
-    # Choose your theme here:
-    ../../themes/nixy.nix
-  ];
-
-  config.var = {
-    hostname = "jack";
-    username = "hadi";
-    configDirectory = "/home/" + config.var.username
-      + "/.config/nixos"; # The path of the nixos configuration directory
-
-    keyboardLayout = "fr";
-
-    location = "Paris";
-    timeZone = "Europe/Paris";
-    defaultLocale = "en_US.UTF-8";
-    extraLocale = "fr_FR.UTF-8";
-
-    git = {
-      username = "Hadi";
-      email = "112569860+anotherhadi@users.noreply.github.com";
-    };
-
-    autoUpgrade = false;
-    autoGarbageCollector = true;
-  };
-
-  # Let this here
-  options = {
-    var = lib.mkOption {
-      type = lib.types.attrs;
-      default = { };
-    };
-  };
-}

nixos/audio.nix

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