hyprland: more improvements

flake.nix

@@ -1,50 +1,46 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    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";
 
-    vpsadminos.url = "github:vpsfreecz/vpsadminos";
-
     nix-index-database = {
       url = "github:Mic92/nix-index-database";
       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-24.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-24_05.follows = "nixpkgs";
     };
 
     dzgui-nix = {
       url = "github:lelgenio/dzgui-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     tlauncher = {
-      url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix";
+      url = "github: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";
@@ -54,70 +50,59 @@
       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 = {
+    nixpkgs-fixed-steam.url = "github:lelgenio/nixpkgs/test-steam-fix";
-      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";
+    nix-software-center.url = "github:vlinkz/nix-software-center";
   };
-    made-you-look = {
+  outputs = inputs:
-      url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    catboy-spinner = {
-      url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
-      flake = false;
-    };
-    tomater = {
-      url = "git+https://git.lelgenio.com/lelgenio/tomater";
-      flake = false;
-    };
-    youre-wrong = {
-      url = "git+https://git.lelgenio.com/lelgenio/youre-wrong";
-      flake = false;
-    };
-    hello-fonts = {
-      url = "git+https://git.lelgenio.com/lelgenio/hello-fonts";
-      flake = false;
-    };
-  };
-  outputs =
-    inputs:
     let
       nixpkgsConfig = {
         inherit system;
-        config = {
+        config = { allowUnfree = true; };
-          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 inputs.nixpkgs nixpkgsConfig;
+      pkgs = import nixpkgs nixpkgsConfig;
       lib = inputs.nixpkgs.lib;
 
       packages = import ./pkgs { inherit pkgs inputs; };
 
       old_overlays = (import ./overlays { inherit packages inputs; });
 
-      specialArgs = {
+      specialArgs = { inherit inputs; };
-        inherit inputs;
+      common_modules = [
-      };
-      common_modules =
-        [
         { nixpkgs.pkgs = pkgs; }
         ./system/configuration.nix
         ./system/secrets.nix
+        ./system/specialisation.nix
         ./system/greetd.nix
-          { login-manager.greetd.enable = desktop == "sway"; }
+        { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; }
 
         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;
@@ -125,33 +110,34 @@
           home-manager.backupFileExtension = "bkp";
           # Optionally, use home-manager.extraSpecialArgs to pass
           # arguments to home.nix
-            home-manager.extraSpecialArgs = {
+          home-manager.extraSpecialArgs = { inherit inputs; };
-              inherit inputs;
-            };
         }
       ]
       ++ lib.optional (desktop == "gnome") ./system/gnome.nix
       ++ lib.optional (desktop == "kde") ./system/kde.nix;
     in
     {
-      checks."${system}" = {
-        disko-format-i15 = pkgs.callPackage ./hosts/i15/partitions-test.nix { };
-      };
       nixosConfigurations = {
         i15 = lib.nixosSystem {
           inherit system specialArgs;
-          modules = [ ./hosts/i15 ] ++ common_modules;
+          modules = [ ./hosts/i15.nix ] ++ common_modules;
         };
         monolith = lib.nixosSystem {
           inherit system specialArgs;
           modules = [
-            ./hosts/monolith
+            ./hosts/monolith.nix
             ./system/monolith-gitlab-runner.nix
-            ./system/monolith-forgejo-runner.nix
             ./system/nix-serve.nix
             ./system/steam.nix
           ] ++ common_modules;
         };
+        rainbow = lib.nixosSystem {
+          inherit system specialArgs;
+          modules = [
+            ./hosts/rainbow.nix
+            ./system/rainbow-gitlab-runner.nix
+          ] ++ common_modules;
+        };
         double-rainbow = lib.nixosSystem {
           inherit system specialArgs;
           modules = [
@@ -161,23 +147,15 @@
         };
         pixie = lib.nixosSystem {
           inherit system specialArgs;
-          modules =
+          modules = [ ./hosts/pixie.nix ] ++ common_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 {
+        ghost = lib.nixosSystem {
           inherit system specialArgs;
-          modules = [
+          modules = [ ./hosts/ghost ];
-            { nixpkgs.pkgs = pkgs; }
-            ./hosts/phantom
-          ];
         };
       };
 
@@ -194,6 +172,6 @@
 
       packages.${system} = pkgs // packages;
 
-      formatter.${system} = pkgs.nixfmt-rfc-style;
+      formatter.${system} = pkgs.nixpkgs-fmt;
     };
 }

hosts/double-rainbow.nix

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

hosts/ghost/default.nix

@@ -0,0 +1,33 @@
+{ config, pkgs, inputs, ... }: {
+  imports = [
+    "${inputs.nixpkgs}/nixos/modules/virtualisation/digital-ocean-image.nix"
+    inputs.agenix.nixosModules.default
+    ../../system/nix.nix
+    ./hardware-config.nix
+    ./mastodon.nix
+    ./nextcloud.nix
+    ./nginx.nix
+    ./syncthing.nix
+    ./users.nix
+    ./writefreely.nix
+    ./renawiki.nix
+  ];
+
+  # Use more aggressive compression then the default.
+  virtualisation.digitalOceanImage.compressionMethod = "bzip2";
+  # Enable networking
+  networking.networkmanager.enable = true;
+  # Set your time zone.
+  time.timeZone = "America/Sao_Paulo";
+  # Select internationalisation properties.
+  i18n.defaultLocale = "pt_BR.utf8";
+
+  boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576;
+
+  age = {
+    identityPaths = [ "/root/.ssh/id_rsa" ];
+  };
+
+  system.stateVersion = "23.05"; # Never change this
+}
+

hosts/ghost/hardware-config.nix

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

hosts/ghost/mastodon.nix

@@ -0,0 +1,16 @@
+{ config, pkgs, inputs, ... }: {
+  services.mastodon = {
+    enable = true;
+    localDomain = "social.lelgenio.xyz";
+    configureNginx = true;
+    smtp.fromAddress = "lelgenio@disroot.org";
+    extraConfig.SINGLE_USER_MODE = "true";
+    streamingProcesses = 2;
+  };
+
+  services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
+    forceSSL = true;
+    enableACME = true;
+  };
+}
+

hosts/ghost/nextcloud.nix

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

hosts/ghost/nginx.nix

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

hosts/ghost/renawiki.nix

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

hosts/ghost/syncthing.nix

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

hosts/ghost/users.nix

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

hosts/ghost/writefreely.nix

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

hosts/i15.nix

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

hosts/i15/default.nix

@@ -1,38 +0,0 @@
-{
-  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

@@ -1,19 +0,0 @@
-{
-  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

@@ -1,73 +0,0 @@
-{
-  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

@@ -0,0 +1,131 @@
+# 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" ];
+
+  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
+  ];
+
+  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;
+  };
+  # 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/amdgpu.nix

@@ -1,44 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  undervoltGpu = pkgs.writeShellScript "undervolt-gpu" ''
-    set -xe
-    cd $1
-    echo "manual" > power_dpm_force_performance_level
-    echo "1" > pp_power_profile_mode
-    test -e pp_od_clk_voltage
-    echo "vo -120" > pp_od_clk_voltage
-    echo "c" > pp_od_clk_voltage
-  '';
-in
-{
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelParams = [
-    "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
-    "video=DP-1:1920x1080@144"
-    "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
-  ];
-
-  systemd.services.amd-fan-control = {
-    script = ''
-      ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
-    '';
-    wantedBy = [ "multi-user.target" ];
-  };
-
-  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
-  ];
-
-  services.udev.extraRules = ''
-    ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device"
-  '';
-}

hosts/monolith/default.nix

@@ -1,164 +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")
-    ./partition.nix
-    ./amdgpu.nix
-    ./factorio-server.nix
-  ];
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-
-  hardware.opentabletdriver.enable = true;
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
-
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelModules = [
-    "kvm-amd"
-    "amdgpu"
-    "zenpower"
-  ];
-
-  systemd.sleep.extraConfig = ''
-    HibernateDelaySec=30s
-    SuspendState=mem
-  '';
-
-  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/old" = {
-    device = "/dev/disk/by-label/BTRFS_ROOT";
-    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.
-
-  virtualisation.virtualbox.host.enable = true;
-
-  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/factorio-server.nix

@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.factorio = {
-    enable = true;
-    package = pkgs.factorio-headless; # I override this in ./pkgs
-    public = true;
-    lan = true;
-    openFirewall = true;
-    admins = [ "lelgenio" ];
-    extraSettingsFile = config.age.secrets.factorio-settings.path;
-  };
-
-  age.secrets.factorio-settings = {
-    file = ../../secrets/factorio-settings.age;
-    mode = "777";
-  };
-}

hosts/monolith/partition.nix

@@ -1,68 +0,0 @@
-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/davi.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-{
-  users.users.davikiwi = {
-    isNormalUser = true;
-    description = "Davi";
-    hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgZDBnj+gVMHqoNvjpx2T/HqnxUDbLPshu+t7301gXd Davi@DESKTOP-EVHFGJ9"
-    ];
-    extraGroups = [ "docker" ];
-    packages = with pkgs; [
-      (pkgs.python3.withPackages (python-pkgs: [
-        python-pkgs.pip
-        python-pkgs.wheel
-      ]))
-    ];
-  };
-
-  services.nginx.virtualHosts."davikiwi.lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:24618";
-    };
-  };
-}

