update

Former-commit-id: bbaf52b496

.gitignore

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

.sops.yaml

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

README.md

@@ -1,157 +1,67 @@
-<h1 align="center">
+[//]: # (Title: Nixy)  
-   <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
-   <br>
+[//]: # (Author: Hadi)  
-      Nixy
+[//]: # (Date: 06/17/24)
-   <br>
-      <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" /> <br>
-   <div align="center">
 
-   <div align="center">
+<div align="center">
-      <p></p>
+    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
-      <div align="center">
+</div>
-         <a href="https://github.com/anotherhadi/nixy/stargazers">
-            <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
-         </a>
-         <a href="https://github.com/anotherhadi/nixy/">
-            <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
-         </a>
-         <a href="https://nixos.org">
-            <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
-         </a>
-         <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-            <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
-         </a>
-      </div>
-      <br>
-   </div>
-</h1>
 
-Hello there! This is my **NixOs (w/home-manager) dotfiles** repo. It's still a *work in progress*, and I'm still learning how to use nix.
+<br><br>
+
+<div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
+    </a>
+    <a href="https://nixos.org">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
+    </a>
+</div>
+
+<br><br>
+
+<div align="center">
+    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
+</div>
+
+# Nixy
+
+**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+It's a simple way to manage your system configuration and dotfiles.
+
+## Table of Content
+
+- [Nixy](#nixy)
+  - [Table of Content](#table-of-content)
+  - [Gallery](#gallery)
+  - [Architecture](#architecture)
+  - [Installation](#installation)
+  - [Documentation](#documentation)
 
 ## Gallery
 
-![neofetch](https://image.nostr.build/c208c164ae04e4c58e01adb9fab584b163a565155865833851275f89c9270b7a.jpg)
+![nixy1](docs/src/nixy/1.png)
-![qutebrowser](https://image.nostr.build/8cc32d981e6be256bdc37a2571c31bb76d7c3335ce7c76fa6eca89a03019bfc9.jpg)
+![nixy2](docs/src/nixy/2.png)
-![spotify](https://image.nostr.build/76b18bcbcdf1d911a2dbdff7bfac6652044d45602a3dce9d9c53feb295d13245.jpg)
+![nixy3](docs/src/nixy/3.png)
-![wofi](https://image.nostr.build/90d69ffe6251c17e25b0fb44abadaeb0dfe6db8210d935fca14bf8b00be49fa6.jpg)
 
-## Apps
+## Architecture
 
-<details>
+- 🏠 `home` are the dotfiles and configuration files for the user
-<summary>Click to expand</summary>
+- 💻 `hosts` are the system configuration files
-
+  - `laptop` is mine
-| Category       | Software      |
+  - `guest` is a template that you can copy and modify for your own system
-|----------------|---------------|
+  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
-| WM             | Hyprland      |
+  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
-|                | hyprlock      |
+- 🤫 `secrets` are the secrets files encrypted with sops
-|                | hyprpaper     |
-|                | hypridle      |
-|                | wlogout       |
-| Bar            | waybar        |
-| Terminal       | kitty         |
-| Shell          | zsh           |
-|                | tmux          |
-|                | starship      |
-|                | bat           |
-|                | eza           |
-|                | zoxide        |
-|                | fzf           |
-| Editor         | nixvim        |
-| File manager   | lf            |
-|                | thunar        |
-| Browser        | qutebrowser   |
-| Music          | spicetify     |
-| Notifications  | dunst         |
-| Launcher       | wofi          |
-| DM             | tuigreet      |
-| Secrets        | sops-nix      |
-| Misc           | lazygit       |
-|                | neofetch      |
-|                | cava          |
-|                | ...           |
-
-</details>
-
-## Themes & Colors
-
-Themes and colors are managed by the `home/themes` folder. You can copy the default `nixy.nix` theme and make your own.
-
-To apply the theme to duckduckgo, follow the instructions in `$HOME/.config/duckduckgo-colorscheme.js`.
-
-## Scripts
-
-### Nix/NixOs shortcuts
-
-<details>
-<summary>Click to expand</summary>
-
-- `nixy-edit`
-- `nixy-rebuild`
-- `nixy-update`
-- `nixy-gc` # garbage collection
-- `nixy-cb` # clean boot menu
-
-</details>
-
-### Brightness control
-
-<details>
-<summary>Click to expand</summary>
-
-- `brightness-up`
-- `brightness-down`
-- `brightness-change <up/down> <increment>`
-
-</details>
-
-### Sound control
-
-<details>
-<summary>Click to expand</summary>
-
-- `sound-up`
-- `sound-down`
-- `sound-toggle`
-- `sound-output`
-- `sound-change <up/down/mute> <increment>`
-
-</details>
-
-### Caffeine
-
-<details>
-<summary>Click to expand</summary>
-
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
-- `caffeine` # Toggle caffeine
-- `caffeine-status` # Return active/inactive
-
-</details>
-
-### Night-Shift
-
-<details>
-<summary>Click to expand</summary>
-
-Blue light filter, using wlsunset
-
-- `night-shift-on`
-- `night-shift-off`
-
-</details>
-
-### Nerdfont FZF
-
-<details>
-<summary>Click to expand</summary>
-
-Nerdfont fzf is a quick way to search for nerdfont icons locally.
-It will copy the selected icon to the clipboard.
-
-- `nerdfont-fzf`
-
-</details>
 
 ## Installation
 
@@ -159,11 +69,19 @@ It will copy the selected icon to the clipboard.
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Change the `variables.nix` file to match your configuration
+- Change the username in the flake.nix file
-- Remove the hardware module in flake.nix line 30
+- import the guest configuration instead of the `hosts/laptop` one
-- Change the `nixos/configuration.nix` file to match your system
+- import your hardware-configuration.nix into the `hosts/guest` folder
-- Copy your `hardware-configuration.nix` file to the `nixos` folder
 
 ```sh
 sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
 ```
+
+## Documentation
+
+- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [APPS.md](docs/APPS.md): Which apps are installed
+- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License

docs/APPS.md

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

docs/CONTRIBUTING.md

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

docs/SCRIPTS.md

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

docs/THEMES.md

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

docs/TODO.md

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

docs/scripts/compress_src_png.sh

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

docs/scripts/create_guest_config.sh

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

docs/scripts/create_readme.sh

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

docs/scripts/install.sh

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

docs/scripts/take_rice_screenshot.sh

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

docs/src/README_template.md

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

docs/src/header.md

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

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

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

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

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

flake.lock

@@ -11,11 +11,11 @@
         "sf-pro": "sf-pro"
       },
       "locked": {
-        "lastModified": 1705496891,
+        "lastModified": 1718062482,
-        "narHash": "sha256-lLX87aJ9oUT3u0Iaf60xKIJ2RQNt3v4Ne2cvSWyaS7U=",
+        "narHash": "sha256-bGWs6XRVgzm1Uagx/EAnz9wnMQVImR1ZlVpAy+SDXCw=",
         "owner": "Lyndeno",
         "repo": "apple-fonts.nix",
-        "rev": "e6ffbc887752ba0fe035fbcc8b282555804dd3f6",
+        "rev": "eeb3521706bfe21206b1301ff8e0876defa1b6dd",
         "type": "github"
       },
       "original": {
@@ -33,11 +33,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713532798,
+        "lastModified": 1717408969,
-        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
+        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
+        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714641030,
+        "lastModified": 1717285511,
-        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
         "type": "github"
       },
       "original": {
@@ -97,31 +97,16 @@
         "type": "github"
       }
     },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1713493429,
-        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1710146030,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -152,24 +137,6 @@
       "inputs": {
         "systems": "systems_4"
       },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_7"
-      },
       "locked": {
         "lastModified": 1685518550,
         "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@@ -184,11 +151,38 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717664902,
+        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
           "nixvim",
-          "pre-commit-hooks",
+          "git-hooks",
           "nixpkgs"
         ]
       },
@@ -213,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715077503,
+        "lastModified": 1718243258,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
         "type": "github"
       },
       "original": {
@@ -234,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715077503,
+        "lastModified": 1718141734,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad",
         "type": "github"
       },
       "original": {
@@ -263,11 +257,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713612213,
+        "lastModified": 1717181720,
-        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
+        "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
+        "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
         "type": "github"
       },
       "original": {
@@ -280,17 +274,18 @@
       "inputs": {
         "hyprcursor": "hyprcursor",
         "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs_2",
         "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1715203037,
+        "lastModified": 1718359900,
-        "narHash": "sha256-yWsrCPhBpin7AXVI66/EAE+YPJTweS8CDCZJQliB10k=",
+        "narHash": "sha256-eVf70Ps7O8R3DEEfSMW54V07kxkRv5IaWMxSa77hMu4=",
         "ref": "refs/heads/main",
-        "rev": "e4e84064f2d07810e0c150bce1369a0a00503e9a",
+        "rev": "b2590b58c51094424a9651d8df37dfab838b5bbb",
-        "revCount": 4638,
+        "revCount": 4824,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -315,11 +310,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714869498,
+        "lastModified": 1691753796,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
         "type": "github"
       },
       "original": {
@@ -329,6 +324,35 @@
       }
     },
     "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717881852,
+        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
@@ -340,38 +364,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1717881334,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
         "owner": "hyprwm",
-        "repo": "hyprlang",
+        "repo": "hyprutils",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprlang",
+        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprlang_2": {
-      "inputs": {
-        "nixpkgs": [
-          "rose-pine-hyprcursor",
-          "nixpkgs"
-        ],
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
         "type": "github"
       }
     },
@@ -387,11 +389,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715090986,
+        "lastModified": 1717784906,
-        "narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=",
+        "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b",
+        "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
         "type": "github"
       },
       "original": {
@@ -408,11 +410,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713946171,
+        "lastModified": 1717976995,
-        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
+        "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
+        "rev": "315aa649ba307704db0b16c92f097a08a65ec955",
         "type": "github"
       },
       "original": {
@@ -423,11 +425,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1715148395,
+        "lastModified": 1718349360,
-        "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
+        "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
+        "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6",
         "type": "github"
       },
       "original": {
@@ -439,11 +441,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696375444,
+        "lastModified": 1717786204,
-        "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
+        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "81e8f48ebdecf07aab321182011b067aafc78896",
+        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
         "type": "github"
       },
       "original": {
@@ -455,11 +457,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1714858427,
+        "lastModified": 1717880976,
-        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
+        "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
+        "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
         "type": "github"
       },
       "original": {
@@ -471,11 +473,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1714253743,
+        "lastModified": 1717974879,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
         "type": "github"
       },
       "original": {
@@ -487,11 +489,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1715087517,
+        "lastModified": 1718160348,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
+        "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
         "type": "github"
       },
       "original": {
@@ -502,22 +504,6 @@
       }
     },
     "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1710272261,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
       "locked": {
         "lastModified": 1686020360,
         "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
@@ -538,21 +524,20 @@
         "devshell": "devshell",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
-        "flake-root": "flake-root",
+        "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks": "pre-commit-hooks",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1715115147,
+        "lastModified": 1718358971,
-        "narHash": "sha256-oREqXPEtuYbOdBKbsDQzr2V01EzK4kD8MTdwO9ljTnU=",
+        "narHash": "sha256-8REGUp3RB2/3Q3Ibu00onhj1HyLh/Z8oRU6D3/EQ08w=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "f7f255afe22fcca0c07177c3707fd61fa0c85835",
+        "rev": "e51b8b9b5c91aa49981d78c4aa1ac08a50150103",
         "type": "github"
       },
       "original": {
@@ -561,10 +546,39 @@
         "type": "github"
       }
     },
+    "nur": {
+      "locked": {
+        "lastModified": 1718354773,
+        "narHash": "sha256-p0pjm5l6LOYoEzSMLZv0QSE4vgGwfhkCz7VN58IUjzc=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "2fe75ecfd4dd1d2063fcc31ccb5db6d9f2b6b33c",
+        "type": "github"
+      },
+      "original": {
+        "id": "nur",
+        "type": "indirect"
+      }
+    },
+    "nurpkgs": {
+      "locked": {
+        "lastModified": 1718354773,
+        "narHash": "sha256-p0pjm5l6LOYoEzSMLZv0QSE4vgGwfhkCz7VN58IUjzc=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "2fe75ecfd4dd1d2063fcc31ccb5db6d9f2b6b33c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "ny": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-phACDdjI8RX6yD77PSmFcsriagt+2UuySD7+WEzdzGo=",
+        "narHash": "sha256-FkV8Z2fdUTwvcKeltFJVCisvAarcdnmlj/33exdyxnQ=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
       },
@@ -573,34 +587,6 @@
         "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1714478972,
-        "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "2849da033884f54822af194400f8dff435ada242",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "apple-fonts": "apple-fonts",
@@ -609,35 +595,16 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
-        "rose-pine-hyprcursor": "rose-pine-hyprcursor",
+        "nur": "nur",
+        "nurpkgs": "nurpkgs",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix"
       }
     },
-    "rose-pine-hyprcursor": {
-      "inputs": {
-        "hyprlang": "hyprlang_2",
-        "nixpkgs": "nixpkgs_4",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1711302328,
-        "narHash": "sha256-wLuFLI6S5DOretqJN05+kvrs8cbnZKfVLXrJ4hvI/Tg=",
-        "owner": "ndom91",
-        "repo": "rose-pine-hyprcursor",
-        "rev": "7e0473876f0e6d2308813a78fe84a6c6430b112b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ndom91",
-        "repo": "rose-pine-hyprcursor",
-        "type": "github"
-      }
-    },
     "sf-arabic": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-CPewXMGI78xHsjdRU8ZJIBSYjh5UY6UW21ihE4B+Bkk=",
+        "narHash": "sha256-u+Q2Hd+JCiKhIQtbQqawg1lIEgGhjmdGye2cNdWlBG0=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
       },
@@ -649,7 +616,7 @@
     "sf-compact": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-nJkPlddKF2dIwj+6jiVvS60hDcGAMasEOWemUwBS2mQ=",
+        "narHash": "sha256-9kXXWmu2zg0LSE7SihItXmBltLvNwyG1Ba6QehvMh04=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
       },
@@ -661,7 +628,7 @@
     "sf-mono": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-KT1RXz3NcWPetyxVlgMfh/dsoznpI3lMnplz6V7PCUU=",
+        "narHash": "sha256-BVmYmgqq79ezgyqNClyHkj2L4N3/PRisPm8YFBQZQ98=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
       },
