flake bump

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Lennart J. Kurzweg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,46 @@
+# ❄️ NixOS Dotfiles
+
+![Screenshot of my desktop](splash.png)
+
+## Information
+
+- Using stable + unstable via flakes
+- Multi-host config (Desktop, Laptop, Server)
+- Using home-manager for home-configuration
+- Using sops-nix with GPG + git-crypt for secrets 
+
+## Features:
+- The WM Hyperland extended to more or less full a DE with 
+  - automounting
+  - notifications
+  - a bar
+  - gesture control
+  - runner
+  - ...
+- Virtualization support
+  - docker
+  - virt-manager
+- Multilingual typing with Fcitx5
+- Fully functioning Nvidia/Nvidia Prime support
+- Fully customized editor `helix`
+- Locally running LLM-server with tools written around it
+- Fully themed ("riced") via a custom, intentionally semi-automatic, adaptive system responding to wallpaper color 
+  - as can be seen in `flake-modules/rice.nix`
+- Next-Gen shell experience with
+  - fish
+  - starship
+  - zoxide
+  - yazi
+  - direnv
+  - lazygit + lazydocker
+
+## Thanks to
+- [LibrePhoenix](https://www.youtube.com/@librephoenix) for getting me started
+- [VimJoyer](https://www.youtube.com/@vimjoyer) for making quick NixOS tutorials on many topics 
+- Everyone that talks about NixOS in NixOS-forums and rooms instead of politics
+- [Everyone that put up their code on Github](https://github.com/search?type=code&auto_enroll=true&q=language%3Anix) for me to reference
+
+## Licensing
+- The code found in this Repository is Licensed under the MIT-license 
+- I've decided against the GPLv3, since I am not going to sue anyone over this, but 
+- I encourage everyone to open source their work for anyone to at least reference

configuration.nix

@@ -1,35 +1,43 @@
-{ pkgs, pkgs-unstable, lib, inputs, allowed, nvidia, ... }:
+{ pkgs, inputs, ... }:
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
+    ./system-modules/auto-mount.nix
     ./system-modules/hardware-configuration.nix
     ./system-modules/fuse.nix
     ./system-modules/nvidia.nix 
     ./system-modules/users.nix
     ./system-modules/sound.nix
     ./system-modules/fonts.nix
-    ./system-modules/boot.nix
+    ./system-modules/boot.nix 
     ./system-modules/gc.nix
+    ./system-modules/boot.nix
     ./system-modules/dm.nix
-    ./system-modules/networking.nix
-    # ./system-modules/virtualisation.nix
-    ./system-modules/sshd.nix
-    ./system-modules/gpg.nix
-    ./system-modules/sops.nix
-    ./system-modules/syncthing.nix
-    ./system-modules/hsmw.nix # old
     ./system-modules/docker.nix
+    ./system-modules/fcitx5.nix
+    ./system-modules/fonts.nix
+    ./system-modules/fuse.nix
+    ./system-modules/gc.nix
+    ./system-modules/gpg.nix
+    ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
-    ./system-modules/ydotool.nix
+    ./system-modules/hsmw.nix
-    ./system-modules/ollama.nix
+    ./system-modules/kanata.nix
-    ./system-modules/nx2site.nix
     ./system-modules/kodi.nix
+    ./system-modules/networking.nix
+    ./system-modules/nvidia.nix 
+    ./system-modules/nx2site.nix
+    ./system-modules/ollama.nix
     ./system-modules/qmk.nix
+    ./system-modules/sops.nix
+    ./system-modules/sound.nix
+    ./system-modules/sshd.nix
+    ./system-modules/syncthing.nix
+    ./system-modules/users.nix
+    ./system-modules/virtualisation.nix
+    ./system-modules/ydotool.nix
   ];
 
-
-
-
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
@@ -56,27 +64,21 @@
   services.libinput.enable = true;
   hardware.uinput.enable = true;
 
-  hardware.bluetooth.enable = true; # enables support for Bluetooth
+  hardware.bluetooth = {
-  hardware.bluetooth.powerOnBoot = true; # 
+    enable = true;
+    powerOnBoot = true;  
+    package = pkgs.bluez5-experimental;
+    settings.Policy.AutoEnable = "true";
+    settings.General.Enable = "Source,Sink,Media,Socket";
+   };
   services.blueman.enable = true;
 
-  # nixpkgs.config.allowUnfree = true;
-  nixpkgs.config = {
-    # allowUnfree = true;
-    # allowUnfreePredicate = (pkg: true);
-    allowUnfreePredicate = let 
-      string-list = allowed.unfree-packages ++ (if nvidia.enable == true then nvidia.unfree else []); 
-    in pkg: builtins.elem (lib.getName pkg) string-list;
-    cudaSupport = nvidia.enable;
-    enableParallelBuildingByDefault = true;
-  };
- 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; ([
     git
-    lazygit # home-manager module is bugged
     git-crypt
+    lazygit # home-manager module is bugged
     wget
     curl
     zip
@@ -84,7 +86,6 @@
     p7zip
     unar
     nano
-    micro
     htop
     direnv
     openssl
@@ -109,6 +110,8 @@
 
   system.stateVersion = "24.05";
 
+  nixpkgs.config.allowUnfree = true;
+
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   programs.bash.shellInit = ''

flake-modules/allowed.nix

@@ -0,0 +1,43 @@
+
+{
+  unfree = [
+    "discord"
+    "spotify"
+    "obsidian"
+    "zoom-us"
+    "zoom"
+
+    # since the predicate ist to be set in the flake and not in a module
+    # it is impossible to make the list dynamic and respect nvidia.enable
+    "nvidia-x11"
+    "nvidia-settings"
+    "nvidia-persistenced"
+    "cudatoolkit"
+    "cuda-merged"
+    "cuda_cuobjdump"
+    "cuda_gdb"
+    "cuda_nvcc"
+    "cuda_nvdisasm"
+    "cuda_nvprune"
+    "cuda_cccl"
+    "cuda_cudart"
+    "cuda_cupti"
+    "cuda_cuxxfilt"
+    "cuda_nvml_dev"
+    "cuda_nvrtc"
+    "cuda_nvtx"
+    "cuda_profiler_api"
+    "cuda_sanitizer_api"
+    "libcublas"
+    "libcufft"
+    "libcurand"
+    "libcusolver"
+    "libnvjitlink"
+    "libcusparse"
+    "libnpp"
+  ];
+
+  inecure = [
+    # "electron-25.9.0"
+  ];
+}

flake-modules/colors.json

@@ -0,0 +1,13 @@
+{
+    "base": {
+        "foreground": "#eedce2",
+        "background": "#221016"
+    },
+    "to_alter": {
+        "accent": "#ac5271",
+        "secondary": "#f20c5b",
+        "tertiary": "#d5a287",
+        "special": "#51ac8d",
+        "weird": "#0cf2a3"
+    }
+}

flake-modules/nvidia.nix

@@ -0,0 +1,4 @@
+{
+  enable = false;
+  prime = false;
+}

flake-modules/rice.nix

@@ -0,0 +1,63 @@
+pkgs: rec {
+
+  lib = import ../nxlib/ricelib.nix pkgs.lib;
+
+  transparency = 0.9;
+  rounding = 10;
+  gap-size = 10;
+  border-width = 3;
+  color =
+    let
+      dark = (-0.5);
+      bright = (0.5);  
+      alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
+      alter     = let f = lib.alter-luminace-hex; in             color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
+      # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json));
+      ccolor = builtins.mapAttrs alter-set {
+        black =   "#111111"; # "#111111" "#001100";
+        white =   "#dddddd"; # "#dddddd" "#66dd66";
+        blue =    "#4444dd"; # "#3333dd" "#003300";
+        cyan =    "#44dddd"; # "#11dddd" "#00dd55";
+        green =   "#44dd44"; # "#11dd11" "#11dd11";
+        magenta = "#dd44dd"; # "#dd11dd" "#005500";
+        red =     "#dd4444"; # "#dd1111" "#00aa00";
+        yellow =  "#dddd44"; # "#dddd11" "#ffff00";
+      };
+      facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter;
+      fbcolor =                             (builtins.fromJSON (builtins.readFile ./colors.json)).base;
+      fcolor = facolor // fbcolor;
+      xcolor = with ccolor; with fcolor; rec {
+        background = "#000000";
+        # foreground = "#dddddd";
+        # accent = blue;
+        # secondary = cyan;
+        # tertiary = magenta;
+        # special = yellow;
+        # weird = green;
+        positive = alter "#00dd00";
+        negative = alter "#dd0000";
+        border = accent.base;
+        border2 = secondary.base;
+      };
+    in ccolor // fcolor // xcolor; 
+  font = {
+    code = {
+      name = "JetBrainsMono-NF";
+      name2 = "JetBrainsMono Nerd Font";
+      package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
+      # name = "CascadiaCove-NF";
+      # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
+    };
+    base = {
+      # name = "NewComputerModern08";
+      # package = pkgs.newcomputermodern;
+      name = "Atkinson Hyperlegible";
+      package = pkgs.atkinson-hyperlegible;
+    };
+  };
+  cursor = {
+    name = "Bibata-Original-Classic";
+    package = pkgs.bibata-cursors;
+    size = 24;
+  };
+}

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718642173,
+        "lastModified": 1726437584,
-        "narHash": "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8=",
+        "narHash": "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY=",
         "owner": "KZDKM",
         "repo": "Hyprspace",
-        "rev": "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7",
+        "rev": "8f14fa2e10d24742d713f04c278bc7651037b74b",
         "type": "github"
       },
       "original": {
@@ -20,6 +20,39 @@
         "type": "github"
       }
     },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727261104,
+        "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": [
@@ -53,29 +86,6 @@
         "type": "github"
       }
     },
-    "firefox-addons": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "pkgs/firefox-addons",
-        "lastModified": 1719875691,
-        "narHash": "sha256-DtfpH7yivPHcfXV0EL70NwCKlg6nVTZGNngWkPshQjM=",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "rev": "f2c6c0e41d6c2c82524b9d104bcfd1750a426d1b",
-        "type": "gitlab"
-      },
-      "original": {
-        "dir": "pkgs/firefox-addons",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "type": "gitlab"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -97,11 +107,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1719877454,
+        "lastModified": 1726153070,
-        "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
         "type": "github"
       },
       "original": {
@@ -132,12 +142,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1629284811,
+        "lastModified": 1681202837,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -148,14 +161,14 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1710146030,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -193,11 +206,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827385,
+        "lastModified": 1726989464,
-        "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
@@ -223,11 +236,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718450675,
+        "lastModified": 1722623071,
-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
+        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
+        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
         "type": "github"
       },
       "original": {
@@ -238,7 +251,9 @@
     },
     "hyprland": {
       "inputs": {
+        "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
+        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
@@ -247,11 +262,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1719938427,
+        "lastModified": 1727451329,
-        "narHash": "sha256-b0QtvQtFAtuOVBNPEUYf4V2VNGChTukkrLH/JlCQds8=",
+        "narHash": "sha256-ysRNFO8X0qE3/+xWcYMY+v94WurNvvdDKlGVLT/aKmA=",
         "ref": "refs/heads/main",
-        "rev": "6247a6b537fd1c05ecf35420529fab1adf83143e",
+        "rev": "58669fef77ac17ea205ce3570f48e17de736111f",
-        "revCount": 4903,
+        "revCount": 5272,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -279,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719784423,
+        "lastModified": 1727258890,
-        "narHash": "sha256-D7O5+nh2Wn9tQPJArWHrDSZeEfBCtj5zTGd86701LPE=",
+        "narHash": "sha256-/55TVManE/J19LSzXtUNhHUpeouRqZxM08ZdWvJrNoA=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "98cb18c6fcfe8196ef4150d09fbae305b7bb2954",
+        "rev": "4fcb465c9d771f4ae1f451e8d953250d16eead70",
         "type": "github"
       },
       "original": {
@@ -293,6 +308,31 @@
       }
     },
     "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727451107,
