WIP: Add kak-tree-sitter

flake.lock

@@ -42,11 +42,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1715290355,
+        "lastModified": 1707830867,
-        "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
         "type": "github"
       },
       "original": {
@@ -186,16 +186,33 @@
         "type": "github"
       }
     },
+    "dzgui": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702780245,
+        "narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=",
+        "owner": "aclist",
+        "repo": "dztui",
+        "rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aclist",
+        "repo": "dztui",
+        "type": "github"
+      }
+    },
     "dzgui-nix": {
       "inputs": {
+        "dzgui": "dzgui",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1715128199,
+        "lastModified": 1702850463,
-        "narHash": "sha256-mj23cBtiDKy3pgg+J26UA8giZgmJApO8IQlC6+XTAx8=",
+        "narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=",
         "owner": "lelgenio",
         "repo": "dzgui-nix",
-        "rev": "03968bade43d23c47e8b4f102c711c171c446645",
+        "rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d",
         "type": "github"
       },
       "original": {
@@ -375,7 +392,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -393,7 +410,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -411,7 +428,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -429,7 +446,7 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_9"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -447,14 +464,14 @@
     },
     "flake-utils_8": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_11"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1681202837,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -491,26 +508,22 @@
         ]
       },
       "locked": {
-        "lastModified": 1716563886,
+        "lastModified": 1710532761,
-        "narHash": "sha256-MKSVKxP50gEbdP60G0M5LampyVSIGT8FGGB88nKPmi8=",
+        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "00a86e4f7a6455ad58b7090a931f1c6097e4fcd7",
+        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "hyprcursor": {
       "inputs": {
-        "hyprlang": [
+        "hyprlang": "hyprlang",
-          "hyprland",
-          "hyprlang"
-        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -521,11 +534,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713612213,
+        "lastModified": 1710257359,
-        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
+        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
+        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
         "type": "github"
       },
       "original": {
@@ -537,20 +550,21 @@
     "hyprland": {
       "inputs": {
         "hyprcursor": "hyprcursor",
-        "hyprlang": "hyprlang",
+        "hyprland-protocols": "hyprland-protocols",
-        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprlang": "hyprlang_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_4",
+        "systems": "systems_5",
+        "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1715342341,
+        "lastModified": 1710538160,
-        "narHash": "sha256-jHCjAwaukNCI7yVsbB8oppl1dUujvFAfRiXaecqWGI0=",
+        "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "38911d6df4977b6b00557cc887eb151d032e505b",
+        "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde",
         "type": "github"
       },
       "original": {
@@ -563,12 +577,10 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "xdph",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
-          "xdph",
           "systems"
         ]
       },
@@ -590,19 +602,17 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
+          "hyprcursor",
           "nixpkgs"
         ],
-        "systems": [
+        "systems": "systems_4"
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1709914708,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
         "type": "github"
       },
       "original": {
@@ -611,7 +621,7 @@
         "type": "github"
       }
     },
-    "hyprwayland-scanner": {
+    "hyprlang_2": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
@@ -623,16 +633,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1715287423,
+        "lastModified": 1709914708,
-        "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
         "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
+        "repo": "hyprlang",
-        "rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
+        "repo": "hyprlang",
         "type": "github"
       }
     },
@@ -698,11 +708,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714878592,
+        "lastModified": 1710120787,
-        "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
+        "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
+        "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
         "type": "github"
       },
       "original": {
@@ -713,16 +723,15 @@
     },
     "nix-software-center": {
       "inputs": {
-        "nixos-appstream-data": "nixos-appstream-data",
         "nixpkgs": "nixpkgs_2",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1714856183,
+        "lastModified": 1703105285,
-        "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=",
+        "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=",
         "owner": "vlinkz",
         "repo": "nix-software-center",
-        "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386",
+        "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65",
         "type": "github"
       },
       "original": {
@@ -731,32 +740,6 @@
         "type": "github"
       }
     },
-    "nixos-appstream-data": {
-      "inputs": {
-        "flake-utils": [
-          "nix-software-center",
-          "utils"
-        ],
-        "nixpkgs": [
-          "nix-software-center",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712858390,
-        "narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=",
-        "owner": "korfuri",
-        "repo": "nixos-appstream-data",
-        "rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "korfuri",
-        "ref": "flake",
-        "repo": "nixos-appstream-data",
-        "type": "github"
-      }
-    },
     "nixos-conf-editor": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -805,11 +788,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714562304,
+        "lastModified": 1702539185,
-        "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=",
+        "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7",
+        "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
         "type": "github"
       },
       "original": {
@@ -882,16 +865,16 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1716408587,
+        "lastModified": 1710451336,
-        "narHash": "sha256-el71IUaQdEmntmd51GBpkJs/Hqh6S4dmfmUGP8GQaME=",
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1a7abfa62e8a36f7f2dbe463722ed9ea31be5e43",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
@@ -914,11 +897,11 @@
     "ranger-icons": {
       "flake": false,
       "locked": {
-        "lastModified": 1713564482,
+        "lastModified": 1709209315,
-        "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=",
+        "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=",
         "owner": "alexanderjeurissen",
         "repo": "ranger_devicons",
-        "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861",
+        "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9",
         "type": "github"
       },
       "original": {
@@ -1073,6 +1056,21 @@
         "type": "github"
       }
     },
+    "systems_11": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -1120,16 +1118,16 @@
     },
     "systems_5": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1689347949,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -1203,20 +1201,20 @@
       "locked": {
         "lastModified": 1684504342,
         "narHash": "sha256-rJ0eH7BuPizvXPc+LjVtovse4gWEuxP2WiyNdXjPNL4=",
-        "ref": "refs/heads/main",
+        "owner": "lelgenio",
+        "repo": "tlauncher-nix",
         "rev": "add4df7220bd0b85177a1938c02b60c966c5eb71",
-        "revCount": 3,
+        "type": "github"
-        "type": "git",
-        "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
       },
       "original": {
-        "type": "git",
+        "owner": "lelgenio",
-        "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
+        "repo": "tlauncher-nix",
+        "type": "github"
       }
     },
     "utils": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -1255,11 +1253,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715216838,
+        "lastModified": 1685576039,
-        "narHash": "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=",
+        "narHash": "sha256-WMkWurJsZZG7YkWzW/k2SNquYLsAZjzFs7CFswSjDew=",
         "owner": "lelgenio",
         "repo": "wl-crosshair",
-        "rev": "39b716cf410a1b45006f50f32f8d63de5c43aedb",
+        "rev": "57d0908e10d9f58fc37fe866404cc8b66be1f0d9",
         "type": "github"
       },
       "original": {
@@ -1268,9 +1266,31 @@
         "type": "github"
       }
     },
+    "wlroots": {
+      "flake": false,
+      "locked": {
+        "host": "gitlab.freedesktop.org",
+        "lastModified": 1709983277,
+        "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
+        "owner": "wlroots",
+        "repo": "wlroots",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
+        "type": "gitlab"
+      },
+      "original": {
+        "host": "gitlab.freedesktop.org",
+        "owner": "wlroots",
+        "repo": "wlroots",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
+        "type": "gitlab"
+      }
+    },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
         "hyprlang": [
           "hyprland",
           "hyprlang"
@@ -1285,11 +1305,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714662532,
+        "lastModified": 1709299639,
-        "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
+        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "1f228ba2f1f254195c0b571302b37482861abee3",
+        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,8 +1,8 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-index-database = {
@@ -42,7 +42,7 @@
     };
 
     tlauncher = {
-      url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix";
+      url = "github:lelgenio/tlauncher-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -68,14 +68,11 @@
     nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
     nix-software-center.url = "github:vlinkz/nix-software-center";
   };
-  outputs =
+  outputs = inputs:
-    inputs:
     let
       nixpkgsConfig = {
         inherit system;
-        config = {
+        config = { allowUnfree = true; };
-          allowUnfree = true;
-        };
         overlays = old_overlays.all;
       };
 
@@ -88,37 +85,32 @@
 
       old_overlays = (import ./overlays { inherit packages inputs; });
 
-      specialArgs = {
+      specialArgs = { inherit inputs; };
-        inherit inputs;
+      common_modules = [
-      };
+        { nixpkgs.pkgs = pkgs; }
-      common_modules =
+        ./system/configuration.nix
-        [
+        ./system/secrets.nix
-          { nixpkgs.pkgs = pkgs; }
+        ./system/specialisation.nix
-          ./system/configuration.nix
+        ./system/greetd.nix
-          ./system/secrets.nix
+        { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; }
-          ./system/specialisation.nix
-          ./system/greetd.nix
-          { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; }
 
-          inputs.agenix.nixosModules.default
+        inputs.agenix.nixosModules.default
-          inputs.hyprland.nixosModules.default
+        inputs.hyprland.nixosModules.default
-          inputs.dzgui-nix.nixosModules.default
+        inputs.dzgui-nix.nixosModules.default
-          { programs.hyprland.enable = (desktop == "hyprland"); }
+        { programs.hyprland.enable = (desktop == "hyprland"); }
-          inputs.home-manager.nixosModules.home-manager
+        inputs.home-manager.nixosModules.home-manager
-          {
+        {
-            home-manager.useGlobalPkgs = true;
+          home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
+          home-manager.useUserPackages = true;
-            home-manager.users.lelgenio = import ./user/home.nix;
+          home-manager.users.lelgenio = import ./user/home.nix;
-            home-manager.backupFileExtension = "bkp";
+          home-manager.backupFileExtension = "bkp";
-            # Optionally, use home-manager.extraSpecialArgs to pass
+          # Optionally, use home-manager.extraSpecialArgs to pass
-            # arguments to home.nix
+          # arguments to home.nix
-            home-manager.extraSpecialArgs = {
+          home-manager.extraSpecialArgs = { inherit inputs; };
-              inherit inputs;
+        }
-            };
+      ]
-          }
+      ++ lib.optional (desktop == "gnome") ./system/gnome.nix
-        ]
+      ++ lib.optional (desktop == "kde") ./system/kde.nix;
-        ++ lib.optional (desktop == "gnome") ./system/gnome.nix
-        ++ lib.optional (desktop == "kde") ./system/kde.nix;
     in
     {
       nixosConfigurations = {
@@ -131,7 +123,6 @@
           modules = [
             ./hosts/monolith.nix
             ./system/monolith-gitlab-runner.nix
-            ./system/monolith-forgejo-runner.nix
             ./system/nix-serve.nix
             ./system/steam.nix
           ] ++ common_modules;
@@ -152,20 +143,15 @@
         };
         pixie = lib.nixosSystem {
           inherit system specialArgs;
-          modules =
+          modules = [ ./hosts/pixie.nix ] ++ common_modules ++ [{
-            [ ./hosts/pixie.nix ]
+            packages.media-packages.enable = lib.mkOverride 0 false;
-            ++ common_modules
+            programs.steam.enable = lib.mkOverride 0 false;
-            ++ [
+            services.flatpak.enable = lib.mkOverride 0 false;
-              {
+          }];
-                packages.media-packages.enable = lib.mkOverride 0 false;
-                programs.steam.enable = lib.mkOverride 0 false;
-                services.flatpak.enable = lib.mkOverride 0 false;
-              }
-            ];
         };
-        phantom = lib.nixosSystem {
+        ghost = lib.nixosSystem {
           inherit system specialArgs;
-          modules = [ ./hosts/phantom ];
+          modules = [ ./hosts/ghost ];
         };
       };
 
@@ -182,6 +168,6 @@
 
       packages.${system} = pkgs // packages;
 
-      formatter.${system} = pkgs.nixfmt-rfc-style;
+      formatter.${system} = pkgs.nixpkgs-fmt;
     };
 }

hosts/double-rainbow.nix

@@ -1,32 +1,13 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 let
-  btrfs_options = [
+  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
-    "compress=zstd:3"
+  btrfs_ssd = [ "ssd" "discard=async" ];
-    "noatime"
-    "x-systemd.device-timeout=0"
-  ];
-  btrfs_ssd = [
-    "ssd"
-    "discard=async"
-  ];
 in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules =
-    "xhci_pci"
+    [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -37,7 +18,8 @@ in
     options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd;
   };
 
-  boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
+  boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device =
+    "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/97EB-7DB5";
@@ -55,7 +37,8 @@ in
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking.hostName = "double-rainbow"; # Define your hostname.
 }

hosts/ghost/default.nix