@@ -673,7 +640,7 @@
     "sf-pro": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-cn8ae2UddF8Pru6i3fSG2Wki5sf1DmWKD2FmKMsoeAA=",
+        "narHash": "sha256-yQhtaEPTuYOIOaC6eSPdka/Jv5Ydw3Mnd8Prlcgjs90=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
       },
@@ -690,11 +657,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1715244550,
+        "lastModified": 1718137936,
-        "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=",
+        "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f",
+        "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
         "type": "github"
       },
       "original": {
@@ -705,8 +672,8 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1704167711,
@@ -782,51 +749,6 @@
         "type": "github"
       }
     },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_7": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -835,11 +757,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714058656,
+        "lastModified": 1718139168,
-        "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
+        "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
+        "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1",
         "type": "github"
       },
       "original": {
@@ -848,24 +770,6 @@
         "type": "github"
       }
     },
-    "utils": {
-      "inputs": {
-        "systems": "systems_6"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
@@ -883,11 +787,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714060055,
+        "lastModified": 1717918856,
-        "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
+        "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
+        "rev": "72907822c19afc0983c69d59d299204381623725",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,5 +1,9 @@
 {
-  description = "Nixy - Hadi's NixOS configuration";
+  # https://github.com/anotherhadi/nixy
+  description = ''
+    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+    It's a simple way to manage your system configuration and dotfiles.
+  '';
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -17,38 +21,33 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
+    nurpkgs.url = "github:nix-community/NUR";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix
+  outputs = inputs@{ nixpkgs, nur, ... }: {
-    , nixos-hardware, ... }: {
+    nixosConfigurations = {
-      nixosConfigurations = {
+
-        nixy = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        system = "x86_64-linux";
-          modules = [
+        modules = [
-            nixos-hardware.nixosModules.omen-16-n0005ne # REMOVE
+          ./hosts/laptop/configuration.nix
-            ./nixos/configuration.nix
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
-            ./nixos/fonts.nix
+          inputs.home-manager.nixosModules.home-manager
-            ./nixos/tuigreet.nix
+          {
-            { _module.args = { inherit inputs; }; }
+            nixpkgs.overlays = [ nur.overlay ];
-            home-manager.nixosModules.home-manager
+            _module.args = { inherit inputs; };
-            {
+            home-manager = {
-              home-manager = {
+              useGlobalPkgs = true;
-                useGlobalPkgs = true;
+              useUserPackages = true;
-                useUserPackages = true;
+              users."hadi" = import ./home/laptop.nix; # CHANGE ME
-                users."hadi" = import ./home/home.nix;
+              extraSpecialArgs = { inherit inputs; };
-                extraSpecialArgs = {
+            };
-                  inherit inputs;
+          }
-                  inherit spicetify-nix;
+        ];
-                  inherit sops-nix;
-                  inherit hyprland;
-                };
-              };
-            }
-          ];
-        };
       };
+
     };
+  };
 }

home/apps/default.nix

@@ -1,14 +0,0 @@
-{
-  imports = [
-    ./kitty
-    ./lf
-    ./neofetch
-    ./nvim
-    ./qutebrowser
-    ./spicetify
-    ./wofi
-    ./cava
-    ./tmux
-    ./lazygit
-  ];
-}

home/apps/kitty/default.nix

@@ -1,50 +0,0 @@
-{ config, pkgs, ... }: {
-
-  programs.kitty = {
-    enable = true;
-    settings = {
-
-      scrollback_lines = 10000;
-      enable_audio_bell = false;
-      update_check_interval = 0;
-      font_family = config.theme.font-mono;
-      font_size = 13;
-      cursor_shape = "Underline";
-      cursor_underline_thickness = 1;
-      window_padding_width = 10;
-      url_style = "curly";
-      confirm_os_window_close = "0";
-      remember_window_size = "no";
-      disable_ligatures = "never";
-      shell = "${pkgs.tmux}/bin/tmux";
-      initial_window_width = 1200;
-      initial_window_height = 600;
-
-      background = "#" + config.theme.colors.bg;
-      url_color = "#" + config.theme.colors.primary-fg;
-
-      color0 = "#" + config.theme.colors.color0;
-      color8 = "#" + config.theme.colors.color8;
-      color1 = "#" + config.theme.colors.color1;
-      color9 = "#" + config.theme.colors.color9;
-      color2 = "#" + config.theme.colors.color2;
-      color10 = "#" + config.theme.colors.color10;
-      color3 = "#" + config.theme.colors.color3;
-      color11 = "#" + config.theme.colors.color11;
-      color4 = "#" + config.theme.colors.color4;
-      color12 = "#" + config.theme.colors.color12;
-      color5 = "#" + config.theme.colors.color5;
-      color13 = "#" + config.theme.colors.color13;
-      color6 = "#" + config.theme.colors.color6;
-      color14 = "#" + config.theme.colors.color14;
-      color7 = "#" + config.theme.colors.color7;
-      color15 = "#" + config.theme.colors.color15;
-
-      cursor = "#" + config.theme.colors.fg;
-      cursor_text_color = "#" + config.theme.colors.bg;
-
-      selection_foreground = "#" + config.theme.colors.primary-fg;
-      selection_background = "#" + config.theme.colors.primary-bg;
-    };
-  };
-}

home/apps/nvim/default.nix

@@ -1,37 +0,0 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./auto-pairs.nix
-    ./options.nix
-    ./bufferline.nix
-    ./lazygit.nix
-    ./telescope.nix
-    ./nvim-tree.nix
-    ./lightline.nix
-    ./git.nix
-    ./cmp.nix
-    ./none-ls.nix
-    ./wilder.nix
-    ./lsp.nix
-    ./treesitter.nix
-    ./toggleterm.nix
-    ./copilot.nix
-    ./obsidian.nix
-    ./whichkey.nix
-    ./alpha.nix
-    ./keymaps.nix
-    ./comment.nix
-    ./oil.nix
-    ./trouble.nix
-    ./tmux-navigator.nix
-  ];
-
-  programs.nixvim = {
-    enable = true;
-    colorschemes.catppuccin = {
-      enable = true;
-      settings = { transparent_background = true; };
-    };
-  };
-
-}

