Release v2.4.0

Former-commit-id: 7ddff66f00

.sops.yaml

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

README.md

@@ -1,8 +1,8 @@
 [//]: # (Title: Nixy)  
 [//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
 [//]: # (Author: Hadi)  
-[//]: # (Date: 06/25/24)
+[//]: # (Date: 09/04/24)
-[//]: # (Version: v2.0.0)
+[//]: # (Version: v2.3.0)
 
 <div align="center">
     <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
@@ -15,7 +15,7 @@
 <br>
 <div align="center">
     <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.0.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.3.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
     </a>
     <a href="https://github.com/anotherhadi/nixy/stargazers">
         <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
@@ -40,25 +40,41 @@ It's a simple way to manage your system configuration and dotfiles.
   - [Table of Content](#table-of-content)
   - [Gallery](#gallery)
   - [Architecture](#architecture)
+    - [🏠 `home`](#-home)
+    - [💻 `hosts`](#-hosts)
   - [Installation](#installation)
   - [Documentation](#documentation)
 
 ## Gallery
 
-![catppuccin1](docs/src/catppuccin/1.png)
+![nixy1](docs/src/nixy/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
+![nixy2](docs/src/nixy/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
+![nixy3](docs/src/nixy/3.png)
 
 ## Architecture
 
-- 🏠 `home` are the dotfiles and configuration files for the user
+### 🏠 `home`
-- 💻 `hosts` are the system configuration files
+
-  - 'laptop' is my configuration for my laptop with Nvidia
+Those are the dotfiles and configuration files for user-level configuration
-  - 'server' is for my Nixos server (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
+
-  - 'guest' is a *template* that you can copy and modify for *your own system*
+**Subfolders:**
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
+
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
+- `programs` is a collection of apps configured with home-manager
-- 🤫 `secrets` are the secrets files encrypted with sops-nix
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+- `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
+
+### 💻 `hosts`
+
+Those are the host-specific configurations
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+
+**Subfolders:**
+
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
+- 📦 `modules` are the nix modules that you can import
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
 
 ## Installation
 
@@ -66,9 +82,9 @@ It's a simple way to manage your system configuration and dotfiles.
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Copy the `hosts/guest` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
 - Add your `hardware-configuration.nix` to your new host's folder
-- Add your 'nixosConfigurations' inside `flake.nix` (You can edit the "yourhostname" one and change the lines containing '# CHANGEME')
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
 
 > [!NOTE]
 > When you add new files, don't forget to run `git add .` to add them to the git repository
@@ -82,6 +98,9 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 - [THEMES.md](docs/THEMES.md): How themes work and how to create your own
 - [APPS.md](docs/APPS.md): Which apps are installed
 - [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+
 - [TODO.md](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
-- [LICENSE](LICENSE): MIT Licensey
+- [LICENSE](LICENSE): MIT License

docs/APPS.md

@@ -4,18 +4,18 @@
 
 ## Laptop
 
-The laptop configuration is used by a Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
+The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
 The configurations files can be found in the `hosts/laptop` directory.
 
-
 | Category                                | Name           |
-|----------------|---------------|
+| --------------------------------------- | -------------- |
 | WM                                      | Hyprland       |
 |                                         | hyprlock       |
 |                                         | hyprpaper      |
 |                                         | hypridle       |
+|                                         | hyprcursor     |
 |                                         | wlogout        |
-| Bar            | waybar        |
+| Bar                                     | hyprpanel      |
 | Terminal                                | kitty          |
 | Shell                                   | zsh            |
 |                                         | tmux           |
@@ -24,34 +24,18 @@ The configurations files can be found in the `hosts/laptop` directory.
 |                                         | eza            |
 |                                         | zoxide         |
 |                                         | fzf            |
-| Editor         | neovim(nixvim)|
+| Editor                                  | neovim(nixvim) |
-| File manager   | lf            |
+| File manager                            | thunar         |
-|                | thunar        |
 | Browser                                 | qutebrowser    |
 | Music                                   | spicetify      |
-| Notifications  | dunst         |
 | Launcher                                | wofi           |
 | DM                                      | tuigreet       |
 | Secrets                                 | sops-nix       |
-| Misc           | lazygit       |
-|                | neofetch      |
-|                | cava          |
 | See [hosts/laptop](../hosts/laptop/)... |                |
 
 ## Server
 
 The server configuration is used by a home server running NixOS.
 The configurations files can be found in the `hosts/server` directory.
-I mainly use it for self hosting websites and services such as Nextcloud, Vaultwarden, ... 
+I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, jellyfin, ...
 I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
-
-### Apps
-
-- Nextcloud
-- Vaultwarden
-- Adguard Home
-- Unifi Controler
-- Uptime Kuma
-- "Jackflix"
-  - Jellyfin, Transmission, *arr
-- See [hosts/server](../hosts/server/)...

docs/CONTRIBUTING.md

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

docs/KEYBINDINGS.md

@@ -0,0 +1,42 @@
+# Keybindings
+
+The list of the keybindings working on Hyprland:
+
+| Description                                | Keybinding               |
+|--------------------------------------------|--------------------------|
+| Switch Workspace                           | SUPER + {Number}         |
+| Move app to Workspace                      | SHIFT + SUPER + {Number} |
+| Kitty                                      | SUPER + RETURN           |
+| Thunar                                     | SUPER + E                |
+| Qutebrowser                                | SUPER + B                |
+| Bitwarden                                  | SUPER + K                |
+| Lock                                       | SUPER + L                |
+| Powermenu                                  | SUPER + X                |
+| Launcher                                   | SUPER + SPACE            |
+| "\$shiftMod, SPACE, hyprexpo:expo, toggle" |                          |
+| Close window                               | SUPER + Q                |
+| Toggle Floating                            | SUPER + T                |
+| Toggle Fullscreen                          | SUPER + F                |
+| Move focus left                            | SUPER + left             |
+| Move focus Right                           | SUPER + right            |
+| Move focus Up                              | SUPER + up               |
+| Move focus Down                            | SUPER + down             |
+| Add to master                              | SHIFT + SUPER + left     |
+| Remove from master                         | SHIFT + SUPER + right    |
+| Screenshot window                          | SUPER + PRINT            |
+| Screenshot monitor                         | PRINT                    |
+| Screenshot region                          | SHIFT + SUPER + PRINT    |
+| Screenshot region then edit                | ALT PRINT                |
+| Search on internet with wofi               | SHIFT + SUPER + S        |
+| Clipboard picker with wofi                 | SHIFT + SUPER + C        |
+| Emoji picker with wofi                     | SHIFT + SUPER + E        |
+| Turn off night shift                       | SUPER + F2               |
+| Turn on night shift                        | SUPER + F3               |
+| Move Window (mouse)                        | SUPER + mouse:272        |
+| Resize Window (mouse)                      | SUPER + R                |
+| Toggle Mute                                | XF86AudioMute            |
+| Lock when closing Lid                      | switch:Lid Switch        |
+| Sound Up                                   | XF86AudioRaiseVolume     |
+| Sound Down                                 | XF86AudioLowerVolume     |
+| Brightness Up                              | XF86MonBrightnessUp      |
+| Brightness Down                            | XF86MonBrightnessDown    |

docs/SCRIPTS.md

@@ -1,6 +1,6 @@
 # Scripts
 
-Scripts are located in the `home/scripts` folder. Home-manager add those in the path.
+Scripts are located in the `home/scripts` folder. Home-manager add those in the user's path.
 
 ## Nix/NixOs shortcuts
 
@@ -18,14 +18,15 @@ Scripts are located in the `home/scripts` folder. Home-manager add those in the
 
 - `brightness-up`
 - `brightness-down`
-- `brightness-change <up/down> <increment>`
+- `brightness-set [value]`
+- `brightness-change [up/down] <increment>`
 
 ## Sound control
 
 - `sound-up`
 - `sound-down`
 - `sound-toggle`
-- `sound-output`
+- `sound-set [value]`
 - `sound-change [up/down/mute] <increment>`
 
 ## Caffeine
@@ -33,12 +34,16 @@ Scripts are located in the `home/scripts` folder. Home-manager add those in the
 Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
 
 - `caffeine` # Toggle caffeine
-- `caffeine-status` # Return active/inactive
+- `caffeine-status` # Return 1/0
+- `caffeine-status-icon` # Return 󰅶/󰾪
 
 ## Night-Shift
 
 Blue light filter, using wlsunset
 
+- `night-shift` # Toggle night shift
+- `night-shift-status` # Return 1/0
+- `night-shift-status-icon` # Return 󰖕/󰖔
 - `night-shift-on`
 - `night-shift-off`
 
@@ -48,10 +53,3 @@ Nerdfont fzf is a quick way to search for nerdfont icons locally.
 It will copy the selected icon to the clipboard.
 
 - `nerdfont-fzf`
-
-## Compress/Extract
-
-Some shortcuts to compress and extract files.
-
-- `compress` ...
-- `extract` ...

docs/THEMES.md

@@ -4,7 +4,7 @@ Themes are defined in `hosts/themes`. Those themes define the colors, fonts, ico
 You can change the selected theme by changing the import statement of your host's variables.nix file.
 
 > [!TIP]
-> To apply the theme to Duckduckgo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
+> To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
 
 ## Create your theme
 
@@ -18,15 +18,3 @@ Wallpapers are loaded from the `home/wallpapers` folder.
 ![nixy1](src/nixy/1.png)
 ![nixy2](src/nixy/2.png)
 ![nixy3](src/nixy/3.png)
-
-### Catppuccin
-
-![catppuccin1](src/catppuccin/1.png)
-![catppuccin2](src/catppuccin/2.png)
-![catppuccin3](src/catppuccin/3.png)
-
-### Windows
-
-![windows1](src/windows/1.png)
-![windows2](src/windows/2.png)
-![windows3](src/windows/3.png)

docs/TODO.md

@@ -1,42 +1,33 @@
-# Todolist
+# Todolist {
 
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
-- [ ] Nixy
+- [ ] Wofi config
-  - [ ] Installation script ([install.sh](./scripts/install.sh) to test on a fresh install)
+  - Calculator
-  - [ ] Variables-template with defaults
-  - [ ] Themes
-    - [ ] Upload new wallpapers
-    - [ ] MacOS theme
-    - [ ] GithubFetch: Neofetch like, github calendar in the terminal
-  - [ ] Write a hyprland shortcuts markdown file (Parse the hyprland settings conf)
-  - [ ] Tofi (Wofi but terminal based)
 
-- [ ] Waybar
+- [ ] Test hyprshade (replacement for gammastep)
-  - [ ] Caffeine status
+
-  - [ ] Night-shift status
+- [ ] Qutebrowser
+  - [ ] !!! Bitwarden integration (I need this.)
 
 - [ ] Hyprland
-  - [ ] Make hyprcursor work
+  - [ ] Fix screenshots (screenshot region's border shows up in the screenshot, hyprshot jq error?) and add in the scripts doc
-  - [ ] Animations based on app name
-    - [ ] Wofi: popin
-    - [ ] Wlogout: fade in
-  - [ ] Fix screenshots
 
 - [ ] Nixvim
-  - [ ] Telescope: find with file content
+  - [ ] Keymaps:
-  - [ ] Markdown snippets
+    - Trouble
-  - [ ] Whichkey: Description for keybindings
+    - Tagbar (actually not working)
-  - [ ] Spelling
 
-- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
+- [ ] Change my keyboard backlight
-  - [ ] Exclude file pattern (nodes modules, ...)
+  - Issue on nixos-hardware ig
-  - [ ] Auto backup when a specific usb key is plugged
 
-- [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
+- [ ] Update docs
 
-- [ ] Server
+## Server
-  - [ ] Bitcoin-git
+
-  - [ ] ServerFetch: Neofetch like, but for server: CPU, RAM, Disk, Network, Uptime, status (check with uptime kuma API)
+- [ ] Jackflix V2
-  - [ ] Ntfy auth file
+  - Backup Radarr, Prowlarr, Sonarr config
-  - [ ] Launch transmission-openvpn on boot (see hosts/server/modules/jackflix/transmission.nix)
+  - Take a look into buildarr or build a custom solution with *arr apis
+- [ ] Bitcoin-git: broken
+- [ ] Secrets mode 0444: not secure
+- [ ] Adguard config

docs/WALLPAPERS.md

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

docs/scripts/compress_png.sh

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

docs/scripts/create_guest_config.sh

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

docs/scripts/create_preview_wallpapers.sh

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

docs/scripts/create_readme.sh

@@ -7,14 +7,18 @@
 README_FILE="./README.md"
 
 header=$(cat "./docs/src/header.md")
-table_of_content=$(~/go/bin/md-table-of-contents ./docs/src/README_template.md)
+table_of_content=$(md-table-of-contents ./docs/src/README_template.md) # https://github.com/anotherhadi/md-table-of-contents
 version=$(git describe --tags --abbrev=0)
 readme_content=$(cat "./docs/src/README_template.md")
+description=$(curl -s https://api.github.com/repos/anotherhadi/nixy | jq .description)
+description="${description%\"}"
+description="${description#\"}"
 
 header=${header//\{date\}/$(date '+%D')}
 header=${header//\{primarycolor\}/89b4fa}
 header=${header//\{backgroundcolor\}/181825}
 header=${header//\{version\}/$version}
+header=${header//\{description\}/$description}
 readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
 
 echo "$header" >"$README_FILE"

docs/scripts/get_keybindings.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1)
-
-config=$( cat "./home/system/hyprland/default.nix")
-
-# get text between
-#  bind = [
-# and next ]
-
-# Example:
-# "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Description
-# Steps:
-# We should remove the ""
-# $mod replace by Super key
-# $shiftMod replace by "Super Shift"
-# Concat with key
-# Remove , exec, 
-# Remove variables and /bin/ if present
-
-# Create a markdown table with everything 

docs/scripts/install.sh

@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-# https://github.com/anotherhadi/nixy
-# Installation script: Should be run on fresh nixos install.
-
-printf "\n\e[0;92m- \e[0m\e[1;77mNixy's Installation Script\e[0;96m [anotherhadi/nixy]\e[0m"
-
-# Check if we're on the good directory
-[[ -f "./docs/scripts/install.sh" ]] || (
-  printf "\n\e[0;91mx \e[0m\e[1;77mNot in the project root directory\e[0m"
-  exit 1
-)
-DIR=$PWD
-
-# Create a new configuration
-read -rp $'\n\e[0;92m+\e[0m\e[1;77m Username: \e[0;96m' username
-read -rp $'\n\e[0;92m+\e[0m\e[1;77m Hostname: \e[0;96m' hostname
-
-HOST_DIR="./hosts/$hostname"
-mkdir "$HOST_DIR"
-
-nixos-generate-config --show-hardware-config >"$HOST_DIR/hardware-configuration.nix"
-
-printf "\n\e[0;92m? \e[0m\e[1;77mInstall Nvidia drivers?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  nvidia=true
-else
-  nvidia=false
-fi
-
-printf "\n\e[0;92m? \e[0m\e[1;77mInstall prime?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  prime=true
-else
-  prime=false
-fi
-
-cp "$LAPTOP_CONFIG/configuration.nix" "$HOST_DIR/configuration.nix"
-cp "$LAPTOP_CONFIG/variables.nix" "$HOST_DIR/variables.nix"
-
-config=$(cat "$LAPTOP_CONFIG/configuration.nix")
-if [[ $nvidia == false ]]; then
-  config=$(echo "$config" | sed 's/..\/shared\/nvidia/# ..\/shared\/nvidia/')
-fi
-if [[ $prime == false ]]; then
-  config=$(echo "$config" | sed 's/..\/shared\/prime/# ..\/shared\/prime/')
-fi
-echo "$config" >"$HOST_DIR/configuration.nix"
-
-variables=$(cat "$LAPTOP_CONFIG/variables.nix")
-variables=$(echo "$variables" | sed 's/112569860+anotherhadi@users.noreply.github.com/your_email/')
-variables=$(echo "$variables" | sed "s/hadi/$username/")
-variables=$(echo "$variables" | sed "s/nixy/$hostname/") # FIXME: Host name can be mixed with themes
-variables=$(echo "$variables" | sed "s/Hadi/$username/")
-variables=$(echo "$variables" | sed 's/sops = true/sops = false/')
-variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/')
-variables=$(echo "$variables" | sed 's/tailscale = true/tailscale = false/')
-echo "$variables" >"$HOST_DIR/variables.nix"
-
-# Add it to the git index
-git add .
-
-printf "\n\e[0;92m+ \e[0m\e[1;77mHost added!\e[0m"
-
-# REBUILD
-
-printf "\n\e[0;92m? \e[0m\e[1;77mDo you want to rebuild?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  sudo nixos-rebuild switch --flake "$DIR"#"$hostname"
-fi
-
-printf "\n\e[0;92m✓ \e[0m\e[1;77mDone!\e[0m"

docs/scripts/keybindings_to_markdown.sh

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

docs/scripts/new_tag.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+TAG=$(git describe --tags --abbrev=0)
+echo "Current tag: $TAG"
+
+read -rp "Enter the new tag name: " NEW_TAG
+
+read -rp "Do you want to compress the png files? [y/N]: " COMPRESS_PNG
+if [[ "$COMPRESS_PNG" == "y" || "$COMPRESS_PNG" == "Y" ]]; then
+  echo "Compresing png files..."
+  bash ./docs/scripts/compress_png.sh
+fi
+
+echo "Creating wallpapers preview..."
+bash ./docs/scripts/create_preview_wallpapers.sh
+echo "Creating README.md..."
+bash ./docs/scripts/create_readme.sh
+echo "Creating keybindings.md..."
+bash ./docs/scripts/keybindings_to_markdown.sh
+
+git add .
+git commit -m "Release $NEW_TAG"
+git tag -a "$NEW_TAG" -m "Release $NEW_TAG"
+git push origin "$NEW_TAG"

docs/src/README_template.md

@@ -8,20 +8,34 @@ It's a simple way to manage your system configuration and dotfiles.
 
 ## Gallery
 
-![catppuccin1](docs/src/catppuccin/1.png)
+![nixy1](docs/src/nixy/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
+![nixy2](docs/src/nixy/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
+![nixy3](docs/src/nixy/3.png)
 
 ## Architecture
 
-- 🏠 `home` are the dotfiles and configuration files for the user
+### 🏠 `home`
-- 💻 `hosts` are the system configuration files
+
-  - 'laptop' is my configuration for my laptop with Nvidia
+Those are the dotfiles and configuration files for user-level configuration
-  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
+
-  - 'guest' is a *template* that you can copy and modify for *your own system*
+**Subfolders:**
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
+
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
+- `programs` is a collection of apps configured with home-manager
-- 🤫 `secrets` are the secrets files encrypted with sops-nix
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+- `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
+
+### 💻 `hosts`
+
+Those are the host-specific configurations
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+
+**Subfolders:**
+
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
+- 📦 `modules` are the nix modules that you can import
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
 
 ## Installation
 
@@ -29,9 +43,9 @@ It's a simple way to manage your system configuration and dotfiles.
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Copy the `hosts/guest` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
 - Add your `hardware-configuration.nix` to your new host's folder
-- Add your 'nixosConfigurations' inside `flake.nix` (You can edit the "yourhostname" one and change the lines containing '# CHANGEME')
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
 
 > [!NOTE]
 > When you add new files, don't forget to run `git add .` to add them to the git repository
@@ -45,6 +59,9 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 - [THEMES.md](docs/THEMES.md): How themes work and how to create your own
 - [APPS.md](docs/APPS.md): Which apps are installed
 - [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+
 - [TODO.md](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
-- [LICENSE](LICENSE): MIT Licensey
+- [LICENSE](LICENSE): MIT License

docs/src/header.md

@@ -1,5 +1,5 @@
 [//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Description: {description})  
 [//]: # (Author: Hadi)  
 [//]: # (Date: {date})
 [//]: # (Version: {version})

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

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

flake.lock

@@ -1,5 +1,24 @@
 {
   "nodes": {
+    "ags": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1721306136,
+        "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
     "apple-fonts": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -11,11 +30,11 @@
         "sf-pro": "sf-pro"
       },
       "locked": {
-        "lastModified": 1718062482,
+        "lastModified": 1719591391,
-        "narHash": "sha256-bGWs6XRVgzm1Uagx/EAnz9wnMQVImR1ZlVpAy+SDXCw=",
+        "narHash": "sha256-sVTFewitXIYe5vBihbCFQGdBPdnT26kES1T05umBBnE=",
         "owner": "Lyndeno",
         "repo": "apple-fonts.nix",
-        "rev": "eeb3521706bfe21206b1301ff8e0876defa1b6dd",
+        "rev": "0e21619dad5b0d9ca2e050155e32448380547b06",
         "type": "github"
       },
       "original": {
@@ -24,20 +43,52 @@
         "type": "github"
       }
     },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1725016199,
+        "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717408969,
+        "lastModified": 1722113426,
-        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
         "type": "github"
       },
       "original": {
@@ -84,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717285511,
+        "lastModified": 1722555600,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -116,33 +167,15 @@
       }
     },
     "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
       "inputs": {
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1685518550,
+        "lastModified": 1710146030,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -153,7 +186,10 @@
     },
     "git-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixvim",
@@ -165,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718879355,
+        "lastModified": 1724857454,
-        "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=",
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
         "type": "github"
       },
       "original": {
@@ -207,11 +243,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719180626,
+        "lastModified": 1724435763,
-        "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -228,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719037157,
+        "lastModified": 1724435763,
-        "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -257,11 +293,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718450675,
+        "lastModified": 1722623071,
-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
+        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
+        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
         "type": "github"
       },
       "original": {
@@ -272,6 +308,7 @@
     },
     "hyprland": {
       "inputs": {
+        "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
@@ -281,11 +318,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1719338642,
+        "lastModified": 1725019943,
-        "narHash": "sha256-oy2IpTiMTof5rUqdmUMYzn6Xugc8kTh629soVCyC3L4=",
+        "narHash": "sha256-tAGs6TpIYkRUWjU0WYAavzHCPy4XLLMn63caFF7OCNc=",
         "ref": "refs/heads/main",
-        "rev": "95782de966ec9e182d49b2f032b74a1101f423e8",
+        "rev": "25e72949a1cc2368425ed81712a394cb277f514f",
-        "revCount": 4889,
+        "revCount": 5160,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -296,6 +333,36 @@
         "url": "https://github.com/hyprwm/Hyprland"
       }
     },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723143591,
+        "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -310,11 +377,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714869498,
+        "lastModified": 1721326555,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
         "type": "github"
       },
       "original": {
@@ -339,11 +406,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717881852,
+        "lastModified": 1724174162,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
         "type": "github"
       },
       "original": {
@@ -352,6 +419,25 @@
         "type": "github"
       }
     },
+    "hyprpanel": {
+      "inputs": {
+        "ags": "ags",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1725006826,
+        "narHash": "sha256-DO9Sxg+HP7Iy/TguZtjwXRjlH35liWXEuG17ilcJejI=",
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "rev": "4bd5c3ed30ae643ac1dee152f8b9332d0c5c3eb9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -364,11 +450,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719316102,
+        "lastModified": 1724966483,
-        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
+        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
+        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
         "type": "github"
       },
       "original": {
@@ -389,11 +475,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719067853,
+        "lastModified": 1721324119,
-        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
+        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
+        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
         "type": "github"
       },
       "original": {
@@ -410,11 +496,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719128254,
+        "lastModified": 1724561770,
-        "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
+        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "50581970f37f06a4719001735828519925ef8310",
+        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
         "type": "github"
       },
       "original": {
@@ -425,11 +511,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1719322773,
+        "lastModified": 1724878143,
-        "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=",
+        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "caabc425565bbd5c8640630b0bf6974961a49242",
+        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
         "type": "github"
       },
       "original": {
@@ -457,27 +543,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1719099622,
+        "lastModified": 1721524707,
-        "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=",
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1719075281,
+        "lastModified": 1724819573,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
         "type": "github"
       },
       "original": {
@@ -489,11 +575,27 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1719254875,
+        "lastModified": 1718714799,
-        "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
+        "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1722185531,
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
         "type": "github"
       },
       "original": {
@@ -503,17 +605,17 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
-        "lastModified": 1686020360,
+        "lastModified": 1724819573,
-        "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -530,14 +632,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1719334058,
+        "lastModified": 1724968633,
-        "narHash": "sha256-5uhWaoHhUYEPNC42NVW+srBgldwQKQE6dvW45rg0K3Q=",
+        "narHash": "sha256-eb2NCdLwfXL1MuTAkoDncSl2lCJwyylV5/NM1Ws2P/U=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "76a8790764ec983ca0659c952c4b6924c4e9bf1a",
+        "rev": "2704133fe3ca616b22ed6685cc67180456eb4160",
         "type": "github"
       },
       "original": {
@@ -546,32 +649,25 @@
         "type": "github"
       }
     },
-    "nur": {
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1719337524,
+        "lastModified": 1724584782,
-        "narHash": "sha256-bYp4//+XM+J1Y23sW6VjXAiCHUdq3aqgXue/tVeCxLw=",
+        "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
-        "owner": "nix-community",
+        "owner": "NuschtOS",
-        "repo": "NUR",
+        "repo": "search",
-        "rev": "37ae43594731d4d801f53dffe465006421c7c292",
+        "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
         "type": "github"
       },
       "original": {
-        "id": "nur",
+        "owner": "NuschtOS",
-        "type": "indirect"
+        "repo": "search",
-      }
-    },
-    "nurpkgs": {
-      "locked": {
-        "lastModified": 1719337524,
-        "narHash": "sha256-bYp4//+XM+J1Y23sW6VjXAiCHUdq3aqgXue/tVeCxLw=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "37ae43594731d4d801f53dffe465006421c7c292",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
         "type": "github"
       }
     },
@@ -592,11 +688,11 @@
         "apple-fonts": "apple-fonts",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
+        "hyprland-plugins": "hyprland-plugins",
+        "hyprpanel": "hyprpanel",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_5",
         "nixvim": "nixvim",
-        "nur": "nur",
-        "nurpkgs": "nurpkgs",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix"
       }
@@ -657,11 +753,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1719268571,
+        "lastModified": 1723501126,
-        "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
         "type": "github"
       },
       "original": {
@@ -672,19 +768,21 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1704167711,
+        "lastModified": 1724991403,
-        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
+        "narHash": "sha256-n0os3uymBUoGlikG87Yp7oisYGrkEwsm3nptS9FhdAk=",
-        "owner": "the-argus",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
+        "rev": "0965e58aa38245b2105fec2949a9463fe34e3f05",
         "type": "github"
       },
       "original": {
-        "owner": "the-argus",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
         "type": "github"
       }
@@ -721,16 +819,16 @@
     },
     "systems_3": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1689347949,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -757,11 +855,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718522839,
+        "lastModified": 1724833132,
-        "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
+        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
+        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
         "type": "github"
       },
       "original": {
@@ -787,11 +885,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718619174,
+        "lastModified": 1724073926,
-        "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
+        "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
+        "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,73 +16,45 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    spicetify-nix.url = "github:the-argus/spicetify-nix";
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    nurpkgs.url = "github:nix-community/NUR";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
   };
 
-  outputs = inputs@{ nixpkgs, nur, ... }: {
+  outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-
+      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
-      nixy = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./hosts/laptop/configuration.nix
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
-          inputs.home-manager.nixosModules.home-manager
           {
-            nixpkgs.overlays = [ nur.overlay ];
+            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
             _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./home/laptop.nix;
-              extraSpecialArgs = { inherit inputs; };
-            };
           }
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
+          inputs.home-manager.nixosModules.home-manager
+          ./hosts/laptop/configuration.nix # CHANGEME
         ];
       };
 
       jack = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
+          { _module.args = { inherit inputs; }; }
           inputs.sops-nix.nixosModules.sops
+          inputs.home-manager.nixosModules.home-manager
           ./hosts/server/configuration.nix
-          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./home/server.nix;
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
-        ];
-      };
-
-      yourhostname = nixpkgs.lib.nixosSystem { # CHANGEME
-        system = "x86_64-linux";
-        modules = [
-          ./hosts/yourhostname/configuration.nix # CHANGEME
-          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."yourusername" = import # CHANGEME
-                ./home/laptop.nix; # you can also create a new ./home/yourhostname.nix
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
         ];
       };
 

home/laptop.nix

@@ -1,103 +0,0 @@
-{ pkgs, config, ... }: {
-
-  imports = [
-    ../hosts/laptop/variables.nix # CHANGEME, replace with your host
-
-    # Programs
-    ./programs/btop
-    ./programs/cava
-    ./programs/kitty
-    ./programs/nextcloud
-    ./programs/nvim
-    ./programs/qutebrowser
-    ./programs/spicetify
-    ./programs/zathura
-    ./programs/shell
-    ./programs/git
-
-    # Scripts
-    ./scripts # All scripts
-
-    # System (Desktop environment like stuff)
-    ./system/dunst
-    ./system/gtk
-    ./system/hyprland
-    ./system/waybar
-    ./system/wlogout
-    ./system/wofi
-    ./system/mime
-    ./system/udiskie
-
-    ./system/sops/laptop.nix # You should probably remove this line
-  ];
-
-  home = {
-    inherit (config.var) username;
-    inherit (config.var) homeDirectory;
-
-    packages = with pkgs; [
-      swappy
-      imv
-      discord
-      obsidian
-      xfce.thunar
-      bitwarden
-      vlc
-      nextcloud-client
-      tailscale
-
-      # Dev
-      go
-      cargo
-      nodejs
-      python3
-      jq
-      git-ignore
-      nurl
-      prefetch-npm-deps
-      figlet
-
-      # Utils
-      fd
-      bc
-      gcc
-      blueman
-      zip
-      unzip
-      xdg_utils
-      wget
-      curl
-      wf-recorder
-      glow
-      nwg-displays
-      wireguard-tools
-      bitwarden-cli
-      optipng
-      pfetch
-      usbutils
-
-      # Just cool
-      peaclock
-      cbonsai
-      pipes
-      cmatrix
-
-      # Backup
-      vscode
-      tor-browser
-      firefox
-      neovide
-    ];
-
-    # Import wallpapers into $HOME/wallpapers
-    file."wallpapers" = {
-      recursive = true;
-      source = ./wallpapers;
-    };
-
-    stateVersion = "24.05";
-  };
-
-  programs.home-manager.enable = true;
-
-}

home/programs/nvim/colorscheme.nix

@@ -3,7 +3,10 @@
     enable = true;
     colorschemes.catppuccin = {
       enable = true;
-      settings = { transparent_background = true; };
+      settings = {
+        transparent_background = true;
+        flavour = "mocha";
+      };
     };
   };
 }

home/programs/nvim/default.nix

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

home/programs/nvim/keymaps.nix

@@ -0,0 +1,24 @@
+{
+  programs.nixvim.keymaps = [
+    {
+      key = "<leader>fm";
+      action = "<cmd>lua vim.lsp.buf.format()<cr>";
+      options.desc = "LSP Format";
+    }
+    {
+      key = "<leader>w";
+      action = "<cmd>set wrap!<cr>";
+      options.desc = "Toggle word wrapping";
+    }
+    {
+      key = "<leader>W";
+      action = "<cmd>set linebreak!<cr>";
+      options.desc = "Toggle linebreak";
+    }
+    {
+      key = "<leader>z";
+      action = "<cmd>ZenMode<cr>";
+      options.desc = "ZenMode";
+    }
+  ];
+}

home/programs/nvim/options.nix

@@ -24,7 +24,7 @@
     wildmode = "list:longest";
     completeopt = [ "menuone" "noselect" ];
     signcolumn = "yes";
-    cursorline = true;
+    cursorline = false;
     scrolloff = 8;
     mouse = "a";
 
@@ -32,6 +32,6 @@
 
     swapfile = false;
     undofile = true;
-    conceallevel = 2;
+    conceallevel = 3;
   };
 }

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

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

home/programs/nvim/plugins/bufferline.nix

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

home/programs/nvim/plugins/comment.nix

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

home/programs/nvim/plugins/copilot.nix

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

home/programs/nvim/plugins/dashboard.nix

@@ -71,7 +71,22 @@
             type = "button";
             val = "  NixOs Config";
             on_press.__raw =
-              "function() vim.cmd[[e ${config.var.configDirectory}]] end";
+              "function() vim.cmd[[Neotree ${config.var.configDirectory}]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  Keybindings";
+            on_press.__raw =
+              "function() vim.cmd[[e ${config.var.configDirectory}/docs/KEYBINDINGS.md]] end";
             opts = {
               shortcut = "nc";
               position = "center";

home/programs/nvim/plugins/git.nix

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

home/programs/nvim/plugins/image.nix

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

home/programs/nvim/plugins/keymaps.nix

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

home/programs/nvim/plugins/lazygit.nix

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

home/programs/nvim/plugins/lightline.nix

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

home/programs/nvim/plugins/lsp.nix

@@ -9,8 +9,16 @@
         gopls.enable = true;
         nixd.enable = true;
         tailwindcss.enable = true;
-        html.enable = true;
+        # html.enable = true; # FIXME: broken for some reason
         svelte.enable = true;
+        marksman.enable = true;
+        ltex = {
+          enable = false;
+          settings = {
+            enabled = false;
+            language = "en";
+          };
+        };
       };
       keymaps.lspBuf = {
         "gd" = "definition";
@@ -20,5 +28,23 @@
         "K" = "hover";
       };
     };
+    none-ls = {
+      enable = true;
+      sources = {
+        diagnostics = {
+          golangci_lint.enable = true;
+          statix.enable = true;
+        };
+        formatting = {
+          gofmt.enable = true;
+          goimports.enable = true;
+          nixfmt.enable = true;
+          markdownlint.enable = true;
+          tidy.enable = true;
+          shellharden.enable = true;
+          shfmt.enable = true;
+        };
+      };
+    };
   };
 }

home/programs/nvim/plugins/markdown.nix

@@ -0,0 +1,133 @@
+{
+  programs.nixvim.plugins = {
+    mkdnflow = {
+      enable = true;
+      mappings = {
+
+        # Main
+        MkdnEnter = {
+          key = "<CR>";
+          modes = [ "n" "v" "i" ];
+        };
+
+        # Links
+        MkdnCreateLink = false;
+        MkdnCreateLinkFromClipboard = {
+          key = "<leader>lc";
+          modes = [ "n" "v" ];
+        };
+        MkdnDestroyLink = {
+          key = "<leader>dl";
+          modes = "n";
+        };
+        MkdnFollowLink = false;
+        MkdnNextLink = {
+          key = "<Tab>";
+          modes = "n";
+        };
+        MkdnYankAnchorLink = {
+          key = "ya";
+          modes = "n";
+        };
+        MkdnYankFileAnchorLink = {
+          key = "yfa";
+          modes = "n";
+        };
+        MkdnPrevLink = {
+          key = "<S-Tab>";
+          modes = "n";
+        };
+
+        MkdnDecreaseHeading = {
+          key = "-";
+          modes = "n";
+        };
+        MkdnExtendList = false;
+        MkdnFoldSection = {
+          key = "<leader>ff";
+          modes = "n";
+        };
+        MkdnUnfoldSection = {
+          key = "<leader>fu";
+          modes = "n";
+        };
+        MkdnGoBack = {
+          key = "<BS>";
+          modes = "n";
+        };
+        MkdnGoForward = {
+          key = "<Del>";
+          modes = "n";
+        };
+        MkdnIncreaseHeading = {
+          key = "+";
+          modes = "n";
+        };
+        MkdnMoveSource = {
+          key = "<F2>";
+          modes = "n";
+        };
+        MkdnNewListItem = false;
+        MkdnNewListItemAboveInsert = {
+          key = "O";
+          modes = "n";
+        };
+        MkdnNewListItemBelowInsert = {
+          key = "o";
+          modes = "n";
+        };
+        MkdnNextHeading = {
+          key = "]]";
+          modes = "n";
+        };
+        MkdnPrevHeading = {
+          key = "[[";
+          modes = "n";
+        };
+        MkdnSTab = false;
+        MkdnTab = false;
+        MkdnTableFormat = {
+          key = "<leader>ft";
+          modes = "n";
+        };
+        MkdnTableNewColAfter = {
+          key = "<leader>ic";
+          modes = "n";
+        };
+        MkdnTableNewColBefore = {
+          key = "<leader>iC";
+          modes = "n";
+        };
+        MkdnTableNewRowAbove = {
+          key = "<leader>iR";
+          modes = "n";
+        };
+        MkdnTableNewRowBelow = {
+          key = "<leader>ir";
+          modes = "n";
+        };
+        MkdnTableNextCell = {
+          key = "<S-Tab>";
+          modes = "i";
+        };
+        MkdnTableNextRow = false;
+        MkdnTablePrevCell = {
+          key = "<M-Tab>";
+          modes = "i";
+        };
+        MkdnTablePrevRow = {
+          key = "<M-CR>";
+          modes = "i";
+        };
+        MkdnToggleToDo = {
+          key = "<C-Space>";
+          modes = [ "n" "v" ];
+        };
+        MkdnUpdateNumbering = {
+          key = "<leader>nn";
+          modes = "n";
+        };
+      };
+    };
+  };
+}

home/programs/nvim/plugins/noice.nix

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

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

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

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

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

home/programs/nvim/plugins/obsidian.nix

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

home/programs/nvim/plugins/oil.nix

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

home/programs/nvim/plugins/telescope.nix

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

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

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

home/programs/nvim/plugins/toggleterm.nix

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

home/programs/nvim/plugins/tree.nix

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

home/programs/nvim/plugins/treesitter.nix

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

home/programs/nvim/plugins/trouble.nix

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

home/programs/nvim/plugins/ui.nix

@@ -0,0 +1,43 @@
+{ pkgs, config, ... }: {
+  home.packages = with pkgs; [ ctags ];
+
+  programs.nixvim = {
+    highlight = {
+      Headline.bg = "#${config.var.theme.colors.bgalt}";
+      Headline.bold = true;
+      Headline1.bg = "#${config.var.theme.colors.c0}";
+      Headline1.bold = true;
+    };
+    plugins = {
+      lualine.enable = true;
+      noice.enable = true;
+      gitsigns = {
+        enable = true;
+        settings.current_line_blame = false;
+      };
+      bufferline.enable = true;
+      trouble.enable = true;
+      indent-blankline.enable = true;
+      which-key.enable = true;
+      headlines = {
+        enable = true;
+        settings = {
+          markdown = {
+            headline_highlights = [ "Headline1" "Headline" ];
+            fat_headlines = false;
+            bullets = [ "" "◉" "○" "✸" ];
+            dash_string = "";
+            codeblock_highlight = "Headline";
+          };
+        };
+      };
+      nvim-colorizer.enable = true;
+      tagbar.enable = true; # FIXME: Tagbar is not working
+    };
+    keymaps = [{
+      key = "<leader>t";
+      action = "<cmd>TroubleToggle<cr>";
+      options.desc = "Trouble";
+    }];
+  };
+}

home/programs/nvim/plugins/utils.nix

@@ -0,0 +1,51 @@
+{ config, ... }: {
+  programs.nixvim = {
+    highlightOverride = {
+      FloatBorder.fg = "#${config.var.theme.colors.accent}";
+    };
+    plugins = {
+      copilot-vim.enable = true;
+      flash.enable = true;
+      # image.enable = true;
+      tmux-navigator.enable = true;
+      comment.enable = true;
+      nvim-autopairs.enable = true;
+      friendly-snippets.enable = true;
+      telescope = {
+        enable = true;
+        keymaps = {
+          "<leader>fg" = "live_grep";
+          "<leader> " = "find_files";
+        };
+        extensions.fzf-native = { enable = true; };
+      };
+      treesitter = {
+        enable = true;
+        nixGrammars = true;
+        settings = {
+          indent.enable = true;
+          highlight.enable = true;
+        };
+      };
+      treesitter-context.enable = true;
+    };
+    keymaps = [
+      {
+        key = "<C-h>";
+        action = "<cmd>TmuxNavigateLeft<cr>";
+      }
+      {
+        key = "<C-j>";
+        action = "<cmd>TmuxNavigateDown<cr>";
+      }
+      {
+        key = "<C-k>";
+        action = "<cmd>TmuxNavigateUp<cr>";
+      }
+      {
+        key = "<C-l>";
+        action = "<cmd>TmuxNavigateRight<cr>";
+      }
+    ];
+  };
+}

home/programs/nvim/plugins/whichkey.nix

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

home/programs/nvim/plugins/wilder.nix

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

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

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

home/programs/qutebrowser/default.nix

@@ -23,8 +23,8 @@ let
               {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
               {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
               {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
-              {"title": "Nerdfont", "url": "https://www.nerdfonts.com/cheat-sheet", "icon": ""},
               {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"},
+              {"title": "Figma", "url": "https://figma.com", "icon": ""},
               {"title": "Server", "url": "https://home.anotherhadi.com", "icon": ""}
             ]
           },
@@ -48,8 +48,8 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "anotherhadi";
       repo = "homepage";
-      rev = "40286c5e03bcfb9993cce354b4f12c00a1b4966d";
+      rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d";
-      hash = "sha256-zlJ/bzFWE64HpUCxiRT5E9wrjVVwSTSgIOrifWKxphU=";
+      hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0=";
     };
 
     # npmDepsHash = lib.fakeHash;
@@ -205,6 +205,8 @@ in {
           "dark"; # Enable dark mode for websites that support it
       };
 
+      statusbar.show = "in-mode";
+
       fonts = { default_family = "${config.var.theme.font}"; };
 
       completion = {
@@ -224,6 +226,7 @@ in {
         autoplay = false;
         javascript.clipboard = "access";
         javascript.enabled = true;
+        webgl = true;
         pdfjs = true;
       };
 
@@ -328,6 +331,7 @@ in {
       config.unbind("gt")
 
       c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+      c.statusbar.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
 
       config.load_autoconfig(True)
     '';

home/programs/shell/default.nix

@@ -7,7 +7,5 @@
     ./tmux.nix
     ./lazygit.nix
     ./eza.nix
-    ./fetch
-    ./lf
   ];
 }

home/programs/shell/lf/config/colors

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

home/programs/shell/lf/config/icons

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

home/programs/shell/lf/default.nix

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

home/programs/shell/tmux.nix

@@ -40,6 +40,7 @@
 
           set -g @catppuccin_directory_text "#{pane_current_path}"
           set -g @catppuccin_status_background "default"
+          set-option -g default-terminal "screen-256color"
         '';
       }
     ];

home/programs/shell/zsh.nix

@@ -2,6 +2,8 @@
 
   home.packages = with pkgs; [ bat ripgrep tldr ];
 
+  home.sessionPath = [ "$HOME/go/bin" ];
+
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -47,16 +49,18 @@
       sl = "ls";
       open = "${pkgs.xdg_utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
-      note = "vim ~/Nextcloud/obsidian";
-      obs = "vim ~/Nextcloud/obsidian";
       wireguard-import = "nmcli connection import type wireguard file";
-      vault = "nvim $HOME/nextcloud/Notes/";
+      neorg =
+        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
+      notes =
+        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
+      note = "notes";
 
       # git
       ga = "git add";
       gc = "git commit";
       gcm = "git commit -m";
-      gcu = "git commit -am 'Update'";
+      gcu = "git add . && git commit -m 'Update'";
       gp = "git push";
       gpl = "git pull";
       gs = "git status";

home/programs/spicetify/default.nix

@@ -1,5 +1,5 @@
 { pkgs, config, lib, inputs, ... }:
-let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
+let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
 in {
 
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
@@ -33,6 +33,7 @@ in {
       lastfm
       historyShortcut
       hidePodcasts
+      adblock
       fullAppDisplay
       shuffle
     ];

home/programs/yazi/default.nix

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

home/scripts/battery/default.nix

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

home/scripts/brightness/default.nix

@@ -4,16 +4,12 @@ let
   increments = "5";
 
   brightness-change = pkgs.writeShellScriptBin "brightness-change" ''
-    sleep 0.05
+    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%+
+    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%-
+  '';
 
-    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%+
+  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
-    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%-
+    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
-
-    brightness_level=$(${pkgs.brightnessctl}/bin/brightnessctl get)
-
-    message="󰃠  Brightness: $brightness_level%"
-
-    notif "brightness" "$message" "extraargs=-h int:value:$brightness_level"
   '';
 
   brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -24,4 +20,12 @@ let
     brightness-change down ${increments}
   '';
 
-in { home.packages = [ brightness-change brightness-up brightness-down ]; }
+in {
+  home.packages = [
+    pkgs.brightnessctl
+    brightness-change
+    brightness-up
+    brightness-down
+    brightness-set
+  ];
+}

home/scripts/caffeine/default.nix

@@ -1,20 +1,25 @@
 { pkgs, ... }:
 let
   caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
-    [[ -f /tmp/caffeine ]] && echo "active" || echo "inactive"
+    [[ $(pidof "hypridle") ]] && echo "0" || echo "1"
+  '';
+
+  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
+    [[ $(pidof "hypridle") ]] && echo "󰾪" || echo "󰅶"
   '';
 
   caffeine = pkgs.writeShellScriptBin "caffeine" ''
-    if [[ -f /tmp/caffeine ]]; then
+    if [[ $(pidof "hypridle") ]]; then
-      rm /tmp/caffeine
-      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
-      message="󰾪  Caffeine Deactivated"
-    else
-      touch /tmp/caffeine
       pkill hypridle
-      message="󰅶  Caffeine Activated"
+      title="󰅶  Caffeine Activated"
+      description="Caffeine is now active! Your screen will not turn off automatically."
+    else
+      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
+      title="󰾪  Caffeine Deactivated"
+      description="Caffeine is now deactivated! Your screen will turn off automatically."
     fi
-    notif "caffeine" "$message"
+
+    notif "caffeine" "$title" "$description"
   '';
 
-in { home.packages = [ caffeine-status caffeine ]; }
+in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }

home/scripts/compress/default.nix

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

home/scripts/default.nix

@@ -6,12 +6,8 @@
     ./caffeine
     ./night-shift
     ./screenshot
-    ./startup
     ./nerdfont_fzf
     ./notification
-    ./battery
+    ./system
-    ./compress
-    ./misc
-    ./tofi
   ];
 }