@@ -0,0 +1,43 @@
+{ config, pkgs, inputs, ... }: {
+  imports = [
+    "${inputs.nixpkgs}/nixos/modules/virtualisation/digital-ocean-image.nix"
+    inputs.agenix.nixosModules.default
+    ../../system/nix.nix
+    ./hardware-config.nix
+    ./mastodon.nix
+    ./nextcloud.nix
+    ./nginx.nix
+    ./syncthing.nix
+    ./users.nix
+    ./writefreely.nix
+    ./renawiki.nix
+    ./email.nix
+  ];
+
+  # Use more aggressive compression then the default.
+  virtualisation.digitalOceanImage.compressionMethod = "bzip2";
+  # Enable networking
+  networking.networkmanager.enable = true;
+  # Set your time zone.
+  time.timeZone = "America/Sao_Paulo";
+  # Select internationalisation properties.
+  i18n.defaultLocale = "pt_BR.utf8";
+
+  boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576;
+
+  age = {
+    identityPaths = [ "/root/.ssh/id_rsa" ];
+  };
+
+  system.autoUpgrade = {
+    enable = true;
+    dates = "04:40";
+    allowReboot = true;
+    operation = "switch";
+    flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ];
+    flake = "github:lelgenio/nixos-config#ghost";
+  };
+
+  system.stateVersion = "23.05"; # Never change this
+}
+

hosts/ghost/email.nix

@@ -0,0 +1,35 @@
+{ pkgs, inputs, ... }: {
+  # It's important to let Digital Ocean set the hostname so we get rDNS to work
+  networking.hostName = "";
+
+  imports = [
+    inputs.nixos-mailserver.nixosModules.mailserver
+  ];
+
+  mailserver = {
+    enable = true;
+    fqdn = "mail.lelgenio.xyz";
+    domains = [ "lelgenio.xyz" ];
+    certificateScheme = "acme-nginx";
+    loginAccounts = {
+      "lelgenio@lelgenio.xyz" = {
+        hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
+        aliases = [ "postmaster@lelgenio.xyz" ];
+      };
+    };
+  };
+
+  # Webmail
+  services.roundcube = rec {
+    enable = true;
+    package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
+    hostName = "mail.lelgenio.xyz";
+    extraConfig = ''
+      $config['smtp_host'] = "tls://${hostName}:587";
+      $config['smtp_user'] = "%u";
+      $config['smtp_pass'] = "%p";
+      $config['plugins'] = [ "carddav" ];
+    '';
+  };
+
+}

hosts/ghost/hardware-config.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, inputs, ... }: {
+  swapDevices = [{
+    device = "/swap/swapfile";
+    size = (1024 * 2); # 2 GB
+  }];
+
+  fileSystems."/var" = {
+    device = "/dev/disk/by-uuid/b19e7272-8fd1-4999-93eb-abc6d5c0a1cc";
+    fsType = "btrfs";
+    options = [ "subvol=@var" ];
+  };
+}
+

hosts/ghost/mastodon.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, inputs, ... }: {
+  services.mastodon = {
+    enable = true;
+    configureNginx = true;
+    localDomain = "social.lelgenio.xyz";
+    smtp.fromAddress = "lelgenio@disroot.org";
+    streamingProcesses = 2;
+    extraConfig.SINGLE_USER_MODE = "true";
+  };
+}

hosts/ghost/nextcloud.nix

@@ -0,0 +1,22 @@
+{ config, pkgs, inputs, ... }: {
+  services.nextcloud = {
+    enable = true;
+    package = pkgs.nextcloud27;
+    hostName = "cloud.lelgenio.xyz";
+    https = true;
+    config = {
+      adminpassFile = config.age.secrets.ghost-nextcloud.path;
+    };
+  };
+
+  age = {
+    secrets.ghost-nextcloud = {
+      file = ../../secrets/ghost-nextcloud.age;
+      mode = "400";
+      owner = "nextcloud";
+      group = "nextcloud";
+    };
+  };
+
+}
+

hosts/ghost/nginx.nix

@@ -0,0 +1,15 @@
+{ config, pkgs, inputs, ... }: {
+  services.nginx = {
+    enable = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+  };
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "lelgenio@disroot.org";
+  };
+
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
+}
+

hosts/ghost/renawiki.nix

@@ -0,0 +1,23 @@
+{ config, pkgs, inputs, ... }: {
+  services.mediawiki = {
+    enable = true;
+    name = "Rena Wiki";
+
+    webserver = "nginx";
+    nginx.hostName = "renawiki.lelgenio.xyz";
+    passwordFile = config.age.secrets.ghost-renawiki.path;
+
+    extensions.VisualEditor = null;
+  };
+  services.nginx.virtualHosts."renawiki.lelgenio.xyz" = {
+    enableACME = true;
+    forceSSL = true;
+  };
+
+  age.secrets.ghost-renawiki = {
+    file = ../../secrets/ghost-renawiki.age;
+    mode = "400";
+    owner = "mediawiki";
+  };
+}
+

hosts/ghost/syncthing.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
 
   services.syncthing = {
     enable = true;
@@ -13,17 +7,18 @@
     openDefaultPorts = true;
   };
 
-  services.nginx.virtualHosts."syncthing.lelgenio.com" = {
+  services.nginx.virtualHosts."syncthing.lelgenio.xyz" = {
     enableACME = true;
     forceSSL = true;
     locations."/" = {
       proxyPass = "http://127.0.0.1:8384";
       extraConfig =
         # required when the target is also TLS server with multiple hosts
-        "proxy_ssl_server_name on;"
+        "proxy_ssl_server_name on;" +
-        +
+        # required when the server wants to use HTTP Authentication
-          # required when the server wants to use HTTP Authentication
+        "proxy_pass_header Authorization;"
-          "proxy_pass_header Authorization;";
+      ;
     };
   };
 }
+

hosts/ghost/users.nix

@@ -1,12 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   security.rtkit.enable = true;
   services.openssh = {
     enable = true;
-    ports = [
+    ports = [ 9022 ];
-      9022
-      22
-    ];
     settings = {
       PasswordAuthentication = false;
       KbdInteractiveAuthentication = false;
@@ -19,15 +15,7 @@
     isNormalUser = true;
     description = "Leonardo Eugênio";
     hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
-    extraGroups = [
+    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ];
-      "networkmanager"
-      "wheel"
-      "docker"
-      "adbusers"
-      "bluetooth"
-      "corectrl"
-      "vboxusers"
-    ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
@@ -44,5 +32,7 @@
 
   programs.fish.enable = true;
 
-  environment.systemPackages = with pkgs; [ git ];
+  environment.systemPackages = with pkgs; [
+    git
+  ];
 }

hosts/ghost/writefreely.nix

@@ -1,18 +1,12 @@
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
   services.writefreely = {
     enable = true;
     acme.enable = true;
     nginx.enable = true;
     nginx.forceSSL = true;
-    host = "blog.lelgenio.com";
+    host = "blog.lelgenio.xyz";
     admin.name = "lelgenio";
-    admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path;
+    admin.initialPasswordFile = config.age.secrets.ghost-writefreely.path;
     settings.app = {
       site_name = "Leo's blog";
       single_user = true;
@@ -20,11 +14,12 @@
   };
 
   age = {
-    secrets.phantom-writefreely = {
+    secrets.ghost-writefreely = {
-      file = ../../secrets/phantom-writefreely.age;
+      file = ../../secrets/ghost-writefreely.age;
       mode = "400";
       owner = "writefreely";
       group = "writefreely";
     };
   };
 }
+

hosts/i15.nix

@@ -1,30 +1,15 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 let
-  btrfs_options = [
+  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
-    "compress=zstd:3"
-    "noatime"
-    "x-systemd.device-timeout=0"
-  ];
 in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules =
-    "xhci_pci"
+    [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
-    "ahci"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_usb_sdmmc"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -60,12 +45,10 @@ in
     options = [ "subvol=@swap" ] ++ btrfs_options;
   };
 
-  swapDevices = [
+  swapDevices = [{
-    {
+    device = "/swap/swapfile";
-      device = "/swap/swapfile";
+    size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
-      size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
+  }];
-    }
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -76,6 +59,7 @@ in
   # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
   networking.hostName = "i15"; # Define your hostname.
 }

hosts/monolith.nix

@@ -1,38 +1,21 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 let
-  btrfs_options = [
+  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
-    "compress=zstd:3"
+  btrfs_ssd = [ "ssd" "discard=async" ];
-    "noatime"
-    "x-systemd.device-timeout=0"
-  ];
-  btrfs_ssd = [
-    "ssd"
-    "discard=async"
-  ];
 in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules =
-    "nvme"
+    [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
 
   hardware.opentabletdriver.enable = true;
 
-  boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    zenpower
+  ];
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelModules = [
     "kvm-amd"
@@ -63,6 +46,9 @@ in
     rocmPackages.rocm-smi
   ];
 
+  programs.corectrl.enable = true;
+  virtualisation.virtualbox.host.enable = true;
+
   fileSystems."/" = {
     device = "/dev/disk/by-label/BTRFS_ROOT";
     fsType = "btrfs";
@@ -96,34 +82,22 @@ in
   fileSystems."/home/lelgenio/Games" = {
     device = "/dev/disk/by-label/BTRFS_DATA";
     fsType = "btrfs";
-    options = [
+    options = [ "subvol=@games" "nofail" ] ++ btrfs_options;
-      "subvol=@games"
-      "nofail"
-    ] ++ btrfs_options;
   };
   fileSystems."/home/lelgenio/Downloads/Torrents" = {
     device = "/dev/disk/by-label/BTRFS_DATA";
     fsType = "btrfs";
-    options = [
+    options = [ "subvol=@torrents" "nofail" ] ++ btrfs_options;
-      "subvol=@torrents"
-      "nofail"
-    ] ++ btrfs_options;
   };
   fileSystems."/home/lelgenio/Música" = {
     device = "/dev/disk/by-label/BTRFS_DATA";
     fsType = "btrfs";
-    options = [
+    options = [ "subvol=@music" "nofail" ] ++ btrfs_options;
-      "subvol=@music"
-      "nofail"
-    ] ++ btrfs_options;
   };
   fileSystems."/home/lelgenio/.local/mount/data" = {
     device = "/dev/disk/by-label/BTRFS_DATA";
     fsType = "btrfs";
-    options = [
+    options = [ "subvol=@data" "nofail" ] ++ btrfs_options;
-      "subvol=@data"
-      "nofail"
-    ] ++ btrfs_options;
   };
   fileSystems."/home/lelgenio/.local/mount/bigboy" = {
     device = "/dev/disk/by-label/BTRFS_BIGBOY";
@@ -133,20 +107,8 @@ in
   fileSystems."/home/lelgenio/projects" = {
     device = "/dev/disk/by-label/BTRFS_BIGBOY";
     fsType = "btrfs";
-    options = [
+    options = [ "subvol=@projects" "nofail" ] ++ btrfs_options ++ btrfs_ssd;
-      "subvol=@projects"
-      "nofail"
-    ] ++ btrfs_options ++ btrfs_ssd;
   };
-  fileSystems."/var/lib/docker" = {
-    device = "/dev/disk/by-label/BTRFS_BIGBOY";
-    fsType = "btrfs";
-    options = [
-      "subvol=@docker"
-      "nofail"
-    ] ++ btrfs_options ++ btrfs_ssd;
-  };
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
@@ -154,16 +116,14 @@ in
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
   powerManagement.cpuFreqGovernor = "ondemand";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
   networking.hostName = "monolith"; # Define your hostname.
 
+  # Fix broken suspend with Logitech USB dongle
+  # `lsusb | grep Logitech` will return "vendor:product"
   services.udev.extraRules = ''
-    # Fix broken suspend with Logitech USB dongle
-    # `lsusb | grep Logitech` will return "vendor:product"
     ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled"
-    # Force all disks to use mq-deadline scheduler
-    # For some reason "noop" is used by default which is kinda bad when io is saturated
-    ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
   '';
 
   # swap
@@ -174,10 +134,8 @@ in
     # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
     options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
   };
-  swapDevices = [
+  swapDevices = [{
-    {
+    device = "/swap/swapfile";
-      device = "/swap/swapfile";
+    size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
-      size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
+  }];
-    }
-  ];
 }

hosts/phantom/default.nix

@@ -1,70 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  imports = [
-    ./vpsadminos.nix
-    inputs.agenix.nixosModules.default
-    ../../system/nix.nix
-    ./hardware-config.nix
-    ./mastodon.nix
-    ./nextcloud.nix
-    ./nginx.nix
-    ./syncthing.nix
-    ./users.nix
-    ./writefreely.nix
-    ./email.nix
-    ./forgejo.nix
-  ];
-
-  services.nginx.virtualHosts."lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    root = pkgs.runCommand "www-dir" { } ''
-      mkdir -p $out
-      cat > $out/index.html <<EOF
-        <!DOCTYPE html>
-        <html lang="en">
-        <body>
-          <h1>
-              Nothing to see here!
-          <h1>
-        </body>
-        </html>
-      EOF
-    '';
-  };
-
-  # # Enable networking
-  # networking.networkmanager.enable = true;
-  # Set your time zone.
-  time.timeZone = "America/Sao_Paulo";
-  # Select internationalisation properties.
-  i18n.defaultLocale = "pt_BR.utf8";
-
-  boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576;
-
-  age = {
-    identityPaths = [ "/root/.ssh/id_rsa" ];
-  };
-
-  system.autoUpgrade = {
-    enable = true;
-    dates = "04:40";
-    operation = "switch";
-    flags = [
-      "--update-input"
-      "nixpkgs"
-      "--no-write-lock-file"
-      "-L"
-    ];
-    flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
-  };
-
-  networking.firewall.allowedTCPPorts = [ 8745 ];
-
-  system.stateVersion = "23.05"; # Never change this
-}

