flake.nix

@@ -22,7 +22,6 @@
           modules = [
             # imports
             ./hosts/eclipse.nix
-            ./nixos/catppuccin.nix
             ./nixos/configuration.nix
             ./nixos/environment.nix
             ./nixos/git.nix
@@ -34,17 +33,13 @@
             ./nixos/tailscale.nix
             ./nixos/zsh.nix
 
-            {
-              # enable bluetooth
-              hardware.bluetooth.enable = true;
-            }
-
             # flake packages
             {
-              environment.systemPackages = with inputs; [
-                compose2nix.packages.${system}.default
-                zen-browser.packages.${system}.specific
-              ];
+              environment.systemPackages = with inputs;
+                [
+                  compose2nix.packages.${system}.default
+                  zen-browser.packages.${system}.specific
+                ];
             }
 
             # Catppuccin theme

hosts/eclipse.nix

@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
@@ -18,17 +18,17 @@
       fsType = "ext4";
     };
 
-  fileSystems."/bulk" =
-    { device = "/dev/disk/by-uuid/3b8e0789-def6-45dd-8eff-7b55b74569ce";
-      fsType = "ext4";
-    };
-
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/484E-279A";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  fileSystems."/bulk" =
+    { device = "/dev/disk/by-uuid/3b8e0789-def6-45dd-8eff-7b55b74569ce";
+      fsType = "ext4";
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-uuid/4eab8c8f-85c5-4a04-a03c-e111ada06ec0"; }
     ];

nixos/catppuccin.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    # catppuccin
-    (catppuccin.override {
-      variant = "mocha";
-      accent ="blue";
-      themeList = [ "bat" "btop" "grub" "lazygit" ];
-    })
-    catppuccin-cursors
-
-    # catppuccin for kde plasma
-    (catppuccin-kde.override {
-      flavour = [ "mocha" "macchiato" "frappe" "latte" ];
-      accents = [ "blue" ];
-      winDecStyles = [ "classic" ];
-    })
-
-    (catppuccin-gtk.override {
-      variant = "mocha";
-      accents = [ "blue" ];
-      size = "standard";
-    })
-  ];
-}

nixos/gui-pkgs.nix

@@ -3,10 +3,13 @@ let
   kdePackages = with pkgs.kdePackages; [ plasma-browser-integration ];
   packages = with pkgs; [
     krita
-    ytmdesktop
     wl-clipboard
-    # we install xdg-desktop-portal-gtx so theming works from kde
-    xdg-desktop-portal-gtk
+    # catppuccin for kde plasma
+    (catppuccin-kde.override {
+      flavour = [ "mocha" "macchiato" "frappe" "latte" ];
+      accents = [ "blue" ];
+      winDecStyles = [ "classic" ];
+    })
   ];
 in {
   environment.systemPackages = lib.lists.unique (kdePackages ++ packages);

nixos/zsh.nix

@@ -34,12 +34,11 @@
       ff = "fastfetch";
       neofetch = "fastfetch";
       nf = "fastfetch";
-      cat = "bat";
 
       ls = "eza --icons";
       l = "eza -lhg --icons";
 
-      upd = "sudo nixos-generate-config --dir /etc/nixos/hosts && sudo rm /etc/nixos/hosts/configuration.nix && sudo mv /etc/nixos/hosts/hardware-configuration.nix /etc/nixos/hosts/$(hostname).nix && git -C /etc/nixos --git-dir=/etc/nixos/.git add /etc/nixos/hosts/$(hostname).nix && sudo nixos-rebuild switch";
+      upd = "sudo nixos-generate-config --dir /etc/nixos/hosts && sudo rm /etc/nixos/hosts/configuration.nix && sudo mv /etc/nixos/hosts/hardware-configuration.nix /etc/nixos/hosts/$(hostname).nix && git --git-dir=/etc/nixos add /etc/nixos/hosts/$(hostname).nix && sudo nixos-rebuild switch";
 
       c = "clear";
       # alias sudo to itself so user aliases can be sudoed