hosts/phantom/default.nix

@@ -1,92 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  imports = [
-    inputs.vpsadminos.nixosConfigurations.container
-    inputs.agenix.nixosModules.default
-    ../../system/nix.nix
-    ./hardware-config.nix
-    ./mastodon.nix
-    ./nextcloud.nix
-    ./nginx.nix
-    ./syncthing.nix
-    ./users.nix
-    ./writefreely.nix
-    ./email.nix
-    ./forgejo.nix
-    ./invidious.nix
-    ./davi.nix
-    ./goofs.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.
-  time.timeZone = "America/Sao_Paulo";
-  # Select internationalisation properties.
-  i18n.defaultLocale = "pt_BR.utf8";
-
-  boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576;
-
-  age = {
-    identityPaths = [ "/root/.ssh/id_rsa" ];
-  };
-
-  virtualisation.docker = {
-    enable = true;
-    daemon.settings = {
-      # needed by bitbucket runner ???
-      log-driver = "json-file";
-      log-opts = {
-        max-size = "10m";
-        max-file = "3";
-      };
-    };
-  };
-
-  nix.settings = {
-    cores = 1;
-    max-jobs = 1;
-  };
-
-  system.autoUpgrade = {
-    enable = true;
-    dates = "04:40";
-    operation = "switch";
-    flags = [
-      "--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,58 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  ...
-}:
-{
-  imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
-
-  mailserver = {
-    enable = true;
-    fqdn = "lelgenio.com";
-    domains = [
-      "lelgenio.xyz"
-      "git.lelgenio.xyz"
-      "lelgenio.com"
-      "git.lelgenio.com"
-      "social.lelgenio.com"
-    ];
-    certificateScheme = "acme-nginx";
-    # Create passwords with
-    # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
-    loginAccounts = {
-      "lelgenio@lelgenio.com" = {
-        hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
-        aliases = [
-          "postmaster@lelgenio.com"
-          "lelgenio@lelgenio.xyz"
-          "lelgenio@lelgenio.xyz"
-        ];
-      };
-      "noreply@git.lelgenio.com" = {
-        hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
-      };
-      "noreply@social.lelgenio.com" = {
-        hashedPassword = "$2b$05$DcA9xMdvHqqQMZw2.zybI.vfKsQAJtaQ/JB.t9AHu6psstWq97m2C";
-      };
-    };
-  };
-
-  # Prefer ipv4 and use main ipv6 to avoid reverse DNS issues
-  services.postfix.extraConfig = ''
-    smtp_address_preference = ipv4
-  '';
-
-  # Webmail
-  services.roundcube = {
-    enable = true;
-    package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
-    hostName = "mail.lelgenio.com";
-    extraConfig = ''
-      $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
-      $config['smtp_user'] = "%u";
-      $config['smtp_pass'] = "%p";
-      $config['plugins'] = [ "carddav", "archive" ];
-    '';
-  };
-}

hosts/phantom/forgejo.nix

@@ -1,53 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-let
-  cfg = config.services.forgejo;
-  srv = cfg.settings.server;
-in
-{
-  services.nginx = {
-    virtualHosts.${cfg.settings.server.DOMAIN} = {
-      forceSSL = true;
-      enableACME = true;
-      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";
-      };
-      repository = {
-        ENABLE_PUSH_CREATE_USER = true;
-      };
-      server = {
-        DOMAIN = "git.lelgenio.com";
-        HTTP_PORT = 3000;
-        ROOT_URL = "https://${srv.DOMAIN}/";
-      };
-      mailer = {
-        ENABLED = true;
-        SMTP_ADDR = "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/goofs.nix

@@ -1,46 +0,0 @@
-{ inputs, config, ... }:
-{
-  imports = [
-    inputs.warthunder-leak-counter.nixosModules.default
-    inputs.made-you-look.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}";
-    };
-  };
-
-  services.made-you-look.enable = true;
-  services.nginx.virtualHosts."coolest-thing-ever.lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:${toString config.services.made-you-look.port}";
-    };
-  };
-
-  services.nginx.virtualHosts."catboy-spinner.lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    root = inputs.catboy-spinner;
-  };
-  services.nginx.virtualHosts."tomater.lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    root = inputs.tomater;
-  };
-  services.nginx.virtualHosts."youre-wrong.lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    root = inputs.youre-wrong;
-  };
-  services.nginx.virtualHosts."hello-fonts.lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    root = inputs.hello-fonts;
-  };
-}

