Add disko

flake.nix

@@ -1,42 +1,55 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-22.11";
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    home-manager.url = "github:nix-community/home-manager/release-22.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    nur.url = "github:nix-community/NUR";
 
     nix-index-database = {
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # mpvpaper
+    wegank = {
+      url = "github:wegank/nur-packages";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    hyprland = {
+      url = "github:hyprwm/Hyprland";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
+    alacritty-sixel.url = "github:ayosec/alacritty";
+    alacritty-sixel.flake = false;
+
+    ranger-sixel.url = "github:remi6397/ranger/feature/sixel";
+    ranger-sixel.flake = false;
+
     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;
+
+    sea-orm-cli.url = "github:lucperkins/nixpkgs/lperkins/sea-orm-cli";
+
+    nil-lsp.url = "github:oxalica/nil";
+    nil-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
     plymouth-themes.url = "github:adi1090x/plymouth-themes";
     plymouth-themes.flake = false;
 
-    agenix = {
+    lipsum.url = "github:hannenz/lipsum";
-      url = "github:ryantm/agenix";
+    lipsum.flake = false;
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
 
-    nixos-mailserver = {
+    agenix.url = "github:ryantm/agenix";
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-24_05.follows = "nixpkgs";
-    };
 
-    dzgui-nix = {
+    dzgui.url = "github:lelgenio/dzgui-nix";
-      url = "github:lelgenio/dzgui-nix";
+    dzgui.inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    tlauncher = {
-      url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
@@ -50,56 +63,37 @@
       url = "github:lelgenio/demoji";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    wl-crosshair = {
-      url = "github:lelgenio/wl-crosshair";
-      inputs.nixpkgs.follows = "nixpkgs";
   };
-
+  outputs = inputs@{ nixpkgs, nixpkgs-unstable, home-manager, nur, ... }:
-    # gnome stuff
-    nixos-conf-editor = {
-      url = "github:vlinkz/nixos-conf-editor";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-software-center = {
-      url = "github:vlinkz/nix-software-center";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-  outputs =
-    inputs:
     let
-      nixpkgsConfig = {
-        inherit system;
-        config = {
-          allowUnfree = true;
-        };
-        overlays = old_overlays.all;
-      };
-
       inherit (import ./user/variables.nix) desktop;
       system = "x86_64-linux";
-      pkgs = import inputs.nixpkgs nixpkgsConfig;
+      pkgs = import nixpkgs {
-      lib = inputs.nixpkgs.lib;
+        inherit system;
+        config = { allowUnfree = true; };
+        overlays = old_overlays.all;
+      };
+      lib = 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/greetd.nix
+        ./system/specialisation.nix
-          { login-manager.greetd.enable = desktop == "sway"; }
-
-          inputs.agenix.nixosModules.default
-          inputs.dzgui-nix.nixosModules.default
-          inputs.home-manager.nixosModules.home-manager
         inputs.disko.nixosModules.disko
+        # nur.nixosModules.nur
+        inputs.agenix.nixosModules.default
+        inputs.hyprland.nixosModules.default
+        {
+          programs.hyprland.enable = true;
+          # programs.hyprland.package = null;
+        }
+        home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
@@ -107,11 +101,9 @@
           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 == "sway") ./system/sway.nix
       ++ lib.optional (desktop == "gnome") ./system/gnome.nix
       ++ lib.optional (desktop == "kde") ./system/kde.nix;
     in
@@ -129,7 +121,6 @@
           modules = [
             ./hosts/monolith
             ./system/monolith-gitlab-runner.nix
-            ./system/monolith-forgejo-runner.nix
             ./system/nix-serve.nix
             ./system/steam.nix
           ] ++ common_modules;
@@ -141,45 +132,24 @@
             ./system/rainbow-gitlab-runner.nix
           ] ++ common_modules;
         };
-        double-rainbow = lib.nixosSystem {
-          inherit system specialArgs;
-          modules = [
-            ./hosts/double-rainbow.nix
-            ./system/rainbow-gitlab-runner.nix
-          ] ++ common_modules;
-        };
         pixie = lib.nixosSystem {
           inherit system specialArgs;
-          modules =
+          modules = [ ./hosts/pixie ] ++ 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 {
-          inherit system specialArgs;
-          modules = [ ./hosts/phantom ];
         };
       };
 
-      homeConfigurations.lelgenio = inputs.home-manager.lib.homeManagerConfiguration {
+      homeConfigurations.lelgenio = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
 
-        extraSpecialArgs = {
+        extraSpecialArgs = { inherit inputs; };
-          inherit inputs;
-          osConfig = { };
-        };
 
         modules = [ ./user/home.nix ];
       };
 
-      packages.${system} = pkgs // packages;
+      packages.${system} = packages;
-
-      formatter.${system} = pkgs.nixfmt-rfc-style;
     };
 }

hosts/double-rainbow.nix

@@ -1,67 +0,0 @@
-{
-  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"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ "i915" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a072a77b-ca29-47df-be65-6d310d067d78";
-    fsType = "btrfs";
-    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";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/97EB-7DB5";
-    fsType = "vfat";
-  };
-
-  swapDevices = [ ];
-
-  services.udev.extraRules = ''
-    # Force all disks to use mq-deadline scheduler
-    # For some reason "noop" is used by default which is kinda bad when io is saturated
-    ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
-  '';
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  networking.hostName = "double-rainbow"; # Define your hostname.
-}

hosts/i15.nix

@@ -1,81 +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"
-  ];
-in
-{
-  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 = [ ];
-
-  boot.initrd.luks.devices = {
-    "main" = {
-      bypassWorkqueues = true;
-      device = "/dev/disk/by-label/CRYPT_ROOT";
-    };
-  };
-
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-label/NIX_BOOT";
-    fsType = "vfat";
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIX_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=@nixos" ] ++ btrfs_options;
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-label/NIX_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=@home" ] ++ btrfs_options;
-  };
-
-  fileSystems."/swap" = {
-    device = "/dev/disk/by-label/NIX_ROOT";
-    fsType = "btrfs";
-    options = [ "subvol=@swap" ] ++ btrfs_options;
-  };
-
-  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
-  # 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.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  networking.hostName = "i15"; # Define your hostname.
-}

hosts/i15/default.nix

