gnome: package gnome-pass-search-provider

This reverts commit 43dd44d237.

flake.lock

@@ -16,37 +16,23 @@
         "type": "github"
       }
     },
-    "advisory-db_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1683272394,
-        "narHash": "sha256-4XQZbSZ8XYAeASpr0Er8mNPnjbYLJwvaB+VyH+bt6DE=",
-        "owner": "rustsec",
-        "repo": "advisory-db",
-        "rev": "50bed3ba4066e6255dab434dc845e7f655812ce1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rustsec",
-        "repo": "advisory-db",
-        "type": "github"
-      }
-    },
     "agenix": {
       "inputs": {
         "darwin": "darwin",
-        "home-manager": "home-manager",
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1707830867,
+        "lastModified": 1718371084,
-        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
+        "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
+        "rev": "3a56735779db467538fb2e577eda28a9daacaca6",
         "type": "github"
       },
       "original": {
@@ -97,20 +83,17 @@
     },
     "crane_2": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_4",
         "nixpkgs": [
-          "maildir-notify-daemon",
+          "warthunder-leak-counter",
           "nixpkgs"
-        ],
+        ]
-        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1683505101,
+        "lastModified": 1718730147,
-        "narHash": "sha256-VBU64Jfu2V4sUR5+tuQS9erBRAe/QEYUxdVMcJGMZZs=",
+        "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "7b5bd9e5acb2bb0cfba2d65f34d8568a894cdb6c",
+        "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
         "type": "github"
       },
       "original": {
@@ -186,6 +169,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719451710,
+        "narHash": "sha256-h+bFEQHQ46pBkEsOXbxmmY6QNPPGrgpDbNlHtAKG49M=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "8767dbf5d723b1b6834f4d09b217da7c31580d58",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "dzgui": {
       "flake": false,
       "locked": {
@@ -205,7 +208,9 @@
     "dzgui-nix": {
       "inputs": {
         "dzgui": "dzgui",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1702850463,
@@ -217,6 +222,7 @@
       },
       "original": {
         "owner": "lelgenio",
+        "ref": "dzgui-4.1.0",
         "repo": "dzgui-nix",
         "type": "github"
       }
@@ -260,22 +266,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "locked": {
         "lastModified": 1696426674,
         "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -289,7 +279,7 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1650374568,
@@ -305,14 +295,14 @@
         "type": "github"
       }
     },
-    "flake-compat_5": {
+    "flake-compat_4": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
+        "lastModified": 1696426674,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -341,7 +331,7 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils_6"
+        "flake-utils": "flake-utils_4"
       },
       "locked": {
         "lastModified": 1696331477,
@@ -392,14 +382,14 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1694529238,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -428,14 +418,14 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
-        "lastModified": 1694529238,
+        "lastModified": 1681202837,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -446,32 +436,14 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_9"
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1710146030,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_8": {
-      "inputs": {
-        "systems": "systems_11"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -483,225 +455,24 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "agenix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1703113217,
+        "lastModified": 1718530513,
-        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
+        "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
+        "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1706981411,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-23.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "hyprcursor": {
-      "inputs": {
-        "hyprlang": "hyprlang",
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1710257359,
-        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "type": "github"
-      }
-    },
-    "hyprland": {
-      "inputs": {
-        "hyprcursor": "hyprcursor",
-        "hyprland-protocols": "hyprland-protocols",
-        "hyprlang": "hyprlang_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_5",
-        "wlroots": "wlroots",
-        "xdph": "xdph"
-      },
-      "locked": {
-        "lastModified": 1710864211,
-        "narHash": "sha256-Uve1/UBnwD4M/9xD0E3XATnLrF8B5vL6MTBhX6Is+TE=",
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "rev": "bcba3951f45f11245d424274130eb3a0ac790d93",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691753796,
-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "hyprlang": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "hyprcursor",
-          "nixpkgs"
-        ],
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprlang_2": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "lipsum": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1630421397,
-        "narHash": "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=",
-        "owner": "hannenz",
-        "repo": "lipsum",
-        "rev": "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hannenz",
-        "repo": "lipsum",
-        "type": "github"
-      }
-    },
-    "maildir-notify-daemon": {
-      "inputs": {
-        "advisory-db": "advisory-db_2",
-        "crane": "crane_2",
-        "flake-utils": "flake-utils_5",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1683946606,
-        "narHash": "sha256-nzI8XDjf7Q0NZdVuxEvkkU4x0w229DmJZAN2yB92oMc=",
-        "owner": "lelgenio",
-        "repo": "maildir-notify-daemon",
-        "rev": "f609cbd6dd6accce8f24594bc2e13822023e3d79",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lelgenio",
-        "repo": "maildir-notify-daemon",
-        "type": "github"
-      }
-    },
-    "material-wifi-icons": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1703850449,
-        "narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=",
-        "owner": "dcousens",
-        "repo": "material-wifi-icons",
-        "rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dcousens",
-        "repo": "material-wifi-icons",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -709,11 +480,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710644923,
+        "lastModified": 1719111455,
-        "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=",
+        "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "e25efda85e39fcdc845e371971ac4384989c4295",
+        "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
         "type": "github"
       },
       "original": {
@@ -724,15 +495,18 @@
     },
     "nix-software-center": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixos-appstream-data": "nixos-appstream-data",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1703105285,
+        "lastModified": 1714856183,
-        "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=",
+        "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=",
         "owner": "vlinkz",
         "repo": "nix-software-center",
-        "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65",
+        "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386",
         "type": "github"
       },
       "original": {
@@ -741,10 +515,38 @@
         "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",
+        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "snowfall-lib": "snowfall-lib"
       },
       "locked": {
@@ -764,118 +566,42 @@
     "nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_4",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-23_05": "nixpkgs-23_05",
+        "nixpkgs-24_05": [
-        "nixpkgs-23_11": "nixpkgs-23_11",
+          "nixpkgs"
+        ],
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1706219574,
+        "lastModified": 1718084203,
-        "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
+        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
+        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702539185,
+        "lastModified": 1719253556,
-        "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
+        "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
+        "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-24.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-23_05": {
-      "locked": {
-        "lastModified": 1704290814,
-        "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-23_11": {
-      "locked": {
-        "lastModified": 1706098335,
-        "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.11",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1692638711,
-        "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1698318101,
-        "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.11",
         "type": "indirect"
       }
     },
@@ -898,11 +624,11 @@
     "ranger-icons": {
       "flake": false,
       "locked": {
-        "lastModified": 1709209315,
+        "lastModified": 1713564482,
-        "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=",
+        "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=",
         "owner": "alexanderjeurissen",
         "repo": "ranger_devicons",
-        "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9",
+        "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861",
         "type": "github"
       },
       "original": {
@@ -916,20 +642,18 @@
         "agenix": "agenix",
         "demoji": "demoji",
         "dhist": "dhist",
+        "disko": "disko",
         "dzgui-nix": "dzgui-nix",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
-        "hyprland": "hyprland",
-        "lipsum": "lipsum",
-        "maildir-notify-daemon": "maildir-notify-daemon",
-        "material-wifi-icons": "material-wifi-icons",
         "nix-index-database": "nix-index-database",
         "nix-software-center": "nix-software-center",
         "nixos-conf-editor": "nixos-conf-editor",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs",
         "plymouth-themes": "plymouth-themes",
         "ranger-icons": "ranger-icons",
         "tlauncher": "tlauncher",
+        "warthunder-leak-counter": "warthunder-leak-counter",
         "wl-crosshair": "wl-crosshair"
       }
     },
@@ -977,36 +701,9 @@
         "type": "github"
       }
     },
-    "rust-overlay_2": {
-      "inputs": {
-        "flake-utils": [
-          "maildir-notify-daemon",
-          "crane",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "maildir-notify-daemon",
-          "crane",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1683080331,
-        "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "snowfall-lib": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "flake-utils-plus": "flake-utils-plus",
         "nixpkgs": [
           "nixos-conf-editor",
@@ -1042,36 +739,6 @@
         "type": "github"
       }
     },
-    "systems_10": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "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,
@@ -1104,31 +771,31 @@
     },
     "systems_4": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
     "systems_5": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -1194,7 +861,7 @@
     },
     "tlauncher": {
       "inputs": {
-        "flake-utils": "flake-utils_7",
+        "flake-utils": "flake-utils_5",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1202,20 +869,20 @@
       "locked": {
         "lastModified": 1684504342,
         "narHash": "sha256-rJ0eH7BuPizvXPc+LjVtovse4gWEuxP2WiyNdXjPNL4=",
-        "owner": "lelgenio",
+        "ref": "refs/heads/main",
-        "repo": "tlauncher-nix",
         "rev": "add4df7220bd0b85177a1938c02b60c966c5eb71",
-        "type": "github"
+        "revCount": 3,
+        "type": "git",
+        "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
       },
       "original": {
-        "owner": "lelgenio",
+        "type": "git",
-        "repo": "tlauncher-nix",
+        "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
-        "type": "github"
       }
     },
     "utils": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -1232,12 +899,15 @@
       }
     },
     "utils_2": {
+      "inputs": {
+        "systems": "systems_6"
+      },
       "locked": {
-        "lastModified": 1605370193,
+        "lastModified": 1709126324,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -1246,19 +916,41 @@
         "type": "github"
       }
     },