hosts/phantom/email.nix

@@ -1,61 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  ...
-}:
-{
-  # It's important to let Digital Ocean set the hostname so we get rDNS to work
-  networking.hostName = "";
-
-  imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
-
-  mailserver = {
-    enable = true;
-    fqdn = "lelgenio.com";
-    domains = [
-      "lelgenio.xyz"
-      "git.lelgenio.xyz"
-      "lelgenio.com"
-      "git.lelgenio.com"
-      "social.lelgenio.com"
-    ];
-    certificateScheme = "acme-nginx";
-    # Create passwords with
-    # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
-    loginAccounts = {
-      "lelgenio@lelgenio.com" = {
-        hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
-        aliases = [
-          "postmaster@lelgenio.com"
-          "lelgenio@lelgenio.xyz"
-          "lelgenio@lelgenio.xyz"
-        ];
-      };
-      "noreply@git.lelgenio.com" = {
-        hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
-      };
-      "noreply@social.lelgenio.com" = {
-        hashedPassword = "$2b$05$DcA9xMdvHqqQMZw2.zybI.vfKsQAJtaQ/JB.t9AHu6psstWq97m2C";
-      };
-    };
-  };
-
-  # Prefer ipv4 and use main ipv6 to avoid reverse DNS issues
-  services.postfix.extraConfig = ''
-    smtp_address_preference = ipv4
-  '';
-
-  # Webmail
-  services.roundcube = {
-    enable = true;
-    package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
-    hostName = "mail.lelgenio.com";
-    extraConfig = ''
-      $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
-      $config['smtp_user'] = "%u";
-      $config['smtp_pass'] = "%p";
-      $config['plugins'] = [ "carddav", "archive" ];
-    '';
-  };
-}

hosts/phantom/forgejo.nix

@@ -1,53 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-let
-  cfg = config.services.forgejo;
-  srv = cfg.settings.server;
-in
-{
-  services.nginx = {
-    virtualHosts.${cfg.settings.server.DOMAIN} = {
-      forceSSL = true;
-      enableACME = true;
-      extraConfig = ''
-        client_max_body_size 512M;
-      '';
-      locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
-    };
-  };
-
-  services.forgejo = {
-    enable = true;
-    database.type = "postgres";
-    lfs.enable = true;
-    settings = {
-      service.DISABLE_REGISTRATION = true;
-      actions = {
-        ENABLED = true;
-        DEFAULT_ACTIONS_URL = "github";
-      };
-      server = {
-        DOMAIN = "git.lelgenio.com";
-        HTTP_PORT = 3000;
-        ROOT_URL = "https://${srv.DOMAIN}/";
-      };
-      mailer = {
-        ENABLED = true;
-        SMTP_ADDR = "mail.lelgenio.com";
-        FROM = "noreply@git.lelgenio.com";
-        USER = "noreply@git.lelgenio.com";
-      };
-    };
-    mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path;
-  };
-
-  age.secrets.phantom-forgejo-mailer-password = {
-    file = ../../secrets/phantom-forgejo-mailer-password.age;
-    mode = "400";
-    owner = "forgejo";
-  };
-}

hosts/phantom/hardware-config.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = (1024 * 2); # 2 GB
-    }
-  ];
-}

hosts/phantom/mastodon.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  services.mastodon = {
-    enable = true;
-    configureNginx = true;
-    localDomain = "social.lelgenio.com";
-    smtp = {
-      authenticate = true;
-      host = "lelgenio.com";
-      fromAddress = "noreply@social.lelgenio.com";
-      user = "noreply@social.lelgenio.com";
-      passwordFile = config.age.secrets.phantom-mastodon-mailer-password.path;
-    };
-    streamingProcesses = 2;
-    extraConfig.SINGLE_USER_MODE = "true";
-    mediaAutoRemove.olderThanDays = 10;
-  };
-
-  age.secrets.phantom-mastodon-mailer-password = {
-    file = ../../secrets/phantom-mastodon-mailer-password.age;
-    mode = "400";
-    owner = "mastodon";
-  };
-}

hosts/phantom/nextcloud.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  services.nextcloud = {
-    enable = true;
-    package = pkgs.nextcloud27;
-    hostName = "cloud.lelgenio.com";
-    https = true;
-    config = {
-      adminpassFile = config.age.secrets.phantom-nextcloud.path;
-    };
-  };
-
-  services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
-    forceSSL = true;
-    enableACME = true;
-  };
-
-  age = {
-    secrets.phantom-nextcloud = {
-      file = ../../secrets/phantom-nextcloud.age;
-      mode = "400";
-      owner = "nextcloud";
-      group = "nextcloud";
-    };
-  };
-}

hosts/phantom/nginx.nix

@@ -1,46 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  services.nginx = {
-    enable = true;
-    recommendedProxySettings = true;
-    recommendedTlsSettings = true;
-    recommendedOptimisation = true;
-    recommendedGzipSettings = true;
-  };
-
-  # Redirect *lelgenio.xyz -> *lelgenio.com
-  services.nginx.virtualHosts =
-    lib.mapAttrs' (key: value: lib.nameValuePair "${key}lelgenio.xyz" value)
-      (
-        lib.genAttrs
-          [
-            ""
-            "social."
-            "blog."
-            "cloud."
-            "mail."
-            "git."
-            "syncthing."
-          ]
-          (name: {
-            enableACME = true;
-            forceSSL = true;
-            locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri";
-          })
-      );
-
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "lelgenio@disroot.org";
-  };
-
-  networking.firewall.allowedTCPPorts = [
-    80
-    443
-  ];
-}

hosts/phantom/vpsadminos.nix

@@ -1,76 +0,0 @@
-# This file provides compatibility for NixOS to run in a container on vpsAdminOS
-# hosts.
-#
-# If you're experiencing issues, try updating this file to the latest version
-# from vpsAdminOS repository:
-#
-#   https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix
-
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib;
-let
-  nameservers = [
-    "1.1.1.1"
-    "2606:4700:4700::1111"
-  ];
-in
-{
-  networking.nameservers = mkDefault nameservers;
-  services.resolved = mkDefault { fallbackDns = nameservers; };
-  networking.dhcpcd.extraConfig = "noipv4ll";
-
-  systemd.services.systemd-sysctl.enable = false;
-  systemd.services.systemd-oomd.enable = false;
-  systemd.sockets."systemd-journald-audit".enable = false;
-  systemd.mounts = [
-    {
-      where = "/sys/kernel/debug";
-      enable = false;
-    }
-  ];
-  systemd.services.rpc-gssd.enable = false;
-
-  # Due to our restrictions in /sys, the default systemd-udev-trigger fails
-  # on accessing PCI devices, etc. Override it to match only network devices.
-  # In addition, boot.isContainer prevents systemd-udev-trigger.service from
-  # being enabled at all, so add it explicitly.
-  systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ];
-  systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [
-    ""
-    "-udevadm trigger --subsystem-match=net --action=add"
-  ];
-
-  boot.isContainer = true;
-  boot.enableContainers = mkDefault true;
-  boot.loader.initScript.enable = true;
-  boot.specialFileSystems."/run/keys".fsType = mkForce "tmpfs";
-  boot.systemdExecutable = mkDefault "/run/current-system/systemd/lib/systemd/systemd systemd.unified_cgroup_hierarchy=0";
-
-  # Overrides for <nixpkgs/nixos/modules/virtualisation/container-config.nix>
-  documentation.enable = mkOverride 500 true;
-  documentation.nixos.enable = mkOverride 500 true;
-  networking.useHostResolvConf = mkOverride 500 false;
-  services.openssh.startWhenNeeded = mkOverride 500 false;
-
-  # Bring up the network, /ifcfg.{add,del} are supplied by the vpsAdminOS host
-  systemd.services.networking-setup = {
-    description = "Load network configuration provided by the vpsAdminOS host";
-    before = [ "network.target" ];
-    wantedBy = [ "network.target" ];
-    after = [ "network-pre.target" ];
-    path = [ pkgs.iproute2 ];
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = true;
-      ExecStart = "${pkgs.bash}/bin/bash /ifcfg.add";
-      ExecStop = "${pkgs.bash}/bin/bash /ifcfg.del";
-    };
-    unitConfig.ConditionPathExists = "/ifcfg.add";
-    restartIfChanged = false;
-  };
-}

hosts/pixie.nix

@@ -1,25 +1,13 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules =
-    "nvme"
+    [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
@@ -30,7 +18,8 @@
     options = [ "subvol=nixos" ];
   };
 
-  boot.initrd.luks.devices."pixie".device = "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
+  boot.initrd.luks.devices."pixie".device =
+    "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
 
   fileSystems."/home" = {
     device = "/dev/mapper/pixie";
@@ -57,7 +46,8 @@
   # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.veth74f3ffc.useDHCP = lib.mkDefault true;
 
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking.hostName = "pixie"; # Define your hostname.
 }

hosts/rainbow.nix

@@ -1,34 +1,16 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 let
-  btrfs_options = [
+  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
-    "compress=zstd:3"
+  btrfs_ssd = [ "ssd" "discard=async" ];
-    "noatime"
-    "x-systemd.device-timeout=0"
-  ];
-  btrfs_ssd = [
-    "ssd"
-    "discard=async"
-  ];
 in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules =
-    "xhci_pci"
+    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -64,12 +46,10 @@ in
     options = [ "subvol=@swap" ] ++ btrfs_ssd;
   };
 
-  swapDevices = [
+  swapDevices = [{
-    {
+    device = "/swap/swapfile";
-      device = "/swap/swapfile";
+    size = (1024 * 8);
-      size = (1024 * 8);
+  }];
-    }
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -79,7 +59,8 @@ in
   # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking.hostName = "rainbow"; # Define your hostname.
 }

overlays/default.nix

@@ -1,11 +1,11 @@
-{ inputs, packages, ... }:
+{ inputs, packages, ... }: rec {
-rec {
   all = [
     scripts
     sway
     themes
     new-packages
     patches
+    variables
     lib_extended
   ];
 
@@ -13,85 +13,70 @@ rec {
 
   sway = (import ./sway.nix);
 
-  themes = (
+  themes = (final: prev: {
-    final: prev: {
+    material-wifi-icons = final.stdenv.mkDerivation rec {
-      material-wifi-icons = final.stdenv.mkDerivation rec {
+      name = "material-wifi-icons";
-        name = "material-wifi-icons";
+      src = inputs.material-wifi-icons;
-        src = inputs.material-wifi-icons;
+      installPhase = ''
-        installPhase = ''
+        install -D material-wifi.ttf $out/share/fonts/${name}
-          install -D material-wifi.ttf $out/share/fonts/${name}
+      '';
-        '';
+    };
-      };
+    papirus_red = (final.papirus-icon-theme.override { color = "red"; });
-      papirus_red = (final.papirus-icon-theme.override { color = "red"; });
+    orchis_theme_compact = (final.orchis-theme.override {
-      orchis_theme_compact = (
+      border-radius = 0;
-        final.orchis-theme.override {
+      tweaks = [ "compact" "solid" ];
-          border-radius = 0;
+    });
-          tweaks = [
+    nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
-            "compact"
+  });
-            "solid"
-          ];
-        }
-      );
-      nerdfonts_fira_hack = (
-        final.nerdfonts.override {
-          fonts = [
-            "FiraCode"
-            "Hack"
-          ];
-        }
-      );
-    }
-  );
 
-  new-packages = (
+  new-packages = (final: prev: packages // {
-    final: prev:
+    dhist = inputs.dhist.packages.${prev.system}.dhist;
-    packages
+    demoji = inputs.demoji.packages.${prev.system}.default;
-    // {
+    tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
-      dhist = inputs.dhist.packages.${prev.system}.dhist;
+    maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
-      demoji = inputs.demoji.packages.${prev.system}.default;
+    wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
-      tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
-      maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
-      wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
-    }
-  );
 
-  patches = (
+    webcord = (prev.webcord.overrideAttrs (old: {
-    final: prev: {
+      patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
-      bemenu = prev.bemenu.overrideAttrs (o: {
+    }));
-        postPatch = ''
+  });
-          substituteInPlace lib/renderers/wayland/window.c \
-            --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
-        '';
-      });
-      mySway = prev.sway.override {
-        sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
-          patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
-        });
-      };
-      mangohud = prev.mangohud.overrideAttrs (o: {
-        patches = o.patches ++ [
-          (prev.fetchpatch {
-            url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
-            hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
-          })
-        ];
-      });
-    }
-  );
 