@@ -1,22 +1,10 @@
-{
+{ config, lib, pkgs, modulesPath, ... }: {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-{
   networking.hostName = "i15"; # Define your hostname.
 
   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 = [ ];
@@ -24,15 +12,14 @@
   disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; });
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
-  swapDevices = [
+  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;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/i15/partitions-test.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 pkgs.makeDiskoTest {
   name = "test-disko-i15";
   disko-config = ./partitions.nix;

hosts/i15/partitions.nix

@@ -1,12 +1,6 @@
-{
+{ disks ? [ "/dev/sda" ], ... }:
-  disks ? [ "/dev/sda" ],
-  ...
-}:
 let
-  btrfs_options = [
+  btrfs_options = [ "compress=zstd:3" "noatime" ];
-    "compress=zstd:3"
-    "noatime"
-  ];
 in
 {
   disk.sda = {
@@ -24,10 +18,7 @@ in
           bootable = true;
           content = {
             type = "filesystem";
-            extraArgs = [
+            extraArgs = [ "-n" "BOOT_I15" ];
-              "-n"
-              "BOOT_I15"
-            ];
             format = "vfat";
             mountpoint = "/boot";
             # options = [ "defaults" ];
@@ -44,25 +35,14 @@ in
             keyFile = "/tmp/secret.key";
             content = {
               type = "btrfs";
-              extraArgs = [
+              extraArgs = [ "--label" "ROOT_I15" ];
-                "--label"
+              subvolumes = let mountOptions = btrfs_options; in {
-                "ROOT_I15"
+                "/home" = { inherit mountOptions; };
-              ];
-              subvolumes =
-                let
-                  mountOptions = btrfs_options;
-                in
-                {
-                  "/home" = {
-                    inherit mountOptions;
-                  };
                 "/nixos" = {
                   inherit mountOptions;
                   mountpoint = "/";
                 };
-                  "/swap" = {
+                "/swap" = { inherit mountOptions; };
-                    inherit mountOptions;
-                  };
               };
             };
           };

hosts/monolith/default.nix

@@ -1,150 +1,85 @@
 # 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" ];
-    "compress=zstd:3"
+  btrfs_ssd = [ "ssd" "discard=async" ];
-    "noatime"
-    "x-systemd.device-timeout=0"
-  ];
-  btrfs_ssd = [
-    "ssd"
-    "discard=async"
-  ];
 in
 {
-  imports = [
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    (modulesPath + "/installer/scan/not-detected.nix")
+  boot.initrd.availableKernelModules =
-    ./partition.nix
+    [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  ];
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-
-  hardware.opentabletdriver.enable = true;
-
-  boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelModules = [
     "kvm-amd"
     "amdgpu"
-    "zenpower"
   ];
   boot.kernelParams = [
-    "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
     "video=DP-1:1920x1080@144"
-    # 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; [
+  # hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
-    libva
+  # # For 32 bit applications
-    libvdpau
+  # # Only available on unstable
-    vaapiVdpau
+  # hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
-    rocm-opencl-icd
+  # environment.variables = { AMD_VULKAN_ICD = "RADV"; };
-    rocm-opencl-runtime
+
-    rocmPackages.rocm-smi
+  boot.extraModulePackages = [
+    ((pkgs.amdgpu-kernel-module.override {
+      kernel = config.boot.kernelPackages.kernel;
+    }).overrideAttrs (_: {
+      patches = [ ../patches/kernel/amdgpu-disable-shutdown-on-overheating.diff ];
+    }))
   ];
-
+  fileSystems."/" = {
-  boot.kernelPackages = pkgs.linuxPackages_6_1;
+    device = "/dev/disk/by-label/BTRFS_ROOT";
-
+    fsType = "btrfs";
-  programs.corectrl = {
+    options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
-    enable = true;
+  };
-    gpuOverclock = {
+  # boot.initrd.luks.reusePassphrases = true;
-      enable = true;
+  boot.initrd.luks.devices = {
-      ppfeaturemask = "0xffffffff";
+    "main" = {
+      bypassWorkqueues = true;
+      device = "/dev/disk/by-label/CRYPT_ROOT";
+    };
+    "data" = {
+      bypassWorkqueues = true;
+      device = "/dev/disk/by-label/CRYPT_DATA";
     };
   };
-
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  # fileSystems."/" = {
+  fileSystems."/boot/efi" = {
-  #   device = "/dev/disk/by-label/BTRFS_ROOT";
+    device = "/dev/disk/by-label/NIXBOOT";
-  #   fsType = "btrfs";
+    fsType = "vfat";
-  #   options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
+  };
-  # };
+  fileSystems."/home" = {
-  # # boot.initrd.luks.reusePassphrases = true;
+    device = "/dev/disk/by-label/BTRFS_ROOT";
-  # boot.initrd.luks.devices = {
+    fsType = "btrfs";
-  #   "main" = {
+    options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
-  #     bypassWorkqueues = true;
+  };
-  #     device = "/dev/disk/by-label/CRYPT_ROOT";
+  fileSystems."/home/lelgenio/Games" = {
-  #   };
+    device = "/dev/disk/by-label/BTRFS_DATA";
-  #   "data" = {
+    fsType = "btrfs";
-  #     bypassWorkqueues = true;
+    options = [ "subvol=@games" "nofail" ] ++ btrfs_options;
-  #     device = "/dev/disk/by-label/CRYPT_DATA";
+  };
-  #   };
+  fileSystems."/home/lelgenio/Downloads/Torrents" = {
-  #   "bigboy" = {
+    device = "/dev/disk/by-label/BTRFS_DATA";
-  #     bypassWorkqueues = true;
+    fsType = "btrfs";
-  #     device = "/dev/disk/by-label/CRYPT_BIGBOY";
+    options = [ "subvol=@torrents" "nofail" ] ++ btrfs_options;
-  #   };
+  };
-  # };
+  fileSystems."/home/lelgenio/Música" = {
-  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
+    device = "/dev/disk/by-label/BTRFS_DATA";
-  # fileSystems."/boot/efi" = {
+    fsType = "btrfs";
-  #   device = "/dev/disk/by-label/NIXBOOT";
+    options = [ "subvol=@music" "nofail" ] ++ btrfs_options;
-  #   fsType = "vfat";
+  };
-  # };
+  services.udev.extraRules = ''
-  # fileSystems."/home" = {
+    ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled"
-  #   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
@@ -152,30 +87,20 @@ in
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
   powerManagement.cpuFreqGovernor = "ondemand";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
   networking.hostName = "monolith"; # Define your hostname.
 
-  services.udev.extraRules = ''
-    # Fix broken suspend with Logitech USB dongle
-    # `lsusb | grep Logitech` will return "vendor:product"
-    ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled"
-    # Force all disks to use mq-deadline scheduler
-    # For some reason "noop" is used by default which is kinda bad when io is saturated
-    ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
-  '';
-
   # swap
-  # fileSystems."/swap" = {
+  fileSystems."/swap" = {
-  #   device = "/dev/disk/by-label/BTRFS_ROOT";
+    device = "/dev/disk/by-label/BTRFS_ROOT";
-  #   fsType = "btrfs";
+    fsType = "btrfs";
-  #   # Note these options effect the entire BTRFS filesystem and not just this volume,
+    # 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
+    # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
-  #   options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
+    options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
-  # };
+  };
-  # swapDevices = [
+  swapDevices = [{
-  #   {
+    device = "/swap/swapfile";
-  #     device = "/swap/swapfile";
+    size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
-  #     size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
+  }];
-  #   }
-  # ];
 }

hosts/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/default.nix

@@ -1,72 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  imports = [
-    ./vpsadminos.nix
-    inputs.agenix.nixosModules.default
-    ../../system/nix.nix
-    ./hardware-config.nix
-    ./mastodon.nix
-    ./nextcloud.nix
-    ./nginx.nix
-    ./syncthing.nix
-    ./users.nix
-    ./writefreely.nix
-    ./email.nix
-    ./forgejo.nix
-  ];
-
-  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" ];
-  };
-
-  system.autoUpgrade = {
-    enable = true;
-    dates = "04:40";
-    operation = "switch";
-    flags = [
-      "--update-input"
-      "nixpkgs"
-      "--no-write-lock-file"
-      "-L"
-    ];
-    flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
-  };
-
-  networking.firewall.allowedTCPPorts = [ 8745 ];
-
-  system.stateVersion = "23.05"; # Never change this
-}

hosts/phantom/email.nix

@@ -1,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;
-      extraConfig = ''
-        client_max_body_size 512M;
-      '';
-      locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
-    };
-  };
-
-  services.forgejo = {
-    enable = true;
-    database.type = "postgres";
-    lfs.enable = true;
-    settings = {
-      service.DISABLE_REGISTRATION = true;
-      actions = {
-        ENABLED = true;
-        DEFAULT_ACTIONS_URL = "github";
-      };
-      server = {
-        DOMAIN = "git.lelgenio.com";
-        HTTP_PORT = 3000;
-        ROOT_URL = "https://${srv.DOMAIN}/";
-      };
-      mailer = {
-        ENABLED = true;
-        SMTP_ADDR = "mail.lelgenio.com";
-        FROM = "noreply@git.lelgenio.com";
-        USER = "noreply@git.lelgenio.com";
-      };
-    };
-    mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path;
-  };
-
-  age.secrets.phantom-forgejo-mailer-password = {
-    file = ../../secrets/phantom-forgejo-mailer-password.age;
-    mode = "400";
-    owner = "forgejo";
-  };
-}

hosts/phantom/hardware-config.nix

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

hosts/phantom/mastodon.nix

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

hosts/phantom/nextcloud.nix

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

hosts/phantom/syncthing.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-
-  services.syncthing = {
-    enable = true;
-    dataDir = "/var/lib/syncthing-data";
-    guiAddress = "0.0.0.0:8384";
-    openDefaultPorts = true;
-  };
-
-  services.nginx.virtualHosts."syncthing.lelgenio.com" = {
-    enableACME = true;
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:8384";
-      extraConfig =
-        # required when the target is also TLS server with multiple hosts
-        "proxy_ssl_server_name on;"
-        +
-          # required when the server wants to use HTTP Authentication
-          "proxy_pass_header Authorization;";
-    };
-  };
-}

hosts/phantom/users.nix

@@ -1,48 +0,0 @@
-{ pkgs, ... }:
-{
-  security.rtkit.enable = true;
-  services.openssh = {
-    enable = true;
-    ports = [
-      9022
-      22
-    ];
-    settings = {
-      PasswordAuthentication = false;
-      KbdInteractiveAuthentication = false;
-    };
-  };
-
-  # 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 = {
-    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"
-    ];
-    initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
-  };
-  security.sudo.wheelNeedsPassword = false;
-
-  programs.fish.enable = true;
-
-  environment.systemPackages = with pkgs; [ git ];
-}