+        "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols_2": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
@@ -306,11 +346,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714869498,
+        "lastModified": 1721326555,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
         "type": "github"
       },
       "original": {
@@ -335,11 +375,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717881852,
+        "lastModified": 1725997860,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
         "type": "github"
       },
       "original": {
@@ -354,11 +394,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1719780938,
+        "lastModified": 1725107917,
-        "narHash": "sha256-YocumFkp3FCgN3UCXp95EV7IvAwhQdlSav8cCB0oHv0=",
+        "narHash": "sha256-6on3nwb3gB4t+P/2IExgGhVLVgAkF6ZiE5x+qcQHEXU=",
         "owner": "h3rmt",
         "repo": "hyprswitch",
-        "rev": "4dbba183fcbaa63de64e973d5dc9bba883765aa3",
+        "rev": "f478c394ad6db5ba268f80052f1eb2366366b21e",
         "type": "github"
       },
       "original": {
@@ -380,11 +420,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719316102,
+        "lastModified": 1727300645,
-        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
+        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
+        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
         "type": "github"
       },
       "original": {
@@ -405,11 +445,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719067853,
+        "lastModified": 1726874836,
-        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
+        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
+        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
         "type": "github"
       },
       "original": {
@@ -423,7 +463,7 @@
         "crane": "crane",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts_2",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "rust-overlay": "rust-overlay"
@@ -445,11 +485,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719075281,
+        "lastModified": 1727122398,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
         "type": "github"
       },
       "original": {
@@ -459,16 +499,32 @@
         "type": "github"
       }
     },