home/scripts/nerdfont_fzf/default.nix

@@ -12,21 +12,15 @@ let
     fi
 
     echo "Copied to clipboard: $fzf_result"
-    echo "Paste it to close the window"
+    ${pkgs.wl-clipboard}/bin/wl-copy "$fzf_result" # wait for paste before exiting.. not cool
-    ${pkgs.wl-clipboard}/bin/wl-copy -o "$fzf_result" # wait for paste before exiting.. not cool
   '';
 
   nerdfont-fzf-fetch = pkgs.writeShellScriptBin "nerdfont-fzf-fetch" ''
     wget "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/glyphnames.json" -O "glyphnames.json" || exit 1
     jq 'del(.METADATA)' "glyphnames.json"
   '';
-
-  nerdfont-popup = pkgs.writeShellScriptBin "nerdfont-popup" ''
-    ${pkgs.kitty}/bin/kitty --class floating -o font_size=18 zsh -c nerdfont-fzf 2>/dev/null
-  '';
-
 in {
-  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch ];
 
   xdg.configFile."nerdfont_glyphnames.json" = {
     source = ./nerdfont_glyphnames.json;

home/scripts/night-shift/default.nix

@@ -4,19 +4,23 @@ let
   default = "4000";
 
   night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
-    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.wlsunset}/bin/wlsunset -t ${default}"
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.gammastep}/bin/gammastep -O ${default}"
-    message="󰖔  Night-Shift Activated"
+    title="󰖔  Night-Shift Activated"
-    notif "night-shift" "$message"
+    description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
+
+    notif "night-shift" "$title" "$description"
   '';
 
   night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