hosts/phantom/vpsadminos.nix

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

hosts/phantom/writefreely.nix

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

hosts/pixie/default.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/default.nix

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

overlays/default.nix

@@ -1,82 +1,92 @@
-{ inputs, packages, ... }:
+{ inputs, packages, ... }: rec {
-rec {
   all = [
+    nur
     scripts
+    sway
+    unstable
+    sixel-patches
     themes
     new-packages
     patches
-    lib_extended
+    variables
-    disko
   ];
 
+  nur = inputs.nur.overlay;
   scripts = (import ../scripts);
 
-  themes = (
+  sway = (import ./sway.nix);
-    final: prev: {
-      papirus_red = (final.papirus-icon-theme.override { color = "red"; });
-      orchis_theme_compact = (
-        final.orchis-theme.override {
-          border-radius = 0;
-          tweaks = [
-            "compact"
-            "solid"
-          ];
-        }
-      );
-      nerdfonts_fira_hack = (
-        final.nerdfonts.override {
-          fonts = [
-            "FiraCode"
-            "Hack"
-          ];
-        }
-      );
-    }
-  );
 
-  new-packages = (
+  unstable = (final: prev: {
-    final: prev:
+    unstable = import inputs.nixpkgs-unstable {
-    packages
+      inherit (prev) system config;
-    // {
+    };
+  });
+
+  sixel-patches = (import ./sixel-patches.nix (inputs));
+
+  themes = (final: prev: {
+    material-wifi-icons = final.stdenv.mkDerivation rec {
+      name = "material-wifi-icons";
+      src = inputs.material-wifi-icons;
+      installPhase =
+        let dest = "$out/share/fonts/${name}";
+        in ''
+          mkdir -p ${dest}
+          cp material-wifi.ttf ${dest}
+        '';
+    };
+    papirus_red = (final.unstable.papirus-icon-theme.override { color = "red"; });
+    orchis_theme_compact = (final.orchis-theme.override { tweaks = [ "compact" "solid" ]; });
+    nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
+  });
+
+  new-packages = (final: prev: packages // {
     dhist = inputs.dhist.packages.${prev.system}.dhist;
     demoji = inputs.demoji.packages.${prev.system}.default;
-      tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
+    dzgui = inputs.dzgui.packages.${prev.system}.dzgui;
-      wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
+    mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper;
-    }
-  );
 
-  patches = (
+    sea-orm-cli = inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli;
-    final: prev: {
+    webcord = (prev.webcord or prev.unstable.webcord).overrideAttrs (old: {
-      mySway = prev.sway.override {
+      patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
-        sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
-          patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
     });
+    nil-lsp = inputs.nil-lsp.packages.${prev.system}.nil;
+  });
+
+  patches = (final: prev: {
+    bemenu = prev.bemenu.overrideAttrs (o: {
+      preBuild = ''
+        sed -i 's/ZWLR_LAYER_SHELL_V1_LAYER_TOP/ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY/g' lib/renderers/wayland/window.c
+      '';
+    });
+    sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
+      patches = old.patches
+        ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
+    });
+    steam = prev.unstable.steam.override {
+      extraPkgs = pkgs: with pkgs; [ capitaine-cursors bibata-cursors ];
     };
-    }
-  );
 
-  lib_extended = (
+    qutebrowser = prev.qutebrowser.overrideAttrs (old: {
-    final: prev: {
+      src = prev.fetchFromGitHub {
-      lib = prev.lib // rec {
+        owner = "pinusc";
-        # Utility function
+        repo = "qutebrowser";
-        # Input: [{v1=1;} {v2=2;}]
+        rev = "feature/tree-tabs";
-        # Output: {v1=1;v2=2;}
+        sha256 = "sha256-kHxZ3AzbfPJ3im1kQNn8DDlKBn+yPI4SLbSZuBQrUWY=";
-        mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { };
-
-        # Easily translate imperative templating code
-        # Input: [ 1 2 ] (num: { "v${num}" = num; })
-        # Output: {v1=1;v2=2;}
-        forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
       };
-    }
+    });
-  );
+  });
+
+  variables = (final: prev: {
+    uservars = import ../user/variables.nix;
 
-  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;
+      (prev.callPackage "${inputs.disko}/tests/lib.nix" {
-  };
+        inherit makeTest eval-config;
+      }).makeDiskoTest;
+  });
 }

overlays/sixel-patches.nix

@@ -0,0 +1,16 @@
+inputs: (final: prev: {
+  alacritty = (prev.unstable.alacritty.overrideAttrs (old-alacritty: rec {
+    src = inputs.alacritty-sixel;
+    cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const {
+      inherit src;
+      outputHash = "sha256-jqjYMVkH32z5EFgafiOYAOc5Q/IYs0jjJeqRb0L6WsY=";
+    });
+  }));
+  ranger = (prev.ranger.overridePythonAttrs (old-ranger: rec {
+    src = inputs.ranger-sixel;
+    checkInputs = [ ];
+    propagatedBuildInputs = with prev.python3Packages;
+      old-ranger.propagatedBuildInputs ++ [ astroid pylint pytest ];
+  }));
+})
+

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/kernel/amdgpu-disable-shutdown-on-overheating.diff