home/apps/spicetify/default.nix

@@ -1,40 +0,0 @@
-{ pkgs, config, lib, spicetify-nix, ... }:
-let spicePkgs = spicetify-nix.packages.${pkgs.system}.default;
-in {
-
-  imports = [ spicetify-nix.homeManagerModules.default ];
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [ "spotify" ];
-  programs.spicetify = {
-    enable = true;
-    theme = spicePkgs.themes.text;
-    colorScheme = "custom";
-
-    customColorScheme = {
-      text = "${config.theme.colors.fg}";
-      subtext = "${config.theme.colors.alt-fg}";
-      sidebar-text = "${config.theme.colors.alt-fg}";
-      main = "${config.theme.colors.bg}";
-      sidebar = "${config.theme.colors.bg}";
-      background = "${config.theme.colors.bg}";
-      player = "${config.theme.colors.bg}";
-      card = "${config.theme.colors.bg}";
-      shadow = "000000";
-      selected-row = "${config.theme.colors.alt-bg}";
-      button = "${config.theme.colors.primary-bg}";
-      button-active = "${config.theme.colors.primary-bg}";
-      button-disabled = "${config.theme.colors.alt-bg}";
-      tab-active = "${config.theme.colors.primary-bg}";
-      misc = "${config.theme.colors.alt-fg}";
-    };
-
-    enabledExtensions = with spicePkgs.extensions; [
-      playlistIcons
-      lastfm
-      historyShortcut
-      hidePodcasts
-      fullAppDisplay
-      shuffle
-    ];
-  };
-}