hosts/phantom/hardware-config.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  fileSystems."/var/lib/syncthing-data" = {
-    device = "172.16.130.7:/nas/5749/syncthinng_data";
-    fsType = "nfs";
-    options = [ "nofail" ];
-  };
-
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = (1024 * 2); # 2 GB
-    }
-  ];
-}

hosts/phantom/invidious.nix

@@ -1,40 +0,0 @@
-{
-  inputs,
-  pkgs,
-  config,
-  ...
-}:
-{
-  # Replace with unstable, since 24.05 does not have sig-helper
-  disabledModules = [ "services/web-apps/invidious.nix" ];
-  imports = [ (inputs.nixpkgs-unstable + "/nixos/modules/services/web-apps/invidious.nix") ];
-
-  services.invidious = {
-    enable = true;
-    domain = "invidious.lelgenio.com";
-    nginx.enable = true;
-    port = 10601;
-    http3-ytproxy.enable = true;
-    sig-helper = {
-      enable = true;
-      package = pkgs.unstable.inv-sig-helper;
-    };
-    # {
-    #     "visitor_data": "...",
-    #     "po_token": "..."
-    # }
-    extraSettingsFile = config.age.secrets.phantom-invidious-settings.path;
-    settings = {
-      force_resolve = "ipv6";
-      db = {
-        user = "invidious";
-        dbname = "invidious";
-      };
-    };
-  };
-
-  age.secrets.phantom-invidious-settings = {
-    file = ../../secrets/phantom-invidious-settings.age;
-    mode = "666";
-  };
-}

hosts/phantom/mastodon.nix

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

hosts/phantom/nextcloud.nix

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

hosts/phantom/nginx.nix

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

hosts/pixie.nix

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

hosts/rainbow.nix