@@ -0,0 +1,44 @@
+diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
+index bfe80ac0a..5343b8b86 100644
+--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
++++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
+@@ -614,7 +614,6 @@ int phm_irq_process(struct amdgpu_device *adev,
+ 			 * Try to do a graceful shutdown to prevent further damage.
+ 			 */
+ 			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
+-			orderly_poweroff(true);
+ 		} else if (src_id == VISLANDS30_IV_SRCID_CG_TSS_THERMAL_HIGH_TO_LOW)
+ 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n");
+ 		else if (src_id == VISLANDS30_IV_SRCID_GPIO_19) {
+@@ -633,7 +632,6 @@ int phm_irq_process(struct amdgpu_device *adev,
+ 			 * Try to do a graceful shutdown to prevent further damage.
+ 			 */
+ 			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
+-			orderly_poweroff(true);
+ 		} else
+ 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n");
+ 	} else if (client_id == SOC15_IH_CLIENTID_ROM_SMUIO) {
+diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+index 70b560737..11373a474 100644
+--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
++++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+@@ -1444,7 +1444,6 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,
+ 			 * Try to do a graceful shutdown to prevent further damage.
+ 			 */
+ 			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
+-			orderly_poweroff(true);
+ 		break;
+ 		case THM_11_0__SRCID__THM_DIG_THERM_H2L:
+ 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n");
+diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+index 89f0f6eb1..99024cfec 100644
+--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
++++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+@@ -1386,7 +1386,6 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
+ 			 * Try to do a graceful shutdown to prevent further damage.
+ 			 */
+ 			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
+-			orderly_poweroff(true);
+ 			break;
+ 		case THM_11_0__SRCID__THM_DIG_THERM_H2L:
+ 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n");

patches/orchis-fix-warnings.patch

@@ -1,19 +0,0 @@
-commit 9c516cc61775a88312280f7732328d5fdf7af825
-Author: lelgenio <lelgenio@disroot.org>
-Date:   Mon May 22 11:30:01 2023 -0300
-
-    fix: limit lowest value for corner-radious at 0
-
-diff --git a/src/_sass/_variables.scss b/src/_sass/_variables.scss
-index 9915a22..6e87a4f 100644
---- a/src/_sass/_variables.scss
-+++ b/src/_sass/_variables.scss
-@@ -24,7 +24,7 @@ $large-icon-size: 32px;
- //
- 
- $window-radius: $default_corner + $space-size;
--$corner-radius: if($compact == 'false', $default_corner, $default_corner - 2px);
-+$corner-radius: if($compact == 'false', $default_corner, max(0, $default_corner - 2px));
- $material-radius: $default_corner / 2 + 4px;
- $menu-radius: $default_corner / 4 + $space-size + 2px;
- $popup-radius: $default_corner + $space-size + 2px;

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/amdgpu-kernel-module.nix

@@ -0,0 +1,38 @@
+{ pkgs
+, lib
+, kernel ? pkgs.linuxPackages_latest.kernel
+}:
+
+pkgs.stdenv.mkDerivation {
+  pname = "amdgpu-kernel-module";
+  inherit (kernel) src version postPatch nativeBuildInputs;
+
+  kernel_dev = kernel.dev;
+  kernelVersion = kernel.modDirVersion;
+
+  modulePath = "drivers/gpu/drm/amd/amdgpu";
+
+  buildPhase = ''
+    BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build
+
+    cp $BUILT_KERNEL/Module.symvers .
+    cp $BUILT_KERNEL/.config        .
+    cp $kernel_dev/vmlinux          .
+
+    make "-j$NIX_BUILD_CORES" modules_prepare
+    make "-j$NIX_BUILD_CORES" M=$modulePath modules
+  '';
+
+  installPhase = ''
+    make \
+      INSTALL_MOD_PATH="$out" \
+      XZ="xz -T$NIX_BUILD_CORES" \
+      M="$modulePath" \
+      modules_install
+  '';
+
+  meta = {
+    description = "AMD GPU kernel module";
+    license = lib.licenses.gpl3;
+  };
+}

pkgs/blade-formatter/default.nix

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

pkgs/blade-formatter/package.json

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

pkgs/cargo-checkmate.nix

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

pkgs/default.nix

@@ -1,11 +1,9 @@
 # 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 }: {
-{
+  plymouth-theme-red = pkgs.callPackage ./plymouth-theme-red.nix { inherit inputs; };
-  blade-formatter = pkgs.callPackage ./blade-formatter { };
   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 { };
+  amdgpu-kernel-module = pkgs.callPackage ./amdgpu-kernel-module.nix { };
-  material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
 }

pkgs/emmet-cli.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-}:
-
-buildNpmPackage rec {
-  pname = "emmet-cli";
-  version = "0.0.1";
-
-  src = fetchFromGitHub {
-    owner = "Delapouite";
-    repo = "emmet-cli";
-    rev = "407b0e8c59f65f205967d6be71105e0bd2001d62";
-    hash = "sha256-8lDgD1eIc2r5aB2baaiHKbkFdAxErX5p96MNqztR9rg=";
-  };
-
-  npmDepsHash = "sha256-Utgk/Cw83ffGr2/4aNkp3n3wSOojLZLA7OR+OakYBC0=";
-
-  dontNpmBuild = true;
-
-  meta = {
-    description = "Emmet command line interface";
-    homepage = "https://github.com/Delapouite/emmet-cli";
-    mainProgram = "emmet";
-  };
-}

pkgs/lipsum.nix

