Apply catppuccin theme

flake.lock

@@ -135,6 +135,21 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1720472194,
+        "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "d75d5803852fb0833767dc969a4581ac13204e22",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -276,6 +291,7 @@
     "root": {
       "inputs": {
         "aagl": "aagl",
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "stylix": "stylix"

flake.nix

@@ -9,6 +9,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    catppuccin.url = "github:catppuccin/nix";
+
     stylix.url = "github:danth/stylix";
 
     aagl = {
@@ -32,8 +34,11 @@
           # Home-manager
           inputs.home-manager.nixosModules.default
 
+          # Catppuccin
+          inputs.catppuccin.nixosModules.catppuccin
+          
           # Stylix
-          inputs.stylix.nixosModules.stylix
+          # inputs.stylix.nixosModules.stylix
 
           #Aagl
           inputs.aagl.nixosModules.default

hosts/default/configuration.nix

@@ -18,7 +18,7 @@
 
       # Stylix colors
       #../../modules/nixos/stylix/ghibli.nix
-      ../../modules/nixos/stylix/kuromi.nix
+      #../../modules/nixos/stylix/kuromi.nix
       #../../modules/nixos/stylix/dracula.nix
     ];
 
@@ -68,6 +68,17 @@
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
+  # Enable Hyprland
+  nix.settings = {
+    substituters = ["https://hyprland.cachix.org"];
+    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+  };
+
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+  };
+
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
@@ -122,6 +133,8 @@
     };
   };
 
+  home-manager.backupFileExtension = "hm-backup";
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -143,6 +156,11 @@
     lm_sensors
   ];
 
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+  };
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;

hosts/default/home.nix

@@ -5,7 +5,10 @@
   [
     ../../modules/home-manager/git.nix
     ../../modules/home-manager/shell/zsh.nix
-    ../../modules/home-manager/themes/basic-gtk.nix
+    ../../modules/home-manager/vscode.nix
+    #../../modules/home-manager/themes/basic-gtk.nix
+    ../../modules/home-manager/hyprland.nix
+    ../../modules/home-manager/catppuccin.nix
   ];
 
   # Allow Unfree
@@ -34,7 +37,6 @@
     git
     gh
     kitty
-    vscode-fhs
 
     # School
     libreoffice-fresh

modules/home-manager/catppuccin.nix

@@ -0,0 +1,57 @@
+{ inputs, ... }:
+
+{
+    imports = [
+        inputs.catppuccin.homeManagerModules.catppuccin
+    ];
+
+    catppuccin = {
+        enable = true;
+        flavor = "mocha";
+
+        pointerCursor.enable = true;
+    };
+
+    gtk = {
+        enable = true;
+
+        catppuccin = {
+            enable = true;
+            flavor = "mocha";  
+            gnomeShellTheme = true;
+
+            icon = {
+                enable = true;
+                flavor = "mocha";
+            };
+        };
+    };
+
+    programs.kitty.catppuccin.enable = true;
+    programs.kitty.catppuccin.flavor = "mocha";
+
+    programs.neovim.catppuccin.enable = true;
+    programs.neovim.catppuccin.flavor = "mocha";
+
+    programs.rofi.catppuccin.enable = true;
+    programs.rofi.catppuccin.flavor = "mocha";
+
+    programs.starship.catppuccin.enable = true;
+    programs.starship.catppuccin.flavor = "mocha";
+
+    programs.waybar.catppuccin.enable = true;
+    programs.waybar.catppuccin.flavor = "mocha";
+
+    programs.zsh.syntaxHighlighting.catppuccin.enable = true;
+    programs.zsh.syntaxHighlighting.catppuccin.flavor = "mocha";
+
+    qt.style.catppuccin.enable = true;
+    qt.style.catppuccin.accent = "mocha";
+    qt.style.catppuccin.apply = true;
+
+    services.mako.catppuccin.enable = true;
+    services.mako.catppuccin.flavor = "mocha";
+
+    wayland.windowManager.hyprland.catppuccin.enable = true;
+    wayland.windowManager.hyprland.catppuccin.flavor = "mocha";
+}

modules/home-manager/hyprland.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+
+{
+    wayland.windowManager.hyprland = {
+        enable = true;
+        xwayland.enable = true;
+        systemd.enable = true;
+    };
+}

modules/home-manager/shell/zsh.nix

@@ -2,7 +2,7 @@
 
 {
     imports = [
-        ./themes/dracula.nix
+        #./themes/dracula.nix
     ];
 
     # Download zsh packages
@@ -27,4 +27,9 @@
             ];
         };
     };
+
+    programs.starship = {
+        enable = true;
+        enableZshIntegration = true;
+    };
 }

modules/home-manager/vscode.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+    programs.vscode = {
+        enable = true;
+        extensions = with pkgs.vscode-extensions; [
+            bbenoist.nix
+            ms-python.python
+            ms-python.debugpy
+            catppuccin.catppuccin-vsc-icons
+            catppuccin.catppuccin-vsc
+        ];
+    };
+}

modules/nixos/alienware/alienware.nix

@@ -7,7 +7,6 @@
         ./hardware/ssd/ssd.nix
         ./gaming.nix
         ./nh.nix
-        ./hyprland.nix
     ];
 
     swapDevices = [{

modules/nixos/alienware/hyprland.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-    programs.hyprland = {
-        enable = true;
-        xwayland.enable = true;
-    };
-}