home/home.nix

@@ -1,61 +0,0 @@
-{ pkgs, ... }:
-let variable = import ../variables.nix;
-in {
-
-  imports = [ ./themes ./system ./scripts ./apps ];
-
-  home = {
-    username = variable.username;
-    homeDirectory = variable.homeDirectory;
-
-    packages = with pkgs; [
-      swappy
-      imv
-      discord
-      obsidian
-      btop
-      xfce.thunar
-      bitwarden
-      vlc
-
-      # Dev
-      go
-      cargo
-      nodejs
-      python3
-      jq
-
-      # Utils
-      sops # Secrets
-      age # Secrets
-      fd
-      bc
-      gcc
-      blueman
-      zip
-      unzip
-      xdg_utils
-      tldr
-      wget
-      curl
-      ripgrep
-      neovide
-      wf-recorder
-      tree # temp
-
-      # Just cool
-      peaclock
-      cbonsai
-      pipes
-      cmatrix
-
-      # Backup
-      vscode
-      firefox
-      tor-browser
-    ];
-
-    stateVersion = variable.stateVersion;
-  };
-  programs.home-manager.enable = true;
-}

home/laptop.nix

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

home/programs/btop/default.nix

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

home/programs/cava/default.nix

@@ -5,8 +5,8 @@
       general.framerate = 60;
       smoothing.noise_reduction = 88;
       color = {
-        background = "'#${config.theme.colors.bg}'";
+        background = "'#${config.var.theme.colors.bg}'";
-        foreground = "'#${config.theme.colors.primary-bg}'";
+        foreground = "'#${config.var.theme.colors.accent}'";
       };
     };
   };