+    "nixpkgs-latest": {
+      "locked": {
+        "lastModified": 1727466185,
+        "narHash": "sha256-03DlXkzcRrsjz/VorCFey0pDxBsnAmerC6LxY32T3DY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0ca03f3df8c81598656de3d955a4353111ae2e0c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1719876945,
+        "lastModified": 1725233747,
-        "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
+        "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       }
     },
     "nixpkgs-stable": {
@@ -489,27 +545,27 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1719663039,
+        "lastModified": 1725762081,
-        "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
+        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
+        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1719848872,
+        "lastModified": 1727348695,
-        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
         "type": "github"
       },
       "original": {
@@ -551,11 +607,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1719838683,
+        "lastModified": 1727264057,
-        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
+        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
+        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
         "type": "github"
       },
       "original": {
@@ -564,6 +620,38 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1722415718,
+        "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1726937504,
+        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -598,15 +686,17 @@
     "root": {
       "inputs": {
         "Hyprspace": "Hyprspace",
-        "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "hyprswitch": "hyprswitch",
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs_4",
+        "nixpkgs-latest": "nixpkgs-latest",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "yazi": "yazi",
+        "zen-browser": "zen-browser"
       }
     },
     "rust-overlay": {
@@ -634,6 +724,28 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721441897,
+        "narHash": "sha256-gYGX9/22tPNeF7dR6bWN5rsrpU4d06GnQNNgZ6ZiXz0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -642,11 +754,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1719873517,
+        "lastModified": 1727423009,
-        "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
+        "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a11224af8d824935f363928074b4717ca2e280db",
+        "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
         "type": "github"
       },
       "original": {
@@ -685,13 +797,36 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": "hyprland-protocols_2",
         "hyprlang": [
           "hyprland",
           "hyprlang"
         ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -702,11 +837,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718619174,
+        "lastModified": 1727109343,
-        "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
+        "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
+        "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea",
         "type": "github"
       },
       "original": {
@@ -714,6 +849,44 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "yazi": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1727455294,
+        "narHash": "sha256-WSSLsNJw4ABnaXjs/lVcCea1d/YF6ko+OZ3TElIEg+E=",
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "rev": "3e4973dbbfa7d34a95b6005822db84db51ebddb7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "type": "github"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1727287465,
+        "narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=",
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,244 +2,70 @@
   description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05"; 
+    nixpkgs =          { url = "nixpkgs/nixos-24.05";                                                                        };
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                     };
-    home-manager = {
+    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                            };
-      url = "github:nix-community/home-manager/release-24.05";
+    home-manager =     { url = "github:nix-community/home-manager/release-24.05";      inputs.nixpkgs.follows = "nixpkgs";   };
-      inputs.nixpkgs.follows = "nixpkgs";
+    sops-nix =         { url = "github:Mic92/sops-nix";                                inputs.nixpkgs.follows = "nixpkgs";   };
-    };
+    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.3.0";                                                     };
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
-    hyprland = {
+    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                        };
-      url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                       inputs.hyprland.follows = "hyprland"; };
-      # url = "github:hyprwm/Hyprland";
+    Hyprspace =        { url = "github:KZDKM/Hyprspace";                               inputs.hyprland.follows = "hyprland"; };
-      # inputs.nixpkgs.follows = "nixpkgs";
+    hyprswitch =       { url = "github:h3rmt/hyprswitch/release";                                                            };
-    };
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
-    Hyprspace = {
-      url = "github:KZDKM/Hyprspace";
-      inputs.hyprland.follows = "hyprland";
-    };
-    hyprswitch.url = "github:h3rmt/hyprswitch/release";
 