-  lib_extended = (
+  patches = (final: prev: {
-    final: prev: {
+    bemenu = prev.bemenu.overrideAttrs (o: {
-      lib = prev.lib // rec {
+      postPatch = ''
-        # Utility function
+        substituteInPlace lib/renderers/wayland/window.c \
-        # Input: [{v1=1;} {v2=2;}]
+          --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
-        # Output: {v1=1;v2=2;}
+      '';
-        mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { };
+    });
+    sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
+      patches = old.patches
+        ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
+    });
+    mangohud = prev.mangohud.overrideAttrs (o: {
+      patches = o.patches ++ [
+        (prev.fetchpatch {
+          url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
+          hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
+        })
+      ];
+    });
+  });
 
-        # Easily translate imperative templating code
+  variables = (final: prev: {
-        # Input: [ 1 2 ] (num: { "v${num}" = num; })
+    uservars = import ../user/variables.nix;
-        # Output: {v1=1;v2=2;}
+  });
-        forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
+
-      };
+  lib_extended = (final: prev: {
-    }
+    lib = prev.lib // rec {
-  );
+      # Utility function
+      # Input: [{v1=1;} {v2=2;}]
+      # Output: {v1=1;v2=2;}
+      mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { };
+
+      # Easily translate imperative templating code
+      # Input: [ 1 2 ] (num: { "v${num}" = num; })
+      # Output: {v1=1;v2=2;}
+      forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
+    };
+  });
 }

overlays/sway.nix

@@ -11,7 +11,7 @@
     executable = true;
     text = ''
       systemctl --user import-environment
-      dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK
+      dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
       # systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
       # systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
     '';

patches/webcord/fix-reading-config.patch