-    pkill wlsunset
+    pkill gammastep
-    message="󰖔  Night-Shift Deactivated"
+    title="󰖕  Night-Shift Deactivated"
-    notif "night-shift" "$message"
+    description="Night-Shift is now deactivated! Your screen will return to normal."
+
+    notif "night-shift" "$title" "$description"
   '';
 
-  night-shift-toggle = pkgs.writeShellScriptBin "night-shift-toggle" ''
+  night-shift = pkgs.writeShellScriptBin "night-shift" ''
-    if pgrep wlsunset; then
+    if pgrep gammastep; then
       night-shift-off
     else
       night-shift-on
@@ -24,11 +28,28 @@ let
   '';
 
   night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
-    if pgrep wlsunset; then
+    if [[ $(pgrep gammastep) ]]; then
       echo "1"
     else
       echo "0"
     fi
   '';
 
-in { home.packages = [ night-shift-on night-shift-off night-shift-toggle night-shift-status ]; }
+  night-shift-status-icon =
+    pkgs.writeShellScriptBin "night-shift-status-icon" ''
+      if [[ $(pgrep gammastep) ]]; then
+        echo "󰖔"
+      else
+        echo "󰖕"
+      fi
+    '';
+in {
+  home.packages = [
+    pkgs.gammastep
+    night-shift-on
+    night-shift-off
+    night-shift
+    night-shift-status
+    night-shift-status-icon
+  ];
+}

