feat: switched back to hyprland

flake.lock

@@ -11,11 +11,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1734342536,
-        "narHash": "sha256-ofvzJJG/aW4GFlCx4AF+ZV2sSpQyTcna45XItu6SLf8=",
+        "lastModified": 1735765398,
+        "narHash": "sha256-tU7wFUNkThhYMAttCpuKyqHC+UgPRpBAr9dHtDKxGhk=",
         "owner": "nix-community",
         "repo": "buildbot-nix",
-        "rev": "8dc24d5432b02a44b34f42916676b60b62dd3478",
+        "rev": "387f1ba65022e4ae17b4d64f44657bea8497aa10",
         "type": "github"
       },
       "original": {
@@ -24,6 +24,21 @@
         "type": "github"
       }
     },
+    "crane": {
+      "locked": {
+        "lastModified": 1727974419,
+        "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "dream2nix": {
       "inputs": {
         "nixpkgs": [
@@ -34,11 +49,11 @@
         "pyproject-nix": "pyproject-nix"
       },
       "locked": {
-        "lastModified": 1732214960,
-        "narHash": "sha256-ViyEMSYwaza6y55XTDrsRi2K4YKCLsefMTorjWSE27s=",
+        "lastModified": 1735160684,
+        "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "a8dac99db44307fdecead13a39c584b97812d0d4",
+        "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4",
         "type": "github"
       },
       "original": {
@@ -118,11 +133,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1736143030,
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -193,6 +208,24 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
       "inputs": {
         "systems": [
           "ngipkgs",
@@ -213,9 +246,9 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "flake-utils_4": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1726560853,
@@ -304,6 +337,27 @@
         "type": "github"
       }
     },
+    "helix": {
+      "inputs": {
+        "crane": "crane",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1736191106,
+        "narHash": "sha256-5eEJ8Af72ZRzdAKHq42DSyowE0b3wM7sDQPFXLwdM+Y=",
+        "owner": "helix-editor",
+        "repo": "helix",
+        "rev": "5616f1d66d735e1995d4a55dba42fcd571216200",
+        "type": "github"
+      },
+      "original": {
+        "owner": "helix-editor",
+        "repo": "helix",
+        "type": "github"
+      }
+    },
     "hercules-ci-effects": {
       "inputs": {
         "flake-parts": [
@@ -338,11 +392,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735053786,
-        "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
+        "lastModified": 1736089250,
+        "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
+        "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196",
         "type": "github"
       },
       "original": {
@@ -367,7 +421,7 @@
     },
     "lix-module": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "flakey-profile": "flakey-profile",
         "lix": "lix",
         "nixpkgs": [
@@ -390,19 +444,19 @@
       "inputs": {
         "buildbot-nix": "buildbot-nix",
         "dream2nix": "dream2nix",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs",
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable",
         "pre-commit-hooks": "pre-commit-hooks",
         "sops-nix": "sops-nix",
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1734391563,
-        "narHash": "sha256-L2MTQEXOpXc5nWPWAKiOyugGl2MwIHIA3IztVNiTSfg=",
+        "lastModified": 1735942246,
+        "narHash": "sha256-uY2qbW6TqC9ODbB7Hsrg+MOMLQ1DpuVVBwHfyJYN1DA=",
         "owner": "ngi-nix",
         "repo": "ngipkgs",
-        "rev": "40be4af909abc7e0e11ab45b90f34c8f8714aa56",
+        "rev": "5a03db311782657fcdbb26311cfa8abbc16c4b5d",
         "type": "github"
       },
       "original": {
@@ -414,16 +468,16 @@
     "nixos-cosmic": {
       "inputs": {
         "flake-compat": "flake-compat_3",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-stable": "nixpkgs-stable_2",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1735925666,
-        "narHash": "sha256-RjsPeJePvEkB+2/mBGhpHrh/H+v4T1xgJzdoRXwSFhM=",
+        "lastModified": 1736188510,
+        "narHash": "sha256-9gUz9t43aPHHPNfSnqqb5R1ZLs4nd5DWFeJwJS4Y+L0=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "c4dd42fb284f12d7adafa0a0e566e8ed0ea76f9f",
+        "rev": "e127ad3374836982730aa094d2b3f7268c025b02",
         "type": "github"
       },
       "original": {
@@ -434,27 +488,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734126203,
-        "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
-        "owner": "NixOS",
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1734202038,
-        "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {
@@ -466,11 +520,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1735669367,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
+        "lastModified": 1736061677,
+        "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+        "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
         "type": "github"
       },
       "original": {
@@ -480,45 +534,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_3": {
-      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "lastModified": 1735873913,
+        "narHash": "sha256-2aXF7GlIMN5ruk0OL+GkbquQY5Psgo+NqdHYthEaDGw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "d33cc2bd23b6b1d5c1af1a5dba9b774216bc0312",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1734649271,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "lastModified": 1735834308,
+        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
         "type": "github"
       },
       "original": {
@@ -530,16 +568,16 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1729265718,
-        "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
+        "lastModified": 1736012469,
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -553,11 +591,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1735070725,
-        "narHash": "sha256-NSKvAqkgOvf74Lxh5kUVV4pFYTPjdGRtuks7hgwczHo=",
+        "lastModified": 1736195583,
+        "narHash": "sha256-o9X/eAJGvUiqs4eP3zp9WQgnuvXaPNxcgy4ww+TrHvw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2fb4eca072cf867a338f11016906345716519db1",
+        "rev": "ee2a092b4b4a2dd676d28c7228474e530622a79e",
         "type": "github"
       },
       "original": {
@@ -580,11 +618,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734379367,
-        "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=",
+        "lastModified": 1734797603,
+        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99",
+        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
         "type": "github"
       },
       "original": {
@@ -599,15 +637,14 @@
         "gitignore": "gitignore_2",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_3"
+        ]
       },
       "locked": {
-        "lastModified": 1734797603,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "lastModified": 1735882644,
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
         "type": "github"
       },
       "original": {
@@ -661,31 +698,32 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "ghostty": "ghostty",
+        "helix": "helix",
         "home-manager": "home-manager",
         "lix-module": "lix-module",
         "ngipkgs": "ngipkgs",
         "nixos-cosmic": "nixos-cosmic",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nur": "nur",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "sops-nix": "sops-nix_2",
-        "systems": "systems_3",
+        "systems": "systems_4",
         "yazi": "yazi"
       }
     },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
-          "nixos-cosmic",
+          "helix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1735784864,
-        "narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=",
+        "lastModified": 1728268235,
+        "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "04d5f1836721461b256ec452883362c5edc5288e",
+        "rev": "25685cc2c7054efc31351c172ae77b21814f2d42",
         "type": "github"
       },
       "original": {
@@ -695,6 +733,27 @@
       }
     },
     "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736044260,
+        "narHash": "sha256-DTAr0mAd8AZwWgRtU9ZZFPz3DwNeoH/Oi/1QMSqc9YQ=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "c8ed24cc104ebbc218d992e208131e9f024b69f0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_3": {
       "inputs": {
         "nixpkgs": [
           "yazi",
@@ -746,11 +805,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733965552,
-        "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
+        "lastModified": 1735844895,
+        "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
+        "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32",
         "type": "github"
       },
       "original": {
@@ -766,11 +825,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734546875,
-        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
+        "lastModified": 1736064798,
+        "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
+        "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930",
         "type": "github"
       },
       "original": {
@@ -795,6 +854,21 @@
       }
     },
     "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -809,7 +883,7 @@
         "type": "github"
       }
     },
-    "systems_3": {
+    "systems_4": {
       "locked": {
         "lastModified": 1680978846,
         "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
@@ -824,7 +898,7 @@
         "type": "github"
       }
     },
-    "systems_4": {
+    "systems_5": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -848,11 +922,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733761991,
-        "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
+        "lastModified": 1735135567,
+        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
+        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
         "type": "github"
       },
       "original": {
@@ -884,16 +958,18 @@
     },
     "yazi": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4",
-        "rust-overlay": "rust-overlay_2"
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1735318734,
-        "narHash": "sha256-p9VfYkunTS8OWo2R1Mvs4pqs/Ymn50KmmSCHyu/UPmA=",
+        "lastModified": 1736142778,
+        "narHash": "sha256-Ym5axSqFVAIejr+QKwveRYl9rWMJBkl6HqLlmcQOxaI=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "2770e0259cc83d91b7877b412a27db2dcb1c9427",
+        "rev": "21f6a92ea39895688cc3c4ea2cdd9676afdcfaec",
         "type": "github"
       },
       "original": {

flake.nix

@@ -39,7 +39,11 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    yazi.url = "github:sxyazi/yazi";
+    yazi = {
+      url = "github:sxyazi/yazi";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    helix.url = "github:helix-editor/helix";
   };
 
   outputs = inputs:
@@ -61,6 +65,7 @@
             ./profiles/user1
             config.nixosModules.personal
             config.nixosModules.desktop
+            config.nixosModules.hyprland
             config.nixosModules.shared
             inputs.home-manager.nixosModules.home-manager
             inputs.lix-module.nixosModules.default

home/default.nix

@@ -71,6 +71,24 @@ in {
       };
     };
 
+    hyprland = {
+      imports = builtins.attrValues {
+        inherit
+          (modules)
+          gtk
+          cursor
+          dunst
+          easyEffects
+          gammastep
+          hyprland
+          misc-hyprland
+          network
+          swaylock
+          tofi
+          waybar
+          ;
+      };
+    };
     productionArt = {
       imports = builtins.attrValues {
         inherit
@@ -128,7 +146,7 @@ in {
           fastfetch
           git
           helix
-          home-manager
+          homeManager
           lazygit
           misc-commandLine
           nushell

home/modules/bottom/config/settings.nix

@@ -1,27 +1,41 @@
-{
-  settings = {
-    colors = {
-      tableHeaderColor = "#f4dbd6";
-      allCpuColor = "#f4dbd6";
-      avgCpuColor = "#ee99a0";
-      cpuCoreColors = ["#ed8796" "#f5a97f" "#eed49f" "#a6da95" "#7dc4e4" "#c6a0f6"];
-      ramColor = "#a6da95";
-      swapColor = "#f5a97f";
-      rxColor = "#a6da95";
-      txColor = "#ed8796";
-      widgetTitleColor = "#f0c6c6";
-      borderColor = "#5b6078";
-      highlightedBorderColor = "#f5bde6";
-      textColor = "#cad3f5";
-      graphColor = "#a5adcb";
-      cursorColor = "#f5bde6";
-      selectedTextColor = "#181926";
-      selectedBgColor = "#c6a0f6";
-      highBatteryColor = "#a6da95";
-      mediumBatteryColor = "#eed49f";
-      lowBatteryColor = "#ed8796";
-      gpuCoreColors = ["#7dc4e4" "#c6a0f6" "#ed8796" "#f5a97f" "#eed49f" "#a6da95"];
-      arcColor = "#91d7e3";
-    };
+{flake, ...}: let
+  inherit (flake.config.aesthetics.themes.theme) colors;
+in {
+  colors = {
+    tableHeaderColor = colors.rosewater;
+    allCpuColor = colors.rosewater;
+    avgCpuColor = colors.maroon;
+    cpuCoreColors = [
+      colors.sapphire
+      colors.peach
+      colors.yellow
+      colors.green
+      colors.sky
+      colors.mauve
+    ];
+    ramColor = colors.green;
+    swapColor = colors.peach;
+    rxColor = colors.green;
+    txColor = colors.red;
+    widgetTitleColor = colors.flamingo;
+    borderColor = colors.surface2;
+    highlightedBorderColor = colors.pink;
+    textColor = colors.text;
+    graphColor = colors.subtext0;
+    cursorColor = colors.pink;
+    selectedTextColor = colors.crust;
+    selectedBgColor = colors.mauve;
+    highBatteryColor = colors.green;
+    mediumBatteryColor = colors.yellow;
+    lowBatteryColor = colors.red;
+    gpuCoreColors = [
+      colors.sky
+      colors.mauve
+      colors.red
+      colors.peach
+      colors.yellow
+      colors.green
+    ];
+    arcColor = colors.sky;
   };
 }

home/modules/bottom/default.nix

@@ -1,9 +1,9 @@
-{
+{flake, ...}: {
   programs.bottom = let
     configPath = ./config;
-  in
-    {
-      enable = true;
-    }
-    // (import (configPath + /settings.nix));
+    settingsPath = import (configPath + "/settings.nix");
+  in {
+    enable = true;
+    settings = settingsPath {inherit flake;};
+  };
 }

home/modules/brave/config/extensions.nix

@@ -1,10 +1,8 @@
-{
-  extensions = [
-    {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin
-    {id = "cmpdlhmnmjhihmcfnigoememnffkimlk";} # Catppuccin Macchiato
-    {id = "dlnpfhfhmkiebpnlllpehlmklgdggbhn";} # Don't Close Last Tab
-    {id = "iplffkdpngmdjhlpjmppncnlhomiipha";} # Unpaywall
-    {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # SponsorBlock
-    {id = "ponfpcnoihfmfllpaingbgckeeldkhle";} # YouTube Enhancer
-  ];
-}
+[
+  {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin
+  {id = "cmpdlhmnmjhihmcfnigoememnffkimlk";} # Catppuccin Macchiato
+  {id = "dlnpfhfhmkiebpnlllpehlmklgdggbhn";} # Don't Close Last Tab
+  {id = "iplffkdpngmdjhlpjmppncnlhomiipha";} # Unpaywall
+  {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # SponsorBlock
+  {id = "ponfpcnoihfmfllpaingbgckeeldkhle";} # YouTube Enhancer
+]

home/modules/brave/default.nix

@@ -1,9 +1,9 @@
 {
   programs.brave = let
     configPath = ./config;
-  in
-    {
-      enable = true;
-    }
-    // (import (configPath + /extensions.nix));
+    extensionsPath = import (configPath + "/extensions.nix");
+  in {
+    enable = true;
+    extensions = extensionsPath;
+  };
 }

home/modules/cursor.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  home.pointerCursor = {
+    gtk.enable = true;
+    name = "catppuccin-mocha-dark-cursors";
+    package = pkgs.catppuccin-cursors.macchiatoDark;
+    size = 14;
+  };
+}

home/modules/dunst.nix

@@ -0,0 +1,32 @@
+{flake, ...}: let
+  inherit (flake.config.aesthetics.themes.theme) colors font;
+  makeColor = c: "#" + c;
+in {
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        font = "${font} 10";
+        background = makeColor colors.base;
+        corner_radius = 10;
+        fade_in_duration = 1000;
+        foreground = makeColor colors.text;
+        frame = 10000;
+        frame_color = makeColor colors.mauve;
+        frame_width = 1;
+        icon_corner_radius = 10;
+        monitor = 1;
+        offset = "20x20";
+        origin = "bottom-right";
+        progress_bar_corner_radius = 4;
+        timeout = 10;
+        transparecncy = true;
+      };
+
+      urgency_critical = {
+        frame_color = makeColor colors.peach;
+        timeout = 0;
+      };
+    };
+  };
+}

home/modules/easyEffects.nix

@@ -0,0 +1,3 @@
+{
+  services.easyeffects.enable = true;
+}

home/modules/firefox/config/themes/config/userChrome.css

@@ -14,6 +14,11 @@
 	overflow: visible !important;
 }
 
+.titlebar-buttonbox-container {
+	display: none !important;
+}
+
+
 /* Nav bar */
 /* #nav-bar {
 	height: 0px;

home/modules/firefox/default.nix

@@ -7,6 +7,11 @@
 in {
   programs.firefox = let
     configPath = ./config;
+    bookmarksPath = import (configPath + /bookmarks) {inherit flake;};
+    extensionsPath = import (configPath + /extensions) {inherit pkgs;};
+    searchPath = import (configPath + /search) {inherit flake;};
+    settingsPath = import (configPath + /settings);
+    themesPath = import (configPath + /themes);
   in {
     enable = true;
     package = pkgs.firefox;
@@ -16,19 +21,19 @@ in {
           isDefault = true;
           id = 0;
         }
-        // (import (configPath + /bookmarks) {inherit flake;})
-        // (import (configPath + /extensions) {inherit pkgs;})
-        // (import (configPath + /search) {inherit flake;})
-        // (import (configPath + /settings))
-        // (import (configPath + /themes));
+        // bookmarksPath
+        // extensionsPath
+        // searchPath
+        // settingsPath
+        // themesPath;
       testing =
         {
           isDefault = false;
           id = 1;
         }
-        // (import (configPath + /bookmarks) {inherit flake;})
-        // (import (configPath + /search) {inherit flake;})
-        // (import (configPath + /themes));
+        // bookmarksPath
+        // searchPath
+        // themesPath;
     };
   };
 }

home/modules/freetube/config/settings.nix

@@ -1,46 +1,44 @@
 {
-  settings = {
-    allSettingsSectionsExpandedByDefault = false;
-    barColor = false;
-    baseTheme = "catppuccinMocha";
-    bounds = {
-      x = 880;
-      y = 221;
-      width = 1200;
-      height = 800;
-      maximized = false;
-      fullScreen = false;
-    };
-    defaultQuality = "1080";
-    downloadAskPath = false;
-    downloadBehavior = "download";
-    downloadFolderPath = "/home/nick/Downloads/FreeTube";
-    expandSideBar = true;
-    externalPlayer = "mpv";
-    hideActiveSubscriptions = false;
-    hideCommentLikes = true;
-    hideCommentPhotos = true;
-    hideHeaderLogo = true;
-    hideLabelsSideBar = true;
-    hidePlaylists = true;
-    hidePopularVideos = true;
-    hideRecommendedVideos = true;
-    hideSubscriptionsShorts = false;
-    hideSubscriptionsVideos = false;
-    hideTrendingVideos = true;
-    hideVideoLikesAndDislikes = true;
-    mainColor = "CatppuccinMochaMauve";
-    maxVideoPlaybackRate = 10;
-    playNextVideo = false;
-    quickBookmarkTargetPlaylistId = "favorites";
-    rememberHistory = false;
-    saveWatchedProgress = false;
-    secColor = "CatppuccinMochaLavender";
-    useDeArrowThumbnails = true;
-    useDeArrowTitles = true;
-    useSponsorBlock = true;
-    defaultTheatreMode = true;
-    listType = "grid";
-    currentLocale = "en_GB";
+  allSettingsSectionsExpandedByDefault = false;
+  barColor = false;
+  baseTheme = "catppuccinMocha";
+  bounds = {
+    x = 880;
+    y = 221;
+    width = 1200;
+    height = 800;
+    maximized = false;
+    fullScreen = false;
   };
+  defaultQuality = "1080";
+  downloadAskPath = false;
+  downloadBehavior = "download";
+  downloadFolderPath = "/home/nick/Downloads/FreeTube";
+  expandSideBar = true;
+  externalPlayer = "mpv";
+  hideActiveSubscriptions = false;
+  hideCommentLikes = true;
+  hideCommentPhotos = true;
+  hideHeaderLogo = true;
+  hideLabelsSideBar = true;
+  hidePlaylists = true;
+  hidePopularVideos = true;
+  hideRecommendedVideos = true;
+  hideSubscriptionsShorts = false;
+  hideSubscriptionsVideos = false;
+  hideTrendingVideos = true;
+  hideVideoLikesAndDislikes = true;
+  mainColor = "CatppuccinMochaMauve";
+  maxVideoPlaybackRate = 10;
+  playNextVideo = false;
+  quickBookmarkTargetPlaylistId = "favorites";
+  rememberHistory = false;
+  saveWatchedProgress = false;
+  secColor = "CatppuccinMochaLavender";
+  useDeArrowThumbnails = true;
+  useDeArrowTitles = true;
+  useSponsorBlock = true;
+  defaultTheatreMode = true;
+  listType = "grid";
+  currentLocale = "en_GB";
 }

home/modules/freetube/default.nix

@@ -1,9 +1,9 @@
 {
   programs.freetube = let
     configPath = ./config;
-  in
-    {
-      enable = true;
-    }
-    // (import (configPath + /settings.nix));
+    settingsPath = import (configPath + "/settings.nix");
+  in {
+    enable = true;
+    settings = settingsPath;
+  };
 }

home/modules/gammastep.nix

@@ -0,0 +1,13 @@
+{
+  services.gammastep = {
+    enable = true;
+    tray = true;
+    provider = "geoclue2";
+    temperature = {
+      day = 3500;
+      night = 3500;
+    };
+    dawnTime = "8:00-8:30";
+    duskTime = "20:30-21:00";
+  };
+}

home/modules/gtk.nix

@@ -0,0 +1,27 @@
+{pkgs, ...}: {
+  gtk = {
+    cursorTheme = {
+      name = "catppuccin-macchiato-dark-cursors";
+      package = pkgs.catppuccin-cursors.macchiatoDark;
+    };
+
+    enable = true;
+
+    iconTheme = {
+      package = pkgs.catppuccin-papirus-folders.override {
+        flavor = "macchiato";
+        accent = "mauve";
+      };
+      name = "Papirus-Dark";
+    };
+
+    theme = {
+      package = pkgs.catppuccin-gtk.override {
+        size = "compact";
+        variant = "macchiato";
+        accents = ["mauve"];
+      };
+      name = "catppuccin-macchiato-mauve-compact";
+    };
+  };
+}

home/modules/helix/config/languages.nix

@@ -1,43 +1,41 @@
 {
-  languages = {
-    language = [
-      {
-        auto-format = true;
-        formatter.command = "alejandra";
-        name = "nix";
-      }
-      {
-        auto-format = true;
-        formatter.command = "cssfmt";
-        name = "css";
-      }
-      {
-        auto-format = true;
-        language-servers = ["elm-language-server"];
-        name = "elm";
-      }
-      {
-        auto-format = true;
-        formatter.command = "haskell";
-        name = "haskell";
-      }
-      {
-        auto-format = true;
-        formatter.command = "yamlfmt";
-        name = "yaml";
-      }
-      {
-        auto-format = true;
-        formatter.command = "yuck";
-        name = "yuck";
-      }
-    ];
-    language-server = {
-      elm-language-server = {
-        config.elmLS = {
-          disableElmLSDiagnostics = true;
-          elmReviewDiagnostics = "warning";
-        };
+  language = [
+    {
+      auto-format = true;
+      formatter.command = "alejandra";
+      name = "nix";
+    }
+    {
+      auto-format = true;
+      formatter.command = "cssfmt";
+      name = "css";
+    }
+    {
+      auto-format = true;
+      language-servers = ["elm-language-server"];
+      name = "elm";
+    }
+    {
+      auto-format = true;
+      formatter.command = "haskell";
+      name = "haskell";
+    }
+    {
+      auto-format = true;
+      formatter.command = "yamlfmt";
+      name = "yaml";
+    }
+    {
+      auto-format = true;
+      formatter.command = "yuck";
+      name = "yuck";
+    }
+  ];
+  language-server = {
+    elm-language-server = {
+      config.elmLS = {
+        disableElmLSDiagnostics = true;
+        elmReviewDiagnostics = "warning";
       };
     };
   };

home/modules/helix/config/settings.nix

@@ -1,25 +1,23 @@
 {
-  settings = {
-    editor = {
-      mouse = true;
-      auto-format = true;
-      soft-wrap.enable = true;
-      auto-save = true;
-      line-number = "relative";
-      lsp = {
-        display-messages = true;
-        display-inlay-hints = true;
-      };
+  editor = {
+    mouse = true;
+    auto-format = true;
+    soft-wrap.enable = true;
+    auto-save = true;
+    line-number = "relative";
+    lsp = {
+      display-messages = true;
+      display-inlay-hints = true;
     };
-    keys = {
-      normal = {
-        space = {
-          f = ":format";
-          q = ":q";
-          w = ":w";
-        };
-      };
-    };
-    theme = "catppuccin_macchiato";
   };
+  keys = {
+    normal = {
+      space = {
+        f = ":format";
+        q = ":q";
+        w = ":w";
+      };
+    };
+  };
+  theme = "catppuccin_macchiato";
 }

home/modules/helix/default.nix

@@ -1,11 +1,12 @@
 {pkgs, ...}: {
   programs.helix = let
     configPath = ./config;
-  in
-    {
-      enable = true;
-      package = pkgs.helix;
-    }
-    // (import (configPath + /languages.nix))
-    // (import (configPath + /settings.nix));
+    settingsPath = import (configPath + "/settings.nix");
+    languagesPath = import (configPath + "/languages.nix");
+  in {
+    enable = true;
+    package = pkgs.helix;
+    languages = languagesPath;
+    settings = settingsPath;
+  };
 }

home/modules/hyprland/config/animation.nix

@@ -0,0 +1,9 @@
+[
+  "border, 1, 2.2, bounce"
+  "fadeIn, 1, 0.1, bounce"
+  "fadeOut, 1, 4.5, bounce"
+  "fadeSwitch, 1, 2.2, bounce"
+  "windows, 1, 2.2, bounce"
+  "windowsOut, 1, 1.1, bounce"
+  "workspaces, 1, 2.2, bounce, slide"
+]

home/modules/hyprland/config/bezier.nix

@@ -0,0 +1,6 @@
+[
+  "wind, 0, 1, 0.5, 1"
+  "winIn, 0, 0.5, 0, 1"
+  "winOut, 0, 0.5, 0, 1"
+  "bounce, 0.7, 1.7, 0.5, 1"
+]

home/modules/hyprland/config/bind.nix

@@ -0,0 +1,84 @@
+let
+  superBinds = builtins.map (x: "SUPER, " + x) [
+    # Apps
+    "Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun"
+    "C, exec, code"
+    "D, exec, obsidian"
+    "T, exec, ghostty -e zellij a dotfiles"
+    "E, exec, ghostty -e y"
+    "B, exec, firefox"
+    "V, exec, vesktop"
+    "W, exec, bitwarden"
+    "H, exec, feishin"
+    "R, exec, ghostty -e btm"
+    "N, exec, signal-desktop"
+    "M, exec, element-desktop"
+    "End, exec, hyprctl dispatch exit"
+    "S, exec, steam"
+    "period, exec, emote"
+    # Workspaces
+    "1, workspace, 1"
+    "2, workspace, 2"
+    "3, workspace, 3"
+    "4, workspace, 4"
+    "5, workspace, 5"
+    # Windows
+    "F, togglefloating"
+    "X, killactive"
+    "Tab, fullscreen, 0"
+    "P, pin, enable"
+    "bracketleft, splitratio, -0.1"
+    "bracketright, splitratio, +0.1"
+    # Window Focus
+    "left , movefocus, l"
+    "down , movefocus, d"
+    "up , movefocus, u"
+    "right , movefocus, r"
+    # Audio
+    "F8, exec, playerctl next"
+    "F7, exec, playerctl previous"
+    "F6, exec, playerctl play-pause"
+  ];
+
+  superShiftBinds = builtins.map (x: "SUPER SHIFT, " + x) [
+    # Super+shift binds
+    "S, exec, grim -g \"$(slurp)\" - | wl-copy -t image/png"
+    "Print, exec, grim -g \"$(slurp)\""
+    "ScrollDown, workspace, previous"
+    "left , movewindow, l"
+    "down , movewindow, d"
+    "up , movewindow, u"
+    "right , movewindow, r"
+  ];
+  superCtrlBinds = builtins.map (x: "SUPER CTRL, " + x) [
+    # Super+shift binds
+    "Space, workspace, previous"
+    "S, layoutmsg, togglesplit"
+    "equal, splitratio, 0.33"
+    "minus, splitratio, -0.33"
+  ];
+
+  altBinds = builtins.map (x: "ALT, " + x) [
+    # Alt binds
+  ];
+
+  shiftBinds = builtins.map (x: "SHIFT, " + x) [
+    # Shift binds
+  ];
+
+  ctrlBinds = builtins.map (x: "CTRL, " + x) [
+    # Ctrl binds
+  ];
+
+  ctrlShiftBinds = builtins.map (x: "CTRL SHIFT, " + x) [
+    # Ctrl+shift binds
+    "1, movetoworkspacesilent, 1"
+    "2, movetoworkspacesilent, 2"
+    "3, movetoworkspacesilent, 3"
+    "4, movetoworkspacesilent, 4"
+  ];
+in
+  superBinds ++ superShiftBinds ++ superCtrlBinds ++ altBinds ++ ctrlBinds ++ ctrlShiftBinds ++ shiftBinds
+# Docs
+# https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
+

home/modules/hyprland/config/bindm.nix

@@ -0,0 +1,10 @@
+let
+  superBinds = builtins.map (x: "SUPER, " + x) [
+    "mouse:272, resizewindow"
+  ];
+
+  altBinds = builtins.map (x: "ALT, " + x) [
+    "mouse:272, movewindow"
+  ];
+in
+  superBinds ++ altBinds

home/modules/hyprland/config/binds.nix

@@ -0,0 +1,3 @@
+{
+  "allow_workspace_cycles" = "1";
+}

home/modules/hyprland/config/decoration.nix

@@ -0,0 +1,36 @@
+{
+  active_opacity = 0.95;
+  inactive_opacity = 0.95;
+  fullscreen_opacity = 1;
+  rounding = 10;
+  dim_inactive = 1;
+  dim_strength = 0.05;
+
+  shadow = {
+    enabled = true;
+    color = "rgba(00000055)";
+    ignore_window = true;
+    offset = "0 2";
+    range = 20;
+    render_power = 3;
+    scale = 0.97;
+  };
+
+  blur = {
+    enabled = true;
+
+    size = 5;
+    passes = 2;
+
+    brightness = 1;
+    contrast = 1.300000;
+    ignore_opacity = true;
+    noise = 0.011700;
+
+    new_optimizations = true;
+
+    xray = true;
+    popups = true;
+    popups_ignorealpha = 0.2;
+  };
+}

home/modules/hyprland/config/dwindle.nix

@@ -0,0 +1,4 @@
+{
+  pseudotile = true;
+  preserve_split = true;
+}

home/modules/hyprland/config/exec-once.nix

@@ -0,0 +1,12 @@
+[
+  "swaylock"
+  "grim"
+  "wl-clipboard"
+  "wpaperd"
+  "gammastep"
+  "dunst"
+  "playerctrld"
+  "waybar"
+  "blueman-manager &"
+  "nm-applet"
+]

home/modules/hyprland/config/general.nix

@@ -0,0 +1,7 @@
+{
+  gaps_in = 5;
+  gaps_out = 5;
+  border_size = 2;
+  "col.active_border" = "rgb(c6a0f6)";
+  "col.inactive_border" = "0xff292a37";
+}

home/modules/hyprland/config/input.nix

@@ -0,0 +1,6 @@
+{
+  sensitivity = 0.07;
+  accel_profile = "flat";
+  follow_mouse = 1;
+  numlock_by_default = true;
+}

home/modules/hyprland/config/misc.nix

@@ -0,0 +1,5 @@
+{
+  focus_on_activate = 1;
+  force_default_wallpaper = 0;
+  # vrr = 1;
+}

home/modules/hyprland/config/windowrule.nix

@@ -0,0 +1,19 @@
+let
+  centerWindows = [
+    "center, ^(gnome-characters)$"
+    "center, ^(mpv)$"
+    "center, ^(nomacs)$"
+  ];
+  opaqueWindows = builtins.map (x: "opaque, " + x) [
+    "^(firefox)$"
+    "^(org.kde.kdenlive)$"
+    "^(krita)$"
+    "^(mpv)$"
+    "^(Brave-browser)$"
+    "^(Gimp-2.10)$"
+    "^(org.kde.okular)$"
+    "^(vlc)$"
+    "^(obsidian)$"
+  ];
+in
+  centerWindows ++ opaqueWindows

home/modules/hyprland/config/windowrulev2.nix

@@ -0,0 +1,30 @@
+let
+  blueman = "(.blueman-manager-wrapped)";
+  easyeffects = "(com.github.wwmm.easyeffects)";
+  nomacs = "(org.nomacs.ImageLounge)";
+  mpv = "(mpv)";
+  emote = "(emote)";
+  proton = "(.protonvpn-app-wrapped)";
+
+  maxsizeWindows = [
+    "maxsize 640x360, class:^${blueman}$"
+    "maxsize 640x360, class:^${easyeffects}$"
+    "maxsize 960x540, class:^${mpv}$"
+    "maxsize 960x540, class:^${nomacs}$"
+    "maxsize 1000x1000, class:^${proton}$"
+  ];
+  floatWindows = builtins.map (x: "float, " + x) [
+    "class:${blueman}"
+    "class:${easyeffects}"
+    "class:${emote}"
+    "class:${mpv}"
+    "class:${nomacs}"
+    "class:${proton}"
+    "title:^(Picture-in-Picture)$"
+  ];
+
+  pinWindows = builtins.map (x: "pin, " + x) [
+    "title:^(Picture-in-Picture)$"
+  ];
+in
+  maxsizeWindows ++ floatWindows ++ pinWindows

home/modules/hyprland/config/xwayland.nix

@@ -0,0 +1,3 @@
+{
+  force_zero_scaling = true;
+}

home/modules/hyprland/default.nix

@@ -0,0 +1,27 @@
+{pkgs, ...}: let
+  configPath = ./config;
+  configImports = {
+    animation = import (configPath + /animation.nix);
+    bezier = import (configPath + /bezier.nix);
+    bind = import (configPath + /bind.nix);
+    bindm = import (configPath + /bindm.nix);
+    binds = import (configPath + /binds.nix);
+    decoration = import (configPath + /decoration.nix);
+    dwindle = import (configPath + /dwindle.nix);
+    exec-once = import (configPath + /exec-once.nix);
+    general = import (configPath + /general.nix);
+    input = import (configPath + /input.nix);
+    misc = import (configPath + /misc.nix);
+    windowrule = import (configPath + /windowrule.nix);
+    windowrulev2 = import (configPath + /windowrulev2.nix);
+  };
+in {
+  wayland.windowManager.hyprland = {
+    enable = true;
+    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    xwayland.enable = true;
+    systemd.enable = false;
+    settings = configImports;
+  };
+  xdg.configFile."wpaperd/wallpaper.toml".source = pkgs.lib.mkForce ./wpaperd/wallpaper.toml;
+}

home/modules/hyprland/wpaperd/wallpaper.toml

@@ -0,0 +1,5 @@
+[default]
+path = "~/Files/Projects/dotfiles/home/modules/hyprland/wpaperd/wallpaper"
+duration = "1m"
+sorting = "random"
+apply-shadow = false