-    lanzaboote = {
+    # firefox-addons =   { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; };
-      url = "github:nix-community/lanzaboote/v0.3.0";
+    yazi.url = "github:sxyazi/yazi";
-      # inputs.nixpkgs.follows = "nixpkgs-unstable";
+    zen-browser.url = "github:MarceColl/zen-browser-flake";
-    };
-    #arion = {
-    #  url = "github:hercules-ci/arion";
-    #  inputs.nixpkgs.follows = "nixpkgs";
-    #};
-    firefox-addons = {
-      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    # yazi.url = "github:sxyazi/yazi";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-latest, home-manager, ... }@inputs: let
-    let
+    system = "x86_64-linux";
-      system = "x86_64-linux";
+    user   = "nx2";
-      pkgs-config = {
-        allowUnfree = true;
-        # cudaSupport = nvidia.enable;
-        # enableParallelBuildingByDefault = true;
-      };
-      pkgs = import nixpkgs { 
-        system = system; 
-        config = pkgs-config;
-      };
-      pkgs-unstable = import nixpkgs-unstable {
-        system = system;
-        config = pkgs-config;
-      };
 
-      user = "nx2";
+    config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
+   
+    pkgs          = import nixpkgs          { inherit system config; };
+    pkgs-unstable = import nixpkgs-unstable { inherit system config; };
+    pkgs-latest   = import nixpkgs-latest   { inherit system config; };
 
-      nvidia = {
+    nvidia-set    = import ./flake-modules/nvidia.nix;
-        enable = true;
+    secrets       = import ./git-crypt/secrets.nix;
-        prime = true;
+    rice          = import ./flake-modules/rice.nix pkgs;
-        # unfree = if enable then [
+  in {
-        unfree = [
+    nixosConfigurations = let
-          "cuda_cccl"
+      make-nixos-system = host: nixpkgs.lib.nixosSystem { 
-          "cuda_cudart"
+        inherit system;
-          "cuda_cuobjdump"
+        modules = [ ./configuration.nix ];
-          "cuda_cupti"
+        specialArgs = let
-          "cuda_cuxxfilt"
+          nvidia = nvidia-set // {
-          "cuda_gdb"
+            enable = if (host == "NxXPS" || host == "NxNORTH") then true else false;
-          "cuda-merged"
+            prime = if (host == "NxXPS") then true else false;
-          "cuda_nvcc"
+          }; 
-          "cuda_nvdisasm"
+        in { inherit inputs user host pkgs-unstable pkgs-latest secrets rice nvidia; };
-          "cuda_nvml_dev"
-          "cuda_nvprune"
-          "cuda_nvrtc"
-          "cuda_nvtx"
-          "cuda_profiler_api"
-          "cuda_sanitizer_api"
-          "cudatoolkit"
-          "libcublas"
-          "libcufft"
-          "libcurand"
-          "libcusolver"
-          "libcusparse"
-          "libnpp"
-          "libnvjitlink"
-          "nviaia-x11"
-          "nvidia-persistenced"
-          "nvidia-settings"
-          "nvidia-x11"
-        ];
-        # ] else [];
-      };
-      allowed = {
-        unfree-packages = [
-          "discord"
-          "obsidian"
-          "spotify"
-          "zoom"
-          "zoom-us"
-        ] ++ nvidia.unfree;
-
-        inecure-packages = [
-          "electron-25.9.0"
-        ];
-      };
-
-      secrets = import ./git-crypt/secrets.nix;
-
-      rice = rec {
-        lib = import ./nxlib/ricelib.nix { lib = nixpkgs.lib; };
-        transparency = 0.8;
-        rounding = 10;
-        gap-size = 10;
-        border-width = 3;
-        color =
-          let
-            dark = (-0.5);
-            bright = (0.5);  
-            alter-set = let f = rice.lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
-            alter     = let f = rice.lib.alter-luminace-hex; in             color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
-            ccolor = builtins.mapAttrs alter-set {
-              black =   "#000022"; # "#111111" "#001100";
-              white =   "#ddddff"; # "#dddddd" "#66dd66";
-              blue =    "#4422ff"; # "#3333dd" "#003300";
-              cyan =    "#11dddd"; # "#11dddd" "#00dd55";
-              green =   "#11dd44"; # "#11dd11" "#11dd11";
-              magenta = "#6622dd"; # "#dd11dd" "#005500";
-              red =     "#dd1166"; # "#dd1111" "#00aa00";
-              yellow =  "#dd6611"; # "#dddd11" "#ffff00";
-            };
-            xcolor = with ccolor; rec {
-              background = black.dark;
-              foreground = white.base;
-              border = cyan.base;
-              border2 = blue.base;
-              accent = blue;
-              secondary = cyan;
-              tertiary = magenta;
-              special = yellow;
-              weird = green;
-              positive = alter "#00dd00";
-              negative = alter "#dd0000";
-            };
-            # ccolor = builtins.mapAttrs alter-set {
-            #   black =   "#112200"; 
-            #   white =   "#ddffdd"; 
-            #   blue =    "#779944"; 
-            #   cyan =    "#11ffcc"; 
-            #   green =   "#00ff00"; 
-            #   magenta = "#449999"; 
-            #   red =     "#dd2200"; 
-            #   yellow =  "#ffff11"; 
-            # };
-            # xcolor = with ccolor; rec {
-            #   background = black.dark;     # black.dark;
-            #   foreground = white.base;     # white.base;
-            #   border = accent.base;        # cyan.base;
-            #   border2 = yellow.base;       # blue.base;
-            #   accent = green;              # blue;
-            #   secondary = red;            # cyan;
-            #   tertiary = yellow;           # magenta;
-            #   special = blue;              # yellow;
-            #   weird = magenta;             # green;
-            #   positive = alter "#00dd00";  # alter "#00dd00";
-            #   negative = alter "#dd0000";  # alter "#dd0000";
-            # };
-          in ccolor // xcolor; 
-        font = {
-          code = {
-            name = "JetBrainsMono-NF";
-            name2 = "JetBrainsMono Nerd Font";
-            package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
-            # name = "CascadiaCove-NF";
-            # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
-          };
-          base = {
-            # name = "NewComputerModern08";
-            # package = pkgs.newcomputermodern;
-            name = "Atkinson Hyperlegible";
-            package = pkgs.atkinson-hyperlegible;
-          };
-        };
-        cursor = {
-          name = "Bibata-Original-Classic";
-          package = pkgs.bibata-cursors;
-          size = 24;
-        };
-      };
-    in
-    {
-      nixosConfigurations = {
-        NxXPS = let host = "NxXPS"; in nixpkgs.lib.nixosSystem {
-            inherit system;
-            modules = [ ./configuration.nix ];
-            specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
-          };
-        NxNORTH = let host = "NxNORTH"; in nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [ ./configuration.nix ];
-          specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
-        };
-        NxACE = let host = "NxACE"; nvidia.enable = false; in nixpkgs.lib.nixosSystem {
-            inherit system;
-            modules = [ ./configuration.nix ];
-            specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
-          };
-      };
-
-      homeConfigurations = {
-        "${user}@NxXPS" = let host = "NxXPS"; in home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = [ ./home.nix ];
-          extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-        };
-        "${user}@NxNORTH" = let host = "NxNORTH"; in home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = [ ./home.nix ];
-          extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-        };
-        "${user}@NxACE" = let host = "NxACE"; nvidia.enable = false; in home-manager.lib.homeManagerConfiguration {
-            inherit pkgs;
-            modules = [ ./home.nix ];
-            extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-          };
-        "tv@NxACE" =
-          let
-            host = "NxACE";
-            user = "tv";
-            nvidia.enable = pkgs.kib.mkForce false;
-          in
-          home-manager.lib.homeManagerConfiguration {
-            inherit pkgs;
-            modules = [ ./home.nix ];
-            extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-          };
       };