home/scripts/nixy/default.nix

@@ -1,7 +1,5 @@
 { pkgs, config, ... }:
-
 let
-
   nixy = pkgs.writeShellScriptBin "nixy" ''
     function exec() {
       $@
@@ -12,11 +10,11 @@ let
 
       # "icon;name;command"[]
       apps=(
-        ";Rebuild;nixy-rebuild"
+        ";Rebuild;nixy rebuild"
-        ";Upgrade;nixy-upgrade"
+        ";Upgrade;nixy upgrade"
-        ";Update;nixy-update"
+        ";Update;nixy update"
-        ";Collect Garbage;nixy-gc"
+        ";Collect Garbage;nixy gc"
-        ";Clean Boot Menu;nixy-cb"
+        ";Clean Boot Menu;nixy cb"
       )
 
       # Apply default icons if empty:
@@ -54,7 +52,4 @@ let
     fi
   '';
 
-in {
+in { home.packages = [ nixy ]; }
-  home.packages =
-    [ nixy ];
-}

home/scripts/notification/default.nix

@@ -1,27 +1,26 @@
 { pkgs, ... }:
 let
-  notif = pkgs.writeShellScriptBin "notif" ''
+  notif = pkgs.writeShellScriptBin "notif" # bash
+    ''
       # Shell script to send custom notifications
+      # Usage: notif "sender_id" "message" ["description"]
       NOTIF_FOLDER="/tmp/notif"
       sender_id=$1 # To overwrite existing notifications
-    message=$2
+      title=$2
-    extraargs=""
+      description=$3
-    description=""
-    if [[ $3 == "extraargs="* ]]; then
-      extraargs=$(echo "$3" | sed 's/extraargs=//g')
-    else
-      description="$3"
-      extraargs="$4"
-    fi
 
       [[ -d "$NOTIF_FOLDER" ]] || mkdir $NOTIF_FOLDER
-    [[ -f "$NOTIF_FOLDER/$sender_id" ]] || echo "0" > "$NOTIF_FOLDER/$sender_id"
+      [[ -f "$NOTIF_FOLDER/$sender_id" ]] || (echo "0" > "$NOTIF_FOLDER/$sender_id")
 
       old_notification_id=$(cat "$NOTIF_FOLDER/$sender_id")
+      [[ -z "$old_notification_id" ]] && old_notification_id=0
 
-     ${pkgs.libnotify}/bin/notify-send "$message" \
+       ${pkgs.libnotify}/bin/notify-send \
-     $extraargs \
+      --replace-id="$old_notification_id" --print-id \
-    --replace-id="$old_notification_id" --print-id > "$NOTIF_FOLDER/$sender_id"
+      --app-name="$sender_id" \
+      "$title" \
+      "$description" \
+      > "$NOTIF_FOLDER/$sender_id"
     '';
 
-in { home.packages = [ notif ]; }
+in { home.packages = [ pkgs.libnotify notif ]; }

home/scripts/screenshot/default.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 
 let
-  # TODO: Broken - hypshot not working (jq error)
   screenshot = pkgs.writeShellScriptBin "screenshot" ''
     if [[ $2 == "swappy" ]];then
       folder="/tmp"

home/scripts/sounds/default.nix

@@ -1,38 +1,23 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 let
-  homedir = config.home.homeDirectory;
   increments = "5";
 
   sound-change = pkgs.writeShellScriptBin "sound-change" ''
-    sleep 0.05
-
     [[ $1 == "mute" ]] && wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%+"
+    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%+
-    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%-"
+    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%-
-
+    [[ $1 == "set" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-100}%
-    sink_info=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
-
-    volume=$(echo "$(echo "$sink_info" | awk '{print $2}' | sed 's/%//')*100" | bc -l | xargs printf "%.0f")
-    muted=false
-    if [[ $sink_info == *"MUTED"* ]]; then
-      muted=true
-    fi
-
-    message=""
-    if [ $muted = true ]; then
-      message="󰖁 Muted"
-    else
-      message="󰕾 Volume: $volume%"
-    fi
-
-    notif "sound" "$message" "extraargs=-h int:value:$volume"
   '';
 
   sound-up = pkgs.writeShellScriptBin "sound-up" ''
     sound-change up ${increments}
   '';
 
+  sound-set = pkgs.writeShellScriptBin "sound-set" ''
+    sound-change set ''${1-100}
+  '';
+
   sound-down = pkgs.writeShellScriptBin "sound-down" ''
     sound-change down ${increments}
   '';
@@ -40,47 +25,6 @@ let
   sound-toggle = pkgs.writeShellScriptBin "sound-toggle" ''
     sound-change mute
   '';
-
-  sound-output = pkgs.writeShellScriptBin "sound-output" ''
-      function parse_sinks(){
-        output=$(wpctl status)
-        sinks=($(echo "$output" | sed 's/ │  //' | awk '/Sinks:/ {flag=1; next} /^$/ {flag=0} flag' | sed 's/ /-/g'))
-
-        for sink in "''${sinks[@]}"; do
-
-          id=""
-          default=false
-          sink=$(echo "$sink" | sed 's/-/ /g')
-          sink_name=$(echo "$sink" | sed 's/\[vol:.*$//')
-
-          if [[ $sink_name == "*"* ]]; then
-            sink_name=$(echo "$sink_name" | sed 's/*//')
-            default=true
-          fi
-
-          id=$(echo "$sink_name" | cut -d'.' -f1)
-          sink_name=$(echo "$sink_name" | sed 's/^[ ]*//;s/[ ]*$//' )
-          sink_name=$(echo "$sink_name" | cut -d'.' -f2 )
-
-          if [[ $default == true ]];then
-            printf "*%s (%d)" "$sink_name" "$id"
-          else
-            printf " %s (%d)" "$sink_name" "$id"
-          fi
-          printf "\n"
-        done
-    }
-
-
-    choosed_sink=$(echo "$(parse_sinks)" | ${pkgs.fzf}/bin/fzf \
-      --border-label "Choose sound output" ) || exit 1
-
-    choosed_sink_id=$(echo "$choosed_sink" | sed 's/.*(\(.*\))/\1/')
-
-    wpctl set-default $choosed_sink_id
-  '';
-
 in {
-  home.packages =
+  home.packages = [ sound-change sound-up sound-down sound-toggle sound-set ];
-    [ sound-output sound-change sound-up sound-down sound-toggle ];
 }

home/scripts/startup/default.nix

@@ -1,17 +0,0 @@
-# File runned at startup by Hyprland
-{ pkgs, config, ... }:
-let
-  startup = pkgs.writeShellScriptBin "startup" ''
-    # Startup is a script called by Hyprland on startup
-    # Because HM enabling services suck.
-
-    [[ ${toString config.var.sops} == "1" ]] && systemctl --user start sops-nix
-
-    battery-watch &
-    ${pkgs.waybar}/bin/waybar &
-
-
-    wlr-randr --output "Unknown-1" --off # FIX: REMOVE WEIRD GHOST MONITOR
-  '';
-
-in { home.packages = [ startup ]; }

home/scripts/tofi/default.nix

@@ -1,62 +0,0 @@
-{ pkgs, config, ... }:
-
-let
-
-  tofi = pkgs.writeShellScriptBin "tofi" ''
-    hyprexec="hyprctl dispatch exec"
-    function exec() {
-      $@
-    }
-
-    function ui(){
-      DEFAULT_ICON="󰘳"
-
-      # "icon;name;command"[]
-      apps=(
-        ";Nixy;nixy"
-        ";Nerdfont FZF;nerdfont-fzf"
-        ";Brightness Up;brightness-up"
-        ";Brightness Down;brightness-down"
-        ";Sound Up;sound-up"
-        ";Sound Down;sound-down"
-        ";Sound Toggle Mute;sound-toggle"
-        ";Sound Change Output;sound-output"
-        ";Caffeine;caffeine"
-        ";Night Shift Toggle;night-shift-toggle"
-        ";Firefox;$hyprexec firefox"
-        ";Qutebrowser;$hyprexec qutebrowser"
-        ";Kitty;$hyprexec kitty"
-        ";Thunar;$hyprexec thunar"
-        ";Powermenu;powermenu"
-        ";Wofi;menu"
-        ";Lock;lock"
-        ";Bitwarden;$hyprexec bitwarden"
-        ";Clock; peaclock"
-        ";Nextcloud;$hyprexec nextcloud"
-        ";Spotify;$hyprexec spotify"
-        ";Btop;btop"
-        ";Cava;cava"
-        ";Discord;$hyprexec discord"
-        ";Vlc;$hyprexec vlc"
-        ";Obsidian;$hyprexec obsidian"
-      )
-
-      # Apply default icons if empty:
-      for i in "''${!apps[@]}"; do
-        apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
-      done
-
-      fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
-      [[ -z $fzf_result ]] && exit 0
-      fzf_result=''${fzf_result/ /;}
-      line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
-      command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
-
-      exec "$command"
-      exit 0
-    }
-
-    ui
-  '';
-
-in { home.packages = [ tofi ]; }

home/system/batsignal/default.nix

@@ -0,0 +1,6 @@
+{
+  services.batsignal = {
+    enable = true;
+    extraArgs = [ "-c 10" "-w 30" "-f 97" ];
+  };
+}

home/system/clipman/default.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+let
+
+  clipboard-clear = pkgs.writeShellScriptBin "clipboard-clear" ''
+    clipman clear --all
+  '';
+
+  clipboard = pkgs.writeShellScriptBin "clipboard" ''
+    clipman pick --tool=wofi
+  '';
+
+in {
+  wayland.windowManager.hyprland.settings.exec-once =
+    [ "${clipboard-clear}" "wl-paste -t text --watch clipman store" ];
+  home.packages = with pkgs; [ clipman clipboard clipboard-clear ];
+  services.clipman.enable = true;
+
+}

home/system/dunst/default.nix

@@ -1,83 +0,0 @@
-{ config, pkgs, ... }: {
-
-  home.packages = with pkgs; [ libnotify ];
-
-  services.dunst = {
-    enable = true;
-    iconTheme = {
-      name = "Adwaita-Dark";
-      package = pkgs.gnome.adwaita-icon-theme;
-    };
-    settings = {
-      global = {
-        rounded = "yes";
-        origin = "top-center";
-        monitor = "0";
-        alignment = "center";
-        vertical_alignment = "center";
-        width = "400";
-        height = "400";
-        scale = 0;
-        gap_size = 0;
-        progress_bar = true;
-        transparency = 0;
-        text_icon_padding = 0;
-        separator_color = "frame";
-        sort = "yes";
-        idle_threshold = 120;
-        line_height = 0;
-        markup = "full";
-        show_age_threshold = 60;
-        ellipsize = "middle";
-        ignore_newline = "no";
-        stack_duplicates = true;
-        sticky_history = "yes";
-        history_length = 20;
-        always_run_script = true;
-        corner_radius = config.var.theme.rounding;
-        follow = "mouse";
-        font = config.var.theme.font;
-        format = "<b>%s</b>\\n%b";
-        progress_bar_corner_radius = config.var.theme.rounding - 10;
-        #format = ''
-        #  <span foreground='#${config.var.theme.colors.accent}'><b>%s %p</b></span>
-        #  %b'';
-        frame_color = "#" + config.var.theme.colors.bg;
-        highlight = "#" + config.var.theme.colors.accent;
-        foreground = "#" + config.var.theme.colors.fg;
-        frame_width = 1;
-        offset = "0x10";
-        horizontal_padding = 10;
-        icon_position = "left";
-        indicate_hidden = "yes";
-        min_icon_size = 0;
-        max_icon_size = 64;
-        mouse_left_click = "do_action, close_current";
-        mouse_middle_click = "close_current";
-        mouse_right_click = "close_all";
-        padding = 10;
-        plain_text = "no";
-        separator_height = 2;
-        show_indicators = "yes";
-        shrink = "no";
-        word_wrap = "yes";
-        browser = "${pkgs.qutebrowser}/bin/qutebrowser";
-      };
-
-      fullscreen_delay_everything = { fullscreen = "delay"; };
-
-      urgency_critical = {
-        background = "#" + config.var.theme.colors.c1;
-        foreground = "#" + config.var.theme.colors.c0;
-      };
-      urgency_low = {
-        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.var.theme.colors.fgalt;
-      };
-      urgency_normal = {
-        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.var.theme.colors.fgalt;
-      };
-    };
-  };
-}

home/system/gtk/default.nix

@@ -32,7 +32,34 @@
   home.file = {
     ".local/share/themes/FlatColor" = {
       recursive = true;
-      source = ./theme;
+      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 = ''

home/system/gtk/theme/gtk-2.0/gtkrc

@@ -1,771 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "include ../colors2"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = { 0, 0, 0, 0 }
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = { 1.0, 1.0 } # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }
-}
-
-style "murrine-wide" {
-	xthickness = 2
-	ythickness = 2
-}
-
-style "murrine-wider" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "murrine-thin" {
-	xthickness = 0
-	ythickness = 0
-}
-
-# Notebook
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-		border_shades = { 0.9, 0.9 }
-		trough_shades = { 0.97, 0.97 }
-		trough_border_shades = { 1.0, 1.0 }
-	}
-}
-
-style "murrine-overlay-scrollbar" {
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}
-
-style "murrine-scale" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {
-		roundness = 8
-		gradient_shades = { 1.08, 1.08, 1.08, 1.08 }
-		border_shades = { 1.0, 1.0 }
-		trough_shades = { 1.08, 1.08 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		roundness = 0
-		border_shades = { 1.2, 1.2 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-treeview" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-frame-title" {
-	fg[NORMAL] = lighter (@text_color)
-}
-
-style "murrine-tooltips" {
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}
-}
-
-style "murrine-spinbutton" = "murrine-button" {
-	engine "murrine" {
-	}
-}
-
-style "murrine-radiocheck" = "murrine-default" {
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}
-
-style "murrine-entry" = "murrine-wider" {
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {
-		border_shades = { 1.15, 1.15 }
-	}
-}
-
-style "metacity-frame" = "murrine-default" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "murrine-statusbar" { 
-  bg[NORMAL] = @bg_color
-}
-style "murrine-comboboxentry" = "murrine-entry" { }
-style "murrine-hscale" = "murrine-scale" { }
-style "murrine-vscale" = "murrine-scale" { }
-style "murrine-hscrollbar" = "murrine-scrollbar" { }
-style "murrine-vscrollbar" = "murrine-scrollbar" { }
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		textstyle = 0
-		border_shades = { 1.2, 1.2 }
-	}
-}
-
-style "murrine-separator-menu-item" = "murrine-thin" { }
-
-style "murrine-menubar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menubaritem" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-style "murrine-toolbutton" = "murrine-button" {
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-	}
-}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {
-	font_name = "Bold"
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "xfce-header" {
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}
-
-style "xfdesktop-windowlist" {
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}
-
-style "xfdesktop-icon-view" {
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {
-		textstyle = 5
-		text_shade = 0.05
-	}
-}
-
-style "xfwm-tabwin" {
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-		focusstyle = 0
-	}
-}
-
-style "xfsm-logout" {
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-	}
-}
-
-style "xfsm-logout-button" {
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {
-	}
-}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {
-	engine "murrine" {
-		roundness = 2
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame" {
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {
-	engine "murrine" {
-		toolbarstyle = 0
-	}
-}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {
-	engine "murrine" {
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-		highlight_shade = 1.0
-	}
-}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {
-	engine "murrine" {
-		textstyle = 0
-	}
-}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"

home/system/gtk/theme/gtk-2.0/gtkrc.base

@@ -1,797 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "bg_color:{color0}
-color0:{color0}
-color1:{color1}
-color2:{color2}
-color3:{color3}
-color4:{color4}
-color5:{color5}
-color6:{color6}
-color7:{color7}
-color8:{color8}
-color9:{color9}
-color10:{color10}
-color11:{color11}
-color12:{color12}
-color13:{color13}
-color14:{color14}
-color15:{color15}
-text_color:{color15}
-selected_bg_color:{active}
-selected_fg_color:{color15}
-tooltip_bg_color:{color0}
-tooltip_fg_color:{color15}
-titlebar_bg_color:{color0}
-titlebar_fg_color:{color15}
-menu_bg_color:{color0}
-menu_fg_color:{color15}
-link_color:{active}"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {{
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = {{ 0, 0, 0, 0 }}
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = {{ 1.0, 1.0 }} # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }} # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }}
-}}
-
-style "murrine-wide" {{
-	xthickness = 2
-	ythickness = 2
-}}
-
-style "murrine-wider" {{
-	xthickness = 3
-	ythickness = 3
-}}
-
-style "murrine-thin" {{
-	xthickness = 0
-	ythickness = 0
-}}
-
-# Notebook
-
-style "murrine-notebook-bg" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}}
-
-style "murrine-notebook" = "murrine-notebook-bg" {{
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {{
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {{
-	}}
-}}
-
-style "murrine-scrollbar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-		border_shades = {{ 0.9, 0.9 }}
-		trough_shades = {{ 0.97, 0.97 }}
-		trough_border_shades = {{ 1.0, 1.0 }}
-	}}
-}}
-
-style "murrine-overlay-scrollbar" {{
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}}
-
-style "murrine-scale" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {{
-		roundness = 8
-		gradient_shades = {{ 1.08, 1.08, 1.08, 1.08 }}
-		border_shades = {{ 1.0, 1.0 }}
-		trough_shades = {{ 1.08, 1.08 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-progressbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {{
-		roundness = 0
-		border_shades = {{ 1.2, 1.2 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-treeview-header" = "murrine-button" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-treeview" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-frame-title" {{
-	fg[NORMAL] = lighter (@text_color)
-}}
-
-style "murrine-tooltips" {{
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {{
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}}
-}}
-
-style "murrine-spinbutton" = "murrine-button" {{
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-radiocheck" = "murrine-default" {{
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}}
-
-style "murrine-entry" = "murrine-wider" {{
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {{
-		border_shades = {{ 1.15, 1.15 }}
-	}}
-}}
-
-style "metacity-frame" = "murrine-default" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "murrine-statusbar" {{ 
-  bg[NORMAL] = @bg_color
-}}
-style "murrine-comboboxentry" = "murrine-entry" {{ }}
-style "murrine-hscale" = "murrine-scale" {{ }}
-style "murrine-vscale" = "murrine-scale" {{ }}
-style "murrine-hscrollbar" = "murrine-scrollbar" {{ }}
-style "murrine-vscrollbar" = "murrine-scrollbar" {{ }}
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {{
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menu-item" = "murrine-wider" {{
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		textstyle = 0
-		border_shades = {{ 1.2, 1.2 }}
-	}}
-}}
-
-style "murrine-separator-menu-item" = "murrine-thin" {{ }}
-
-style "murrine-menubar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menubaritem" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-toolbutton" = "murrine-button" {{
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {{
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-	}}
-}}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {{
-	font_name = "Bold"
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "xfce-header" {{
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}}
-
-style "xfdesktop-windowlist" {{
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}}
-
-style "xfdesktop-icon-view" {{
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {{
-		textstyle = 5
-		text_shade = 0.05
-	}}
-}}
-
-style "xfwm-tabwin" {{
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-		focusstyle = 0
-	}}
-}}
-
-style "xfsm-logout" {{
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-	}}
-}}
-
-style "xfsm-logout-button" {{
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {{
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {{
-	engine "murrine" {{
-		roundness = 2
-		textstyle = 0
-	}}
-}}
-
-style "chrome-gtk-frame" {{
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {{
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {{
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {{
-	engine "murrine" {{
-		toolbarstyle = 0
-	}}
-}}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {{
-	engine "murrine" {{
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }}
-		highlight_shade = 1.0
-	}}
-}}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {{
-	engine "murrine" {{
-		textstyle = 0
-	}}
-}}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"