@@ -1,32 +1,23 @@
-{
+{ 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 = [
+  buildInputs = with pkgs; [
     pkg-config
+    glib
+    gtk3.dev
     vala
-    wrapGAppsHook
   ];
 
-  makeFlags = [ "PRG=${pname}" ];
+  makeFlags = [
+    "PRG=${pname}"
+  ];
 
   installPhase = ''
     install -Dm 755 "$pname" "$out/bin/$pname"
-    install -Dm 755 "./data/de.hannenz.lipsum.gschema.xml" "$out/share/glib-2.0/schemas/de.hannenz.lipsum.gschema.xml"
-    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}
-  '';
-}

pkgs/plymouth-theme-red.nix

@@ -0,0 +1,25 @@
+{ pkgs, inputs }:
+pkgs.stdenv.mkDerivation rec {
+  pname = "red-loader-plymouth";
+  version = "0.0.1";
+
+  src = inputs.plymouth-themes;
+
+  buildInputs = [
+    pkgs.git
+  ];
+
+  configurePhase = ''
+    mkdir -p $out/share/plymouth/themes/
+  '';
+
+  buildPhase = ''
+  '';
+
+  installPhase = ''
+    cp -r pack_4/red_loader $out/share/plymouth/themes
+    cat pack_4/red_loader/red_loader.plymouth | sed  "s@\/usr\/@$out\/@" > \
+      $out/share/plymouth/themes/red_loader/red_loader.plymouth
+  '';
+}
+

scripts/_sway_idle_toggle

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-swayidlectl() {
-  systemctl --user $1 swayidle.service
-}
-
-if swayidlectl status > /dev/null; then
-    swayidlectl stop
-else
-    swayidlectl start
-fi

scripts/auto_connect_gamepad

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

scripts/color_picker

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-grim -g "$(slurp -b aabbcc00 -p)" - |
-    convert - txt:- |
-    grep -oE '#[0-9A-Fa-f]{6}' |
-    wl-copy -n
-
-notify-send "$(wl-paste)" "Copied to clipboard"

scripts/default.nix

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

scripts/down_meme

@@ -6,11 +6,9 @@ cd "$DIR"
 
 yt-dlp --merge-output-format mp4 "$(wl-paste)"
 
-FILENAME="$(ls | head -n1)"
+FILENAME="$(ls)"
 
-mkdir -p "$HOME/Downloads/Memes"
+cp * "$HOME/Downloads/Memes/$FILENAME"
-
-cp "$FILENAME" "$HOME/Downloads/Memes/$FILENAME"
 
 wl-copy-file "$HOME/Downloads/Memes/$FILENAME"
 

scripts/dzadd

@@ -1,176 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-tmpf=$(mktemp /tmp/dzadd.XXXXXX)
-
-clean() {
-    test "$?" -eq "0" ||
-        notify-send "Exiting with error"
-
-    set +e
-    kill "$mpvPid"
-    rm -f "$tmpf"
-}
-
-trap clean EXIT
-
-main() {
-    sType=$(printf "Track\nAlbum\nArtist" | wdmenu | tr '[:upper:]' '[:lower:]')
-    test -n "$sType" || exit 1
-
-    query=$(echo -n | wdmenu | sed 's/[^ a-z0-9]//g;s/ /+/g')
-    test -n "$query" || exit 1
-
-    case "$sType" in
-        track)
-            deezer_category="track"
-            jqFilter='.data[]| "\(.title) - \(.album.title) - \(.artist.name) |\(.id)"'
-            ;;
-        album)
-            deezer_category="album"
-            jqFilter='.data[]| "\(.nb_tracks) - \(.title) - \(.artist.name) |\(.id)"'
-            ;;
-        artist)
-            deezer_category="artist"
-            jqFilter='.data[]| "\(.nb_fan) - \(.name) |\(.id)"'
-            ;;
-        top50)
-            deezer_category="artist"
-            jqFilter='.data[]| "\(.nb_fan) - \(.name) |\(.id)"'
-            ;;
-        *)
-            exit 1
-            ;;
-    esac
-
-    curl -m30 -s "api.deezer.com/search/${deezer_category}?q=${query}" |
-        sed 's/|//g' |
-        jq -r "$jqFilter" >"$tmpf"
-
-    pick_song
-}
-
-pick_song() {
-    choice=$(cat "$tmpf" | cut -d\| -f1 | wdmenu)
-    choice=$(grep "$choice" "$tmpf" | head -n 1)
-    choiceId=$(printf "%s" "$choice" | cut -d\| -f2)
-
-    case "$sType" in
-        top50)
-            choiceUrl="http://deezer.com/${deezer_category}/${choiceId}/top?=limit=50"
-            ;;
-        *)
-            choiceUrl="http://deezer.com/${deezer_category}/${choiceId}"
-            ;;
-    esac
-
-
-    pick_action "$choiceUrl"
-}
-
-pick_action() {
-
-    choiceUrl="$1"
-
-    COMMON_CHOISES="View Image\nDownload\nCopy URL\nAnother"
-    choice=$(printf "Preview\n${COMMON_CHOISES}" | wdmenu)
-
-    case "$choice" in
-
-        "Preview")
-            common_preview
-            ;;
-
-        "View Image")
-            common_art
-            ;;
-
-        "Download")
-            common_download
-            ;;
-
-        "Copy URL")
-            wl-copy
-            ;;
-
-        "Another")
-            pick_song
-            ;;
-
-        *)
-            exit 1
-            ;;
-
-    esac
-
-}
-
-common_preview() {
-
-    case "$sType" in
-        track)
-            ;;
-        album)
-            preview_suffix=tracks
-            ;;
-        artist)
-            preview_suffix=top
-            ;;
-        top50)
-            preview_suffix=top
-            ;;
-        *)
-            exit 1
-            ;;
-    esac
-
-    choicePreview=$(
-        curl -m30 -s "http://api.deezer.com/${deezer_category}/${choiceId}/${preview_suffix}" |
-            jq -r '.preview, .data[0].preview | select(. != null)'
-    )
-
-    mpv --quiet --volume=50 --no-resume-playback "$choicePreview" &
-    mpvPid="$!"
-    choice=$(printf "$COMMON_CHOISES" | wdmenu -p 'Download?')
-    kill "$mpvPid" || true
-}
-
-common_art() {
-
-    case "$sType" in
-        track)
-            image_filter='.album.cover_big'
-            ;;
-        album)
-            image_filter='.cover_big'
-            ;;
-        artist)
-            image_filter='.picture_big'
-            ;;
-        top50)
-            image_filter='.picture_big'
-            ;;
-        *)
-            exit 1
-            ;;
-    esac
-
-    curl -m30 -s "api.deezer.com/${deezer_category}/${choiceId}" |
-        jq -r "$image_filter" |
-        xargs curl -m30 -s |
-        pqiv -
-
-    pick_action
-}
-
-common_download() {
-    notify-send "Starting Download"
-    deemix "$choiceUrl" </dev/null &&
-        notify-send "Download Successful" ||
-        notify-send "Download Failed"
-    mpc add /
-    mpdDup
-}
-
-main

scripts/helix-man-pager

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-col -b -x | hx

scripts/helix-pager

@@ -1,28 +0,0 @@
-#!/usr/bin/env fish
-
-if test (count $argv) -ne 0
-    for i in $argv
-        cat "$i"
-    end | eval (status filename)
-    exit 0
-end
-
-set term_line_count (tput lines)
-
-while read line
-    set -a input_lines "$line"
-
-    set input_line_count (printf "%s\n" $input_lines | wc -l)
-
-    if test "$term_line_count" -lt "$input_line_count"
-        begin
-            printf "%s\n" $input_lines
-            cat
-        end | hx
-
-        exit 0
-    end
-
-end
-
-printf "%s\n" $input_lines

scripts/kak-man-pager

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+col -b -x |
 kak -e '
     map global normal q :q<ret>;
     set buffer filetype man;

scripts/mpdDup

@@ -1,5 +0,0 @@
-#!/bin/sh
-mpc playlist -f '%position%\t%file%' |
-    sort -k 2 |
-    perl -ne 'm/(.*)\t(.*)/; print "$1\n" if $2 eq $prev; $prev=$2' |
-    mpc del

scripts/pass-export

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

scripts/playerctl-status

@@ -2,9 +2,13 @@
 
 PLAYERCTL="playerctl --ignore-player=mpd"
 
-test "$(LC_ALL=C $PLAYERCTL status)" = "Playing" \
+STATUS="$(env LC_ALL=C $PLAYERCTL status title)"
-&& printf " %s" "$($PLAYERCTL metadata title)" \
+TITLE="$($PLAYERCTL metadata title)"
-&& test -n "$($PLAYERCTL metadata artist)" \
+ARTIST="$($PLAYERCTL metadata artist)"
-&& printf " - %s" "$($PLAYERCTL metadata artist)"
+
+test "$STATUS" = "Playing" \
+&& printf " %s" "$TITLE" \
+&& test -n "$ARTIST" \
+&& printf " - %s" "$ARTIST"
 
 echo ""

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/volumesh

@@ -45,7 +45,7 @@ get_vol_system() {
 }
 
 is_muted_system() {
-    test "$(pamixer --get-mute)" = "true" >/dev/null
+    pamixer --get-mute >/dev/null
 }
 
 change_vol_system() {

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

@@ -1,5 +1,3 @@
-#!/bin/sh
-
 _gpg-unlock
 set -xe
 
@@ -9,18 +7,8 @@ find_file() {
   wdmenu -p "Password" $@
 }
 
-print_actions_for_entry() {
-  echo "Autotype"
-  if test -n "$username"; then
-    echo "Username -> $username"
-  fi
-  echo "Password"
-  if test -n "$otp"; then
-    echo "OTP"
-  fi
-}
-
 main() {
+
   test -n "$PASSWORD_STORE_DIR" &&
     cd "$PASSWORD_STORE_DIR" ||
     cd "$HOME/.password-store"
@@ -31,9 +19,8 @@ main() {
 
     username=`pass show "$entry" 2>/dev/null | perl -ne 'print $2 if /^(login|user|email): (.*)/'`
     password=`pass show "$entry" 2>/dev/null | head -n 1`
-    otp=`pass otp "$entry" 2>/dev/null` || true
 
-    action="$(print_actions_for_entry | wdmenu -p Action)"
+    action=`printf "Autotype\nUsername -> $username\nPassword" | wdmenu -p Action`
 
     case $action in
         Autotype)
@@ -43,8 +30,6 @@ main() {
             printf '%s' "$username" | wl-copy;;
         Password)
             printf '%s' "$password" | wl-copy;;
-        OTP)
-            pass otp "$entry" | wl-copy;;
     esac
 
 }

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/phantom-nextcloud.age