@@ -0,0 +1,66 @@
+# 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 =
+    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "i915" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/BTRFS_ROOT";
+    fsType = "btrfs";
+    options = [ "subvol=@nixos" ] ++ btrfs_options ++ btrfs_ssd;
+  };
+
+  boot.initrd.luks.devices = {
+    "main" = {
+      bypassWorkqueues = true;
+      device = "/dev/disk/by-label/CRYPT_ROOT";
+    };
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-label/BTRFS_ROOT";
+    fsType = "btrfs";
+    options = [ "subvol=@home" ] ++ btrfs_options ++ btrfs_ssd;
+  };
+
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/DC3B-5753";
+    fsType = "vfat";
+  };
+
+  fileSystems."/swap" = {
+    device = "/dev/disk/by-label/BTRFS_ROOT";
+    fsType = "btrfs";
+    options = [ "subvol=@swap" ] ++ btrfs_ssd;
+  };
+
+  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
+  # 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.enp1s0.useDHCP = lib.mkDefault true;
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  networking.hostName = "rainbow"; # Define your hostname.
+}

install/i15.sh

@@ -0,0 +1,63 @@
+#!/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,69 +1,64 @@
-{ inputs, packages, ... }:
+{ inputs, packages, ... }: rec {
-rec {
   all = [
     scripts
-    unstable
+    sway
     themes
     new-packages
     patches
+    variables
     lib_extended
-    disko
   ];
 
   scripts = (import ../scripts);
 
-  unstable = final: prev: {
+  sway = (import ./sway.nix);
-    unstable = import inputs.nixpkgs-unstable { inherit (final) system config; };
+
+  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}
+      '';
     };
-
-  themes = (
-    final: prev: {
     papirus_red = (final.papirus-icon-theme.override { color = "red"; });
-      orchis_theme_compact = (
+    orchis_theme_compact = (final.orchis-theme.override {
-        final.orchis-theme.override {
       border-radius = 0;
-          tweaks = [
+      tweaks = [ "compact" "solid" ];
-            "compact"
+    });
-            "solid"
+    nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
-          ];
+  });
-        }
-      );
-      nerdfonts_fira_hack = (
-        final.nerdfonts.override {
-          fonts = [
-            "FiraCode"
-            "Hack"
-          ];
-        }
-      );
-    }
-  );
 
-  new-packages = (
+  new-packages = (final: prev: 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;
-    }
-  );
 
-  patches = (
+    webcord = (prev.webcord.overrideAttrs (old: {
-    final: prev: {
+      patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
-      mySway = prev.sway.override {
+    }));
-        withBaseWrapper = true;
-        withGtkWrapper = true;
-        sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
-          patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
   });
-      };
-    }
-  );
 