@@ -0,0 +1,14 @@
+diff --git a/sources/code/main/modules/config.ts b/sources/code/main/modules/config.ts
+index caf51df..41faabe 100644
+--- a/sources/code/main/modules/config.ts
++++ b/sources/code/main/modules/config.ts
+@@ -158,6 +158,9 @@ class Config<T> {
+   #read(): unknown {
+     const encodedData = readFileSync(this.#path+this.#pathExtension);
+     let decodedData = encodedData.toString();
++    if (decodedData === "")
++        return {};
++
+     if(this.#pathExtension === FileExt.Encrypted)
+       decodedData = safeStorage.decryptString(encodedData);
+     return JSON.parse(decodedData);

pkgs/blade-formatter/default.nix

@@ -1,64 +0,0 @@
-{
-  lib,
-  mkYarnPackage,
-  fetchFromGitHub,
-  fetchYarnDeps,
-  testers,
-  writeText,
-  runCommand,
-  blade-formatter,
-}:
-
-mkYarnPackage rec {
-  pname = "blade-formatter";
-  version = "1.38.2";
-
-  src = fetchFromGitHub {
-    owner = "shufo";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-JvILLw7Yp4g/dSsYtZ2ylmlXfS9t+2KADlBrYOJWTpg=";
-  };
-
-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-UFDxw3fYMzSUhZw+TCEh/dN7OioKI75LzKSnEwGPKDA=";
-  };
-
-  postBuild = "yarn build";
-
-  passthru.tests = {
-    version = testers.testVersion {
-      package = blade-formatter;
-      command = "blade-formatter --version";
-    };
-
-    simple = testers.testEqualContents {
-      assertion = "blade-formatter formats a basic blade file";
-      expected = writeText "expected" ''
-        @if (true)
-            Hello world!
-        @endif
-      '';
-      actual =
-        runCommand "actual"
-          {
-            nativeBuildInputs = [ blade-formatter ];
-            base = writeText "base" ''
-              @if(   true )  Hello world!   @endif
-            '';
-          }
-          ''
-            blade-formatter $base > $out
-          '';
-    };
-  };
-
-  meta = with lib; {
-    description = "Laravel Blade template formatter";
-    homepage = "https://github.com/shufo/blade-formatter";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lelgenio ];
-  };
-}

pkgs/blade-formatter/package.json

@@ -1,120 +0,0 @@
-{
-  "name": "blade-formatter",
-  "engines": {
-    "node": ">= 14.0.0"
-  },
-  "keywords": [
-    "php",
-    "formatter",
-    "laravel"
-  ],
-  "version": "1.38.2",
-  "description": "An opinionated blade template formatter for Laravel",
-  "main": "./dist/bundle.cjs",
-  "types": "./dist/types/main.d.ts",
-  "type": "module",
-  "exports": {
-    ".": {
-      "import": "./dist/bundle.js",
-      "require": "./dist/bundle.cjs",
-      "default": "./dist/bundle.js"
-    },
-    "./*": "./*"
-  },
-  "scripts": {
-    "build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js",
-    "prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true",
-    "watch": "node esbuild.js",
-    "test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest",
-    "lint": "eslint src -c .eslintrc.json --ext ts",
-    "fix": "prettier {src,__tests__}/**/*.ts --write",
-    "check_formatted": "prettier **/*.ts -c",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "prepare": "husky install",
-    "bin": "cross-env ./bin/blade-formatter.cjs"
-  },
-  "bin": {
-    "blade-formatter": "bin/blade-formatter.cjs"
-  },
-  "author": "Shuhei Hayashibara",
-  "license": "MIT",
-  "dependencies": {
-    "@prettier/plugin-php": "^0.19.7",
-    "@shufo/tailwindcss-class-sorter": "3.0.1",
-    "aigle": "^1.14.1",
-    "ajv": "^8.9.0",
-    "chalk": "^4.1.0",
-    "concat-stream": "^2.0.0",
-    "detect-indent": "^6.0.0",
-    "find-config": "^1.0.0",
-    "glob": "^8.0.1",
-    "html-attribute-sorter": "^0.4.3",
-    "ignore": "^5.1.8",
-    "js-beautify": "^1.14.8",
-    "lodash": "^4.17.19",
-    "php-parser": "3.1.5",
-    "prettier": "^2.2.0",
-    "tailwindcss": "^3.1.8",
-    "vscode-oniguruma": "1.7.0",
-    "vscode-textmate": "^7.0.1",
-    "xregexp": "^5.0.1",
-    "yargs": "^17.3.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.6.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.16.5",
-    "@babel/preset-env": "^7.13.12",
-    "@babel/preset-typescript": "^7.16.5",
-    "@types/concat-stream": "^2.0.0",
-    "@types/find-config": "^1.0.1",
-    "@types/fs-extra": "^11.0.0",
-    "@types/glob": "^8.0.0",
-    "@types/jest": "^29.0.0",
-    "@types/js-beautify": "^1.13.3",
-    "@types/lodash": "^4.14.178",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.0.0",
-    "@types/xregexp": "^4.4.0",
-    "@typescript-eslint/eslint-plugin": "^5.8.1",
-    "@typescript-eslint/parser": "^5.8.1",
-    "app-root-path": "^3.0.0",
-    "babel-jest": "^29.0.0",
-    "codecov": "^3.8.3",
-    "cross-env": "^7.0.3",
-    "esbuild": "^0.19.0",
-    "esbuild-node-externals": "^1.4.1",
-    "eslint": "^8.5.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^3.0.0",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^26.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "fs-extra": "^11.0.0",
-    "husky": "^8.0.0",
-    "jest": "^29.0.0",
-    "lint-staged": ">=10",
-    "source-map-loader": "^4.0.0",
-    "ts-jest": "^29.0.0",
-    "ts-loader": "^9.2.6",
-    "ts-migrate": "^0.1.27",
-    "ts-node": "^10.4.0",
-    "typescript": "^5.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/shufo/blade-formatter.git"
-  },
-  "files": [
-    "dist",
-    "src",
-    "bin",
-    "wasm",
-    "syntaxes",
-    "CHANGELOG.md"
-  ],
-  "lint-staged": {
-    "*.ts": "yarn run fix"
-  }
-}

pkgs/cargo-checkmate.nix

@@ -1,12 +1,11 @@
-{
+{ lib
-  lib,
+, rustPlatform
-  rustPlatform,
+, fetchFromGitHub
-  fetchFromGitHub,
+, pkg-config
-  pkg-config,
+, openssl
-  openssl,
+, zlib
-  zlib,
+, stdenv
-  stdenv,
+, Security ? null
-  Security ? null,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -23,7 +22,9 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "sha256-hOB84u55ishahIFSqBnqccqH3OlC9J8mCYzsd23jTyA=";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
+    Security
+  ];
 
   meta = with lib; {
     description = "Check all the things.";

pkgs/default.nix

@@ -1,9 +1,7 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
 
-{ pkgs, inputs }:
+{ pkgs, inputs }: {
-{
-  blade-formatter = pkgs.callPackage ./blade-formatter { };
   cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
   lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };
   emmet-cli = pkgs.callPackage ./emmet-cli.nix { };

pkgs/emmet-cli.nix

@@ -1,7 +1,6 @@
-{
+{ lib
-  lib,
+, buildNpmPackage
-  buildNpmPackage,
+, fetchFromGitHub
-  fetchFromGitHub,
 }:
 
 buildNpmPackage rec {

pkgs/lipsum.nix

@@ -11,7 +11,9 @@ pkgs.stdenv.mkDerivation rec {
     wrapGAppsHook
   ];
 
-  makeFlags = [ "PRG=${pname}" ];
+  makeFlags = [
+    "PRG=${pname}"
+  ];
 
   installPhase = ''
     install -Dm 755 "$pname" "$out/bin/$pname"
@@ -19,3 +21,4 @@ pkgs.stdenv.mkDerivation rec {
     glib-compile-schemas "$out/share/glib-2.0/schemas/"
   '';
 }
+

scripts/auto_connect_gamepad

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-list_paired_controllers() {
-    bluetoothctl devices Paired | grep -i 'controller' | cut -d' ' -f2
-}
-
-count_connected_controllers() {
-    bluetoothctl devices Connected | grep -i 'controller' | wc -l
-}
-
-try_to_connect_to_all_controllers() {
-    list_paired_controllers | while read paired_controller; do
-        echo "Trying to connect to controller $paired_controller"
-        bluetoothctl connect "$paired_controller"
-    done
-}
-
-while true; do
-    echo "looping"
-    if test "$(count_connected_controllers)" -ne 0 ; then
-        echo "there is a controller connected, not attempting to connect to any other"
-        sleep 10s
-        continue
-    fi
-    try_to_connect_to_all_controllers
-done

scripts/default.nix

@@ -1,136 +1,58 @@
-(
+(final: prev:
-  final: prev:
+with prev;
-  with prev;
+let
-  let
+  import_script = (_: path: import (path) { inherit pkgs lib; });
-    import_script = (_: path: import (path) { inherit pkgs lib; });
+  create_script = (name: text: runtimeInputs:
-    create_script = (
+    let
-      name: text: runtimeInputs:
+      script_body = pkgs.writeTextFile {
-      let
+        inherit name;
-        script_body = pkgs.writeTextFile {
+        executable = true;
-          inherit name;
+        text = ''
-          executable = true;
+          ${builtins.readFile text}
-          text = ''
+        '';
-            ${builtins.readFile text}
+      };
-          '';
+    in
-        };
+    (pkgs.writeShellApplication {
-      in
+      inherit name runtimeInputs;
-      (pkgs.writeShellApplication {
+      text = ''exec ${script_body} "$@"'';
-        inherit name runtimeInputs;
+      checkPhase = "";
-        text = ''exec ${script_body} "$@"'';
+    }));
-        checkPhase = "";
+  create_scripts =
-      })
+    lib.mapAttrs (name: deps: create_script name ./${name} deps);
-    );
-    create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
 
-    pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
+  pass = pkgs.pass.withExtensions (ex: with ex; [
-  in
+    pass-otp
-  create_scripts {
+  ]);
+in
+create_scripts
+  {
     br = [ ];
-    bmenu = [
+    bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ];
-      final.bemenu
+    down_meme = [ wl-clipboard yt-dlp libnotify ];
-      final.dhist
+    wl-copy-file = [ wl-clipboard fish ];
-      fish
-      j4-dmenu-desktop
-      jq
-      sway
-    ];
-    down_meme = [
-      wl-clipboard
-      yt-dlp
-      libnotify
-    ];
-    wl-copy-file = [
-      wl-clipboard
-      fish
-    ];
     _diffr = [ diffr ];
     _thunar-terminal = [ final.terminal ];
     _sway_idle_toggle = [ final.swayidle ];
-    kak-pager = [
+    kak-pager = [ fish final._diffr ];
-      fish
-      final._diffr
-    ];
     kak-man-pager = [ final.kak-pager ];
-    helix-pager = [
+    helix-pager = [ fish final._diffr ];
-      fish
-      final._diffr
-    ];
     helix-man-pager = [ final.helix-pager ];
-    musmenu = [
+    musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ];
-      mpc-cli
+    showkeys =
-      final.wdmenu
+      [ ]; # This will not work unless programs.wshowkeys is enabled systemwide
-      trash-cli
-      xdg-user-dirs
-      libnotify
-      sd
-      wl-clipboard
-    ];
-    showkeys = [ ]; # This will not work unless programs.wshowkeys is enabled systemwide
     terminal = [ alacritty ];
     playerctl-status = [ playerctl ];
-    pass-export = [
+    wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ];
-      pass2csv
+    screenshotsh =
-      gnupg
+      [ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ];
-    ];
+    volumesh = [ pulseaudio libnotify ];
-    wpass = [
+    pulse_sink = [ pulseaudio pamixer final.wdmenu ];
-      final.wdmenu
+    color_picker = [ grim slurp wl-clipboard libnotify imagemagick ];
-      fd
+    dzadd = [ procps libnotify final.wdmenu jq mpv pqiv python3Packages.deemix mpc-cli final.mpdDup ];
-      pass
+    mpdDup = [ mpc-cli perl ];
-      sd
+    readQrCode = [ grim zbar wl-clipboard ];
-      wl-clipboard
+  } // lib.mapAttrs import_script {
-      wtype
+  wdmenu = ./wdmenu.nix;
-    ];
+  wlauncher = ./wlauncher.nix;
-    screenshotsh = [
+  _gpg-unlock = ./_gpg-unlock.nix;
-      capitaine-cursors
+})
-      grim
-      slurp
-      jq
-      sway
-      wl-clipboard
-      xdg-user-dirs
-    ];
-    volumesh = [
-      pulseaudio
-      libnotify
-    ];
-    pulse_sink = [
-      pulseaudio
-      pamixer
-      final.wdmenu
-    ];
-    color_picker = [
-      grim
-      slurp
-      wl-clipboard
-      libnotify
-      imagemagick
-    ];
-    dzadd = [
-      procps
-      libnotify
-      final.wdmenu
-      jq
-      mpv
-      pqiv
-      python3Packages.deemix
-      mpc-cli
-      final.mpdDup
-    ];
-    mpdDup = [
-      mpc-cli
-      perl
-    ];
-    readQrCode = [
-      grim
-      zbar
-      wl-clipboard
-    ];
-    auto_connect_gamepad = [ bluez ];
-    vrr-fullscreen = [ ];
-  }
-  // lib.mapAttrs import_script {
-    wdmenu = ./wdmenu.nix;
-    wlauncher = ./wlauncher.nix;
-    _gpg-unlock = ./_gpg-unlock.nix;
-  }
-)

scripts/pass-export

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if test -z "$PASSWORD_STORE_DIR"; then
-  PASSWORD_STORE_DIR="$HOME/.password-store"
-fi
-
-pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \
-  -f User '(user|login)(:\s*)?' \
-  -f TOTP 'otpauth(:)?' \
-  -f URL 'url(:\s*)?'

scripts/vrr-fullscreen

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# List of supported outputs for VRR
-output_vrr_whitelist=(
-    "DP-1"
-    "DP-2"
-)
-
-# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop
-swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do
-    window_event=$(echo ${window_json} | jq -r '.change')
-
-    # Process only focus change and fullscreen toggle
-    if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then
-        output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)')
-        output_name=$(echo ${output_json} | jq -r '.name')
-
-        # Use only VRR in whitelisted outputs
-        if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then
-            output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status')
-            window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode')
-
-            # Only update output if nesseccary to avoid flickering
-            [[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1
-            [[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0
-        fi
-    fi
-done

scripts/wdmenu.nix

@@ -1,4 +1,12 @@
 { pkgs, ... }:
+let
+  inherit (pkgs.uservars) dmenu;
+  available_menus = {
+    bmenu = "bmenu";
+    rofi = "rofi -dmenu -sort";
+  };
+  menu_cmd = available_menus.${dmenu};
+in
 pkgs.writeShellScriptBin "wdmenu" ''
-  exec bmenu "$@"
+  exec ${menu_cmd} "$@"
 ''

scripts/wfile-picker.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  inherit (config.my) dmenu;
+  inherit (pkgs.uservars) dmenu;
   available_menus = {
     bmenu = "bmenu run";
     rofi = "rofi -show drun -sort";

scripts/wlauncher.nix

@@ -1,4 +1,12 @@
 { pkgs, ... }:
+let
+  inherit (pkgs.uservars) dmenu;
+  available_menus = {
+    bmenu = "bmenu run";
+    rofi = "rofi -show drun -sort";
+  };
+  menu_cmd = available_menus.${dmenu};
+in
 pkgs.writeShellScriptBin "wlauncher" ''
-  exec bmenu run "$@"
+  exec ${menu_cmd} "$@"
 ''

scripts/wpass

@@ -50,6 +50,10 @@ main() {
 }
 
 autotype(){
+    if pgrep qutebrowser >/dev/null; then
+        qutebrowser ":mode-enter insert"
+    fi
+
     env wtype -s 100 "$username"
     env wtype -s 100 -k tab
     env wtype -s 100 "$password"

secrets/phantom-mastodon-mailer-password.age

@@ -1,13 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa BwwxHg
-Mnc+/tJ0QqxHkg2nl9gEkz5Oj1RgxtOZnD5gRv66ISUOqZhNm1+F+xVEdKn843/q
-/WzH0f1cTF9NXP8vIaEo//bMmp50obJAd+JNovJxV+0gb9L55Nu7ayvK+eyk6j5n
-eb8TxUnwh5BPkEyc6akDh/O49GXzLlVoFD6Ik/0f3YCqUDNAYOl2bsssXtevCeK/
-WEPoCFGhZfNUrOo/0eAhiujZZ5zVb0CWNqXi8VTe2eWOE20VJULcN13TEyO3ZePx
-bAPBmDfS5GgGlV4INWxVLaIMDrzlm0tYozbBNNUbdLFFOhIOrgvay9RWxdk0u2hJ
-MPKoKsJ96EFxrbZJdS0W7a+aZk/Q3A3Civ2rtPx+5UANhmlY8e1lUHa26e1vA4K7
-ApoMtDyCbuZ9FbLurwl9zO64wWP68aKzuyKOIw+wpy41NQ/PcViSY8KNG9Pt7A2N
-CcOkByx+rwz+JdNHbOF8O4FFG4fNSWn7SvVtu5ymGgVi1bOd8PdJpjDR+6Is0SX7
-
---- DHNyITb7ZseEV58MOD/zHeH5vff0hhlbKg27rlYECGk
-ÆJ…¨Úãè·<hUs/¿ïš}ó´Zi`ˆ‘ 'ÂJŸ°z5ùÃgõãŸ%€ì‡`¤º%/˜‚±
<01>ˆ„á-Î<x—íõÉ’|

secrets/secrets.nix

@@ -2,19 +2,12 @@ let
   main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15";
 in
 {
-  "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
+  "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
-    main_ssh_public_key
+  "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
-  ];
-  "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
-    main_ssh_public_key
-  ];
   "gitlab-runner-thoreb-telemetria-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
-  "monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ];
   "lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];
   "monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
-  "phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ];
+  "ghost-nextcloud.age".publicKeys = [ main_ssh_public_key ];
-  "phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
+  "ghost-writefreely.age".publicKeys = [ main_ssh_public_key ];
-  "phantom-renawiki.age".publicKeys = [ main_ssh_public_key ];
+  "ghost-renawiki.age".publicKeys = [ main_ssh_public_key ];
-  "phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ];
-  "phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ];
 }

settings/default.nix

@@ -1,6 +0,0 @@
-{ lib, ... }:
-{
-  options = {
-    my = lib.mkOption { };
-  };
-}

switch

@@ -2,7 +2,7 @@
 
 nix fmt
 
-git --no-pager diff
+git diff
 
 sudo nice ionice \
     nixos-rebuild \

switch-phantom

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-nix fmt
-
-git --no-pager diff
-
-nixos-rebuild switch --flake .#phantom \
-  --update-input nixpkgs \
-  --no-write-lock-file \
-  --build-host phantom \
-  --target-host phantom \
-  "$@"

system/bluetooth.nix

@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-{
-  services.blueman.enable = true;
-  hardware.bluetooth = {
-    enable = true;
-    settings = {
-      General = {
-        DiscoverableTimeout = 0;
-        # Discoverable = true;
-        AlwaysPairable = true;
-      };
-      Policy = {
-        AutoEnable = true;
-      };
-    };
-  };
-}

system/boot.nix

@@ -1,11 +1,4 @@
-{
+{ config, pkgs, lib, inputs, ... }: {
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-{
   console = {
     font = "${pkgs.terminus_font}/share/consolefonts/ter-120n.psf.gz";
     packages = [ pkgs.terminus_font ];
@@ -43,9 +36,11 @@
     };
     plymouth = {
       enable = true;
-      theme = lib.mkIf (config.my.desktop == "sway") "red_loader";
+      theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader";
       themePackages = with pkgs; [
-        (adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; })
+        (adi1090x-plymouth-themes.override {
+          selected_themes = [ "red_loader" ];
+        })
       ];
     };
   };

system/cachix.nix

@@ -1,10 +1,4 @@
-{
+{ pkgs, lib, config, ... }: {
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
   services.cachix-watch-store = {
     enable = true;
     cacheName = "lelgenio";

system/configuration.nix

@@ -1,13 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
   imports = [
     ./gamemode.nix
     ./cachix.nix
@@ -15,25 +9,117 @@
     ./boot.nix
     ./thunar.nix
     ./nix.nix
-    ./fonts.nix
-    ./sound.nix
-    ./bluetooth.nix
-    ./locale.nix
-    ./users.nix
-    ./containers.nix
-    ./network.nix
-    ../settings
   ];
 
-  my = import ../user/variables.nix;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   zramSwap.enable = true;
 
   programs.adb.enable = true;
   services.udev.packages = [ pkgs.android-udev-rules ];
 
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+  # Enable networking
+  networking.networkmanager.enable = true;
+  # Open kde connect ports
+  programs.kdeconnect.enable = true;
+  networking.firewall.allowedTCPPorts = [ 55201 ];
+
+  # Set your time zone.
+  time.timeZone = "America/Sao_Paulo";
+  environment.variables.TZ = config.time.timeZone;
+  # Select internationalisation properties.
+  i18n.defaultLocale = "pt_BR.utf8";
+
+  # Enable the GNOME Desktop Environment.
+  # services.xserver.displayManager.gdm.enable = true;
+  # services.xserver.desktopManager.gnome.enable = true;
+  # services.xserver.displayManager.autologin.user = "lelgenio";
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "colemak";
+  };
+  console.keyMap = "colemak";
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+  services.flatpak.enable = true;
+  virtualisation.docker.enable = true;
+  virtualisation.docker.autoPrune.enable = true;
+  virtualisation.docker.autoPrune.dates = "monthly";
+  virtualisation.docker.autoPrune.flags = [ "--all --volumes" ];
+
+  programs.extra-container.enable = true;
+
+  programs.firejail.enable = true;
+
+  security.rtkit.enable = true;
+  services.openssh = {
+    enable = true;
+    ports = [ 9022 ];
+    settings = {
+      PermitRootLogin = "no";
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+    };
+  };
+  # programs.ssh = {
+  #   startAgent = true;
+  #   extraConfig = ''
+  #     AddKeysToAgent yes
+  #   '';
+  # };
+
+  ## Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    wireplumber.enable = true;
+    pulse.enable = true;
+    alsa.enable = true;
+    jack.enable = true;
+  };
+
+  services.blueman.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    settings = {
+      General = {
+        DiscoverableTimeout = 0;
+        # Discoverable = true;
+        AlwaysPairable = true;
+      };
+      Policy = { AutoEnable = true; };
+    };
+  };
+
   # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
+  services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.mutableUsers = false;
+  users.users.lelgenio = {
+    isNormalUser = true;
+    description = "Leonardo Eugênio";
+    hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
+    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ];
+    shell = pkgs.fish;
+    openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
+    ];
+  };
+  users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
+
+  # services.getty.autologinUser = "lelgenio";
+  programs.fish.enable = true;
+
+  programs.dzgui.enable = true;
+  programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default;
 
   packages.media-packages.enable = true;
   environment.systemPackages = with pkgs; [
@@ -45,7 +131,21 @@
     gnome3.adwaita-icon-theme # default gnome cursors
   ];
 
+  fonts.enableDefaultPackages = true;
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    nerdfonts_fira_hack
+  ];
+
   services.geoclue2.enable = true;
+  # programs.qt5ct.enable = true;
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  services.pcscd.enable = true;
+  security.sudo.wheelNeedsPassword = false;
 
   systemd.extraConfig = ''
     DefaultTimeoutStopSec=10s

system/containers.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  services.flatpak.enable = true;
-  virtualisation.docker.enable = true;
-  virtualisation.docker.autoPrune.enable = true;
-  virtualisation.docker.autoPrune.dates = "monthly";
-  virtualisation.docker.autoPrune.flags = [ "--all --volumes" ];
-
-  programs.extra-container.enable = true;
-
-  programs.firejail.enable = true;
-}