home/programs/kitty/default.nix

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

home/programs/nvim/colorscheme.nix

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

home/programs/nvim/default.nix

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

home/programs/nvim/plugins/alpha.nix

@@ -1,9 +1,9 @@
 { config, ... }: {
 
   programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = "#${config.theme.colors.primary-bg}";
+    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
-    AlphaTextColor.fg = "#${config.theme.colors.fg}";
+    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
-    AlphaShortcutColor.fg = "#${config.theme.colors.alt-fg}";
+    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
   };
 
   programs.nixvim.plugins.alpha = {
@@ -70,7 +70,8 @@
           {
             type = "button";
             val = "  NixOs Config";
-            on_press.__raw = "function() vim.cmd[[e ~/.config/nixos]] end";
+            on_press.__raw =
+              "function() vim.cmd[[e ${config.var.configDirectory}]] end";
             opts = {
               shortcut = "nc";
               position = "center";

home/programs/nvim/plugins/noice.nix

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

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

@@ -12,6 +12,8 @@
         nixfmt.enable = true;
         markdownlint.enable = true;
         tidy.enable = true;
+        shellharden.enable = true;
+        shfmt.enable = true;
       };
     };
   };

home/programs/nvim/plugins/obsidian.nix

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

home/programs/qutebrowser/default.nix