-  lib_extended = (
+  patches = (final: prev: {
-    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/sway/fix-hide_cursor-clearing-focus.patch ];
+    });
+  });
+
+  variables = (final: prev: {
+    uservars = import ../user/variables.nix;
+  });
+
+  lib_extended = (final: prev: {
     lib = prev.lib // rec {
       # Utility function
       # Input: [{v1=1;} {v2=2;}]
@@ -75,15 +70,5 @@ rec {
       # 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

@@ -0,0 +1,19 @@
+(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

@@ -0,0 +1,27 @@
+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

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

pkgs/cargo-checkmate.nix

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

pkgs/default.nix

@@ -1,14 +1,8 @@
 # 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 }: {
-rec {
   cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
-  lipsum = pkgs.callPackage ./lipsum.nix { };
+  lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };
   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 { };
-  factorio-headless = pkgs.callPackage ./factorio-headless {
-    inherit (pkgs.unstable) factorio-headless;
-  };
 }

pkgs/emmet-cli.nix

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

pkgs/factorio-headless/default.nix

@@ -1,10 +0,0 @@
-{ factorio-headless, pkgs }:
-
-factorio-headless.overrideAttrs (_: rec {
-  version = "2.0.15";
-  src = pkgs.fetchurl {
-    name = "factorio_headless_x64-${version}.tar.xz";
-    url = "https://www.factorio.com/get-download/${version}/headless/linux64";
-    hash = "sha256-cLRBy4B4EaYFhsARBySMHY164EO9HyNnX8kk+6qlONg=";
-  };
-})

pkgs/factorio-headless/update.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-cd "$(dirname $0)"
-
-current_version="$(rg '^.*?version\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
-current_hash="$(rg '^.*?hash\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
-
-new_version="$(curl https://factorio.com/api/latest-releases | jq -r .stable.headless)"
-new_hash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --type sha256 https://www.factorio.com/get-download/${new_version}/headless/linux64))"
-
-sd "$current_version" "$new_version" ./default.nix
-sd "$current_hash" "$new_hash" ./default.nix

pkgs/gnome-pass-search-provider.nix

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

pkgs/material-wifi-icons.nix

@@ -1,16 +0,0 @@
-{ 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/amd-fan-control

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-DEVICE="$1" # eg: /sys/class/drm/card1/device
-HWMON=$(echo "$DEVICE"/hwmon/hwmon*)
-
-exit() {
-    echo "Setting controll to auto" >&2
-    echo 2 > "$HWMON/pwm1_enable"
-}
-
-trap exit EXIT INT
-
-bail() {
-    echo "Error: $@" >&2
-    echo "Exiting..." >&2
-    exit 1
-}
-
-if ! [ -d $HWMON ]; then
-    bail "Invalid HWMON"
-fi
-
-TEMP_INPUT="$HWMON/temp2_input"
-
-if ! [ -f $TEMP_INPUT ]; then
-    bail "Invalid TEMP_INPUT"
-fi
-
-MIN="$2"
-MAX="$3"
-
-echo "Running..." >&2
-while true; do
-    TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
-    TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
-    # Remap from a number between 60_000..90_000 to 0..255
-    PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) ))
-
-    if [ "$PWM" -gt 255 ]; then
-        PWM=255
-    elif [ "$PWM" -lt 0 ]; then
-        PWM=0
-    fi
-
-    echo 1 > "$HWMON/pwm1_enable"
-    echo "$PWM" > "$HWMON/pwm1"
-    sleep .1s
-done

scripts/controller-battery

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-CONTROLLER=$(find /sys/class/power_supply -maxdepth 1 -name '*controller*' || true)
-
-if test -z "$CONTROLLER"; then
-    echo
-    exit 0
-fi
-
-CAPACITY=$(cat "$CONTROLLER/capacity")
-
-echo -n '󰊴'
-
-if test "$CAPACITY" -ge 90; then
-    echo '󰁹'
-elif test "$CAPACITY" -ge 90; then
-    echo '󰂂'
-elif test "$CAPACITY" -ge 80; then
-    echo '󰂁'
-elif test "$CAPACITY" -ge 70; then
-    echo '󰂀'
-elif test "$CAPACITY" -ge 60; then
-    echo '󰁿'
-elif test "$CAPACITY" -ge 50; then
-    echo '󰁾'
-elif test "$CAPACITY" -ge 40; then
-    echo '󰁽'
-elif test "$CAPACITY" -ge 30; then
-    echo '󰁼'
-elif test "$CAPACITY" -ge 20; then
-    echo '󰁻'
-elif test "$CAPACITY" -ge 10; then
-    echo '󰁺'
-else
-    echo '󰂎'
-fi

scripts/default.nix

@@ -1,142 +1,57 @@
-(
+(final: prev:
-  final: prev:
+with prev;
 let
-    lib = prev.lib;
+  import_script = (_: path: import (path) { inherit pkgs lib; });
-
+  create_script = (name: text: runtimeInputs:
-    importScript = (_: path: import (path) { inherit (final) pkgs lib; });
+    let
-    wrapScript =
+      script_body = pkgs.writeTextFile {
-      name: text: runtimeInputs:
+        inherit name;
-      final.runCommand name
+        executable = true;
-        {
+        text = ''
-          nativeBuildInputs = [ final.makeWrapper ];
+          ${builtins.readFile text}
-          meta.mainProgram = name;
-        }
-        ''
-          mkdir -p $out/bin
-          cp ${text} $out/bin/${name}
-          wrapProgram $out/bin/${name} \
-              --suffix PATH : ${lib.makeBinPath runtimeInputs}
         '';
-    createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps);
+      };
-
-    myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]);
     in
-  with final;
+    (pkgs.writeShellApplication {
-  createScripts {
+      inherit name runtimeInputs;
-    amd-fan-control = [ bash ];
+      text = ''exec ${script_body} "$@"'';
+      checkPhase = "";
+    }));
+  create_scripts =
+    lib.mapAttrs (name: deps: create_script name ./${name} deps);
+
+  pass = pkgs.pass.withExtensions (ex: with ex; [
+    pass-otp
+  ]);
+in
+create_scripts
+  {
     br = [ ];
-    bmenu = [
+    bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ];
-      bemenu
+    down_meme = [ wl-clipboard yt-dlp libnotify ];
-      dhist
+    wl-copy-file = [ wl-clipboard fish ];
-      fish
-      j4-dmenu-desktop
-      jq
-      sway
-    ];
-    down_meme = [
-      wl-clipboard
-      yt-dlp
-      libnotify
-    ];
-    wl-copy-file = [
-      wl-clipboard
-      fish
-    ];
     _diffr = [ diffr ];
-    _thunar-terminal = [ terminal ];
+    _thunar-terminal = [ final.terminal ];
-    _sway_idle_toggle = [ swayidle ];
+    _sway_idle_toggle = [ final.swayidle ];
-    kak-pager = [
+    kak-pager = [ fish final._diffr ];
-      fish
+    kak-man-pager = [ final.kak-pager ];
-      _diffr
+    helix-pager = [ fish final._diffr ];
-    ];
+    helix-man-pager = [ final.helix-pager ];
-    kak-man-pager = [ kak-pager ];
+    musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ];
-    helix-pager = [
+    showkeys =
-      fish
+      [ ]; # This will not work unless programs.wshowkeys is enabled systemwide
-      _diffr
-    ];
-    helix-man-pager = [ helix-pager ];
-    musmenu = [
-      mpc-cli
-      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 ];
-    pass-export = [
+    wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ];
-      pass2csv
+    screenshotsh =
-      gnupg
+      [ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ];
-      sd
+    volumesh = [ pulseaudio libnotify ];
-    ];
+    pulse_sink = [ pulseaudio pamixer final.wdmenu ];
-    wpass = [
+    color_picker = [ grim slurp wl-clipboard libnotify imagemagick ];
-      wdmenu
+    dzadd = [ procps libnotify final.wdmenu jq mpv pqiv python3Packages.deemix mpc-cli final.mpdDup ];
-      fd
+    mpdDup = [ mpc-cli perl ];
-      myPass
+  } // lib.mapAttrs import_script {
-      sd
-      wl-clipboard
-      wtype
-    ];
-    screenshotsh = [
-      capitaine-cursors
-      grim
-      slurp
-      jq
-      sway
-      wl-clipboard
-      xdg-user-dirs
-    ];
-    volumesh = [
-      pulseaudio
-      libnotify
-    ];
-    pulse_sink = [
-      pulseaudio
-      pamixer
-      wdmenu
-    ];
-    color_picker = [
-      grim
-      slurp
-      wl-clipboard
-      libnotify
-      imagemagick
-    ];
-    dzadd = [
-      procps
-      libnotify
-      wdmenu
-      jq
-      mpv
-      pqiv
-      python3Packages.deemix
-      mpc-cli
-      mpdDup
-    ];
-    mpdDup = [
-      mpc-cli
-      perl
-    ];
-    readQrCode = [
-      grim
-      zbar
-      wl-clipboard
-    ];
-    pint-fmt = [ ];
-    powerplay-led-idle = [
-      bash
-      libinput
-      libratbag
-    ];
-    vrr-fullscreen = [ ];
-    controller-battery = [ ];
-  }
-  // lib.mapAttrs importScript {
   wdmenu = ./wdmenu.nix;
   wlauncher = ./wlauncher.nix;
   _gpg-unlock = ./_gpg-unlock.nix;