+    "warthunder-leak-counter": {
+      "inputs": {
+        "crane": "crane_2",
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719076817,
+        "narHash": "sha256-B6NTomYXL50j6fabZrAGvTPp3zv5oFxNUhwvLhDNoMw=",
+        "ref": "refs/heads/main",
+        "rev": "406d6646970191c016a375f25a35aa00dfa0d4aa",
+        "revCount": 4,
+        "type": "git",
+        "url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter"
+      }
+    },
     "wl-crosshair": {
       "inputs": {
-        "flake-utils": "flake-utils_8",
+        "flake-utils": "flake-utils_7",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1685576039,
+        "lastModified": 1715216838,
-        "narHash": "sha256-WMkWurJsZZG7YkWzW/k2SNquYLsAZjzFs7CFswSjDew=",
+        "narHash": "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=",
         "owner": "lelgenio",
         "repo": "wl-crosshair",
-        "rev": "57d0908e10d9f58fc37fe866404cc8b66be1f0d9",
+        "rev": "39b716cf410a1b45006f50f32f8d63de5c43aedb",
         "type": "github"
       },
       "original": {
@@ -1266,58 +958,6 @@
         "repo": "wl-crosshair",
         "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",
-          "hyprland-protocols"
-        ],
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709299639,
-        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -1,8 +1,8 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-index-database = {
@@ -10,42 +10,37 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     ranger-icons.url = "github:alexanderjeurissen/ranger_devicons";
     ranger-icons.flake = false;
 
-    material-wifi-icons.url = "github:dcousens/material-wifi-icons";
-    material-wifi-icons.flake = false;
-
     plymouth-themes.url = "github:adi1090x/plymouth-themes";
     plymouth-themes.flake = false;
 
-    lipsum.url = "github:hannenz/lipsum";
-    lipsum.flake = false;
-
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
     };
 
     nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-24_05.follows = "nixpkgs";
     };
 
     dzgui-nix = {
-      url = "github:lelgenio/dzgui-nix";
+      url = "github:lelgenio/dzgui-nix/dzgui-4.1.0";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     tlauncher = {
-      url = "github:lelgenio/tlauncher-nix";
+      url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    disko.url = "github:nix-community/disko";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
+
     # my stuff
     dhist = {
       url = "github:lelgenio/dhist";
@@ -55,58 +50,60 @@
       url = "github:lelgenio/demoji";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    maildir-notify-daemon = {
-      url = "github:lelgenio/maildir-notify-daemon";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     wl-crosshair = {
       url = "github:lelgenio/wl-crosshair";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    warthunder-leak-counter = {
+      url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # gnome stuff
-    nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
+    nixos-conf-editor = {
-    nix-software-center.url = "github:vlinkz/nix-software-center";
+      url = "github:vlinkz/nixos-conf-editor";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-  outputs = inputs:
+    nix-software-center = {
+      url = "github:vlinkz/nix-software-center";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+  outputs =
+    inputs:
     let
       nixpkgsConfig = {
         inherit system;
-        config = { allowUnfree = true; };
+        config = {
-        overlays = old_overlays.all;
+          allowUnfree = true;
         };
-
+        overlays = old_overlays.all;
-      bootstrapPkgs = import inputs.nixpkgs nixpkgsConfig;
-      nixpkgs = bootstrapPkgs.applyPatches {
-        name = "patched-nixpkgs";
-        src = inputs.nixpkgs;
-        patches = lib.mapAttrsToList (k: v: ./patches/nixpkgs/${k})
-          (builtins.readDir ./patches/nixpkgs);
       };
 
       inherit (import ./user/variables.nix) desktop;
       system = "x86_64-linux";
-      pkgs = import nixpkgs nixpkgsConfig;
+      pkgs = import inputs.nixpkgs nixpkgsConfig;
       lib = inputs.nixpkgs.lib;
 
       packages = import ./pkgs { inherit pkgs inputs; };
 
       old_overlays = (import ./overlays { inherit packages inputs; });
 
-      specialArgs = { inherit inputs; };
+      specialArgs = {
-      common_modules = [
+        inherit inputs;
+      };
+      common_modules =
+        [
           { nixpkgs.pkgs = pkgs; }
           ./system/configuration.nix
           ./system/secrets.nix
-        ./system/specialisation.nix
           ./system/greetd.nix
-        { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; }
+          { login-manager.greetd.enable = desktop == "sway"; }
 
           inputs.agenix.nixosModules.default
-        inputs.hyprland.nixosModules.default
           inputs.dzgui-nix.nixosModules.default
-        { programs.hyprland.enable = (desktop == "hyprland"); }
           inputs.home-manager.nixosModules.home-manager
+          inputs.disko.nixosModules.disko
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
@@ -114,23 +111,29 @@
             home-manager.backupFileExtension = "bkp";
             # Optionally, use home-manager.extraSpecialArgs to pass
             # arguments to home.nix
-          home-manager.extraSpecialArgs = { inherit inputs; };
+            home-manager.extraSpecialArgs = {
+              inherit inputs;
+            };
           }
         ]
         ++ lib.optional (desktop == "gnome") ./system/gnome.nix
         ++ lib.optional (desktop == "kde") ./system/kde.nix;
     in
     {
+      checks."${system}" = {
+        disko-format-i15 = pkgs.callPackage ./hosts/i15/partitions-test.nix { };
+      };
       nixosConfigurations = {
         i15 = lib.nixosSystem {
           inherit system specialArgs;
-          modules = [ ./hosts/i15.nix ] ++ common_modules;
+          modules = [ ./hosts/i15 ] ++ common_modules;
         };
         monolith = lib.nixosSystem {
           inherit system specialArgs;
           modules = [
-            ./hosts/monolith.nix
+            ./hosts/monolith
             ./system/monolith-gitlab-runner.nix
+            ./system/monolith-forgejo-runner.nix
             ./system/nix-serve.nix
             ./system/steam.nix
           ] ++ common_modules;
@@ -138,7 +141,7 @@
         rainbow = lib.nixosSystem {
           inherit system specialArgs;
           modules = [
-            ./hosts/rainbow.nix
+            ./hosts/rainbow
             ./system/rainbow-gitlab-runner.nix
           ] ++ common_modules;
         };
@@ -151,11 +154,16 @@
         };
         pixie = lib.nixosSystem {
           inherit system specialArgs;
-          modules = [ ./hosts/pixie.nix ] ++ common_modules ++ [{
+          modules =
+            [ ./hosts/pixie.nix ]
+            ++ common_modules
+            ++ [
+              {
                 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 {
           inherit system specialArgs;
@@ -176,6 +184,6 @@
 
       packages.${system} = pkgs // packages;
 
-      formatter.${system} = pkgs.nixpkgs-fmt;
+      formatter.${system} = pkgs.nixfmt-rfc-style;
     };
 }

hosts/double-rainbow.nix

@@ -1,13 +1,32 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 let
-  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
+  btrfs_options = [
-  btrfs_ssd = [ "ssd" "discard=async" ];
+    "compress=zstd:3"
+    "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" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -18,8 +37,7 @@ in
     options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd;
   };
 
-  boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device =
+  boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
-    "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/97EB-7DB5";
@@ -28,6 +46,12 @@ in
 
   swapDevices = [ ];
 
+  services.udev.extraRules = ''
+    # 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"
+  '';
+
   # 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
@@ -37,8 +61,7 @@ in
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode =
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking.hostName = "double-rainbow"; # Define your hostname.
 }

hosts/i15.nix

@@ -1,15 +1,30 @@
 # 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 = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
+  btrfs_options = [
+    "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" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_usb_sdmmc"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -45,10 +60,12 @@ in
     options = [ "subvol=@swap" ] ++ btrfs_options;
   };
 
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/swap/swapfile";
       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
@@ -59,7 +76,6 @@ in
   # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode =
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
   networking.hostName = "i15"; # Define your hostname.
 }

hosts/i15/default.nix

@@ -0,0 +1,38 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+{
+  networking.hostName = "i15"; # Define your hostname.
+
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_usb_sdmmc"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; });
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  swapDevices = [
+    {
+      device = "/swap/swapfile";
+      size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
+    }
+  ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/i15/partitions-test.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+pkgs.makeDiskoTest {
+  name = "test-disko-i15";
+  disko-config = ./partitions.nix;
+  enableOCR = true;
+  bootCommands = ''
+    machine.wait_for_text("[Pp]assphrase for")
+    machine.send_chars("secretsecret\n")
+  '';
+  extraTestScript = ''
+    machine.succeed("cryptsetup isLuks /dev/vda2");
+    machine.succeed("mountpoint /home");
+  '';
+}

hosts/i15/partitions.nix

@@ -0,0 +1,73 @@
+{
+  disks ? [ "/dev/sda" ],
+  ...
+}:
+let
+  btrfs_options = [
+    "compress=zstd:3"
+    "noatime"
+  ];
+in
+{
+  disk.sda = {
+    type = "disk";
+    device = builtins.elemAt disks 0;
+    content = {
+      type = "table";
+      format = "gpt";
+      partitions = [
+        {
+          type = "partition";
+          name = "NIX_BOOT";
+          start = "1MiB";
+          end = "300MiB";
+          bootable = true;
+          content = {
+            type = "filesystem";
+            extraArgs = [
+              "-n"
+              "BOOT_I15"
+            ];
+            format = "vfat";
+            mountpoint = "/boot";
+            # options = [ "defaults" ];
+          };
+        }
+        {
+          type = "partition";
+          name = "CRYPT_I15";
+          start = "300MiB";
+          end = "100%";
+          content = {
+            type = "luks";
+            name = "main";
+            keyFile = "/tmp/secret.key";
+            content = {
+              type = "btrfs";
+              extraArgs = [
+                "--label"
+                "ROOT_I15"
+              ];
+              subvolumes =
+                let
+                  mountOptions = btrfs_options;
+                in
+                {
+                  "/home" = {
+                    inherit mountOptions;
+                  };
+                  "/nixos" = {
+                    inherit mountOptions;
+                    mountpoint = "/";
+                  };
+                  "/swap" = {
+                    inherit mountOptions;
+                  };
+                };
+            };
+          };
+        }
+      ];
+    };
+  };
+}

hosts/monolith.nix

@@ -1,140 +0,0 @@
-# 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, ... }:
-let
-  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
-  btrfs_ssd = [ "ssd" "discard=async" ];
-in
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  boot.initrd.availableKernelModules =
-    [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-
-  hardware.opentabletdriver.enable = true;
-
-  boot.extraModulePackages = with config.boot.kernelPackages; [
-    zenpower
-  ];
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelModules = [
-    "kvm-amd"
-    "amdgpu"
-    "zenpower"
-  ];
-  boot.kernelParams = [
-    "video=DP-1:1920x1080@144"
-    # hibernation
-    "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/
-    "resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile
-  ];
-  systemd.sleep.extraConfig = ''
-    HibernateDelaySec=30s
-    SuspendState=mem
-  '';
-
-  hardware.opengl.driSupport = true;
-  # # For 32 bit applications
-  hardware.opengl.driSupport32Bit = true;
-
-  hardware.opengl.extraPackages = with pkgs; [
-    libva
-    libvdpau
-    vaapiVdpau
-    rocm-opencl-icd
-    rocm-opencl-runtime
-  ];
-
-  programs.corectrl.enable = true;
-  virtualisation.virtualbox.host.enable = true;
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/BTRFS_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
-  };
-  # boot.initrd.luks.reusePassphrases = true;
-  boot.initrd.luks.devices = {
-    "main" = {
-      bypassWorkqueues = true;
-      device = "/dev/disk/by-label/CRYPT_ROOT";
-    };
-    "data" = {
-      bypassWorkqueues = true;
-      device = "/dev/disk/by-label/CRYPT_DATA";
-    };
-    "bigboy" = {
-      bypassWorkqueues = true;
-      device = "/dev/disk/by-label/CRYPT_BIGBOY";
-    };
-  };
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-label/NIXBOOT";
-    fsType = "vfat";
-  };
-  fileSystems."/home" = {
-    device = "/dev/disk/by-label/BTRFS_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
-  };
-  fileSystems."/home/lelgenio/Games" = {
-    device = "/dev/disk/by-label/BTRFS_DATA";
-    fsType = "btrfs";
-    options = [ "subvol=@games" "nofail" ] ++ btrfs_options;
-  };
-  fileSystems."/home/lelgenio/Downloads/Torrents" = {
-    device = "/dev/disk/by-label/BTRFS_DATA";
-    fsType = "btrfs";
-    options = [ "subvol=@torrents" "nofail" ] ++ btrfs_options;
-  };
-  fileSystems."/home/lelgenio/Música" = {
-    device = "/dev/disk/by-label/BTRFS_DATA";
-    fsType = "btrfs";
-    options = [ "subvol=@music" "nofail" ] ++ btrfs_options;
-  };
-  fileSystems."/home/lelgenio/.local/mount/data" = {
-    device = "/dev/disk/by-label/BTRFS_DATA";
-    fsType = "btrfs";
-    options = [ "subvol=@data" "nofail" ] ++ btrfs_options;
-  };
-  fileSystems."/home/lelgenio/.local/mount/bigboy" = {
-    device = "/dev/disk/by-label/BTRFS_BIGBOY";
-    fsType = "btrfs";
-    options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
-  };
-  fileSystems."/home/lelgenio/projects" = {
-    device = "/dev/disk/by-label/BTRFS_BIGBOY";
-    fsType = "btrfs";
-    options = [ "subvol=@projects" "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
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-  powerManagement.cpuFreqGovernor = "ondemand";
-  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 = ''
-    ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled"
-  '';
-
-  # swap
-  fileSystems."/swap" = {
-    device = "/dev/disk/by-label/BTRFS_ROOT";
-    fsType = "btrfs";
-    # Note these options effect the entire BTRFS filesystem and not just this volume,
-    # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
-    options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
-  };
-  swapDevices = [{
-    device = "/swap/swapfile";
-    size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
-  }];
-}

hosts/monolith/default.nix

@@ -0,0 +1,183 @@
+# 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,
+  ...
+}:
+let
+  btrfs_options = [
+    "compress=zstd:3"
+    "noatime"
+    "x-systemd.device-timeout=0"
+  ];
+  btrfs_ssd = [
+    "ssd"
+    "discard=async"
+  ];
+in
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    ./partition.nix
+  ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
+
+  hardware.opentabletdriver.enable = true;
+
+  boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [
+    "kvm-amd"
+    "amdgpu"
+    "zenpower"
+  ];
+  boot.kernelParams = [
+    "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
+    "video=DP-1:1920x1080@144"
+  ];
+  systemd.sleep.extraConfig = ''
+    HibernateDelaySec=30s
+    SuspendState=mem
+  '';
+
+  hardware.opengl.driSupport = true;
+  # # For 32 bit applications
+  hardware.opengl.driSupport32Bit = true;
+
+  hardware.opengl.extraPackages = with pkgs; [
+    libva
+    libvdpau
+    vaapiVdpau
+    rocm-opencl-icd
+    rocm-opencl-runtime
+    rocmPackages.rocm-smi
+  ];
+
+  boot.kernelPackages = pkgs.linuxPackages_6_1;
+
+  programs.corectrl = {
+    enable = true;
+    gpuOverclock = {
+      enable = true;
+      ppfeaturemask = "0xffffffff";
+    };
+  };
+
+  fileSystems."/mnt/old" = {
+    device = "/dev/disk/by-label/BTRFS_ROOT";
+    fsType = "btrfs";
+    options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
+  };
+  # boot.initrd.luks.reusePassphrases = true;
+  boot.initrd.luks.devices = {
+    "old" = {
+      bypassWorkqueues = true;
+      device = "/dev/disk/by-label/CRYPT_ROOT";
+    };
+    "data" = {
+      bypassWorkqueues = true;
+      device = "/dev/disk/by-label/CRYPT_DATA";
+    };
+    # "bigboy" = {
+    #   bypassWorkqueues = true;
+    #   device = "/dev/disk/by-label/CRYPT_BIGBOY";
+    # };
+  };
+  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  # fileSystems."/boot/efi" = {
+  #   device = "/dev/disk/by-label/NIXBOOT";
+  #   fsType = "vfat";
+  # };
+  # fileSystems."/home" = {
+  #   device = "/dev/disk/by-label/BTRFS_ROOT";
+  #   fsType = "btrfs";
+  #   options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
+  # };
+  fileSystems."/home/lelgenio/Games" = {
+    device = "/dev/disk/by-label/BTRFS_DATA";
+    fsType = "btrfs";
+    options = [
+      "subvol=@games"
+      "nofail"
+    ] ++ btrfs_options;
+  };
+  fileSystems."/home/lelgenio/Downloads/Torrents" = {
+    device = "/dev/disk/by-label/BTRFS_DATA";
+    fsType = "btrfs";
+    options = [
+      "subvol=@torrents"
+      "nofail"
+    ] ++ btrfs_options;
+  };
+  fileSystems."/home/lelgenio/Música" = {
+    device = "/dev/disk/by-label/BTRFS_DATA";
+    fsType = "btrfs";
+    options = [
+      "subvol=@music"
+      "nofail"
+    ] ++ btrfs_options;
+  };
+  fileSystems."/home/lelgenio/.local/mount/data" = {
+    device = "/dev/disk/by-label/BTRFS_DATA";
+    fsType = "btrfs";
+    options = [
+      "subvol=@data"
+      "nofail"
+    ] ++ btrfs_options;
+  };
+  # fileSystems."/home/lelgenio/.local/mount/bigboy" = {
+  #   device = "/dev/disk/by-label/BTRFS_BIGBOY";
+  #   fsType = "btrfs";
+  #   options = [ "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
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
+  powerManagement.cpuFreqGovernor = "ondemand";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  networking.hostName = "monolith"; # Define your hostname.
+
+  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"
+  '';
+
+  boot.tmp = {
+    cleanOnBoot = true;
+    useTmpfs = true;
+  };
+
+  # swap
+  # fileSystems."/swap" = {
+  #   device = "/dev/disk/by-label/BTRFS_ROOT";
+  #   fsType = "btrfs";
+  #   # Note these options effect the entire BTRFS filesystem and not just this volume,
+  #   # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
+  #   options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
+  # };
+  # swapDevices = [
+  #   {
+  #     device = "/swap/swapfile";
+  #     size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
+  #   }
+  # ];
+}

hosts/monolith/partition.nix

@@ -0,0 +1,68 @@
+let
+  btrfs_options = [
+    "compress=zstd:3"
+    "noatime"
+    "x-systemd.device-timeout=0"
+  ];
+  btrfs_ssd = btrfs_options ++ [
+    "ssd"
+    "discard=async"
+  ];
+in
+{
+  disko.devices = {
+    disk = {
+      bigboy_disk = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "2G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "defaults" ];
+              };
+            };
+            luks = {
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "bigboy";
+                # disable settings.keyFile if you want to use interactive password entry
+                passwordFile = "/tmp/secret.key"; # Interactive
+                # settings = {
+                #   allowDiscards = true;
+                #   keyFile = "/tmp/secret.key";
+                # };
+                # additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
+                content = {
+                  type = "btrfs";
+                  extraArgs = [ "-f" ];
+                  subvolumes = {
+                    "/@nixos" = {
+                      mountpoint = "/";
+                      mountOptions = btrfs_ssd;
+                    };
+                    "/@home" = {
+                      mountpoint = "/home";
+                      mountOptions = btrfs_ssd;
+                    };
+                    "/@swap" = {
+                      mountpoint = "/.swapvol";
+                      swap.swapfile.size = "32G";
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}

hosts/phantom/default.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, inputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   imports = [
     ./vpsadminos.nix
     inputs.agenix.nixosModules.default
@@ -10,10 +16,31 @@
     ./syncthing.nix
     ./users.nix
     ./writefreely.nix
-    ./renawiki.nix
     ./email.nix
+    ./forgejo.nix
+    ./warthunder-leak-counter.nix
   ];
 
+  networking.hostName = "phantom";
+
+  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.
@@ -27,14 +54,25 @@
     identityPaths = [ "/root/.ssh/id_rsa" ];
   };
 
+  nix.settings = {
+    cores = 1;
+    max-jobs = 1;
+  };
+
   system.autoUpgrade = {
     enable = true;
     dates = "04:40";
     operation = "switch";
-    flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ];
+    flags = [
-    flake = "github:lelgenio/nixos-config#phantom";
+      "--update-input"
+      "nixpkgs"
+      "--no-write-lock-file"
+      "--print-build-logs"
+    ];
+    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,35 +1,58 @@
-{ pkgs, inputs, ... }: {
+{
-  # It's important to let Digital Ocean set the hostname so we get rDNS to work
+  pkgs,
-  networking.hostName = "";
+  inputs,
-
+  config,
-  imports = [
+  ...
-    inputs.nixos-mailserver.nixosModules.mailserver
+}:
-  ];
+{
+  imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
 
   mailserver = {
     enable = true;
-    fqdn = "mail.lelgenio.xyz";
+    fqdn = "lelgenio.com";
-    domains = [ "lelgenio.xyz" ];
+    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.xyz" = {
+      "lelgenio@lelgenio.com" = {
         hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
-        aliases = [ "postmaster@lelgenio.xyz" ];
+        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 = rec {
+  services.roundcube = {
     enable = true;
     package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
-    hostName = "mail.lelgenio.xyz";
+    hostName = "mail.lelgenio.com";
     extraConfig = ''
-      $config['smtp_host'] = "tls://${hostName}:587";
+      $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
       $config['smtp_user'] = "%u";
       $config['smtp_pass'] = "%p";
-      $config['plugins'] = [ "carddav" ];
+      $config['plugins'] = [ "carddav", "archive" ];
     '';
   };
-
 }

hosts/phantom/forgejo.nix

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

hosts/phantom/mastodon.nix

@@ -1,10 +1,29 @@
-{ config, pkgs, inputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   services.mastodon = {
     enable = true;
     configureNginx = true;
-    localDomain = "social.lelgenio.xyz";
+    localDomain = "social.lelgenio.com";
-    smtp.fromAddress = "lelgenio@disroot.org";
+    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 = 5;
+  };
+
+  age.secrets.phantom-mastodon-mailer-password = {
+    file = ../../secrets/phantom-mastodon-mailer-password.age;
+    mode = "400";
+    owner = "mastodon";
   };
 }

hosts/phantom/nextcloud.nix

@@ -1,14 +1,25 @@
-{ config, pkgs, inputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud27;
+    package = pkgs.nextcloud29;
-    hostName = "cloud.lelgenio.xyz";
+    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;
@@ -17,6 +28,4 @@
       group = "nextcloud";
     };
   };
-
 }
-

hosts/phantom/nginx.nix

@@ -1,15 +1,46 @@
-{ config, pkgs, inputs, ... }: {
+{
+  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 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 }
-

hosts/phantom/renawiki.nix

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

hosts/phantom/syncthing.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, inputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
 
   services.syncthing = {
     enable = true;
@@ -7,18 +13,17 @@
     openDefaultPorts = true;
   };
 
-  services.nginx.virtualHosts."syncthing.lelgenio.xyz" = {
+  services.nginx.virtualHosts."syncthing.lelgenio.com" = {
     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
-        "proxy_pass_header Authorization;"
+          "proxy_pass_header Authorization;";
-      ;
     };
   };
 }
-

hosts/phantom/users.nix

@@ -1,8 +1,12 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   security.rtkit.enable = true;
   services.openssh = {
     enable = true;
-    ports = [ 9022 ];
+    ports = [
+      9022
+      22
+    ];
     settings = {
       PasswordAuthentication = false;
       KbdInteractiveAuthentication = false;
@@ -15,7 +19,15 @@
     isNormalUser = true;
     description = "Leonardo Eugênio";
     hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
-    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ];
+    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"
@@ -32,7 +44,5 @@
 
   programs.fish.enable = true;
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ git ];
-    git
-  ];
 }

hosts/phantom/vpsadminos.nix

@@ -6,14 +6,20 @@
 #
 #   https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix
 
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib;
 let
   nameservers = [
     "1.1.1.1"
     "2606:4700:4700::1111"
   ];
-in {
+in
+{
   networking.nameservers = mkDefault nameservers;
   services.resolved = mkDefault { fallbackDns = nameservers; };
   networking.dhcpcd.extraConfig = "noipv4ll";
@@ -21,16 +27,19 @@ in {
   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.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.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ];
-    "systemd-udev-trigger.service"
-  ];
   systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [
     ""
     "-udevadm trigger --subsystem-match=net --action=add"

hosts/phantom/warthunder-leak-counter.nix

@@ -0,0 +1,19 @@
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+{
+  imports = [ inputs.warthunder-leak-counter.nixosModules.default ];
+
+  services.warthunder-leak-counter.enable = true;
+
+  services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}";
+    };
+  };
+}

hosts/phantom/writefreely.nix

@@ -1,10 +1,16 @@
-{ config, pkgs, inputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   services.writefreely = {
     enable = true;
     acme.enable = true;
     nginx.enable = true;
     nginx.forceSSL = true;
-    host = "blog.lelgenio.xyz";
+    host = "blog.lelgenio.com";
     admin.name = "lelgenio";
     admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path;
     settings.app = {
@@ -22,4 +28,3 @@
     };
   };
 }
-

hosts/pixie/default.nix

@@ -1,13 +1,25 @@
 # 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" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
@@ -18,8 +30,7 @@
     options = [ "subvol=nixos" ];
   };
 
-  boot.initrd.luks.devices."pixie".device =
+  boot.initrd.luks.devices."pixie".device = "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
-    "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
 
   fileSystems."/home" = {
     device = "/dev/mapper/pixie";
@@ -46,8 +57,7 @@
   # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.veth74f3ffc.useDHCP = lib.mkDefault true;
 
-  hardware.cpu.amd.updateMicrocode =
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking.hostName = "pixie"; # Define your hostname.
 }

hosts/rainbow/default.nix

@@ -1,16 +1,34 @@
 # 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 = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
+  btrfs_options = [
-  btrfs_ssd = [ "ssd" "discard=async" ];
+    "compress=zstd:3"
+    "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" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -46,10 +64,12 @@ in
     options = [ "subvol=@swap" ] ++ btrfs_ssd;
   };
 
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/swap/swapfile";
       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
@@ -59,8 +79,7 @@ in
   # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode =
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking.hostName = "rainbow"; # Define your hostname.
 }

install/i15.sh

@@ -1,63 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-settle() {
-    udevadm trigger --subsystem-match=block
-    udevadm settle
-}
-
-lsblk
-echo 'Enter the name of the device to WIPE and install (something like "sda"):'
-read DRIVE_ID
-
-echo 'Enter a passphrase to encrypt the disk:'
-read -s DRIVE_PASSPHRASE
-
-echo "Creating partition table..."
-parted -s "/dev/${DRIVE_ID}" -- mklabel gpt
-
-echo "Creating EFI system partition..."
-parted -s "/dev/${DRIVE_ID}" -- mkpart ESP 1MiB 1GiB
-parted -s "/dev/${DRIVE_ID}" -- set 1 boot on
-mkfs.fat -F32 "/dev/${DRIVE_ID}1" -n NIX_BOOT
-
-echo "Creating encrypted root partition..."
-parted -s "/dev/${DRIVE_ID}" -- mkpart luks 1GiB 100%
-echo "$DRIVE_PASSPHRASE" | cryptsetup --batch-mode luksFormat --label CRYPT_ROOT "/dev/${DRIVE_ID}2"
-settle
-echo "$DRIVE_PASSPHRASE" | cryptsetup luksOpen /dev/disk/by-label/CRYPT_ROOT "crypt_root"
-
-echo "Creating btrfs partition..."
-mkfs.btrfs --quiet --label NIX_ROOT /dev/mapper/"crypt_root"
-MNTPOINT=$(mktemp -d)
-mount /dev/mapper/"crypt_root" "$MNTPOINT"
-
-echo "Creating subvolumes..."
-btrfs subvolume create "$MNTPOINT"/@nixos
-btrfs subvolume create "$MNTPOINT"/@home
-btrfs subvolume create "$MNTPOINT"/@swap
-
-echo "Closing btrfs partition..."
-umount -Rl "$MNTPOINT"
-rm -rf "$MNTPOINT"
-
-echo "Mounting root btrfs submodule to '$MNTPOINT' ..."
-MNTPOINT=$(mktemp -d)
-mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT" -o subvol=@nixos,noatime,compress=zstd
-
-echo "Creating and mounting EFI system partition mountpoint..."
-mkdir -p "$MNTPOINT/boot"
-mount /dev/disk/by-label/NIX_BOOT "$MNTPOINT/boot"
-
-echo "Creating home partition mountpoint..."
-mkdir -p "$MNTPOINT/home"
-mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/home" -o subvol=@home,noatime,compress=zstd
-
-echo "Swapfile"
-mkdir -p "$MNTPOINT/swap"
-mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/swap" -o subvol=@swap,noatime
-
-# echo "Installing system..."
-nixos-generate-config --root "$MNTPOINT"
-# nixos-install --root "$MNTPOINT"

overlays/default.nix

@@ -1,64 +1,64 @@
-{ inputs, packages, ... }: rec {
+{ inputs, packages, ... }:
+rec {
   all = [
     scripts
-    sway
     themes
     new-packages
     patches
-    variables
     lib_extended
+    disko
   ];
 
   scripts = (import ../scripts);
 
-  sway = (import ./sway.nix);
+  themes = (
-
+    final: prev: {
-  themes = (final: prev: {
-    material-wifi-icons = final.stdenv.mkDerivation rec {
-      name = "material-wifi-icons";
-      src = inputs.material-wifi-icons;
-      installPhase = ''
-        install -D material-wifi.ttf $out/share/fonts/${name}
-      '';
-    };
       papirus_red = (final.papirus-icon-theme.override { color = "red"; });
-    orchis_theme_compact = (final.orchis-theme.override {
+      orchis_theme_compact = (
+        final.orchis-theme.override {
           border-radius = 0;
-      tweaks = [ "compact" "solid" ];
+          tweaks = [
-    });
+            "compact"
-    nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
+            "solid"
-  });
+          ];
+        }
+      );
+      nerdfonts_fira_hack = (
+        final.nerdfonts.override {
+          fonts = [
+            "FiraCode"
+            "Hack"
+          ];
+        }
+      );
+    }
+  );
 
-  new-packages = (final: prev: packages // {
+  new-packages = (
+    final: prev:
+    packages
+    // {
       dhist = inputs.dhist.packages.${prev.system}.dhist;
       demoji = inputs.demoji.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;
+    }
+  );
 
-    webcord = (prev.webcord.overrideAttrs (old: {
+  patches = (
-      patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
+    final: prev: {
-    }));
+      mySway = prev.sway.override {
-  });
+        withBaseWrapper = true;
-
+        withGtkWrapper = true;
-  patches = (final: prev: {
-    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
-      '';
-    });
         sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
-      patches = old.patches
+          patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
-        ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
-    });
         });
+      };
+    }
+  );
 
-  variables = (final: prev: {
+  lib_extended = (
-    uservars = import ../user/variables.nix;
+    final: prev: {
-  });
-
-  lib_extended = (final: prev: {
       lib = prev.lib // rec {
         # Utility function
         # Input: [{v1=1;} {v2=2;}]
@@ -70,5 +70,15 @@
         # Output: {v1=1;v2=2;}
         forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
       };
-  });
+    }
+  );
+
+  disko = final: prev: {
+    makeDiskoTest =
+      let
+        makeTest = import (prev.path + "/nixos/tests/make-test-python.nix");
+        eval-config = import (prev.path + "/nixos/lib/eval-config.nix");
+      in
+      (prev.callPackage "${inputs.disko}/tests/lib.nix" { inherit makeTest eval-config; }).makeDiskoTest;
+  };
 }

overlays/sway.nix

@@ -1,19 +0,0 @@
-(pkgs: _: {
-  # bash script to let dbus know about important env variables and
-  # propogate them to relevent services run at the end of sway config
-  # see
-  # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
-  # note: this is pretty much the same as  /etc/sway/config.d/nixos.conf but also restarts
-  # some user services to make sure they have the correct environment variables
-  dbus-sway-environment = pkgs.writeTextFile {
-    name = "dbus-sway-environment";
-    destination = "/bin/dbus-sway-environment";
-    executable = true;
-    text = ''
-      systemctl --user import-environment
-      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/nixpkgs/fix-steam-generation-after-generation-switch.patch

@@ -1,27 +0,0 @@
-From ac4d51306af54a088e29e2e5efcfac5dfe87d95c Mon Sep 17 00:00:00 2001
-From: lelgenio <lelgenio@disroot.org>
-Date: Fri, 4 Aug 2023 01:25:04 -0300
-Subject: [PATCH] HACK: fix steam after generation switch
-
----
- pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
-index 3500e5e9216f..4d7ac0aa7618 100644
---- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
-+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
-@@ -152,6 +152,10 @@ let
-       fi
-       if [[ -L $i ]]; then
-         symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i")
-+      elif [[ -f $i && -r $i ]]; then
-+        SNAPSHOT=$(mktemp --dry-run)
-+        cp "$i" "$SNAPSHOT"
-+        ro_mounts+=(--ro-bind-try "$SNAPSHOT" "$i")
-       else
-         ro_mounts+=(--ro-bind-try "$i" "$i")
-       fi
--- 
-2.42.0
-

patches/webcord/fix-reading-config.patch

@@ -1,14 +0,0 @@
-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,11 +1,12 @@
-{ lib
+{
-, mkYarnPackage
+  lib,
-, fetchFromGitHub
+  mkYarnPackage,
-, fetchYarnDeps
+  fetchFromGitHub,
-, testers
+  fetchYarnDeps,
-, writeText
+  testers,
-, runCommand
+  writeText,
-, blade-formatter
+  runCommand,
+  blade-formatter,
 }:
 
 mkYarnPackage rec {
@@ -40,13 +41,15 @@ mkYarnPackage rec {
             Hello world!
         @endif
       '';
-      actual = runCommand "actual"
+      actual =
+        runCommand "actual"
           {
             nativeBuildInputs = [ blade-formatter ];
             base = writeText "base" ''
               @if(   true )  Hello world!   @endif
             '';
-        } ''
+          }
+          ''
             blade-formatter $base > $out
           '';
     };

pkgs/cargo-checkmate.nix

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

pkgs/default.nix

@@ -1,9 +1,12 @@
 # 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; };
+  lipsum = pkgs.callPackage ./lipsum.nix { };
   emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
+  material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
+  gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { };
 }

pkgs/emmet-cli.nix

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

pkgs/gnome-pass-search-provider.nix

@@ -0,0 +1,64 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  python3Packages,
+  wrapGAppsHook,
+  gtk3,
+  gobject-introspection,
+  gnome,
+}:
+
+let
+  inherit (python3Packages)
+    dbus-python
+    pygobject3
+    fuzzywuzzy
+    levenshtein
+    ;
+in
+
+stdenv.mkDerivation rec {
+  pname = "gnome-pass-search-provider";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "jle64";
+    repo = "gnome-pass-search-provider";
+    rev = version;
+    hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw=";
+  };
+
+  nativeBuildInputs = [
+    python3Packages.wrapPython
+    wrapGAppsHook
+  ];
+
+  propagatedBuildInputs = [
+    dbus-python
+    pygobject3
+    fuzzywuzzy
+    levenshtein
+
+    gtk3
+    gobject-introspection
+  ];
+
+  env = {
+    LIBDIR = builtins.placeholder "out" + "/lib";
+    DATADIR = builtins.placeholder "out" + "/share";
+  };
+
+  postPatch = ''
+    substituteInPlace  conf/org.gnome.Pass.SearchProvider.service.{dbus,systemd} \
+      --replace-fail "/usr/lib" "$LIBDIR"
+  '';
+
+  installPhase = ''
+    bash ./install.sh
+  '';
+
+  postFixup = ''
+    makeWrapperArgs=( "''${gappsWrapperArgs[@]}" )
+    wrapPythonProgramsIn "$out/lib" "$out $propagatedBuildInputs"
+  '';
+}

pkgs/lipsum.nix

@@ -1,19 +1,28 @@
-{ pkgs, inputs }:
+{
-pkgs.stdenv.mkDerivation rec {
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  vala,
+  wrapGAppsHook,
+}:
+stdenv.mkDerivation rec {
   pname = "lipsum";
   version = "0.0.1";
 
-  src = inputs.lipsum;
+  src = fetchFromGitHub {
+    owner = "hannenz";
+    repo = "lipsum";
+    rev = "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed";
+    hash = "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=";
+  };
 
-  nativeBuildInputs = with pkgs; [
+  nativeBuildInputs = [
     pkg-config
     vala
     wrapGAppsHook
   ];
 
-  makeFlags = [
+  makeFlags = [ "PRG=${pname}" ];
-    "PRG=${pname}"
-  ];
 
   installPhase = ''
     install -Dm 755 "$pname" "$out/bin/$pname"
@@ -21,4 +30,3 @@ pkgs.stdenv.mkDerivation rec {
     glib-compile-schemas "$out/share/glib-2.0/schemas/"
   '';
 }
-

pkgs/material-wifi-icons.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  pname = "material-wifi-icons";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "dcousens";
+    repo = "material-wifi-icons";
+    rev = "2daf6b3d96d65beb2a3e37a9a53556aab3826d97";
+    hash = "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=";
+  };
+
+  installPhase = ''
+    install -D material-wifi.ttf $out/share/fonts/${pname}
+  '';
+}

scripts/auto_connect_gamepad

@@ -0,0 +1,27 @@
+#!/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
+    sleep 1s
+    try_to_connect_to_all_controllers
+done

scripts/default.nix

@@ -1,8 +1,10 @@
-(final: prev:
+(
-with prev;
+  final: prev:
-let
+  with prev;
+  let
     import_script = (_: path: import (path) { inherit pkgs lib; });
-  create_script = (name: text: runtimeInputs:
+    create_script = (
+      name: text: runtimeInputs:
       let
         script_body = pkgs.writeTextFile {
           inherit name;
@@ -16,43 +18,123 @@ let
         inherit name runtimeInputs;
         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 = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
-    pass-otp
+  in
-  ]);
+  create_scripts {
-in
-create_scripts
-  {
     br = [ ];
-    bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ];
+    bmenu = [
-    down_meme = [ wl-clipboard yt-dlp libnotify ];
+      final.bemenu
-    wl-copy-file = [ wl-clipboard fish ];
+      final.dhist
+      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 = [ fish final._diffr ];
+    kak-pager = [
+      fish
+      final._diffr
+    ];
     kak-man-pager = [ final.kak-pager ];
-    helix-pager = [ fish final._diffr ];
+    helix-pager = [
+      fish
+      final._diffr
+    ];
     helix-man-pager = [ final.helix-pager ];
-    musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ];
+    musmenu = [
-    showkeys =
+      mpc-cli
-      [ ]; # This will not work unless programs.wshowkeys is enabled systemwide
+      final.wdmenu
+      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 ];
-    wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ];
+    pass-export = [
-    screenshotsh =
+      pass2csv
-      [ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ];
+      gnupg
-    volumesh = [ pulseaudio libnotify ];
+    ];
-    pulse_sink = [ pulseaudio pamixer final.wdmenu ];
+    wpass = [
-    color_picker = [ grim slurp wl-clipboard libnotify imagemagick ];
+      final.wdmenu
-    dzadd = [ procps libnotify final.wdmenu jq mpv pqiv python3Packages.deemix mpc-cli final.mpdDup ];
+      fd
-    mpdDup = [ mpc-cli perl ];
+      pass
-    readQrCode = [ grim zbar wl-clipboard ];
+      sd
-  } // lib.mapAttrs import_script {
+      wl-clipboard
+      wtype
+    ];
+    screenshotsh = [
+      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
+      coreutils
+      gnugrep
+    ];
+    vrr-fullscreen = [ ];
+  }
+  // lib.mapAttrs import_script {
     wdmenu = ./wdmenu.nix;
     wlauncher = ./wlauncher.nix;
     _gpg-unlock = ./_gpg-unlock.nix;
-})
+  }
+)

scripts/pass-export

@@ -0,0 +1,10 @@
+#!/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

@@ -0,0 +1,28 @@
+#!/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,12 +1,4 @@
 { pkgs, ... }:
-let
-  inherit (pkgs.uservars) dmenu;
-  available_menus = {
-    bmenu = "bmenu";
-    rofi = "rofi -dmenu -sort";
-  };
-  menu_cmd = available_menus.${dmenu};
-in
 pkgs.writeShellScriptBin "wdmenu" ''
-  exec ${menu_cmd} "$@"
+  exec bmenu "$@"
 ''

scripts/wfile-picker.nix

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

scripts/wlauncher.nix

@@ -1,12 +1,4 @@
 { 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 ${menu_cmd} "$@"
+  exec bmenu run "$@"
 ''

scripts/wpass

@@ -50,10 +50,6 @@ 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

@@ -0,0 +1,13 @@
+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,12 +2,19 @@ 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 = [ main_ssh_public_key ];
+  "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
-  "monolith-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
+  ];
   "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 ];
   "phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
   "phantom-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

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

switch

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

switch-phantom

@@ -0,0 +1,12 @@
+#!/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

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

system/boot.nix

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

system/cachix.nix

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

system/configuration.nix

@@ -1,7 +1,13 @@
 # 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
@@ -9,115 +15,25 @@
     ./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;
+
   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 = {
-    layout = "us";
-    xkbVariant = "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.xserver.libinput.enable = true;
+  services.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; [
@@ -129,21 +45,7 @@
     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

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

system/fonts.nix

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

system/gamemode.nix

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

system/gitlab-runner.nix

@@ -1,5 +1,7 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
-  mkNixRunner = registrationConfigFile: with lib; rec {
+{
+  mkNixRunner =
+    registrationConfigFile: with lib; rec {
       # File should contain at least these two variables:
       # `CI_SERVER_URL`
       # `REGISTRATION_TOKEN`
@@ -26,7 +28,17 @@
 
         . ${pkgs.nix}/etc/profile.d/nix.sh
 
-      ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
+        ${pkgs.nix}/bin/nix-env -i ${
+          concatStringsSep " " (
+            with pkgs;
+            [
+              nix
+              cacert
+              git
+              openssh
+            ]
+          )
+        }
       '';
       environmentVariables = {
         ENV = "/etc/profile";

system/gnome.nix

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

system/greetd.nix

@@ -1,6 +1,17 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 let
-  inherit (pkgs.uservars) key accent font theme desktop;
+  inherit (config.my)
+    key
+    accent
+    font
+    theme
+    desktop
+    ;
 
   cfg = config.login-manager.greetd;
 in
@@ -17,6 +28,7 @@ in
     # enable sway window manager
     programs.sway = {
       enable = true;
+      package = pkgs.mySway;
       wrapperFeatures.gtk = true;
     };
 
@@ -33,7 +45,6 @@ in
     services.greetd =
       let
         greetd_main_script = pkgs.writeShellScriptBin "main" ''
-          ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
           export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
           ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
           swaymsg exit
@@ -59,7 +70,7 @@ in
         enable = true;
         settings = {
           initial_session = {
-            command = "${pkgs.sway}/bin/sway";
+            command = desktop;
             user = "lelgenio";
           };
           default_session = {

system/kde.nix

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

system/locale.nix

@@ -0,0 +1,13 @@
+{ 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,6 +1,13 @@
-{ config, pkgs, lib, ... }:
+{
-let cfg = config.packages.media-packages;
+  config,
-in {
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.packages.media-packages;
+in
+{
   options.packages.media-packages = {
     enable = lib.mkEnableOption "media packages";
   };
@@ -16,7 +23,7 @@ in {
       gimp
       inkscape
       krita
-      kdenlive
+      kdePackages.kdenlive
       pitivi
       blender-hip
       libreoffice

system/monolith-forgejo-runner.nix

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

system/network.nix

@@ -0,0 +1,25 @@
+{ 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,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   services.nix-serve = {
     enable = true;
     secretKeyFile = config.age.secrets.monolith-nix-serve-privkey.path;

system/nix.nix

@@ -1,7 +1,13 @@
-{ lib, config, pkgs, inputs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
 let
-  collectFlakeInputs = input:
+  collectFlakeInputs =
-    [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
+    input: [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
 in
 {
   system.extraDependencies = collectFlakeInputs inputs.self;
@@ -11,18 +17,19 @@ in
     nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     gc = {
       automatic = true;
-      dates = "daily";
+      dates = "weekly";
-      options = "--delete-older-than 3d";
+      options = "--delete-older-than 7d";
     };
     optimise.automatic = true;
     settings = {
-      auto-optimise-store = true;
+      trusted-users = [
-      trusted-users = [ "root" "@wheel" ];
+        "root"
+        "@wheel"
+      ];
       substituters = [
         "https://cache.nixos.org"
         "https://nix-community.cachix.org"
         # "http://nixcache.lelgenio.1337.cx:5000"
-        "https://hyprland.cachix.org"
         "https://lelgenio.cachix.org"
         "https://wegank.cachix.org"
         "https://snowflakeos.cachix.org/"
@@ -31,7 +38,6 @@ in
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         # "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
         "wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
         "snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="

system/rainbow-gitlab-runner.nix

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

system/secrets.nix

@@ -1,14 +1,13 @@
-{ 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.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
-      ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
+    secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
-    secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file =
+    secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age;
-      ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
+    secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
-    secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file =
+    secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age;
-      ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
+    secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age;
-    secrets.monolith-nix-serve-privkey.file =
-      ../secrets/monolith-nix-serve-privkey.age;
   };
 }

system/sound.nix

@@ -0,0 +1,12 @@
+{ 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,24 +0,0 @@
-{ pkgs, ... }: {
-  specialisation.dark-theme.configuration = {
-    nixpkgs.overlays = [
-      (final: prev: {
-        uservars = prev.uservars;
-      })
-    ];
-  };
-  specialisation.light-theme.configuration = {
-    nixpkgs.overlays = [
-      (final: prev: {
-        uservars = prev.uservars // rec {
-          theme = prev.uservars.themes.light;
-          color = theme.color;
-        };
-      })
-    ];
-  };
-  environment.systemPackages = [
-    (pkgs.writeShellScriptBin "theme" ''
-      sudo "/nix/var/nix/profiles/system/specialisation/$1-theme/bin/switch-to-configuration" test
-    '')
-  ];
-}

system/steam.nix

@@ -1,12 +1,22 @@
-{ config, pkgs, inputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   programs.steam.enable = true;
   programs.steam.package = pkgs.steam.override {
-    extraLibraries = pkgs: with config.hardware.opengl;
+    extraLibraries =
-      if pkgs.hostPlatform.is64bit
+      pkgs:
-      then [ package ] ++ extraPackages
+      with config.hardware.opengl;
-      else [ package32 ] ++ extraPackages32;
+      if pkgs.hostPlatform.is64bit then
+        [ package ] ++ extraPackages
+      else
+        [ package32 ] ++ extraPackages32;
 
-    extraPkgs = pkgs: with pkgs; [
+    extraPkgs =
+      pkgs: with pkgs; [
         capitaine-cursors
         bibata-cursors
         mangohud
@@ -17,4 +27,7 @@
     protontricks
     bottles
   ];
+
+  programs.dzgui.enable = true;
+  programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default;
 }

system/thunar.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, inputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   programs.thunar = {
     enable = true;
     plugins = with pkgs.xfce; [
@@ -12,8 +18,7 @@
   services.tumbler.enable = true;
 
   environment.systemPackages = [
-    (
+    (pkgs.writeTextFile {
-      pkgs.writeTextFile {
       name = "thumbs";
       text = ''
         [Thumbnailer Entry]
@@ -22,7 +27,6 @@
         MimeType=application/x-krita;
       '';
       destination = "/share/thumbnailers/kra.thumbnailer";
-      }
+    })
-    )
   ];
 }

system/users.nix

@@ -0,0 +1,30 @@
+{ 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"
+      "input"
+    ];
+    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
-./switch
+exec ./switch "$@"

user/alacritty.nix

@@ -1,6 +1,16 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
-  inherit (pkgs.uservars) key theme accent font;
+  inherit (config.my)
+    key
+    theme
+    accent
+    font
+    ;
   inherit (theme) color;
 in
 {
@@ -10,7 +20,9 @@ in
       settings = {
         font = {
           size = font.size.small;
-          normal = { family = font.mono; };
+          normal = {
+            family = font.mono;
+          };
         };
         colors = {
           primary = {
@@ -31,8 +43,8 @@ in
             cyan = "${color.normal.cyan}";
             white = "${color.normal.white}";
           };
-        };
           draw_bold_text_with_bright_colors = false;
+        };
         window = {
           opacity = theme.opacity / 100.0;
           dynamic_padding = true;
@@ -40,11 +52,11 @@ in
 
         hints = {
           alphabet = key.hints;
-          enabled = [{
+          enabled = [
+            {
               regex =
                 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
                   delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^⟨⟩`'';
                   # Kakoune uses these characters to represent whitespace,
@@ -62,10 +74,13 @@ in
                 key = "U";
                 mods = "Control|Shift";
               };
-          }];
+            }
+          ];
         };
-        mouse = { hide_when_typing = true; };
+        mouse = {
-        key_bindings = [
+          hide_when_typing = true;
+        };
+        keyboard.bindings = [
           {
             key = lib.toUpper key.up;
             mode = "Vi|~Search";
@@ -141,7 +156,9 @@ in
       };
     };
 
-    home.sessionVariables = { TERMINAL = "alacritty"; };
+    home.sessionVariables = {
+      TERMINAL = "alacritty";
+    };
 
     # Look at this fucking bullshit:
     # https://gitlab.gnome.org/GNOME/glib/-/blob/20c4fcb2a7246a2b205649eae3ebda4296217afc/gio/gdesktopappinfo.c#L2702

user/bmenu.nix

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

user/chat.nix

@@ -1,15 +1,22 @@
-{ config, pkgs, lib, inputs, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+{
   wayland.windowManager.sway = {
     extraConfig = ''
       exec thunderbird
-      exec webcord
+      exec vesktop
       exec telegram-desktop
     '';
   };
 
   home.packages = with pkgs; [
     tdesktop
-    webcord
+    vesktop
     thunderbird
     element-desktop-wayland
   ];

user/controller.nix

@@ -1,10 +1,22 @@
-{ config, pkgs, lib, inputs, ... }: {
+{ pkgs, lib, ... }:
-  xdg.desktopEntries = {
+{
-    connect-controller = {
+  systemd.user.services = {
-      name = "Connect Controller";
+    autoconnect-gamepad = {
-      exec = "bluetoothctl connect 84:30:95:97:1A:79";
+      Unit = {
-      terminal = false;
+        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 = {
     disconnect-controller = {
       name = "Disconnect Controller";
       exec = "bluetoothctl disconnect 84:30:95:97:1A:79";

user/desktop-entries.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   xdg.desktopEntries = {
     kak = {
       name = "Kakoune";
@@ -8,7 +14,10 @@
       terminal = true;
       type = "Application";
       icon = "kak.desktop";
-      categories = [ "Utility" "TextEditor" ];
+      categories = [
+        "Utility"
+        "TextEditor"
+      ];
       startupNotify = true;
       mimeType = [
         "text/english"
@@ -32,19 +41,6 @@
         TryExec = "kak";
       };
     };
-    neomutt = {
-      name = "Neomutt";
-      genericName = "Email Client";
-      comment = "View and Send Emails";
-      exec = "neomutt %U";
-      terminal = true;
-      type = "Application";
-      icon = "mutt";
-      categories = [ "Network" "Email" ];
-      startupNotify = false;
-      mimeType = [ "x-scheme-handler/mailto" ];
-      settings = { Keywords = "Mail;E-mail;"; };
-    };
     down_meme = {
       name = "DownMeme";
       genericName = "Download memes";

user/firefox.nix

@@ -1,6 +1,16 @@
-{ config, pkgs, lib, font, ... }:
+{
-let inherit (pkgs.uservars) desktop browser;
+  config,
-  bugfixedFirefox = pkgs.firefox-esr-unwrapped // { requireSigning = false; allowAddonSideload = true; };
+  pkgs,
+  lib,
+  font,
+  ...
+}:
+let
+  inherit (config.my) desktop browser;
+  bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
+    requireSigning = false;
+    allowAddonSideload = true;
+  };
 in
 {
   config = {
@@ -28,6 +38,18 @@ in
             url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi";
             hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0=";
           })
+          (pkgs.fetchFirefoxAddon {
+            name = "user_agent_string_switcher";
+            url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi";
+            hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM=";
+          })
+
+          (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";
@@ -38,11 +60,22 @@ in
             url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi";
             hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE=";
           })
+          (pkgs.fetchFirefoxAddon {
+            name = "return_youtube_dislikes";
+            url = "https://addons.mozilla.org/firefox/downloads/file/4208483/return_youtube_dislikes-3.0.0.14.xpi";
+            hash = "sha256-oxqyNUmEa36rkqCU6S34NJBHtIu9gH8GnRKAg8Oyf2E=";
+          })
+
           (pkgs.fetchFirefoxAddon {
             name = "mastodon_simplified_federation";
             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 {
@@ -66,6 +99,7 @@ in
             "devtools.theme" = "auto";
             "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
             "browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1;
+            "sidebar.position_start" = false; # Move sidebar to the right
 
             # enable media RDD to allow gpu acceleration
             "media.rdd-ffmpeg.enabled" = true;

user/fish/completions/todo.fish

@@ -1,124 +0,0 @@
-set __fish_complete_todoman_subcomands cancel copy delete done edit flush list move new show
-function __fish_complete_todoman_not_subcomand
-    not __fish_seen_subcommand_from $__fish_complete_todoman_subcomands
-end
-
-function __fish_complete_todoman_list_todos
-    todo list |
-        string replace -r '^\[.\] ' "" |
-        string replace -r ' ' '\t' |
-        string replace -r '\t!*' '\t' |
-        string replace -r '\(.*?\)' ""
-end
-
-function __fish_complete_todoman_config_path
-    set -q XDG_CONFIG_DIR
-    or set -l XDG_CONFIG_DIR "$HOME/.config"
-
-    set -l config_path "$XDG_CONFIG_DIR/todoman/config.py"
-
-    test -f "$config_path"
-    and echo "$config_path"
-end
-
-function __fish_complete_todoman_lists_dir
-    set -l config_path (__fish_complete_todoman_config_path)
-    or return
-
-    # looks something like "~/.local/share/calendars/*"
-    string replace -fr 'path\s*=\s*"(.*)"\s*$' '$1' < $config_path |
-    string replace -r '^~' "$HOME" |
-    string replace -r '\*$' ''
-end
-
-function __fish_complete_todoman_list_lists
-    set -l lists_path (__fish_complete_todoman_lists_dir)
-    string replace -r '.*/(.*?)$' '$1' $lists_path/*
-end
-
-
-#### Initial command definition ####
-complete --erase todo
-complete -c todo -f
-
-#### Base command flags ####
-complete -c todo -n __fish_complete_todoman_not_subcomand -s v -l verbosity -a "CRITICAL ERROR WARNING INFO DEBUG"
-complete -c todo -n __fish_complete_todoman_not_subcomand -l colour -l color -a "always auto never"
-complete -c todo -n __fish_complete_todoman_not_subcomand -l porcelain -a "Use a stable JSON format"
-complete -c todo -n __fish_complete_todoman_not_subcomand -s h -l humanize -a "Format all dates and times in a human friendly way"
-complete -c todo -n __fish_complete_todoman_not_subcomand -s c -l config -a "The config file to use."
-complete -c todo -n __fish_complete_todoman_not_subcomand -l version -d "Show the version and exit."
-complete -c todo -n __fish_complete_todoman_not_subcomand -l help -d "Show this message and exit."
-
-#### Subcommands ####
-complete -c todo -n __fish_complete_todoman_not_subcomand -a cancel -d 'Cancel one or more tasks'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a copy -d 'Copy tasks to another list'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a delete -d 'Delete tasks'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a done -d 'Mark one or more tasks as done'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a edit -d 'Edit the task with id ID'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a flush -d 'Delete done tasks'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a list -d 'List tasks'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a move -d 'Move tasks to another list'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a new -d 'Create a new task with SUMMARY'
-complete -c todo -n __fish_complete_todoman_not_subcomand -a show -d 'Show details about a task'
-
-#### Subcommand flags ####
-
-complete -c todo -n "__fish_seen_subcommand_from cancel" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.'
-complete -c todo -n "__fish_seen_subcommand_from cancel" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from copy" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.'
-complete -c todo -n "__fish_seen_subcommand_from copy" -s l -l list -d 'The list to copy the tasks to.'
-complete -c todo -n "__fish_seen_subcommand_from copy" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from delete" -a "(__fish_complete_todoman_list_todos)" -d 'Delete tasks.'
-complete -c todo -n "__fish_seen_subcommand_from delete" -l yes -d 'Confirm the action without prompting.'
-complete -c todo -n "__fish_seen_subcommand_from delete" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from done" -a "(__fish_complete_todoman_list_todos)" -d 'Mark one or more tasks as done.'
-complete -c todo -n "__fish_seen_subcommand_from done" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from edit" -a "(__fish_complete_todoman_list_todos)" -d 'Edit the task with id ID.'
-complete -c todo -n "__fish_seen_subcommand_from edit" -l raw -d 'Open the raw file for editing in $EDITOR. Only use this'
-complete -c todo -n "__fish_seen_subcommand_from edit" -s s -l start -r -d 'When the task starts.'
-complete -c todo -n "__fish_seen_subcommand_from edit" -s d -l due -r -d 'Due date of the task, in the format specified in the configuration.'
-complete -c todo -n "__fish_seen_subcommand_from edit" -l location -r -d 'The location where this todo takes place.'
-complete -c todo -n "__fish_seen_subcommand_from edit" -l priority -r -d 'Priority for this task'
-complete -c todo -n "__fish_seen_subcommand_from edit" -s i -l interactive -r -d 'Go into interactive mode before saving the task.'
-complete -c todo -n "__fish_seen_subcommand_from edit" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.'
-complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.'
-complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.'
-complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.'
-complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from list" -a "(__fish_complete_todoman_list_lists)" -d 'List tasks by list name'
-complete -c todo -n "__fish_seen_subcommand_from list" -l location -r -d 'Only show tasks with location containg TEXT'
-complete -c todo -n "__fish_seen_subcommand_from list" -l category -d "Only show tasks with category containg"
-complete -c todo -n "__fish_seen_subcommand_from list" -l grep -d "Only show tasks with message containg"
-complete -c todo -n "__fish_seen_subcommand_from list" -l sort -d "Sort tasks by field" -a "description location status summary uid rrule percent_complete priority sequence categories completed_at created_at dtstamp start due last_modified"
-complete -c todo -n "__fish_seen_subcommand_from list" -l reverse -l no-reverse -d 'Sort tasks in reverse order (see --sort)'
-complete -c todo -n "__fish_seen_subcommand_from list" -l due -d 'Only show tasks due in INTEGER hours'
-complete -c todo -n "__fish_seen_subcommand_from list" -l priority -r -d 'Only show tasks with priority at least as high as' -a "low medium high"
-complete -c todo -n "__fish_seen_subcommand_from list" -l start -r -d "Only shows tasks before/after given DATE"
-complete -c todo -n "__fish_seen_subcommand_from list" -l startable -d "Show only todos which should can be started today"
-complete -c todo -n "__fish_seen_subcommand_from list" -s s -l status -r -d "Show only todos with the provided comma-separated" -a "NEEDS-ACTION CANCELLED COMPLETED IN-PROCESS ANY"
-complete -c todo -n "__fish_seen_subcommand_from list" -l help -d "Show this message and exit."
-
-complete -c todo -n "__fish_seen_subcommand_from move" -a "(__fish_complete_todoman_list_todos)" -d 'Move tasks to another list.'
-complete -c todo -n "__fish_seen_subcommand_from move" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'The list to move the tasks to.'
-complete -c todo -n "__fish_seen_subcommand_from move" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from new" -d 'Create a new task with SUMMARY.'
-complete -c todo -n "__fish_seen_subcommand_from new" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'List in which the task will be saved.'
-complete -c todo -n "__fish_seen_subcommand_from new" -s r -l read-description -d 'Read task description from stdin.'
-complete -c todo -n "__fish_seen_subcommand_from new" -s s -l start -d 'When the task starts.'
-complete -c todo -n "__fish_seen_subcommand_from new" -s d -l due -d 'Due date of the task, in the format specified in the configuration.'
-complete -c todo -n "__fish_seen_subcommand_from new" -l location -d 'The location where this todo takes place.'
-complete -c todo -n "__fish_seen_subcommand_from new" -s i -l interactive -d 'Go into interactive mode before saving the task.'
-complete -c todo -n "__fish_seen_subcommand_from new" -l help -d 'Show this message and exit.'
-
-complete -c todo -n "__fish_seen_subcommand_from show" -a "(__fish_complete_todoman_list_todos)" -d 'Show details about a task.'

user/fish/default.nix

@@ -1,6 +1,13 @@
-{ config, pkgs, lib, ... }:
+{
-let inherit (pkgs.uservars) key theme color accent font editor desktop;
+  config,
-in {
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (config.my) accent editor desktop;
+in
+{
   config = {
     programs.fish = {
       enable = true;
@@ -25,19 +32,20 @@ in {
         set_color normal
 
         bind \cy 'commandline | wl-copy -n'
-
-        ${pkgs.todoman}/bin/todo list
       '';
       shellAliases = {
         rm = "trash";
         tree = "eza -T";
+        kys = "shutdown now";
       };
       shellAbbrs = {
         off = "shutdown now";
-        v = {
+        v =
+          {
             "helix" = "hx";
             "kakoune" = "kak";
-        }.${editor};
+          }
+          .${editor};
         ns = "nix develop --command $SHELL";
         wcf = "wl-copy-file";
         c = "cargo";
@@ -64,21 +72,18 @@ in {
         gr = "cd (git root)";
         gri = "git rebase --interactive FETCH_HEAD";
       };
-      functions = { fish_greeting = ""; };
+      functions = {
+        fish_greeting = "";
+      };
     };
     programs = {
       zoxide.enable = true;
       eza.enable = true;
-      eza.enableAliases = true;
       direnv.enable = true;
       direnv.nix-direnv.enable = true;
     };
     xdg.configFile = {
       "fish/conf.d/prompt.fish".source = ./fish_prompt.fish;
-      "fish/completions/" = {
-        recursive = true;
-        source = ./completions;
-      };
       "fish/conf.d/" = {
         recursive = true;
         source = ./conf.d;
@@ -86,13 +91,18 @@ in {
     };
     # programs.command-not-found.enable = true;
     programs.nix-index.enable = true;
-    home.packages = (with pkgs; with fishPlugins;[
+    home.packages = (
+      with pkgs;
+      with fishPlugins;
+      [
         trash-cli
         wl-copy-file
         foreign-env
-    ] ++ (lib.optionals (desktop == "sway") [
+      ]
+      ++ (lib.optionals (desktop == "sway") [
         async-prompt
         done
-    ]));
+      ])
+    );
   };
 }

user/fzf.nix

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

user/git.nix

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

user/gnome.nix

@@ -1,4 +1,11 @@
-{ pkgs, lib, inputs, ... }: lib.mkIf (pkgs.uservars.desktop == "gnome") {
+{
+  pkgs,
+  lib,
+  inputs,
+  config,
+  ...
+}:
+lib.mkIf (config.my.desktop == "gnome") {
 
   home.pointerCursor = {
     name = "Adwaita";
@@ -14,9 +21,7 @@
       cursor-theme = "Adwaita";
       # color-scheme = "default";
     };
-    "org/gnome/desktop/wm/preferences" = lib.mkForce {
+    "org/gnome/desktop/wm/preferences" = lib.mkForce { button-layout = "appmenu:close"; };
-      button-layout = "appmenu:close";
-    };
     "org/gnome/desktop/input-sources" = {
       xkb-options = [ "lv3:lsgt_switch" ];
     };
@@ -36,20 +41,17 @@
 
     libsForQt5.qt5ct
     libsForQt5.qtstyleplugin-kvantum
+    qt6Packages.qt6ct
+    qt6Packages.qtstyleplugin-kvantum
   ];
 
-  home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; };
+  home.sessionVariables = {
+    QT_QPA_PLATFORMTHEME = "qt5ct";
+  };
+
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
 
   xdg.defaultApplications = {
-    enable = true;
+    enable = lib.mkForce false;
-    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,15 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   config = {
     services.gpg-agent = {
       enable = true;
       defaultCacheTtl = 604800;
       maxCacheTtl = 604800;
-      pinentryFlavor = "gtk2";
       extraConfig = ''
         allow-preset-passphrase
       '';
@@ -16,7 +21,9 @@
           PartOf = [ "graphical-session.target" ];
           After = [ "graphical-session.target" ];
         };
-        Service = { ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock"; };
+        Service = {
+          ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock";
+        };
       };
     };
     systemd.user.timers = {
@@ -31,9 +38,10 @@
           OnUnitActiveSec = "300";
           Unit = "gpg_unlock.service";
         };
-        Install = { WantedBy = [ "sway-session.target" ]; };
+        Install = {
+          WantedBy = [ "sway-session.target" ];
+        };
       };
     };
-
   };
 }

user/helix.nix

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

user/home.nix

@@ -1,4 +1,12 @@
-{ config, pkgs, lib, inputs, osConfig, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  osConfig,
+  ...
+}:
+{
   imports = [
     ./controller.nix
     ./waybar
@@ -7,11 +15,9 @@
     ./vscode
     ./fish
     ./firefox.nix
-    ./hyprland.nix
     ./alacritty.nix
     ./git.nix
     ./ssh.nix
-    ./qutebrowser
     ./gpg.nix
     ./rofi.nix
     ./mpv.nix
@@ -21,7 +27,6 @@
     ./desktop-entries.nix
     ./chat.nix
     ./syncthing.nix
-    ./vdir.nix
     ./bmenu.nix
     ./fzf.nix
     ./ranger
@@ -35,17 +40,19 @@
     ./gnome.nix
     ./thunar.nix
     ./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";
   home.homeDirectory = "/home/lelgenio";
 
   # Let Home Manager install and manage itself.
-  # programs.home-manager.enable = true;
+  programs.home-manager.enable = true;
   home.packages = with pkgs; [
     # home-manager
 
@@ -70,7 +77,7 @@
     comma
 
     # System monitors
-    btop
+    (btop.override { cudaSupport = true; })
     amdgpu_top
     inxi
     dmidecode
@@ -126,7 +133,7 @@
     rust-analyzer # rust analyzer
 
     blade-formatter
-    nixpkgs-fmt
+    nixfmt-rfc-style
   ];
 
   fonts.fontconfig.enable = true;
@@ -138,14 +145,10 @@
     };
   };
   home.sessionVariables = {
-    VOLUME_CHANGE_SOUND =
+    VOLUME_CHANGE_SOUND = "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga";
-      "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga";
   };
-  programs.bash = { enable = true; };
+  programs.bash = {
-
-  services.nextcloud-client = {
     enable = true;
-    startInBackground = true;
   };
 
   xdg.defaultApplications = {
@@ -153,12 +156,7 @@
     text-editor = lib.mkDefault "kak.desktop";
     image-viewer = lib.mkDefault "pqiv.desktop";
     video-player = lib.mkDefault "mpv.desktop";
-    web-browser = lib.mkDefault (
+    web-browser = lib.mkDefault "firefox.desktop";
-      {
-        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";
@@ -166,7 +164,9 @@
     torrent-client = lib.mkDefault "torrent.desktop";
   };
 
-  wayland.windowManager.sway.extraConfig = lib.optionalString (osConfig.networking.hostName or "" == "monolith") ''
+  wayland.windowManager.sway.extraConfig =
+    lib.optionalString (osConfig.networking.hostName or "" == "monolith")
+      ''
         exec steam
         exec obs --startreplaybuffer --disable-shutdown-check
         exec deluge-gtk
@@ -185,12 +185,16 @@
     };
   };
   systemd.user.timers.rm-target = {
-    Unit = { Description = "Remove directories named 'target'"; };
+    Unit = {
+      Description = "Remove directories named 'target'";
+    };
     Timer = {
       OnCalendar = "weekly";
       Unit = "rm-target.service";
     };
-    Install = { WantedBy = [ "timers.target" ]; };
+    Install = {
+      WantedBy = [ "timers.target" ];
+    };
   };
 
   # This value determines the Home Manager release that your

user/hyprland.nix

@@ -1,127 +0,0 @@
-{ config, pkgs, lib, ... }: {
-  config = lib.mkIf (pkgs.uservars.desktop == "hyprland") {
-    wayland.windowManager.hyprland = {
-      enable = false;
-      extraConfig = ''
-        monitor=,preferred,auto,1
-
-        input {
-            kb_file=
-            kb_layout=us(colemak)
-            kb_variant=
-            kb_model=
-            kb_options=
-            kb_rules=
-
-            follow_mouse=1
-
-            touchpad {
-                natural_scroll=no
-            }
-        }
-
-        general {
-            sensitivity=1.0 # for mouse cursor
-            main_mod=SUPER
-
-            gaps_in=5
-            gaps_out=10
-            border_size=2
-            col.active_border=0xffF44336
-            col.inactive_border=0x66333333
-
-            apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
-
-            damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
-        }
-
-        decoration {
-            rounding=5
-            blur=1
-            blur_size=3 # minimum 1
-            blur_passes=1 # minimum 1, more passes = more resource intensive.
-            # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts.
-            # if you want heavy blur, you need to up the blur_passes.
-            # the more passes, the more you can up the blur_size without noticing artifacts.
-        }
-
-        animations {
-            enabled=1
-            animation=windows,1,7,default
-            animation=border,1,10,default
-            animation=fade,1,10,default
-            animation=workspaces,1,6,default
-        }
-
-        dwindle {
-            pseudotile=0 # enable pseudotiling on dwindle
-        }
-
-        gestures {
-            workspace_swipe=no
-        }
-
-        # example window rules
-        # for windows named/classed as abc and xyz
-        #windowrule=move 69 420,abc
-        #windowrule=size 420 69,abc
-        #windowrule=tile,xyz
-        #windowrule=float,abc
-        #windowrule=pseudo,abc
-        #windowrule=monitor 0,xyz
-
-        # example binds
-        bind=SUPER,Q,exec,kitty
-        bind=SUPER,RETURN,exec,alacritty
-        bind=SUPER,x,killactive,
-        bind=SUPER,M,exit,
-        # bind=SUPER,E,exec,dolphin
-        bind=SUPER,V,togglefloating,
-        bind=SUPER,s,exec,wlauncher
-        bind=SUPER,P,pseudo,
-
-        bind=SUPER,f,fullscreen
-
-        bind=SUPER,n,movefocus,l
-        bind=SUPER,o,movefocus,r
-        bind=SUPER,i,movefocus,u
-        bind=SUPER,e,movefocus,d
-
-        bind=SUPER,left,movefocus,l
-        bind=SUPER,right,movefocus,r
-        bind=SUPER,up,movefocus,u
-        bind=SUPER,down,movefocus,d
-
-        bind=SUPER,1,workspace,1
-        bind=SUPER,2,workspace,2
-        bind=SUPER,3,workspace,3
-        bind=SUPER,4,workspace,4
-        bind=SUPER,5,workspace,5
-        bind=SUPER,6,workspace,6
-        bind=SUPER,7,workspace,7
-        bind=SUPER,8,workspace,8
-        bind=SUPER,9,workspace,9
-        bind=SUPER,0,workspace,10
-
-        bind=ALT,1,movetoworkspace,1
-        bind=ALT,2,movetoworkspace,2
-        bind=ALT,3,movetoworkspace,3
-        bind=ALT,4,movetoworkspace,4
-        bind=ALT,5,movetoworkspace,5
-        bind=ALT,6,movetoworkspace,6
-        bind=ALT,7,movetoworkspace,7
-        bind=ALT,8,movetoworkspace,8
-        bind=ALT,9,movetoworkspace,9
-        bind=ALT,0,movetoworkspace,10
-
-        bind=SUPER,u,workspace,e-1
-        bind=SUPER,y,workspace,e+1
-
-        bind=SUPER,mouse_down,workspace,e-1
-        bind=SUPER,mouse_up,workspace,e+1
-      '';
-    };
-    home.file.".config/eww".source = ./eww;
-    home.packages = with pkgs; [ eww-wayland jq ];
-  };
-}

user/kakoune/colors.nix

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

user/kakoune/default.nix

@@ -1,6 +1,17 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
-  inherit (pkgs.uservars) key dmenu editor theme accent;
+  inherit (config.my)
+    key
+    dmenu
+    editor
+    theme
+    accent
+    ;
   inherit (theme) color;
   inherit (pkgs) kakounePlugins;
   inherit (pkgs.kakouneUtils) buildKakounePlugin;
@@ -74,8 +85,9 @@ in
         })
       ];
       extraConfig =
-        lib.concatStringsSep "\n"
+        lib.concatStringsSep "\n" (
-          (map (lib.readFile) ([
+          map (lib.readFile) (
+            [
               ./filetypes.kak
               ./hooks.kak
               ./indent.kak
@@ -83,17 +95,29 @@ in
               ./lsp-config.kak
               ./usermode.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 autoreload yes
           set global startup_info_version 99999999
 
-      '' + (import ./colors.nix {
+        ''
-          inherit pkgs lib color accent;
+        + (import ./colors.nix {
+          inherit
+            pkgs
+            lib
+            color
+            accent
+            ;
         });
     };
-    home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; };
+    home.file = {
+      ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
+    };
     home.packages = with pkgs; [
       terminal
       ranger
@@ -123,4 +147,3 @@ in
     };
   };
 }
-

user/kakoune/filetypes.kak

@@ -12,7 +12,7 @@ hook global WinSetOption filetype=c %{
 }
 
 hook global WinSetOption filetype=nix %{
-    set buffer formatcmd 'nixpkgs-fmt'
+    set buffer formatcmd 'nixfmt'
 }
 
 hook global BufCreate .*\.html %{
@@ -93,6 +93,7 @@ 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
@@ -108,6 +109,9 @@ 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/git-mode.kak

@@ -32,6 +32,7 @@ map global git 'N'     ': git-next-merge-conflict <ret>' -docstring 'next git me
 map global git 'P'     ': git-prev-merge-conflict <ret>' -docstring 'previous git merge conflict'
 map global git 'm'     ': git-merge-head <ret>' -docstring 'merge using head'
 map global git 'M'     ': git-merge-new <ret>' -docstring 'merge using new'
+map global git '<c-m>' ': git-merge-head-and-new <ret>' -docstring 'merge using both head and new'
 map global git '<a-m>' ': git-merge-original <ret>' -docstring 'merge using original'
 
 define-command -override git-next-merge-conflict %{
@@ -92,6 +93,19 @@ define-command -override git-merge-new %{
     }
 } -docstring "merge using new"
 
+define-command -override git-merge-head-and-new %{
+    evaluate-commands -draft %{
+        # delete head marker
+        execute-keys <a-/>^<lt>{4,}<ret>xd
+        # select middle of conflict
+        execute-keys /^[|]{4,}<ret>x
+        # extendo to theirs marker
+        execute-keys ?^={4,}<ret>xd
+        # delete end marker
+        execute-keys /^<gt>{4,}<ret>xd
+    }
+} -docstring "merge using head and new"
+
 define-command -override git-graph %{
     try %{ delete-buffer '*git-graph*' }
     edit -scratch '*git-graph*'

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 & }}
+} > /dev/null 2>&1 < /dev/null & }} -group sync-clipboard
 
 # Trim trailing whitespace
 hook global BufWritePre .* %{ try %{

user/kakoune/kak-lsp.toml

@@ -7,7 +7,7 @@ verbosity = 2
 # set to 0 to disable
 timeout = 1800 # seconds = 30 minutes
 
-[language.angular]
+[language_server.angular]
 filetypes = ["angular"]
 roots = [".angular", ".git"]
 command = "node"
@@ -20,134 +20,80 @@ args = [
     "--stdio",
 ]
 
-[language.bash]
+[language_server.bash-language-server]
 filetypes = ["sh"]
 roots = [".git", ".hg"]
 command = "bash-language-server"
 args = ["start"]
 
-[language.c_cpp]
+[language_server.clangd]
 filetypes = ["c", "cpp"]
-roots = [ "compile_commands.json", ".clangd", ".git" ]
+roots = ["compile_commands.json", ".clangd", ".git", ".hg"]
 command = "clangd"
 
-[language.crystal]
+[language_server.css-language-server]
-filetypes = ["crystal"]
-roots = ["shard.yml"]
-command = "scry"
-
-[language.css]
 filetypes = ["css"]
-roots = ["package.json"]
+roots = ["package.json", ".git", ".hg"]
 command = "vscode-css-languageserver"
 args = ["--stdio"]
 
-[language.less]
+[language_server.less-language-server]
 filetypes = ["less"]
-roots = ["package.json", ".git"]
+roots = ["package.json", ".git", ".hg"]
 command = "vscode-css-languageserver"
 args = ["--stdio"]
 
-[language.d]
+[language_server.html-language-server]
-filetypes = ["d", "di"]
-roots = [".git", "dub.sdl", "dub.json"]
-command = "dls"
-
-[language.dart]
-# start shell to find path to dart analysis server source
-filetypes = ["dart"]
-roots = ["pubspec.yaml", ".git"]
-command = "sh"
-args = ["-c", "dart $(dirname $(which dart))/snapshots/analysis_server.dart.snapshot --lsp"]
-
-[language.elm]
-filetypes = ["elm"]
-roots = ["elm.json"]
-command = "elm-language-server"
-args = ["--stdio"]
-
-# [language.elm.initialization_options]
-# runtime = "node"
-# elmPath = "elm"
-# elmFormatPath = "elm-format"
-# elmTestPath = "elm-test"
-
-[language.go]
-filetypes = ["go"]
-roots = ["Gopkg.toml", "go.mod", ".git", ".hg"]
-command = "gopls"
-offset_encoding = "utf-8"
-
-[language.haskell]
-filetypes = ["haskell"]
-roots = ["Setup.hs", "stack.yaml", "*.cabal"]
-command = "haskell-language-server-wrapper"
-args = ["--lsp"]
-
-[language.html]
 filetypes = ["html"]
 roots = ["package.json"]
 command = "vscode-html-languageserver"
 args = ["--stdio"]
+settings_section = "_"
+[language_server.html-language-server.settings._]
+# quotePreference = "single"
+# javascript.format.semicolons = "insert"
 
-[language.javascript]
+[language_server.typescript-language-server]
-filetypes = ["javascript"]
+filetypes = ["javascript", "typescript"]
-roots = [".flowconfig"]
+roots = ["package.json", "tsconfig.json", "jsconfig.json", ".git", ".hg"]
-command = "flow"
-args = ["lsp"]
-
-[language.typescript]
-filetypes = ["typescript"]
-roots = ["package.json"]
 command = "typescript-language-server"
 args = ["--stdio"]
+settings_section = "_"
+[language_server.typescript-language-server.settings._]
+# quotePreference = "double"
+# typescript.format.semicolons = "insert"
 
-[language.json]
+[language_server.json-language-server]
 filetypes = ["json"]
 roots = ["package.json"]
 command = "vscode-json-languageserver"
 args = ["--stdio"]
 
-[language.latex]
+[language_server.nil]
-filetypes = ["latex"]
-roots = [".git"]
-command = "texlab"
-
-[language.nim]
-filetypes = ["nim"]
-roots = ["*.nimble", ".git"]
-command = "nimlsp"
-
-[language.nix]
 filetypes = ["nix"]
 command = "nil"
 roots = ["flake.nix", "shell.nix", ".git"]
-[language.nix.settings.nil]
+[language_server.nil.settings.nil]
-formatting.command = [ "nixpkgs-fmt" ]
+formatting.command = [ "nixfmt" ]
 
-[language.ocaml]
+[language_server.intelephense]
-filetypes = ["ocaml"]
-roots = ["Makefile", "opam", "*.opam", "dune"]
-command = "ocaml-language-server"
-args = ["--stdio"]
-
-[language.php]
 filetypes = ["php"]
 roots = [".htaccess", "composer.json"]
 command = "intelephense"
 args = ["--stdio"]
 settings_section = "intelephense"
-[language.php.settings]
+[language_server.intelephense.settings.intelephense]
-intelephense.format.braces = "k&r"
+storagePath = "/tmp/intelephense"
-intelephense.storagePath = "/tmp/intelephense"
+
-intelephense.environment.includePaths = [
+format.braces = "k&r"
+environment.includePaths = [
     "./vendor",
     "./vendor/autoload",
     "./vendor/laravel/framework/",
     "./vendor/laravel/framework/src/",
     "./vendor/laravel/framework/src/Illuminate/"
 ]
-intelephense.files.exclude = [
+files.exclude = [
     "**/.git/**",
     "**/.svn/**",
     "**/.hg/**",
@@ -159,42 +105,9 @@ intelephense.files.exclude = [
     "**/resources/views/**"
 ]
 
-[language.python]
+[language_server.rust-analyzer]
-filetypes = ["python"]
-roots = ["requirements.txt", "setup.py", ".git", ".hg"]
-command = "pyls"
-offset_encoding = "utf-8"
-
-[language.reason]
-filetypes = ["reason"]
-roots = ["package.json", "Makefile", ".git", ".hg"]
-command = "ocaml-language-server"
-args = ["--stdio"]
-
-[language.ruby]
-filetypes = ["ruby"]
-roots = ["Gemfile"]
-command = "solargraph"
-args = ["stdio"]
-
-# [language.rust]
-# filetypes = ["rust"]
-# roots = ["Cargo.toml"]
-# command = "sh"
-# args = [
-#     "-c",
-#     """
-#         if path=$(rustup which rls 2>/dev/null); then
-#             "$path"
-#         else
-#             rls
-#         fi
-#     """,
-# ]
-
-[language.rust]
 filetypes = ["rust"]
-roots = ["rust-toolchain.toml", "rust-toolchain", "Cargo.toml"]
+roots = ["Cargo.toml"]
 command = "sh"
 args = [
     "-c",
@@ -206,99 +119,37 @@ args = [
         fi
     """,
 ]
-[language.rust.settings.rust-analyzer]
+[language_server.rust-analyzer.settings.rust-analyzer]
-## this can use too much space and processing power
+# See https://rust-analyzer.github.io/manual.html#configuration
-# checkOnSave.extraArgs = ["--target-dir", "./target/check"]
+# cargo.features = []
 checkOnSave.command = "clippy"
 hoverActions.enable = false # kak-lsp doesn't support this at the moment
-# procMacro.enable = true
-# cargo.loadOutDirsFromCheck = true
-# rustfmt.rangeFormatting.enable = true
-# rustfmt.extraArgs = ["+nightly"]
 
-[language.terraform]
+[language_server.godot]
-filetypes = ["terraform"]
-roots = ["*.tf"]
-command = "terraform-ls"
-args = ["serve"]
-
-[language.godot]
 filetypes = ["gd", "gdscript", "gdscript3"]
 roots = ["project.godot", ".git/"]
 command = "nc"
 args = [ "localhost", "6008"]
 
-[language.clojure]
+# Semantic tokens support
-filetypes = ["clojure"]
+# See https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_semanticTokens
-roots = ["project.clj", ".git/"]
+# for the default list of tokens and modifiers.
-command = "clojure-lsp"
+# However, many language servers implement their own values.
-args = []
+# Make sure to check the output of `lsp-capabilities` and each server's documentation and source code as well.
-
+# Examples:
-
+# - TypeScript: https://github.com/microsoft/vscode-languageserver-node/blob/main/client/src/common/semanticTokens.ts
-
+# - Rust Analyzer: https://github.com/rust-analyzer/rust-analyzer/blob/master/crates/ide/src/syntax_highlighting.rs
-
+[semantic_tokens]
-[semantic_scopes]
+faces = [
-# Map textmate scopes to kakoune faces for semantic highlighting
+    {face="documentation", token="comment", modifiers=["documentation"]},
-# the underscores are translated to dots, and indicate nesting.
+    {face="comment", token="comment"},
-# That is, if variable_other_field is omitted, it will try the face for
+    {face="function", token="function"},
-# variable_other and then variable
+    {face="keyword", token="keyword"},
-#
+    {face="module", token="namespace"},
-# To see a list of available scopes in the debug buffer, run lsp-semantic-available-scopes
+    {face="operator", token="operator"},
-variable = "variable"
+    {face="string", token="string"},
-entity_name_function = "function"
+    {face="type", token="type"},
-entity_name_type = "type"
+    {face="default+d", token="variable", modifiers=["readonly"]},
-variable_other_enummember = "variable"
+    {face="default+d", token="variable", modifiers=["constant"]},
-entity_name_namespace = "module"
+    {face="variable", token="variable"},
-
+]
-[semantic_modifiers]
-documentation = "documentation"
-readonly = "default+d"
-
-
-
-[[semantic_tokens]]
-token = "comment"
-face = "documentation"
-modifiers = ["documentation"]
-
-[[semantic_tokens]]
-token = "comment"
-face = "comment"
-
-[[semantic_tokens]]
-token = "function"
-face = "function"
-
-[[semantic_tokens]]
-token = "keyword"
-face = "keyword"
-
-[[semantic_tokens]]
-token = "namespace"
-face = "module"
-
-[[semantic_tokens]]
-token = "operator"
-face = "operator"
-
-[[semantic_tokens]]
-token = "string"
-face = "string"
-
-[[semantic_tokens]]
-token = "type"
-face = "type"
-
-[[semantic_tokens]]
-token = "variable"
-face = "default+d"
-modifiers = ["readonly"]
-
-[[semantic_tokens]]
-token = "variable"
-face = "default+d"
-modifiers = ["constant"]
-
-[[semantic_tokens]]
-token = "variable"
-face = "variable"