system/fonts.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  fonts.enableDefaultPackages = true;
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    nerdfonts_fira_hack
-  ];
-}

system/gamemode.nix

@@ -1,16 +1,8 @@
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
   programs.gamemode.enable = true;
   programs.gamemode.enableRenice = true;
   programs.gamemode.settings = {
-    general = {
+    general = { renice = 10; };
-      renice = 10;
-    };
 
     # Warning: GPU optimisations have the potential to damage hardware
     gpu = {

system/gitlab-runner.nix

@@ -1,52 +1,40 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, ... }: {
-{
+  mkNixRunner = registrationConfigFile: with lib; rec {
-  mkNixRunner =
+    # File should contain at least these two variables:
-    registrationConfigFile: with lib; rec {
+    # `CI_SERVER_URL`
-      # File should contain at least these two variables:
+    # `REGISTRATION_TOKEN`
-      # `CI_SERVER_URL`
+    inherit registrationConfigFile; # 2
-      # `REGISTRATION_TOKEN`
+    dockerImage = "alpine:3.18.2";
-      inherit registrationConfigFile; # 2
+    dockerAllowedImages = [ dockerImage ];
-      dockerImage = "alpine:3.18.2";
+    dockerVolumes = [
-      dockerAllowedImages = [ dockerImage ];
+      "/etc/nix/nix.conf:/etc/nix/nix.conf:ro"
-      dockerVolumes = [
+      "/nix/store:/nix/store:ro"
-        "/etc/nix/nix.conf:/etc/nix/nix.conf:ro"
+      "/nix/var/nix/db:/nix/var/nix/db:ro"
-        "/nix/store:/nix/store:ro"
+      "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
-        "/nix/var/nix/db:/nix/var/nix/db:ro"
+    ];
-        "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
+    dockerDisableCache = true;
-      ];
+    preBuildScript = pkgs.writeScript "setup-container" ''
-      dockerDisableCache = true;
+      mkdir -p -m 0755 /nix/var/log/nix/drvs
-      preBuildScript = pkgs.writeScript "setup-container" ''
+      mkdir -p -m 0755 /nix/var/nix/gcroots
-        mkdir -p -m 0755 /nix/var/log/nix/drvs
+      mkdir -p -m 0755 /nix/var/nix/profiles
-        mkdir -p -m 0755 /nix/var/nix/gcroots
+      mkdir -p -m 0755 /nix/var/nix/temproots
-        mkdir -p -m 0755 /nix/var/nix/profiles
+      mkdir -p -m 0755 /nix/var/nix/userpool
-        mkdir -p -m 0755 /nix/var/nix/temproots
+      mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
-        mkdir -p -m 0755 /nix/var/nix/userpool
+      mkdir -p -m 1777 /nix/var/nix/profiles/per-user
-        mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
+      mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
-        mkdir -p -m 1777 /nix/var/nix/profiles/per-user
+      mkdir -p -m 0700 "$HOME/.nix-defexpr"
-        mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
-        mkdir -p -m 0700 "$HOME/.nix-defexpr"
 
-        . ${pkgs.nix}/etc/profile.d/nix.sh
+      . ${pkgs.nix}/etc/profile.d/nix.sh
 
-        ${pkgs.nix}/bin/nix-env -i ${
+      ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
-          concatStringsSep " " (
+    '';
-            with pkgs;
+    environmentVariables = {
-            [
+      ENV = "/etc/profile";
-              nix
+      USER = "root";
-              cacert
+      NIX_REMOTE = "daemon";
-              git
+      PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
-              openssh
+      NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
-            ]
-          )
-        }
-      '';
-      environmentVariables = {
-        ENV = "/etc/profile";
-        USER = "root";
-        NIX_REMOTE = "daemon";
-        PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
-        NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
-      };
-      tagList = [ "nix" ];
     };
+    tagList = [ "nix" ];
+  };
 }

system/gnome.nix

@@ -1,44 +1,25 @@
-{ pkgs, lib, ... }:
+# Edit this configuration file to define what should be installed on
-{
+# your system.  Help is available in the configuration.nix(5) man page
-  services.xserver = {
+# and in the NixOS manual (accessible by running ‘nixos-help’).
-    enable = true;
+{ config, pkgs, ... }: {
-    desktopManager.gnome = {
+  # Enable the X11 windowing system.
-      enable = true;
+  services.xserver.enable = true;
-      # Enable VRR (Variable Refresh Rate)
+  # Enable the GNOME Desktop Environment.
-      extraGSettingsOverridePackages = with pkgs; [ gnome.mutter ];
+  services.xserver.displayManager.gdm.enable = true;
-      extraGSettingsOverrides = ''
+  services.xserver.desktopManager.gnome.enable = true;
-        [org.gnome.mutter]
-        experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
-      '';
-    };
-    displayManager.gdm.enable = true;
-  };
 
-  # Workaround for https://github.com/NixOS/nixpkgs/issues/103746
+  services.xserver.displayManager.autoLogin = {
-  systemd.services."getty@tty1".enable = false;
-  systemd.services."autovt@tty1".enable = false;
-
-  services.displayManager.autoLogin = {
     enable = true;
     user = "lelgenio";
   };
 
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.gnomeExtensions.gsconnect;
-  };
-
-  hardware.opentabletdriver.enable = lib.mkForce false;
-
   # services.xserver.displayManager.autologin.user = "lelgenio";
-  environment.systemPackages =
+  environment.systemPackages = with pkgs; with gnome; [
-    with pkgs;
+    gnome-tweaks
-    with gnome;
+    dconf-editor
-    [
-      gnome-tweaks
-      dconf-editor
 
-      chrome-gnome-shell
+    chrome-gnome-shell
-      gnomeExtensions.quick-settings-audio-devices-hider
+    gnomeExtensions.gsconnect
-    ];
+    gnomeExtensions.quick-settings-audio-devices-hider
+  ];
 }

system/greetd.nix

@@ -1,17 +1,6 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 let
-  inherit (config.my)
+  inherit (pkgs.uservars) key accent font theme desktop;
-    key
-    accent
-    font
-    theme
-    desktop
-    ;
 
   cfg = config.login-manager.greetd;
 in
@@ -28,7 +17,6 @@ in
     # enable sway window manager
     programs.sway = {
       enable = true;
-      package = pkgs.mySway;
       wrapperFeatures.gtk = true;
     };
 
@@ -71,7 +59,7 @@ in
         enable = true;
         settings = {
           initial_session = {
-            command = desktop;
+            command = "${pkgs.sway}/bin/sway";
             user = "lelgenio";
           };
           default_session = {

system/kde.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, ... }: {
-{
   # Enable the X11 windowing system.
   services.xserver.enable = true;
   # Enable the KDE Desktop Environment.

system/locale.nix

@@ -1,13 +0,0 @@
-{ pkgs, config, ... }:
-{
-  time.timeZone = "America/Sao_Paulo";
-  environment.variables.TZ = config.time.timeZone;
-  i18n.defaultLocale = "pt_BR.utf8";
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "colemak";
-  };
-  console.keyMap = "colemak";
-}

system/media-packages.nix

@@ -1,13 +1,6 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let cfg = config.packages.media-packages;
-  pkgs,
+in {
-  lib,
-  ...
-}:
-let
-  cfg = config.packages.media-packages;
-in
-{
   options.packages.media-packages = {
     enable = lib.mkEnableOption "media packages";
   };

system/monolith-forgejo-runner.nix

@@ -1,20 +0,0 @@
-{ pkgs, config, ... }:
-{
-  services.gitea-actions-runner = {
-    package = pkgs.forgejo-actions-runner;
-    instances.default = {
-      enable = true;
-      name = "monolith";
-      url = "https://git.lelgenio.com";
-      tokenFile = config.age.secrets.monolith-forgejo-runner-token.path;
-      labels = [
-        # provide a debian base with nodejs for actions
-        "debian-latest:docker://node:18-bullseye"
-        # fake the ubuntu name, because node provides no ubuntu builds
-        "ubuntu-latest:docker://node:18-bullseye"
-        # provide native execution on the host
-        #"native:host"
-      ];
-    };
-  };
-}

system/monolith-gitlab-runner.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
   inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
 in
@@ -20,8 +15,7 @@ in
       #   dockerPrivileged = true;
       # };
       thoreb_builder = {
-        registrationConfigFile =
+        registrationConfigFile = config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
-          config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
         dockerImage = "debian";
         dockerPrivileged = true;
       };

system/network.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-{
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-  # Enable networking
-  networking.networkmanager.enable = true;
-  # Open kde connect ports
-  programs.kdeconnect.enable = true;
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  security.rtkit.enable = true;
-  services.openssh = {
-    enable = true;
-    ports = [ 9022 ];
-    settings = {
-      PermitRootLogin = "no";
-      PasswordAuthentication = false;
-      KbdInteractiveAuthentication = false;
-    };
-  };
-}

system/nix-serve.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, lib, ... }: {
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
   services.nix-serve = {
     enable = true;
     secretKeyFile = config.age.secrets.monolith-nix-serve-privkey.path;

system/nix.nix

@@ -1,13 +1,7 @@
-{
+{ lib, config, pkgs, inputs, ... }:
-  lib,
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
 let
-  collectFlakeInputs =
+  collectFlakeInputs = input:
-    input: [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
+    [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
 in
 {
   system.extraDependencies = collectFlakeInputs inputs.self;
@@ -17,15 +11,13 @@ in
     nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     gc = {
       automatic = true;
-      dates = "weekly";
+      dates = "daily";
-      options = "--delete-older-than 7d";
+      options = "--delete-older-than 3d";
     };
     optimise.automatic = true;
     settings = {
-      trusted-users = [
+      auto-optimise-store = true;
-        "root"
+      trusted-users = [ "root" "@wheel" ];
-        "@wheel"
-      ];
       substituters = [
         "https://cache.nixos.org"
         "https://nix-community.cachix.org"

system/rainbow-gitlab-runner.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
   inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
 in
@@ -20,8 +15,7 @@ in
       #   dockerPrivileged = true;
       # };
       thoreb_builder = {
-        registrationConfigFile =
+        registrationConfigFile = config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
-          config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
         dockerImage = "debian";
         dockerPrivileged = true;
       };

system/secrets.nix

@@ -1,13 +1,14 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   age = {
     identityPaths = [ "/root/.ssh/id_rsa" ];
     secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age;
-    secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
+    secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file =
-    secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
+      ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
-    secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age;
+    secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file =
-    secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
+      ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
-    secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age;
+    secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file =
-    secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age;
+      ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
+    secrets.monolith-nix-serve-privkey.file =
+      ../secrets/monolith-nix-serve-privkey.age;
   };
 }

system/sound.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    wireplumber.enable = true;
-    pulse.enable = true;
-    alsa.enable = true;
-    jack.enable = true;
-  };
-}

system/specialisation.nix

@@ -1,7 +1,10 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   specialisation.dark-theme.configuration = {
-    nixpkgs.overlays = [ (final: prev: { uservars = prev.uservars; }) ];
+    nixpkgs.overlays = [
+      (final: prev: {
+        uservars = prev.uservars;
+      })
+    ];
   };
   specialisation.light-theme.configuration = {
     nixpkgs.overlays = [

system/steam.nix

@@ -1,33 +1,20 @@
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
   programs.steam.enable = true;
   programs.steam.package = pkgs.steam.override {
-    extraLibraries =
+    extraLibraries = pkgs: with config.hardware.opengl;
-      pkgs:
+      if pkgs.hostPlatform.is64bit
-      with config.hardware.opengl;
+      then [ package ] ++ extraPackages
-      if pkgs.hostPlatform.is64bit then
+      else [ package32 ] ++ extraPackages32;
-        [ package ] ++ extraPackages
-      else
-        [ package32 ] ++ extraPackages32;
 
-    extraPkgs =
+    extraPkgs = pkgs: with pkgs; [
-      pkgs: with pkgs; [
+      capitaine-cursors
-        capitaine-cursors
+      bibata-cursors
-        bibata-cursors
+      mangohud
-        mangohud
+      xdg-user-dirs
-        xdg-user-dirs
+    ];
-      ];
   };
   environment.systemPackages = with pkgs; [
     protontricks
     bottles
   ];
-
-  programs.dzgui.enable = true;
-  programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default;
 }

system/thunar.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
   programs.thunar = {
     enable = true;
     plugins = with pkgs.xfce; [
@@ -18,15 +12,17 @@
   services.tumbler.enable = true;
 
   environment.systemPackages = [
-    (pkgs.writeTextFile {
+    (
-      name = "thumbs";
+      pkgs.writeTextFile {
-      text = ''
+        name = "thumbs";
-        [Thumbnailer Entry]
+        text = ''
-        TryExec=unzip
+          [Thumbnailer Entry]
-        Exec=sh -c "${pkgs.unzip}/bin/unzip -p %i preview.png > %o"
+          TryExec=unzip
-        MimeType=application/x-krita;
+          Exec=sh -c "${pkgs.unzip}/bin/unzip -p %i preview.png > %o"
-      '';
+          MimeType=application/x-krita;
-      destination = "/share/thumbnailers/kra.thumbnailer";
+        '';
-    })
+        destination = "/share/thumbnailers/kra.thumbnailer";
+      }
+    )
   ];
 }

system/users.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }:
-{
-  security.sudo.wheelNeedsPassword = false;
-
-  # services.getty.autologinUser = "lelgenio";
-  programs.fish.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.mutableUsers = false;
-  users.users.lelgenio = {
-    isNormalUser = true;
-    description = "Leonardo Eugênio";
-    hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "docker"
-      "adbusers"
-      "bluetooth"
-      "corectrl"
-      "vboxusers"
-    ];
-    shell = pkgs.fish;
-    openssh.authorizedKeys.keys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
-    ];
-  };
-  users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
-}

update

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 nix flake update --verbose --print-build-logs
-exec ./switch "$@"
+./switch

user/alacritty.nix

@@ -1,16 +1,6 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
-  inherit (config.my)
+  inherit (pkgs.uservars) key theme accent font;
-    key
-    theme
-    accent
-    font
-    ;
   inherit (theme) color;
 in
 {
@@ -20,9 +10,7 @@ in
       settings = {
         font = {
           size = font.size.small;
-          normal = {
+          normal = { family = font.mono; };
-            family = font.mono;
-          };
         };
         colors = {
           primary = {
@@ -52,34 +40,31 @@ in
 
         hints = {
           alphabet = key.hints;
-          enabled = [
+          enabled = [{
-            {
+            regex =
-              regex =
+              let
-                let
+                mimes =
-                  mimes = "(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)";
+                  "(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)";
-                  # I fucking hate regex, look at this bullshit
+                # I fucking hate regex, look at this bullshit
-                  delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^⟨⟩`'';
+                delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^⟨⟩`'';
-                  # Kakoune uses these characters to represent whitespace,
+                # Kakoune uses these characters to represent whitespace,
-                  # but alacritty doesn't know about them
+                # but alacritty doesn't know about them
-                  whitespace_characters = ''¬·→'';
+                whitespace_characters = ''¬·→'';
-                in
+              in
-                "${mimes}[${delimiters}${whitespace_characters}]+";
+              "${mimes}[${delimiters}${whitespace_characters}]+";
-              command = "xdg-open";
+            command = "xdg-open";
-              post_processing = true;
+            post_processing = true;
-              mouse = {
+            mouse = {
-                enabled = true;
+              enabled = true;
-                mods = "None";
+              mods = "None";
-              };
+            };
-              binding = {
+            binding = {
-                key = "U";
+              key = "U";
-                mods = "Control|Shift";
+              mods = "Control|Shift";
-              };
+            };
-            }
+          }];
-          ];
-        };
-        mouse = {
-          hide_when_typing = true;
         };
+        mouse = { hide_when_typing = true; };
         keyboard.bindings = [
           {
             key = lib.toUpper key.up;
@@ -156,9 +141,7 @@ in
       };
     };
 
-    home.sessionVariables = {
+    home.sessionVariables = { TERMINAL = "alacritty"; };
-      TERMINAL = "alacritty";
-    };
 
     # Look at this fucking bullshit:
     # https://gitlab.gnome.org/GNOME/glib/-/blob/20c4fcb2a7246a2b205649eae3ebda4296217afc/gio/gdesktopappinfo.c#L2702

user/bmenu.nix

@@ -1,17 +1,6 @@
-{
+{ config, pkgs, lib, inputs, ... }:
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
 let
-  inherit (config.my)
+  inherit (pkgs.uservars) key theme accent font;
-    key
-    theme
-    accent
-    font
-    ;
   inherit (theme) color;
 in
 {

user/chat.nix

@@ -1,11 +1,4 @@
-{
+{ config, pkgs, lib, inputs, ... }: {
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-{
   wayland.windowManager.sway = {
     extraConfig = ''
       exec thunderbird

user/controller.nix

@@ -1,22 +1,10 @@
-{ pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }: {
-{
-  systemd.user.services = {
-    autoconnect-gamepad = {
-      Unit = {
-        Description = "Attempt to connect to game controllers";
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-      };
-      Service = {
-        ExecStart = lib.getExe pkgs.auto_connect_gamepad;
-      };
-      Install = {
-        WantedBy = [ "sway-session.target" ];
-      };
-    };
-  };
-
   xdg.desktopEntries = {
+    connect-controller = {
+      name = "Connect Controller";
+      exec = "bluetoothctl connect 84:30:95:97:1A:79";
+      terminal = false;
+    };
     disconnect-controller = {
       name = "Disconnect Controller";
       exec = "bluetoothctl disconnect 84:30:95:97:1A:79";

user/desktop-entries.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, lib, ... }: {
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
   xdg.desktopEntries = {
     kak = {
       name = "Kakoune";
@@ -14,10 +8,7 @@
       terminal = true;
       type = "Application";
       icon = "kak.desktop";
-      categories = [
+      categories = [ "Utility" "TextEditor" ];
-        "Utility"
-        "TextEditor"
-      ];
       startupNotify = true;
       mimeType = [
         "text/english"
@@ -49,15 +40,10 @@
       terminal = true;
       type = "Application";
       icon = "mutt";
-      categories = [
+      categories = [ "Network" "Email" ];
-        "Network"
-        "Email"
-      ];
       startupNotify = false;
       mimeType = [ "x-scheme-handler/mailto" ];
-      settings = {
+      settings = { Keywords = "Mail;E-mail;"; };
-        Keywords = "Mail;E-mail;";
-      };
     };
     down_meme = {
       name = "DownMeme";

user/firefox.nix

@@ -1,16 +1,6 @@
-{
+{ config, pkgs, lib, font, ... }:
-  config,
+let inherit (pkgs.uservars) desktop browser;
-  pkgs,
+  bugfixedFirefox = pkgs.firefox-esr-unwrapped // { requireSigning = false; allowAddonSideload = true; };
-  lib,
-  font,
-  ...
-}:
-let
-  inherit (config.my) desktop browser;
-  bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
-    requireSigning = false;
-    allowAddonSideload = true;
-  };
 in
 {
   config = {
@@ -38,12 +28,6 @@ in
             url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi";
             hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0=";
           })
-          (pkgs.fetchFirefoxAddon {
-            name = "i-still-dont-care-about-cookies";
-            url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi";
-            hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U=";
-          })
-
           (pkgs.fetchFirefoxAddon {
             name = "vimium_ff";
             url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi";
@@ -59,11 +43,6 @@ in
             url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi";
             hash = "sha256-4iU25chpjsdsMTPaa0yQOTWc9V9q1qFz6YV0lYtNjLA=";
           })
-          (pkgs.fetchFirefoxAddon {
-            name = "substitoot";
-            url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi";
-            hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI=";
-          })
 
           # Locale
           (pkgs.fetchFirefoxAddon {

user/fish/default.nix

@@ -1,13 +1,6 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let inherit (pkgs.uservars) key theme color accent font editor desktop;
-  pkgs,
+in {
-  lib,
-  ...
-}:
-let
-  inherit (config.my) accent editor desktop;
-in
-{
   config = {
     programs.fish = {
       enable = true;
@@ -41,12 +34,10 @@ in
       };
       shellAbbrs = {
         off = "shutdown now";
-        v =
+        v = {
-          {
+          "helix" = "hx";
-            "helix" = "hx";
+          "kakoune" = "kak";
-            "kakoune" = "kak";
+        }.${editor};
-          }
-          .${editor};
         ns = "nix develop --command $SHELL";
         wcf = "wl-copy-file";
         c = "cargo";
@@ -73,9 +64,7 @@ in
         gr = "cd (git root)";
         gri = "git rebase --interactive FETCH_HEAD";
       };
-      functions = {
+      functions = { fish_greeting = ""; };
-        fish_greeting = "";
-      };
     };
     programs = {
       zoxide.enable = true;
@@ -96,18 +85,13 @@ in
     };
     # programs.command-not-found.enable = true;
     programs.nix-index.enable = true;
-    home.packages = (
+    home.packages = (with pkgs; with fishPlugins;[
-      with pkgs;
+      trash-cli
-      with fishPlugins;
+      wl-copy-file
-      [
+      foreign-env
-        trash-cli
+    ] ++ (lib.optionals (desktop == "sway") [
-        wl-copy-file
+      async-prompt
-        foreign-env
+      done
-      ]
+    ]));
-      ++ (lib.optionals (desktop == "sway") [
-        async-prompt
-        done
-      ])
-    );
   };
 }

user/fzf.nix

@@ -1,17 +1,6 @@
-{
+{ config, pkgs, lib, inputs, ... }:
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
 let
-  inherit (config.my)
+  inherit (pkgs.uservars) key theme accent font;
-    key
-    theme
-    accent
-    font
-    ;
   inherit (theme) color;
 
   colors = {
@@ -26,21 +15,22 @@ let
   makeOptList = lib.mapAttrsToList makeKeyValue colors;
   makeColorValue = lib.strings.concatStringsSep "," makeOptList;
   color_opts = "--color=${makeColorValue}";
-  preview_opts = "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'";
+  preview_opts =
+    "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'";
+
 in
 {
   programs.fzf = {
     enable = true;
 
     fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
-    fileWidgetOptions = [ "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'" ];
+    fileWidgetOptions =
+      [ "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'" ];
 
     changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
-    changeDirWidgetOptions = [ "--preview '${pkgs.eza}/bin/eza -T L3 | head -200'" ];
+    changeDirWidgetOptions =
+      [ "--preview '${pkgs.eza}/bin/eza -T L3 | head -200'" ];
 
-    defaultOptions = [
+    defaultOptions = [ color_opts preview_opts ];
-      color_opts
-      preview_opts
-    ];
   };
 }

user/git.nix

@@ -1,17 +1,9 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let inherit (pkgs.uservars) username mail;
-  pkgs,
+in {
-  lib,
-  ...
-}:
-let
-  inherit (config.my) username mail;
-in
-{
   config = {
     programs.git = {
       enable = true;
-      lfs.enable = true;
       extraConfig = {
         user = {
           name = username;

user/gnome.nix

@@ -1,11 +1,4 @@
-{
+{ pkgs, lib, inputs, ... }: lib.mkIf (pkgs.uservars.desktop == "gnome") {
-  pkgs,
-  lib,
-  inputs,
-  config,
-  ...
-}:
-lib.mkIf (config.my.desktop == "gnome") {
 
   home.pointerCursor = {
     name = "Adwaita";
@@ -21,7 +14,9 @@ lib.mkIf (config.my.desktop == "gnome") {
       cursor-theme = "Adwaita";
       # color-scheme = "default";
     };
-    "org/gnome/desktop/wm/preferences" = lib.mkForce { button-layout = "appmenu:close"; };
+    "org/gnome/desktop/wm/preferences" = lib.mkForce {
+      button-layout = "appmenu:close";
+    };
     "org/gnome/desktop/input-sources" = {
       xkb-options = [ "lv3:lsgt_switch" ];
     };
@@ -45,11 +40,18 @@ lib.mkIf (config.my.desktop == "gnome") {
     qt6Packages.qtstyleplugin-kvantum
   ];
 
-  home.sessionVariables = {
+  home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; };
-    QT_QPA_PLATFORMTHEME = "qt5ct";
-  };
 
   xdg.defaultApplications = {
-    enable = lib.mkForce false;
+    enable = true;
+    text-editor = "codium.desktop";
+    image-viewer = "org.gnome.eog.desktop";
+    video-player = "org.gnome.Totem.desktop";
+    web-browser = "firefox.desktop";
+    document-viewer = "org.gnome.Evince.desktop";
+    file-manager = "org.gnome.Nautilus.desktop";
+    archive-manager = "org.gnome.FileRoller.desktop;";
+    email-client = "thunderbird.desktop";
+    torrent-client = "torrent.desktop";
   };
 }

user/gpg.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, lib, ... }: {
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
   config = {
     services.gpg-agent = {
       enable = true;
@@ -22,9 +16,7 @@
           PartOf = [ "graphical-session.target" ];
           After = [ "graphical-session.target" ];
         };
-        Service = {
+        Service = { ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock"; };
-          ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock";
-        };
       };
     };
     systemd.user.timers = {
@@ -39,10 +31,9 @@
           OnUnitActiveSec = "300";
           Unit = "gpg_unlock.service";
         };
-        Install = {
+        Install = { WantedBy = [ "sway-session.target" ]; };
-          WantedBy = [ "sway-session.target" ];
-        };
       };
     };
+
   };
 }

user/helix.nix

@@ -1,11 +1,6 @@
-{
+{ pkgs, lib, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 let
-  inherit (config.my) accent theme editor;
+  inherit (pkgs.uservars) accent theme editor;
   inherit (theme) color;
 in
 {
@@ -79,9 +74,7 @@ in
           g.n = "goto_line_start";
           g.o = "goto_line_end";
         };
-        keys.insert = {
+        keys.insert = { "A-k" = "normal_mode"; };
-          "A-k" = "normal_mode";
-        };
       };
       languages.language = [
         {
@@ -103,29 +96,14 @@ in
         my-theme = {
           "inherits" = "gruvbox";
           "ui.menu" = "none";
-          "ui.background" = {
+          "ui.background" = { bg = "none"; };
-            bg = "none";
-          };
           "ui.virtual.whitespace" = color.nontxt;
-          "ui.cursor.primary" = {
+          "ui.cursor.primary" = { fg = accent.fg; bg = accent.color; };
-            fg = accent.fg;
+          "ui.cursorline.primary" = { bg = color.bg_dark; };
-            bg = accent.color;
+          "ui.cursorcolumn.primary" = { modifiers = [ "bold" ]; };
-          };
+          "ui.cursorline" = { bg = "none"; };
-          "ui.cursorline.primary" = {
+          "ui.cursorcolumn" = { bg = "none"; };
-            bg = color.bg_dark;
+          "ui.linenr.selected" = { fg = color.txt; };
-          };
-          "ui.cursorcolumn.primary" = {
-            modifiers = [ "bold" ];
-          };
-          "ui.cursorline" = {
-            bg = "none";
-          };
-          "ui.cursorcolumn" = {
-            bg = "none";
-          };
-          "ui.linenr.selected" = {
-            fg = color.txt;
-          };
 
           function = color.normal.orange;
           module = color.normal.brown;
@@ -146,6 +124,8 @@ in
         };
       };
     };
-    home.sessionVariables = lib.mkIf (editor == "helix") { EDITOR = "hx"; };
+    home.sessionVariables = lib.mkIf (editor == "helix") {
+      EDITOR = "hx";
+    };
   };
 }

user/home.nix

@@ -1,12 +1,4 @@
-{
+{ config, pkgs, lib, inputs, osConfig, ... }: {
-  config,
-  pkgs,
-  lib,
-  inputs,
-  osConfig,
-  ...
-}:
-{
   imports = [
     ./controller.nix
     ./waybar
@@ -19,6 +11,7 @@
     ./alacritty.nix
     ./git.nix
     ./ssh.nix
+    ./qutebrowser
     ./gpg.nix
     ./rofi.nix
     ./mpv.nix
@@ -44,11 +37,8 @@
     ./xdg-dirs.nix
     inputs.hyprland.homeManagerModules.default
     inputs.nix-index-database.hmModules.nix-index
-    ../settings
   ];
 
-  my = import ./variables.nix;
-
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "lelgenio";
@@ -80,7 +70,9 @@
     comma
 
     # System monitors
-    (btop.override { cudaSupport = true; })
+    (btop.override {
+      cudaSupport = true;
+    })
     amdgpu_top
     inxi
     dmidecode
@@ -135,8 +127,7 @@
     clang-tools # c/c++ lsp server
     rust-analyzer # rust analyzer
 
-    blade-formatter
+    nixpkgs-fmt
-    nixfmt-rfc-style
   ];
 
   fonts.fontconfig.enable = true;
@@ -148,10 +139,14 @@
     };
   };
   home.sessionVariables = {
-    VOLUME_CHANGE_SOUND = "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga";
+    VOLUME_CHANGE_SOUND =
+      "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga";
   };
-  programs.bash = {
+  programs.bash = { enable = true; };
+
+  services.nextcloud-client = {
     enable = true;
+    startInBackground = true;
   };
 
   xdg.defaultApplications = {
@@ -159,7 +154,12 @@
     text-editor = lib.mkDefault "kak.desktop";
     image-viewer = lib.mkDefault "pqiv.desktop";
     video-player = lib.mkDefault "mpv.desktop";
-    web-browser = lib.mkDefault "firefox.desktop";
+    web-browser = lib.mkDefault (
+      {
+        firefox = lib.mkDefault "firefox.desktop";
+        qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop";
+      }.${pkgs.uservars.browser}
+    );
     document-viewer = lib.mkDefault "org.pwmt.zathura.desktop";
     file-manager = lib.mkDefault "thunar.desktop";
     archive-manager = "engrampa.desktop";
@@ -167,14 +167,12 @@
     torrent-client = lib.mkDefault "torrent.desktop";
   };
 
-  wayland.windowManager.sway.extraConfig =
+  wayland.windowManager.sway.extraConfig = lib.optionalString (osConfig.networking.hostName or "" == "monolith") ''
-    lib.optionalString (osConfig.networking.hostName or "" == "monolith")
+    exec steam
-      ''
+    exec obs --startreplaybuffer --disable-shutdown-check
-        exec steam
+    exec deluge-gtk
-        exec obs --startreplaybuffer --disable-shutdown-check
+    exec nicotine
-        exec deluge-gtk
+  '';
-        exec nicotine
-      '';
 
   systemd.user.services.rm-target = {
     Unit = {
@@ -188,16 +186,12 @@
     };
   };
   systemd.user.timers.rm-target = {
-    Unit = {
+    Unit = { Description = "Remove directories named 'target'"; };
-      Description = "Remove directories named 'target'";
-    };
     Timer = {
       OnCalendar = "weekly";
       Unit = "rm-target.service";
     };
-    Install = {
+    Install = { WantedBy = [ "timers.target" ]; };
-      WantedBy = [ "timers.target" ];
-    };
   };
 
   # This value determines the Home Manager release that your

user/hyprland.nix

@@ -1,11 +1,5 @@
-{
+{ config, pkgs, lib, ... }: {
-  config,
+  config = lib.mkIf (pkgs.uservars.desktop == "hyprland") {
-  pkgs,
-  lib,
-  ...
-}:
-{
-  config = lib.mkIf (config.my.desktop == "hyprland") {
     wayland.windowManager.hyprland = {
       enable = false;
       extraConfig = ''
@@ -128,9 +122,6 @@
       '';
     };
     home.file.".config/eww".source = ./eww;
-    home.packages = with pkgs; [
+    home.packages = with pkgs; [ eww-wayland jq ];
-      eww-wayland
-      jq
-    ];
   };
 }

user/kakoune/colors.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, color, accent }:
-  pkgs,
-  lib,
-  color,
-  accent,
-}:
 let
   colors = lib.mapAttrs (_: lib.replaceStrings [ "#" ] [ "rgb:" ]) {
     accent_fg = accent.fg;
@@ -99,9 +94,8 @@ with colors;
   face global InlayHint ${bg_light}+buif
 
   # Lsp
-''
+'' + (
-+ (lib.concatStringsSep "\n" (
+  lib.concatStringsSep "\n" (lib.mapAttrsToList
-  lib.mapAttrsToList
     (name: color: ''
       face global HighlightDiagnostic${name} ${color},default+bu
       face global Diagnostic${name} ${color},default+bu
@@ -112,5 +106,6 @@ with colors;
       Error = "red";
       Warning = "yellow";
       Hint = "blue";
-    }
+    })
-))
+)
+

user/kakoune/default.nix

@@ -1,17 +1,6 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
-  inherit (config.my)
+  inherit (pkgs.uservars) key dmenu editor theme accent;
-    key
-    dmenu
-    editor
-    theme
-    accent
-    ;
   inherit (theme) color;
   inherit (pkgs) kakounePlugins;
   inherit (pkgs.kakouneUtils) buildKakounePlugin;
@@ -85,39 +74,26 @@ in
         })
       ];
       extraConfig =
-        lib.concatStringsSep "\n" (
+        lib.concatStringsSep "\n"
-          map (lib.readFile) (
+          (map (lib.readFile) ([
-            [
+            ./filetypes.kak
-              ./filetypes.kak
+            ./hooks.kak
-              ./hooks.kak
+            ./indent.kak
-              ./indent.kak
+            ./keys.kak
-              ./keys.kak
+            ./lsp-config.kak
-              ./lsp-config.kak
+            ./usermode.kak
-              ./usermode.kak
+            ./git-mode.kak
-              ./git-mode.kak
+          ] ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak)) + ''
-            ]
-            ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak
-          )
-        )
-        + ''
 
-          set global scrolloff 10,20
+        set global scrolloff 10,20
-          set global autoreload yes
+        set global autoreload yes
-          set global startup_info_version 99999999
+        set global startup_info_version 99999999
 
-        ''
+      '' + (import ./colors.nix {
-        + (import ./colors.nix {
+          inherit pkgs lib color accent;
-          inherit
-            pkgs
-            lib
-            color
-            accent
-            ;
         });
     };
-    home.file = {
+    home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; };
-      ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
-    };
     home.packages = with pkgs; [
       terminal
       ranger
@@ -147,3 +123,4 @@ in
     };
   };
 }
+

user/kakoune/filetypes.kak

@@ -12,7 +12,7 @@ hook global WinSetOption filetype=c %{
 }
 
 hook global WinSetOption filetype=nix %{
-    set buffer formatcmd 'nixfmt'
+    set buffer formatcmd 'nixpkgs-fmt'
 }
 
 hook global BufCreate .*\.html %{
@@ -93,7 +93,6 @@ hook global WinSetOption filetype=blade %[
     hook -once -always window WinSetOption filetype=.* %{ remove-hooks window blade-.+ }
 
     require-module php
-    require-module javascript
 
     add-highlighter buffer/blade regions
     add-highlighter buffer/blade/base default-region group
@@ -109,9 +108,6 @@ hook global WinSetOption filetype=blade %[
     add-highlighter buffer/blade/php/ ref php
     add-highlighter buffer/blade/php/ regex '@((end)?php)' 1:block
 
-    add-highlighter buffer/blade/js  region '<script>' '</script>' group
-    add-highlighter buffer/blade/js/ ref javascript
-
     add-highlighter buffer/blade/expression region '\{\{(?!--)' '(?!--)\}\}' ref php
     add-highlighter buffer/blade/statement  region -recurse '\(' '@(if|foreach|for|section|yield|include)\s*\(' '\)' ref php
     add-highlighter buffer/blade/base/      regex '@(else(if)?|include|case|break)' 1:keyword

user/kakoune/hooks.kak

@@ -47,7 +47,7 @@ hook global BufOpenFile .*/COMMIT_EDITMSG %{
 hook global RegisterModified '"' %{ nop %sh{ {
     printf %s "$kak_reg_dquote" | wl-copy -n
     printf %s "$kak_reg_dquote" | xclip -i -selection clipboard
-} > /dev/null 2>&1 < /dev/null & }} -group sync-clipboard
+} > /dev/null 2>&1 < /dev/null & }}
 
 # Trim trailing whitespace
 hook global BufWritePre .* %{ try %{

user/kakoune/kak-lsp.toml

@@ -74,7 +74,7 @@ filetypes = ["nix"]
 command = "nil"
 roots = ["flake.nix", "shell.nix", ".git"]
 [language_server.nil.settings.nil]
-formatting.command = [ "nixfmt" ]
+formatting.command = [ "nixpkgs-fmt" ]
 
 [language_server.intelephense]
 filetypes = ["php"]

user/lf/default.nix

@@ -1,11 +1,4 @@
-{
+{ config, pkgs, lib, inputs, ... }: {
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-{
   programs.lf = {
     enable = true;
     keybindings = {

user/man.nix

@@ -1,20 +1,5 @@
-{
+{ config, pkgs, lib, inputs, ... }:
-  config,
+let inherit (pkgs.uservars) key theme color accent font desktop editor;
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-let
-  inherit (config.my)
-    key
-    theme
-    color
-    accent
-    font
-    desktop
-    editor
-    ;
   pagers = rec {
     kak = kakoune;
     kakoune = {