Changes Stuff

nixos/default.nix

@@ -9,15 +9,34 @@
     ./fonts.nix
     ./sops.nix
     ./regreet.nix
-    ./plymouth
+    ./plymouth.nix
     ./audio.nix
     ./ssh.nix
     ./locale.nix
     ./tailscale.nix
     ./virt.nix
     ./webcam.nix
+
+    inputs.catppuccin.nixosModules.catppuccin
   ];
 
+  catppuccin = {
+    enable = true;
+    accent = "sky";
+    flavor = "mocha";
+    cache.enable = true;
+
+    cursors = {
+      enable = true;
+      accent = "sapphire";
+    };
+
+    fcitx5.enable = false;
+    forgejo.enable = false;
+    gitea.enable = false;
+    sddm.enable = false;
+  };
+
   # nix config
   nix = {
     settings = {
@@ -63,7 +82,7 @@
     users.${primaryUser} = {
       imports = [ ../home ];
     };
-	backupFileExtension = "backup";
+    backupFileExtension = "backup";
     extraSpecialArgs = { inherit inputs primaryUser; };
   };
 
@@ -84,7 +103,12 @@
   security = {
     pam.services.swaylock = { };
     polkit.enable = true;
-    apparmor.enable = true;
+    apparmor.enable = false;
+  };
+
+  services.gnome = {
+    tinysparql.enable = true;
+    localsearch.enable = true;
   };
 
   users.users.${primaryUser} = {

nixos/plymouth.nix

@@ -0,0 +1,20 @@
+{ ... }:
+{
+  boot = {
+    plymouth = {
+      enable = true;
+    };
+
+    # Enable "Silent boot"
+    consoleLogLevel = 3;
+    initrd.verbose = false;
+    kernelParams = [
+      "quiet"
+      "splash"
+      "boot.shell_on_fail"
+      "udev.log_priority=3"
+      "rd.systemd.show_status=auto"
+    ];
+    loader.timeout = 0;
+  };
+}

nixos/plymouth/default.nix

@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-let
-  mikuTheme = pkgs.stdenv.mkDerivation {
-    name = "plymouth-theme-miku";
-    src = ./miku;
-    installPhase = ''
-      mkdir -p $out/share/plymouth/themes/miku/frames
-      cp miku.plymouth $out/share/plymouth/themes/miku/
-      cp miku.script $out/share/plymouth/themes/miku/
-      cp images/frames/*.png $out/share/plymouth/themes/miku/frames/
-    '';
-  };
-in
-{
-  boot = {
-    plymouth = {
-      enable = true;
-      theme = "miku";
-      themePackages = [
-        mikuTheme
-      ];
-    };
-
-    # Enable "Silent boot"
-    consoleLogLevel = 3;
-    initrd.verbose = false;
-    kernelParams = [
-      "quiet"
-      "splash"
-      "boot.shell_on_fail"
-      "udev.log_priority=3"
-      "rd.systemd.show_status=auto"
-    ];
-    loader.timeout = 0;
-  };
-}

nixos/plymouth/miku/miku.plymouth

@@ -1,8 +0,0 @@
-[Plymouth Theme]
-Name=Miku
-Description=Hatsune Miku Dancing
-ModuleName=Script
-
-[script]
-ImageDir=/usr/share/plymouth/themes/miku 
-ScriptFile=/usr/share/plymouth/themes/miku/miku.script

nixos/plymouth/miku/miku.script

@@ -1,30 +0,0 @@
-# Screen dimensions
-screen_width = Window.GetWidth();
-screen_height = Window.GetHeight();
-
-# Load frames
-frame_count = 53;
-frames = [];
-for (i = 0; i < frame_count; i++) {
-    num = String(i);
-    if (i < 10) num = "000" + num;
-    else if (i < 100) num = "00" + num;
-	else num = "0" + num;
-    frames[i] = Image("frames/frame_" + num + ".png");
-}
-
-# Position centered
-x = (screen_width - 498) / 2;
-y = (screen_height - 498) / 2;
-
-# Animation state
-current_frame = 0;
-
-fun refresh_callback() {
-    sprite = Sprite(frames[current_frame]);
-    sprite.SetX(x);
-    sprite.SetY(y);
-    current_frame = (current_frame + 1) % frame_count;
-}
-
-Plymouth.SetRefreshFunction(refresh_callback);

nixos/regreet.nix

@@ -30,7 +30,7 @@
 
       GTK = {
         application_prefer_dark_theme = true;
-        cursor_theme_name = lib.mkForce "catppuccin-mocha-dark";
+        cursor_theme_name = lib.mkForce "catppuccin-mocha-dark-cursors";
         font_name = lib.mkForce "FiraCode Nerd Font Propo 12";
         icon_theme_name = lib.mkForce "Papirus-Dark";
         theme_name = lib.mkForce "catppuccin-mocha-standard-mauve-dark";