+    in {
+      NxXPS = make-nixos-system "NxXPS";
+      NxNORTH = make-nixos-system "NxNORTH"; 
+      NxACE = make-nixos-system "NxACE"; 
     };
+
+    homeConfigurations = let 
+      make-home-configuration = host: user: home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = [ ./home.nix ];
+        extraSpecialArgs = let
+          nvidia = nvidia-set // {
+            enable = if (host == "NxXPS" || host == "NxNORTH") then true else false;
+            prime = if (host == "NxXPS") then true else false;
+          }; 
+        in { inherit inputs system user host pkgs-unstable pkgs-latest rice secrets nvidia; };
+      };
+    in {
+      "${user}@NxXPS" = make-home-configuration "NxXPS" user; 
+      "${user}@NxNORTH" = make-home-configuration "NxNORTH" user; 
+      "${user}@NxACE" = make-home-configuration "NxACE" user; 
+      "tv@NxACE" = make-home-configuration "NxACE" "tv"; 
+    };
+  };
 }

home-modules/assets/gtk-2.0/apps.rc

@@ -1,92 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-  # Spin background
-  bg[NORMAL] = @base_color
-
-  engine "pixmap" {
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up-alt.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up-alt-disabled.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down-alt.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down-alt-disabled.png"
-      overlay_stretch = FALSE
-    }
-  }
-}
-
-style "chrome_gtk_frame" {
-  ChromeGtkFrame::frame-color                    = @titlebar_bg_color
-  ChromeGtkFrame::inactive-frame-color           = @titlebar_bg_color
-  ChromeGtkFrame::incognito-frame-color          = @titlebar_bg_color
-  ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-  ChromeGtkFrame::frame-gradient-size = 0
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"