@@ -1,15 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa BwwxHg
-bpGCgyaAPDutva1Gp/YPuek6IZTXJHKb7+oIAV/x+7Ry4Oci9zM2VWvPVE/rPE/d
-0AzBX1NvsWBB005w42RfiErk4FQYRCouwNR1FNjUWNdQOmku++RPfxBXspAFIDkQ
-yM7mqbhwf5by5rZY+2kl20QxkErkVtZolus1am9RV4uyXfdPaRcKjWOuPiEim42d
-YdeCXq4nJGxlL3tRunIqLIZGhV08wHBl7Dubhn9hdD6/ekDk0RloVTBDZUY5tUPL
-dJk+bfFPI0DimytzCwyQbWEHOkdiWYSNzbx2JhTSvuqefHP1UzB2LukaQc2gOJFV
-mVKvQuGpOWknytMUhM6zCTvRw4OQutAZd96OniQYTas/vnmfT2l2n9aMEzQK157A
-U9DmsvhBypILiQSPpA7QrGB1QVuRjAFJA86ASY1FAT6MdBBK4vZ8fK7mpT06JO/n
-gwv+UlvFBziWHzA/1GOLrfD+ExjmbeucRZr5XGszrAaK/7GPZt4LF69hRmKegL94
-
--> 9I3~SC,<-grease M$2 RibFL]C
-uR6MirHtTc4Tyrcw3T2my+BN2Q
---- 56zk9BqgwQqNymga1mUDgpvtfIpMy5i/JnaSXbjx6jk
-ÞQÚÞ—Ž)NâÿÚ¦¨Žß‘-†ŸÀ ÷ÑDz-ÖIÅß-°]p$ÉX5æT·PU=u;kæ8}wÁV¦mšç=

secrets/phantom-renawiki.age

@@ -1,16 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa BwwxHg
-BUJ9L1bwZ0RWj3FmMghmZDkY4iuc0gujS3Rfat+hj/pg+MALZ69Tovc5RnqmOZT/
-pTGPTzWj3WO70YU+wCUHKZ74JcKdL3wSD1FWOWYRvyDV3gxZjDTjw4Grs+sH9M4Z
-MrhdoyY95fhmGZHJ7Qkx/aKCAK/OaFSu5Vhh37ykmLd1gQ9NJYQ+G3lLr1Mrqjd/
-1QaBqJtJpAFTA0eCd3+oBtQ/qgHD2ZBJcOmkS9sRC6S4YKNoyoDifTbL29aJC4f/
-08myI0WH/ApbtN1hWuiVWibmy/9/76IAvgUqi8fULNY5w7Otz3nKGV+mDA5+oD11
-jCHZJdcec9JFyZ/V2mh/PoHpNawksNPy85eJ0MpM1avM25Qib8kWJM6fnZb7uJzt
-DsYCl2q4ILnTaieuTSJUfgacKbrwSv7MQfgdh1SkXAShyZ7aSCoDhsgSdOVwYoAX
-Mspm0NtodeV7493qZwYspO6H0xbfh20vXa1DOeMt98T1iP0aYYhfRXkb0wACx1QF
-
--> \z/RLj3S-grease cmv( uCkG*= .cX3S 9r^&
-OVTVTnB3PjD4COiRCtQ
---- EhfDqxfjLIHF9Sa7V4ytO1xsRK8p23WDsWcB9/B9fRw
-.ß=–£))/’ö‰Í¹êÒ‹#´
ýLÁƒŒÓ‰Ž—|p
-7	ÍñÄKä®7ò²Š@üCJfš:w6Pè•@@/N<>7¿

secrets/secrets.nix

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

settings/default.nix

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

switch

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-nix fmt
-
-git --no-pager diff
-
 sudo nice ionice \
     nixos-rebuild \
     switch \

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,13 +1,6 @@
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-{
   console = {
-    font = "${pkgs.terminus_font}/share/consolefonts/ter-120n.psf.gz";
+    font = "ter-120n";
     packages = [ pkgs.terminus_font ];
     earlySetup = false;
   };
@@ -23,11 +16,6 @@
       "rd.systemd.show_status=false"
       "rd.udev.log_level=3"
       "udev.log_priority=3"
-
-      # Disable password timeout
-      "luks.options=timeout=0"
-      "rd.luks.options=timeout=0"
-      "rootflags=x-systemd.device-timeout=0"
     ];
 
     initrd.systemd.enable = true;
@@ -43,9 +31,9 @@
     };
     plymouth = {
       enable = true;
-      theme = lib.mkIf (config.my.desktop == "sway") "red_loader";
+      theme = "red_loader";
-      themePackages = with pkgs; [
+      themePackages = [
-        (adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; })
+        pkgs.plymouth-theme-red
       ];
     };
   };

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,42 +1,119 @@
 # 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,
+  imports = [ ./gamemode.nix ./cachix.nix ./media-packages.nix ./boot.nix ];
-  pkgs,
+  packages.media-packages.enable = true;
-  inputs,
-  ...
-}:
-{
-  imports = [
-    ./gamemode.nix
-    ./cachix.nix
-    ./media-packages.nix
-    ./boot.nix
-    ./thunar.nix
-    ./nix.nix
-    ./fonts.nix
-    ./sound.nix
-    ./bluetooth.nix
-    ./locale.nix
-    ./users.nix
-    ./containers.nix
-    ./network.nix
-    ../settings
-  ];
 
-  my = import ../user/variables.nix;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  boot.kernel.sysctl = {
+    "vm.max_map_count" = 1048576; # Needed by DayZ
+  };
 
   zramSwap.enable = true;
 
   programs.adb.enable = true;
   services.udev.packages = [ pkgs.android-udev-rules ];
 
-  # Enable touchpad support (enabled default in most desktopManager).
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  services.libinput.enable = true;
+  # 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;
+  # Set your time zone.
+  time.timeZone = "America/Sao_Paulo";
+  # 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;
+  programs.firejail.enable = true;
+
+  security.rtkit.enable = true;
+  services.openssh = {
+    enable = true;
+    kbdInteractiveAuthentication = false;
+    passwordAuthentication = false;
+    permitRootLogin = "no";
+    ports = [ 9022 ];
+  };
+  # 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;
+    package = pkgs.bluezFull;
+    settings = {
+      General = {
+        DiscoverableTimeout = 0;
+        # Discoverable = true;
+        AlwaysPairable = true;
+      };
+      Policy = { AutoEnable = true; };
+    };
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.mutableUsers = false;
+  users.users.lelgenio = {
+    isNormalUser = true;
+    description = "Leonardo Eugênio";
+    hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
+    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" ];
+    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;
+  # TODO: enable thunar plugins
+  # programs.thunar.enable = true;
+  # programs.thunar.plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
 
-  packages.media-packages.enable = true;
   environment.systemPackages = with pkgs; [
+    pinentry-curses
     pavucontrol
 
     glib # gsettings
@@ -45,15 +122,63 @@
     gnome3.adwaita-icon-theme # default gnome cursors
   ];
 
+  fonts.enableDefaultFonts = true;
+  fonts.fonts = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    nerdfonts_fira_hack
+  ];
+
   services.geoclue2.enable = true;
+  # programs.qt5ct.enable = true;
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  services.pcscd.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryFlavor = "curses";
+  };
+  # List services that you want to enable:
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  networking.firewall.enable = false;
+  security.sudo.wheelNeedsPassword = false;
 