@@ -1,6 +1,6 @@
 { config, ... }: {
 
-  imports = [ ./duckduckgo-colorscheme.nix ./homepage/default.nix ];
+  imports = [ ./duckduckgo-colorscheme.nix ./homepage ];
 
   programs.qutebrowser = {
     enable = true;
@@ -18,7 +18,8 @@
     };
 
     quickmarks = {
-      home = "${config.home.homeDirectory}/.config/startpage/index.html";
+      home = "${config.var.homeDirectory}/.config/startpage/index.html";
+      server = "${config.var.homeDirectory}/.config/serverpage/index.html";
       mynixos = "https://mynixos.com";
       github = "https://github.com";
       outlook = "https://outlook.office.com/mail/";
@@ -38,92 +39,92 @@
     settings = {
       url = {
         default_page =
-          "${config.home.homeDirectory}/.config/startpage/index.html";
+          "${config.var.homeDirectory}/.config/startpage/index.html";
         start_pages =
-          [ "${config.home.homeDirectory}/.config/startpage/index.html" ];
+          [ "${config.var.homeDirectory}/.config/startpage/index.html" ];
       };
 
       colors = {
         tabs = {
-          odd.bg = "#${config.theme.colors.bg}";
+          odd.bg = "#${config.var.theme.colors.bg}";
-          odd.fg = "#${config.theme.colors.fg}";
+          odd.fg = "#${config.var.theme.colors.fg}";
-          even.bg = "#${config.theme.colors.bg}";
+          even.bg = "#${config.var.theme.colors.bg}";
-          even.fg = "#${config.theme.colors.fg}";
+          even.fg = "#${config.var.theme.colors.fg}";
           selected = {
             odd = {
-              bg = "#${config.theme.colors.primary-bg}";
+              bg = "#${config.var.theme.colors.accent}";
-              fg = "#${config.theme.colors.primary-fg}";
+              fg = "#${config.var.theme.colors.accentFg}";
             };
             even = {
-              bg = "#${config.theme.colors.primary-bg}";
+              bg = "#${config.var.theme.colors.accent}";
-              fg = "#${config.theme.colors.primary-fg}";
+              fg = "#${config.var.theme.colors.accentFg}";
             };
           };
           indicator = {
-            error = "#${config.theme.colors.color1}";
+            error = "#${config.var.theme.colors.c1}";
-            start = "#${config.theme.colors.alt-bg}";
+            start = "#${config.var.theme.colors.bgalt}";
-            stop = "#${config.theme.colors.alt-bg}";
+            stop = "#${config.var.theme.colors.bgalt}";
           };
         };
 
         hints = {
-          bg = "#${config.theme.colors.alt-bg}";
+          bg = "#${config.var.theme.colors.bgalt}";
-          fg = "#${config.theme.colors.alt-fg}";
+          fg = "#${config.var.theme.colors.fgalt}";
-          match.fg = "#${config.theme.colors.bg}";
+          match.fg = "#${config.var.theme.colors.bg}";
         };
 
         completion = {
           category = {
-            bg = "#${config.theme.colors.bg}";
+            bg = "#${config.var.theme.colors.bg}";
-            fg = "#${config.theme.colors.fg}";
+            fg = "#${config.var.theme.colors.fg}";
             border = {
-              top = "#${config.theme.colors.bg}";
+              top = "#${config.var.theme.colors.bg}";
-              bottom = "#${config.theme.colors.bg}";
+              bottom = "#${config.var.theme.colors.bg}";
             };
           };
 
-          odd.bg = "#${config.theme.colors.bg}";
+          odd.bg = "#${config.var.theme.colors.bg}";
-          even.bg = "#${config.theme.colors.bg}";
+          even.bg = "#${config.var.theme.colors.bg}";
 
           fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
 
-          match.fg = "#${config.theme.colors.primary-bg}";
+          match.fg = "#${config.var.theme.colors.accent}";
 
           item.selected = {
-            bg = "#${config.theme.colors.primary-bg}";
+            bg = "#${config.var.theme.colors.accent}";
-            border.top = "#${config.theme.colors.primary-bg}";
+            border.top = "#${config.var.theme.colors.accent}";
-            border.bottom = "#${config.theme.colors.primary-bg}";
+            border.bottom = "#${config.var.theme.colors.accent}";
-            fg = "#${config.theme.colors.primary-fg}";
+            fg = "#${config.var.theme.colors.accentFg}";
-            match.fg = "#${config.theme.colors.primary-fg}";
+            match.fg = "#${config.var.theme.colors.accentFg}";
           };
         };
 
         statusbar = {
-          normal.bg = "#${config.theme.colors.bg}";
+          normal.bg = "#${config.var.theme.colors.bg}";
-          normal.fg = "#${config.theme.colors.fg}";
+          normal.fg = "#${config.var.theme.colors.fg}";
-          private.bg = "#${config.theme.colors.bg}";
+          private.bg = "#${config.var.theme.colors.bg}";
-          private.fg = "#${config.theme.colors.fg}";
+          private.fg = "#${config.var.theme.colors.fg}";
-          insert.bg = "#${config.theme.colors.primary-bg}";
+          insert.bg = "#${config.var.theme.colors.accent}";
-          insert.fg = "#${config.theme.colors.primary-fg}";
+          insert.fg = "#${config.var.theme.colors.accentFg}";
           command = {
-            bg = "#${config.theme.colors.alt-bg}";
+            bg = "#${config.var.theme.colors.bgalt}";
-            fg = "#${config.theme.colors.alt-fg}";
+            fg = "#${config.var.theme.colors.fgalt}";
-            private.bg = "#${config.theme.colors.alt-bg}";
+            private.bg = "#${config.var.theme.colors.bgalt}";
-            private.fg = "#${config.theme.colors.alt-fg}";
+            private.fg = "#${config.var.theme.colors.fgalt}";
           };
         };
 
         messages = {
           info = {
-            bg = "#${config.theme.colors.alt-bg}";
+            bg = "#${config.var.theme.colors.bgalt}";
-            fg = "#${config.theme.colors.alt-fg}";
+            fg = "#${config.var.theme.colors.fgalt}";
-            border = "#${config.theme.colors.alt-bg}";
+            border = "#${config.var.theme.colors.bgalt}";
           };
 
           error = {
-            bg = "#${config.theme.colors.color1}";
+            bg = "#${config.var.theme.colors.c1}";
-            fg = "#${config.theme.colors.alt-fg}";
+            fg = "#${config.var.theme.colors.fgalt}";
-            border = "#${config.theme.colors.color1}";
+            border = "#${config.var.theme.colors.c1}";
           };
         };
 
@@ -132,7 +133,7 @@
           "dark"; # Enable dark mode for websites that support it
       };
 
-      fonts = { default_family = "${config.theme.font}"; };
+      fonts = { default_family = "${config.var.theme.font}"; };
 
       completion = {
         height = "30%";
@@ -183,7 +184,8 @@
 
     keyBindings = {
       normal = {
-        "gh" = "open ${config.home.homeDirectory}/.config/startpage/index.html";
+        "gh" = "open ${config.var.homeDirectory}/.config/startpage/index.html";
+        "gs" = "open ${config.var.homeDirectory}/.config/serverpage/index.html";
 
         " p" = "tab-move -";
         " n" = "tab-move +";

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -1,10 +1,9 @@
 { config, ... }: {
-
+  home.file.".duckduckgo-colorscheme.js".text = ''
-  xdg.configFile."duckduckgo-colorscheme.js".text = ''
     // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
     // based on https://ddg.codingcodax.dev/
     // Cookies string for your theme
-    const cookie = '7=${config.theme.colors.bg}; j=${config.theme.colors.bg}; 9=${config.theme.colors.fg}; aa=${config.theme.colors.alt-fg}; 8=${config.theme.colors.color7}; x=${config.theme.colors.primary-bg}; 21=${config.theme.colors.alt-bg};';
+    const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};';
 
     // Converts cookie string into formatted JSON
     const cookieToJSON = (cookieRaw) => {

home/programs/qutebrowser/homepage/default.nix

@@ -40,7 +40,7 @@ in {
         p {
           margin: 0;
           padding: 0;
-          font-family: '${config.theme.font}', sans-serif;
+          font-family: '${config.var.theme.font}', sans-serif;
         }
 
         .w-screen {
@@ -175,14 +175,14 @@ in {
         </style>
     </head>
 
-    <body class="w-screen" style="background-color: #${config.theme.colors.bg}; color: #${config.theme.colors.fg};">
+    <body class="w-screen" style="background-color: #${config.var.theme.colors.bg}; color: #${config.var.theme.colors.fg};">
       <div class="max-w-7xl mx-auto p-10">
         <div class="w-full flex justify-between" id="date-time">
           <p class="text-xl"></p>
           <p class="text-xl"></p>
         </div>
         <div class="w-full py-12 px-2" id="greeting">
-          <h1 class="text-5xl font-bold mb-4" style="color: #${config.theme.colors.primary-bg};"></h1>
+          <h1 class="text-5xl font-bold mb-4" style="color: #${config.var.theme.colors.accent};"></h1>
         </div>
         <div id="link-list" class="flex gap-5 flex-col justify-start items-start"></div>
       </div>
@@ -232,7 +232,7 @@ in {
               const url = document.createElement('p');
               url.textContent = link.url;
               url.className = 'text-sm';
-              url.style = "color: #${config.theme.colors.alt-fg};"
+              url.style = "color: #${config.var.theme.colors.fgalt};"
 
               divNameUrl.appendChild(name);
               divNameUrl.appendChild(url);

home/programs/spicetify/default.nix

@@ -0,0 +1,40 @@
+{ pkgs, config, lib, inputs, ... }:
+let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
+in {
+
+  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "spotify" ];
+  programs.spicetify = {
+    enable = true;
+    theme = spicePkgs.themes.text;
+    colorScheme = "custom";
+
+    customColorScheme = {
+      text = "${config.var.theme.colors.fg}";
+      subtext = "${config.var.theme.colors.fgalt}";
+      sidebar-text = "${config.var.theme.colors.fgalt}";
+      main = "${config.var.theme.colors.bg}";
+      sidebar = "${config.var.theme.colors.bg}";
+      background = "${config.var.theme.colors.bg}";
+      player = "${config.var.theme.colors.bg}";
+      card = "${config.var.theme.colors.bg}";
+      shadow = "000000";
+      selected-row = "${config.var.theme.colors.bgalt}";
+      button = "${config.var.theme.colors.accent}";
+      button-active = "${config.var.theme.colors.accent}";
+      button-disabled = "${config.var.theme.colors.bgalt}";
+      tab-active = "${config.var.theme.colors.accent}";
+      misc = "${config.var.theme.colors.fgalt}";
+    };
+
+    enabledExtensions = with spicePkgs.extensions; [
+      playlistIcons
+      lastfm
+      historyShortcut
+      hidePodcasts
+      fullAppDisplay
+      shuffle
+    ];
+  };
+}

home/scripts/brightness/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 let
   increments = "5";

home/scripts/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./nixy
-    ./nerdfetch
     ./sounds
     ./brightness
     ./caffeine
@@ -10,8 +9,7 @@
     ./startup
     ./nerdfont_fzf
     ./system
-    ./zip
+    ./compress
-
+    ./misc
-    ./misc.nix
   ];
 }

home/scripts/nixy/default.nix

@@ -1,26 +1,20 @@
 { pkgs, config, ... }:
 
 let
-  homedir = config.home.homeDirectory;
-
   nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" ''
-    sudo nixos-rebuild switch --flake ${homedir}/.config/nixos#nixy
+    sudo nixos-rebuild switch --flake ${config.var.configDirectory}#nixy
-  '';
-
-  nixy-edit = pkgs.writeShellScriptBin "nixy-edit" ''
-    $EDITOR ${homedir}/.config/nixos/
   '';
 
   nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" ''
-    sudo nixos-rebuild switch --upgrade --flake ${homedir}/.config/nixos#nixy
+    sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#nixy
   '';
 
   nixy-update = pkgs.writeShellScriptBin "nixy-update" ''
-    cd ${homedir}/.config/nixos && sudo nix flake update
+    cd ${config.var.configDirectory} && sudo nix flake update
   '';
 
   nixy-gc = pkgs.writeShellScriptBin "nixy-gc" ''
-    cd ${homedir}/.config/nixos && sudo nix-collect-garbage -d
+    cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
   '';
 
   nixy-cb = pkgs.writeShellScriptBin "nixy-cb" ''
@@ -30,7 +24,6 @@ let
 in {
   home.packages = with pkgs; [
     nixy-rebuild
-    nixy-edit
     nixy-upgrade
     nixy-update
     nixy-gc

home/scripts/screenshot/default.nix

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

home/scripts/startup/default.nix

@@ -1,14 +1,13 @@
 # File runned at startup by Hyprland
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 let
-  variable = import ../../../variables.nix;
-
   nextcloud-watch = pkgs.writeShellScriptBin "nextcloud-watch" ''
-    # Start nextcloud if I'm on my networks
+    # Start nextcloud if I'm on my local network
     while true;do
+      sleep 120
       ssid=$(nmcli -t -f name connection show --active | head -n1)
-      status=$(pgrep -n nextcloud)
+      nextcloud_status=$(ps -aux | grep -E "/bin/nextcloud --background$")
-      if [[ -z $status ]]; then
+      if [[ $nextcloud_status == "" ]]; then
         service_status="inactive"
       else
         service_status="active"
@@ -20,24 +19,25 @@ let
         fi
       else
         if [[ $service_status == "active" ]]; then
-            pkill nextcloud
+            nextcloud_pid=$(pgrep -n nextcloud)
+            kill $nextcloud_pid
         fi
       fi
-      sleep 120
     done
   '';
 
   startup = pkgs.writeShellScriptBin "startup" ''
     # Because HM enabling services suck.
 
-    [[ ${
+    [[ ${toString config.var.sops} == "1" ]] && systemctl --user start sops-nix
-      toString variable.enableSops
-    } == "1" ]] && systemctl --user start sops-nix
 
-    [[ ${toString variable.enableNextcloud} == "1" ]] && nextcloud-watch &
+    [[ ${toString config.var.nextcloud} == "1" ]] && nextcloud-watch &
 
-    system-notif &
+    notify-system &
     ${pkgs.waybar}/bin/waybar &
+
+
+    wlr-randr --output "Unknown-1" --off # REMOVE WEIRD GHOST MONITOR
   '';
 
 in { home.packages = with pkgs; [ startup nextcloud-watch nextcloud-client ]; }

home/scripts/system/default.nix

@@ -10,13 +10,13 @@ let
       done
     }
 
-    minute &
+    minute
   '';
 
   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 ]]; then
+    if [[ $BATTERY_STATUS != $OLD_BATTERY_STATUS && $OLD_BATTERY_STATUS != "Unknown" ]]; then
       if [[ $BATTERY_STATUS == "Discharging" ]]; then
         ${pkgs.libnotify}/bin/notify-send "󰚦  " "Battery is unplugged"
       else

home/system/default.nix

@@ -1,4 +0,0 @@
-{
-  imports =
-    [ ./git ./dunst ./hyprland ./shell ./sops ./waybar ./wlogout ./sops ];
-}

home/system/dunst/default.nix

@@ -34,17 +34,17 @@
         sticky_history = "yes";
         history_length = 20;
         always_run_script = true;
-        corner_radius = config.theme.rounding;
+        corner_radius = config.var.theme.rounding;
         follow = "mouse";
-        font = config.theme.font;
+        font = config.var.theme.font;
         format = "<b>%s</b>\\n%b";
-        progress_bar_corner_radius = config.theme.rounding - 10;
+        progress_bar_corner_radius = config.var.theme.rounding - 10;
         #format = ''
-        #  <span foreground='#${config.theme.colors.primary-bg}'><b>%s %p</b></span>
+        #  <span foreground='#${config.var.theme.colors.accent}'><b>%s %p</b></span>
         #  %b'';
-        frame_color = "#" + config.theme.colors.bg;
+        frame_color = "#" + config.var.theme.colors.bg;
-        highlight = "#" + config.theme.colors.primary-bg;
+        highlight = "#" + config.var.theme.colors.accent;
-        foreground = "#" + config.theme.colors.fg;
+        foreground = "#" + config.var.theme.colors.fg;
         frame_width = 1;
         offset = "0x10";
         horizontal_padding = 10;
@@ -67,16 +67,16 @@
       fullscreen_delay_everything = { fullscreen = "delay"; };
 
       urgency_critical = {
-        background = "#" + config.theme.colors.color1;
+        background = "#" + config.var.theme.colors.c1;
-        foreground = "#" + config.theme.colors.color0;
+        foreground = "#" + config.var.theme.colors.c0;
       };
       urgency_low = {
-        background = "#" + config.theme.colors.alt-bg;
+        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.theme.colors.alt-fg;
+        foreground = "#" + config.var.theme.colors.fgalt;
       };
       urgency_normal = {
-        background = "#" + config.theme.colors.alt-bg;
+        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.theme.colors.alt-fg;
+        foreground = "#" + config.var.theme.colors.fgalt;
       };
     };
   };

home/system/git/default.nix

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

home/system/gtk/default.nix

@@ -0,0 +1,97 @@
+{ config, pkgs, ... }: {
+
+  qt = {
+    enable = true;
+    platformTheme.name = "gtk2";
+    style.name = "gtk2";
+  };
+
+  gtk = {
+    enable = true;
+
+    theme = { name = "FlatColor"; };
+
+    iconTheme = {
+      package = pkgs.moka-icon-theme;
+      name = "Moka";
+    };
+
+    font = {
+      name = config.var.theme.font;
+      size = config.var.theme.font-size;
+    };
+  };
+
+  home.pointerCursor = {
+    gtk.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 14;
+  };
+
+  home.file = {
+    ".local/share/themes/FlatColor" = {
+      recursive = true;
+      source = ./gtk;
+    };
+
+    ".local/share/themes/FlatColor/colors2".text = ''
+      bg_color:#${config.var.theme.colors.bg}
+      color0:#${config.var.theme.colors.c0}
+      color1:#${config.var.theme.colors.c1}
+      color2:#${config.var.theme.colors.c2}
+      color3:#${config.var.theme.colors.c3}
+      color4:#${config.var.theme.colors.c4}
+      color5:#${config.var.theme.colors.c5}
+      color6:#${config.var.theme.colors.c6}
+      color7:#${config.var.theme.colors.c7}
+      color8:#${config.var.theme.colors.c8}
+      color9:#${config.var.theme.colors.c9}
+      color10:#${config.var.theme.colors.c10}
+      color11:#${config.var.theme.colors.c11}
+      color12:#${config.var.theme.colors.c12}
+      color13:#${config.var.theme.colors.c13}
+      color14:#${config.var.theme.colors.c14}
+      color15:#${config.var.theme.colors.c15}
+      text_color:#${config.var.theme.colors.fg}
+      selected_bg_color:#${config.var.theme.colors.accent}
+      selected_fg_color:#${config.var.theme.colors.accentFg}
+      tooltip_bg_color:#${config.var.theme.colors.bgalt}
+      tooltip_fg_color:#${config.var.theme.colors.fgalt}
+      titlebar_bg_color:#${config.var.theme.colors.bgalt}
+      titlebar_fg_color:#${config.var.theme.colors.fgalt}
+      menu_bg_color:#${config.var.theme.colors.bgalt}
+      menu_fg_color:#${config.var.theme.colors.fgalt}
+      link_color:#${config.var.theme.colors.accent}
+    '';
+
+    ".local/share/themes/FlatColor/colors3".text = ''
+      @define-color color0 #${config.var.theme.colors.c0};
+      @define-color color1 #${config.var.theme.colors.c1};
+      @define-color color2 #${config.var.theme.colors.c2};
+      @define-color color3 #${config.var.theme.colors.c3};
+      @define-color color4 #${config.var.theme.colors.c4};
+      @define-color color5 #${config.var.theme.colors.c5};
+      @define-color color6 #${config.var.theme.colors.c6};
+      @define-color color7 #${config.var.theme.colors.c7};
+      @define-color color8 #${config.var.theme.colors.c8};
+      @define-color color9 #${config.var.theme.colors.c9};
+      @define-color color10 #${config.var.theme.colors.c10};
+      @define-color color11 #${config.var.theme.colors.c11};
+      @define-color color12 #${config.var.theme.colors.c12};
+      @define-color color13 #${config.var.theme.colors.c13};
+      @define-color color14 #${config.var.theme.colors.c14};
+      @define-color color15 #${config.var.theme.colors.c15};
+      @define-color selected_bg_color #${config.var.theme.colors.accent};
+      @define-color selected_fg_color #${config.var.theme.colors.accentFg};
+
+      @define-color bg_color #${config.var.theme.colors.bg};
+      @define-color fg_color #${config.var.theme.colors.fg};
+      @define-color base_color @bg_color;
+      @define-color text_color @fg_color;
+      @define-color text_color_disabled mix(@text_color, @base_color, 0.4);
+      @define-color tooltip_bg_color #${config.var.theme.colors.bgalt};
+      @define-color tooltip_fg_color #${config.var.theme.colors.fgalt};
+    '';
+  };
+}

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

@@ -0,0 +1,771 @@
+#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/gtk/gtk-2.0/gtkrc.base

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