-  }
+})
-)

scripts/pass-export

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

scripts/pint-fmt

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-file="$(mktemp)"
-cat - >"$file"
-./vendor/bin/pint --quiet "$file"
-cat "$file"
-rm "$file"

scripts/powerplay-led-idle

@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Constants
-SECONDS_UNTIL_FADE=$(( 1 * 60))
-SECONDS_UNTIL_OFF=$(( 6 * 60))
-
-COLOR_ON=ff0000
-COLOR_FADE=880000
-COLOR_OFF=000000
-
-# Logging
-
-if [[ "$1" = "debug" ]]; then
-    echo "Running with debugging" >&2
-    DEBUG="true"
-
-    SECONDS_UNTIL_FADE=$(( 3 ))
-    SECONDS_UNTIL_OFF=$(( 5 ))
-fi
-
-log() {
-    if [[ "$DEBUG" = "true" ]]; then
-        echo "$@" >&2
-    fi
-}
-
-# Implementation
-
-main() {
-    CURRENT_STATE="UNKNOWN"
-    LAST_POINTER_MOTION="$(date +%s)"
-
-    if [ "$(ratbagctl list | wc -l)" -ne 1 ]; then
-        echo "Not exactly one device found, exiting..."
-        exit 1
-    fi
-
-    DEVICE="$(ratbagctl list | cut -d: -f1)"
-
-    while true; do
-        while read line; do
-            LAST_POINTER_MOTION="$(date +%s)"
-            break
-        done < <(
-            timeout 5s \
-                libinput debug-events \
-                | grep POINTER_MOTION
-        )
-        TIME_SINCE_LAST=$(( "$(date +%s)" - "$LAST_POINTER_MOTION" ))
-        log "Last pointer motion was $TIME_SINCE_LAST seconds ago"
-        if [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_OFF" ]; then
-            setState OFF "$COLOR_OFF"
-        elif [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_FADE" ]; then
-            setState FADE "$COLOR_FADE"
-        else
-            setState ON "$COLOR_ON"
-        fi
-    done
-}
-
-setState() {
-    STATE="$1"
-    COLOR="$2"
-    MODE="$3"
-
-    if [[ "$STATE" = "$CURRENT_STATE" ]]; then
-        log "Already in $STATE state"
-        return
-    fi
-    log "Changing state to $STATE"
-    CURRENT_STATE="$STATE"
-
-    ratbagctl "$DEVICE" led 0 set mode on
-    ratbagctl "$DEVICE" led 0 set color "$COLOR"
-}
-
-main

scripts/readQrCode

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -o pipefail
-
-main() {
-
-    if wl-paste | zbarimg -q --raw - | wl-copy
-    then
-        notify-send "Copied" "QrCode was copied to clipboard"
-        rm "$LOGFILE"
-    else
-        notify-send "Failed to read QrCode" "Log file is '$LOGFILE'"
-    fi
-
-}
-
-LOGFILE=$(mktemp /tmp/qrcode-XXXXXXXX.log)
-main > "$LOGFILE" 2>&1

scripts/vrr-fullscreen

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

scripts/wdmenu.nix

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

scripts/wfile-picker.nix

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

scripts/wl-copy-file

@@ -10,13 +10,12 @@ if test (count $argv) != 1
 end
 
 set -a file (realpath $argv[1])
-set -a url (string escape --style=url "$file")
 set -e argv[1]
 
 if test -d "$file"
     die 1 "Cannot copy directories" >&2
 else if test -f "$file"
-    wl-copy $argv -t text/uri-list "file:///$url"
+    wl-copy $argv -t text/uri-list "file:///$file"
 else
     die 2 "No file found" >&2
 end

scripts/wlauncher.nix

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

scripts/wpass

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

secrets/phantom-invidious-settings.age

@@ -1,16 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa BwwxHg
-iTcgtxF1IxopbtF+aw7V8IQfH7tWiMk9lE/eWlVHVjeaRvER5W6Y3xZNOFCjtbqY
-VwEyV6ibfZ4GJt1jRu2icEH/AnLUJFFGQnxu/K/rtoZ3tqSIk9WCBv3aPo4oZRiU
-uaaxi2gD8qo1RLyl/Ij7Djw4i/isUOO1EON5sgx1d39k6qUD4Mak0DSU4EtGdTsr
-OaxDAc0kAxhxZQOUH/QlKa0HLonaFcy1LHqvttOcw3UZuZnaYfZiPlcqe3USS9cm
-96aIC5cS9pHr4JFrqRYvfpla2TY5jlCB/xBGw3KjGEIQoBPXSsJZA6BCMZyp00++
-tdfS2aomt9HFmb1wZDS0jWAxkVF6nXXBbolFVih+58h0nYLljtHIQ3SizRoXY459
-x3JE9NReHp2OO3SlIeO03Kv8YMBvj7nSSd1C1PMpu+hJ/eCXi1WQxD6QY+40muk6
-KhqE3PZ8BCY2b+VpywUF5gVH28mo3jscqAzhf2dZ3SQlzldI+hFyKPxTdAqkfUOH
-
---- cinb+wzjVfTkpfm1CtFIFaepwoQVCj1MquB5rAC45Ew
-¾
-6
-ZCþHS07ïºÖóýE¼X*Àqb=üOßíÛÉwu¥¤³­Pºþ¹Ùçǖѳ/£ómvòÞ×Ë2VœÄ«
-ÁŠxvç
[“£‚µ£±”Ì‚A~ evdÓåÙ0¢Œni³1Ò›¹Qý„"í@Ù¹§ÞÔ{KpÐ:åϵuµsÊÎBñò(X…r[ÂQVg¢Tš¤°ðœîËï@Ä*ÇõÿíB«<>.§¯žhE鲟èÐë’­÷½¥Žûzlz|kã`l8‘´8¼M›cch<63>îáZ`ƒ ?yeoƒ+ÈM-:/–À**ìè¦ÊcŸÎZD¡2Ñá¼é&·÷¾Ç¢¹£e¤ï*Hnç"Þ~+|ua(û6óËJ

secrets/phantom-mastodon-mailer-password.age

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

secrets/secrets.nix

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

settings/default.nix

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

switch

@@ -1,12 +1,9 @@
 #!/usr/bin/env bash
 
-nix fmt
+sudo nice ionice \
-
-git --no-pager diff
-
     nixos-rebuild \
     switch \
-    --use-remote-sudo \
+    --verbose \
     --print-build-logs \
     --flake .# \
-    "$@"
+    $@

switch-phantom

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

system/bluetooth.nix

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

system/boot.nix

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

system/cachix.nix

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

system/configuration.nix

@@ -1,13 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
   imports = [
     ./gamemode.nix
     ./cachix.nix
@@ -15,29 +9,129 @@
     ./boot.nix
     ./thunar.nix
     ./nix.nix
-    ./fonts.nix
-    ./sound.nix
-    ./bluetooth.nix
-    ./mouse.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.libinput.enable = true;
+  services.xserver.libinput.enable = true;
+
+  xdg.portal = {
+    config.common.default = "*";
+    enable = true;
+    wlr.enable = true;
+    # Always pick the first monitor, this is fine since I only ever use a single monitor
+    wlr.settings.screencast.chooser_type = "none";
+    # gtk portal needed to make gtk apps happy
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  };
+
+  # 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; [
+    pinentry-curses
     pavucontrol
 
     glib # gsettings
@@ -46,20 +140,27 @@
     gnome3.adwaita-icon-theme # default gnome cursors
   ];
 
-  services.geoclue2.enable = true;
+  fonts.enableDefaultPackages = true;
-
+  fonts.packages = with pkgs; [
-  # Workaround for nm-wait-online hanging??
+    noto-fonts
-  # Ref: https://github.com/NixOS/nixpkgs/issues/180175
+    noto-fonts-cjk
-  systemd.services.NetworkManager-wait-online = {
+    noto-fonts-emoji
-    serviceConfig.ExecStart = [
+    nerdfonts_fira_hack
-      ""
-      "${pkgs.networkmanager}/bin/nm-online -q"
   ];
-  };
 
-  systemd.extraConfig = ''
+  services.geoclue2.enable = true;
-    DefaultTimeoutStopSec=10s
+  # 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;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryFlavor = "curses";
+  };
+  security.sudo.wheelNeedsPassword = false;
+
   services.logind.extraConfig = ''
     HandlePowerKey=suspend
   '';

system/containers.nix

@@ -1,28 +0,0 @@
-{ pkgs, ... }:
-{
-  services.flatpak.enable = true;
-
-  virtualisation.docker = {
-    enable = true;
-    autoPrune = {
-      enable = true;
-      dates = "monthly";
-      flags = [
-        "--all"
-        "--volumes"
-      ];
-    };
-    daemon.settings = {
-      # needed by bitbucket runner ???
-      log-driver = "json-file";
-      log-opts = {
-        max-size = "10m";
-        max-file = "3";
-      };
-    };
-  };
-
-  programs.extra-container.enable = true;
-
-  programs.firejail.enable = true;
-}

system/fonts.nix

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

system/gamemode.nix

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

system/gitlab-runner.nix

@@ -1,11 +1,9 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, ... }: {
-{
+  mkNixRunner = registrationConfigFile: with lib; rec {
-  mkNixRunner =
-    authenticationTokenConfigFile: with lib; rec {
     # File should contain at least these two variables:
     # `CI_SERVER_URL`
     # `REGISTRATION_TOKEN`
-      inherit authenticationTokenConfigFile; # 2
+    inherit registrationConfigFile; # 2
     dockerImage = "alpine:3.18.2";
     dockerAllowedImages = [ dockerImage ];
     dockerVolumes = [
@@ -28,17 +26,7 @@
 
       . ${pkgs.nix}/etc/profile.d/nix.sh
 
-        ${pkgs.nix}/bin/nix-env -i ${
+      ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
-          concatStringsSep " " (
-            with pkgs;
-            [
-              nix
-              cacert
-              git
-              openssh
-            ]
-          )
-        }
     '';
     environmentVariables = {
       ENV = "/etc/profile";
@@ -47,5 +35,6 @@
       PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
       NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
     };
+    tagList = [ "nix" ];
   };
 }

system/gnome.nix

@@ -1,47 +1,25 @@
-{ pkgs, lib, ... }:
+# Edit this configuration file to define what should be installed on
-{
+# your system.  Help is available in the configuration.nix(5) man page
-  services.xserver = {
+# and in the NixOS manual (accessible by running ‘nixos-help’).
-    enable = true;
+{ config, pkgs, ... }: {
-    desktopManager.gnome = {
+  # Enable the X11 windowing system.
-      enable = true;
+  services.xserver.enable = true;
-      # Enable VRR (Variable Refresh Rate)
+  # Enable the GNOME Desktop Environment.
-      extraGSettingsOverridePackages = with pkgs; [ gnome.mutter ];
+  services.xserver.displayManager.gdm.enable = true;
-      extraGSettingsOverrides = ''
+  services.xserver.desktopManager.gnome.enable = true;
-        [org.gnome.mutter]
-        experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
-      '';
-    };
-    displayManager.gdm.enable = true;
-  };
 
-  # Workaround for https://github.com/NixOS/nixpkgs/issues/103746
+  services.xserver.displayManager.autoLogin = {
-  systemd.services."getty@tty1".enable = false;
-  systemd.services."autovt@tty1".enable = false;
-
-  services.displayManager.autoLogin = {
     enable = true;
     user = "lelgenio";
   };
 
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.gnomeExtensions.gsconnect;
-  };
-
-  hardware.opentabletdriver.enable = lib.mkForce false;
-
-  programs.gpaste.enable = true;
-
   # services.xserver.displayManager.autologin.user = "lelgenio";
-  environment.systemPackages =
+  environment.systemPackages = with pkgs; with gnome; [
-    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,17 +1,6 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 let
-  inherit (config.my)
+  inherit (pkgs.uservars) key accent font theme desktop;
-    key
-    accent
-    font
-    theme
-    desktop
-    ;
 
   cfg = config.login-manager.greetd;
 in
@@ -28,7 +17,6 @@ in
     # enable sway window manager
     programs.sway = {
       enable = true;
-      package = pkgs.mySway;
       wrapperFeatures.gtk = true;
     };
 
@@ -45,8 +33,12 @@ 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}
+          ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${{
+            sway = "sway";
+            hyprland = "Hyprland";
+          }.${desktop}}
           swaymsg exit
         '';
         swayConfig = pkgs.writeText "greetd-sway-config" ''
@@ -70,7 +62,7 @@ in
         enable = true;
         settings = {
           initial_session = {
-            command = desktop;
+            command = "${pkgs.sway}/bin/sway";
             user = "lelgenio";
           };
           default_session = {

system/kde.nix

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

system/locale.nix

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

system/media-packages.nix

@@ -1,13 +1,6 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let cfg = config.packages.media-packages;
-  pkgs,
+in {
-  lib,
-  ...
-}:
-let
-  cfg = config.packages.media-packages;
-in
-{
   options.packages.media-packages = {
     enable = lib.mkEnableOption "media packages";
   };
@@ -23,10 +16,8 @@ in
       gimp
       inkscape
       krita
-      kdePackages.breeze
+      kdenlive
-      kdePackages.kdenlive
+      blender
-      pitivi
-      blender-hip
       libreoffice
       godot_4
     ];

system/monolith-forgejo-runner.nix

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

system/monolith-gitlab-runner.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
   inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
 in
@@ -12,8 +7,19 @@ in
   virtualisation.docker.enable = true;
   services.gitlab-runner = {
     enable = true;
-    settings.concurrent = 12;
+    settings.concurrent = 4;
     services = {
+      # ci_test = {
+      #   registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
+      #   dockerImage = "debian";
+      #   dockerPrivileged = true;
+      # };
+      thoreb_builder = {
+        registrationConfigFile = config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
+        dockerImage = "debian";
+        dockerPrivileged = true;
+      };
+
       # runner for building in docker via host's nix-daemon
       # nix store will be readable in runner, might be insecure
       thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;