-  systemd.extraConfig = ''
+  nix.registry.nixpkgs.flake = inputs.nixpkgs;
-    DefaultTimeoutStopSec=10s
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    optimise.automatic = true;
+    settings = {
+      auto-optimise-store = true;
+      substituters = [
+        # "http://nixcache.lelgenio.1337.cx:5000"
+        "https://hyprland.cachix.org"
+        "https://lelgenio.cachix.org"
+        "https://wegank.cachix.org"
+      ];
+      trusted-public-keys = [
+        # "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        "lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
+        "wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
+      ];
+    };
+    package = pkgs.unstable.nixFlakes; # or versioned attributes like nixVersions.nix_2_8
+    extraOptions = ''
+      experimental-features = nix-command flakes
     '';
-  services.logind.extraConfig = ''
+  };
-    HandlePowerKey=suspend
-  '';
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

system/containers.nix

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

system/fonts.nix

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

system/gamemode.nix

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

system/gitlab-runner.nix

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

system/gnome.nix

@@ -1,44 +1,16 @@
-{ 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
-  systemd.services."getty@tty1".enable = false;
-  systemd.services."autovt@tty1".enable = false;
-
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "lelgenio";
-  };
-
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.gnomeExtensions.gsconnect;
-  };
-
-  hardware.opentabletdriver.enable = lib.mkForce false;
-
   # services.xserver.displayManager.autologin.user = "lelgenio";
-  environment.systemPackages =
+  environment.systemPackages = with pkgs;
-    with pkgs;
+    with gnome; [
-    with gnome;
-    [
       gnome-tweaks
       dconf-editor
-
-      chrome-gnome-shell
-      gnomeExtensions.quick-settings-audio-devices-hider
     ];
 }

system/greetd.nix

@@ -1,97 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-let
-  inherit (config.my)
-    key
-    accent
-    font
-    theme
-    desktop
-    ;
-
-  cfg = config.login-manager.greetd;
-in
-{
-  options.login-manager.greetd = {
-    enable = lib.mkEnableOption "Use greetd as login manager";
-  };
-
-  config = lib.mkIf cfg.enable {
-
-    # Enable the X11 windowing system.
-    services.xserver.enable = false;
-
-    # enable sway window manager
-    programs.sway = {
-      enable = true;
-      package = pkgs.mySway;
-      wrapperFeatures.gtk = true;
-    };
-
-    services.dbus.enable = true;
-    programs.wshowkeys.enable = true;
-    xdg.portal = {
-      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 ];
-    };
-    services.greetd =
-      let
-        greetd_main_script = pkgs.writeShellScriptBin "main" ''
-          export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
-          ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
-          swaymsg exit
-        '';
-        swayConfig = pkgs.writeText "greetd-sway-config" ''
-          # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet.
-          exec "${greetd_main_script}/bin/main"
-          bindsym Mod4+shift+e exec swaynag \
-            -t warning \
-            -m 'What do you want to do?' \
-            -b 'Poweroff' 'systemctl poweroff' \
-            -b 'Reboot' 'systemctl reboot'
-          input "*" {
-            repeat_delay 200
-            repeat_rate 30
-            xkb_layout us(colemak)
-            xkb_numlock enabled
-            xkb_options lv3:lsgt_switch,grp:shifts_toggle
-          }
-        '';
-      in
-      {
-        enable = true;
-        settings = {
-          initial_session = {
-            command = desktop;
-            user = "lelgenio";
-          };
-          default_session = {
-            command = "${pkgs.sway}/bin/sway --config ${swayConfig}";
-          };
-        };
-      };
-    environment.systemPackages = with pkgs; [
-      sway
-      swaylock
-      swayidle
-
-      wayland
-      pkgs.xdg-desktop-portal
-      pkgs.xdg-desktop-portal-wlr
-
-      ## Theme
-      capitaine-cursors
-      bibata-cursors
-      orchis_theme_compact
-      papirus_red
-    ];
-  };
-}

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";
   };
@@ -16,18 +9,15 @@ in
       down_meme
       yt-dlp
       ffmpeg
-      obs-studio
       imagemagick
       mpc-cli
-      helvum
+      pkgs.unstable.helvum
       gimp
       inkscape
-      krita
+      kdenlive
-      kdePackages.kdenlive
+      blender
-      pitivi
-      blender-hip
       libreoffice
-      godot_4
+      godot
     ];
   };
 }

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,13 +1,4 @@
-{
+{ config, pkgs, lib, ... }: {
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
-in
-{
   boot.kernel.sysctl."net.ipv4.ip_forward" = true;
   virtualisation.docker.enable = true;
   services.gitlab-runner = {
@@ -20,16 +11,52 @@ in
       #   dockerPrivileged = true;
       # };
       thoreb_builder = {
-        registrationConfigFile =
+        registrationConfigFile = config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
-          config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
         dockerImage = "debian";
         dockerPrivileged = true;
       };
 
       # 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;
+      nix = with lib;{
-      thoreb-itinerario-nix = mkNixRunner config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
+        # File should contain at least these two variables:
+        # `CI_SERVER_URL`
+        # `REGISTRATION_TOKEN`
+        registrationConfigFile = config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; # 2
+        dockerImage = "alpine";
+        dockerVolumes = [
+          "/nix/store:/nix/store:ro"
+          "/nix/var/nix/db:/nix/var/nix/db:ro"
+          "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
+        ];
+        dockerDisableCache = true;
+        preBuildScript = pkgs.writeScript "setup-container" ''
+          mkdir -p -m 0755 /nix/var/log/nix/drvs
+          mkdir -p -m 0755 /nix/var/nix/gcroots
+          mkdir -p -m 0755 /nix/var/nix/profiles
+          mkdir -p -m 0755 /nix/var/nix/temproots
+          mkdir -p -m 0755 /nix/var/nix/userpool
+          mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
+          mkdir -p -m 1777 /nix/var/nix/profiles/per-user
+          mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
+          mkdir -p -m 0700 "$HOME/.nix-defexpr"
+          . ${pkgs.nix}/etc/profile.d/nix-daemon.sh
+          ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-20.09 nixpkgs # 3
+          ${pkgs.nix}/bin/nix-channel --update nixpkgs
+          ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
+        '';
+        environmentVariables = {
+          ENV = "/etc/profile";
+          USER = "root";
+          NIX_REMOTE = "daemon";
+          PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
+          NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
+        };
+        tagList = [ "nix" ];
+      };
+
+
+
     };
   };
   systemd.services.gitlab-runner.serviceConfig.Nice = 10;

system/network.nix

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

system/nix-serve.nix

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

system/nix.nix

@@ -1,50 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-let
-  collectFlakeInputs =
-    input: [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
-in
-{
-  system.extraDependencies = collectFlakeInputs inputs.self;
-
-  nix.registry.nixpkgs.flake = inputs.nixpkgs;
-  nix = {
-    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-    optimise.automatic = true;
-    settings = {
-      trusted-users = [
-        "root"
-        "@wheel"
-      ];
-      substituters = [
-        "https://cache.nixos.org"
-        "https://nix-community.cachix.org"
-        # "http://nixcache.lelgenio.1337.cx:5000"
-        "https://lelgenio.cachix.org"
-        "https://wegank.cachix.org"
-        "https://snowflakeos.cachix.org/"
-      ];
-      trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        # "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
-        "lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
-        "wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
-        "snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
-      ];
-    };
-    extraOptions = ''
-      experimental-features = nix-command flakes repl-flake
-    '';
-  };
-}

system/rainbow-gitlab-runner.nix

@@ -1,13 +1,4 @@
-{
+{ config, pkgs, lib, ... }: {
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
-in
-{
   boot.kernel.sysctl."net.ipv4.ip_forward" = true;
   virtualisation.docker.enable = true;
   services.gitlab-runner = {
@@ -20,14 +11,10 @@ in
       #   dockerPrivileged = true;
       # };
       thoreb_builder = {
-        registrationConfigFile =
+        registrationConfigFile = config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
-          config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
         dockerImage = "debian";
         dockerPrivileged = true;
       };
-
-      thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
-      thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
     };
   };
   systemd.services.gitlab-runner.serviceConfig.Nice = 10;

system/secrets.nix

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

system/sound.nix

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

system/specialisation.nix

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

system/steam.nix

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

system/sway.nix

@@ -0,0 +1,75 @@
+{ pkgs, ... }:
+let
+  inherit (pkgs.uservars) key accent font theme;
+in
+{
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = false;
+
+  # enable sway window manager
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+  };
+  services.dbus.enable = true;
+  programs.wshowkeys.enable = true;
+  xdg.portal = {
+    enable = true;
+    wlr.enable = true;
+    # gtk portal needed to make gtk apps happy
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  };
+  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 sway
+        swaymsg exit
+      '';
+      swayConfig = pkgs.writeText "greetd-sway-config" ''
+        # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet.
+        exec "${greetd_main_script}/bin/main"
+        bindsym Mod4+shift+e exec swaynag \
+          -t warning \
+          -m 'What do you want to do?' \
+          -b 'Poweroff' 'systemctl poweroff' \
+          -b 'Reboot' 'systemctl reboot'
+        input "*" {
+          repeat_delay 200
+          repeat_rate 30
+          xkb_layout us(colemak)
+          xkb_numlock enabled
+          xkb_options lv3:lsgt_switch,grp:shifts_toggle
+        }
+      '';
+    in
+    {
+      enable = true;
+      settings = {
+        initial_session = {
+          command = "${pkgs.sway}/bin/sway";
+          user = "lelgenio";
+        };
+        default_session = {
+          command = "${pkgs.sway}/bin/sway --config ${swayConfig}";
+        };
+      };
+    };
+  environment.systemPackages = with pkgs; [
+    sway
+    swaylock
+    swayidle
+
+    wayland
+    pkgs.xdg-desktop-portal
+    pkgs.xdg-desktop-portal-wlr
+
+    ## Theme
+    capitaine-cursors
+    bibata-cursors
+    orchis_theme_compact
+    papirus_red
+  ];
+}

system/thunar.nix

@@ -1,32 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  programs.thunar = {
-    enable = true;
-    plugins = with pkgs.xfce; [
-      thunar-archive-plugin
-      thunar-volman
-    ];
-  };
-  # Mount, trash, and other functionalities
-  services.gvfs.enable = true;
-  # Thumbnail support for images
-  services.tumbler.enable = true;
-
-  environment.systemPackages = [
-    (pkgs.writeTextFile {
-      name = "thumbs";
-      text = ''
-        [Thumbnailer Entry]
-        TryExec=unzip
-        Exec=sh -c "${pkgs.unzip}/bin/unzip -p %i preview.png > %o"
-        MimeType=application/x-krita;
-      '';
-      destination = "/share/thumbnailers/kra.thumbnailer";
-    })
-  ];
-}

system/users.nix

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

update

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

user/alacritty.nix

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

user/bmenu.nix

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

user/chat.nix

@@ -1,23 +1,59 @@
-{
+{ config, pkgs, lib, inputs, ... }: {
-  config,
+  systemd.user.services = {
-  pkgs,
+    astroid = lib.mkIf (pkgs.uservars.email-client == "astroid") {
-  lib,
+      Unit = {
-  inputs,
+        Description = "Astroid Email client";
-  ...
+        PartOf = [ "graphical-session.target" ];
-}:
+        After = [ "graphical-session.target" ];
-{
+      };
-  wayland.windowManager.sway = {
+      Service = {
-    extraConfig = ''
+        ExecStartPre = "/usr/bin/env sleep 10s";
-      exec thunderbird
+        ExecStart = "${pkgs.astroid}/bin/astroid";
-      exec webcord
+        Restart = "on-failure";
-      exec telegram-desktop
+        TimeoutStopSec = 10;
-    '';
+      };
+      Install = { WantedBy = [ "sway-session.target" ]; };
+    };
+    thunderbird = lib.mkIf (pkgs.uservars.email-client == "thunderbird") {
+      Unit = {
+        Description = "Thunderbird Email client";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" ];
+      };
+      Service = {
+        ExecStartPre = "/usr/bin/env sleep 10s";
+        ExecStart = "${pkgs.thunderbird}/bin/thunderbird";
+        Restart = "on-failure";
+      };
+      Install = { WantedBy = [ "sway-session.target" ]; };
+    };
+    discord = {
+      Unit = {
+        Description = "Discord Internet voice chat";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" "pipewire-pulse.service" "tray.service" "telegram.service" ];
+      };
+      Service = {
+        ExecStartPre = "/usr/bin/env sleep 12s";
+        ExecStart = "${pkgs.webcord}/bin/webcord";
+        Restart = "on-failure";
+      };
+      Install = { WantedBy = [ "sway-session.target" ]; };
+    };
+    telegram = {
+      Unit = {
+        Description = "Telegram Internet chat";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" "pipewire-pulse.service" "tray.service" ];
+      };
+      Service = {
+        ExecStartPre = "/usr/bin/env sleep 11s";
+        ExecStart = "${pkgs.tdesktop}/bin/telegram-desktop";
+        Restart = "on-failure";
+      };
+      Install = { WantedBy = [ "sway-session.target" ]; };
+    };
   };
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ tdesktop webcord thunderbird ];
-    tdesktop
-    webcord
-    thunderbird
-    element-desktop-wayland
-  ];
 }

user/controller.nix

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

user/desktop-entries.nix

@@ -1,63 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  xdg.desktopEntries = {
-    kak = {
-      name = "Kakoune";
-      genericName = "Text Editor";
-      comment = "Edit text files";
-      exec = "kak %F";
-      terminal = true;
-      type = "Application";
-      icon = "kak.desktop";
-      categories = [
-        "Utility"
-        "TextEditor"
-      ];
-      startupNotify = true;
-      mimeType = [
-        "text/english"
-        "text/plain"
-        "text/x-makefile"
-        "text/x-c++hdr"
-        "text/x-c++src"
-        "text/x-chdr"
-        "text/x-csrc"
-        "text/x-java"
-        "text/x-moc"
-        "text/x-pascal"
-        "text/x-tcl"
-        "text/x-tex"
-        "application/x-shellscript"
-        "text/x-c"
-        "text/x-c++"
-      ];
-      settings = {
-        Keywords = "Text;editor;";
-        TryExec = "kak";
-      };
-    };
-    down_meme = {
-      name = "DownMeme";
-      genericName = "Download memes";
-      exec = "down_meme";
-      terminal = true;
-      type = "Application";
-      icon = "download";
-      categories = [ "Network" ];
-    };
-    readQrCode = {
-      name = "Read QR Code";
-      genericName = "Read QR Code from clipboard image";
-      exec = "readQrCode";
-      terminal = true;
-      type = "Application";
-      icon = "download";
-      categories = [ "Network" ];
-    };
-  };
-}