feat: reorganize system ricing

Author: artur-sannikov

flake.lock

@@ -37,7 +37,7 @@
 
     # Catppuccin theme for VSCodium
     # https://github.com/catppuccin/vscode
-    catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
+    #catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
 
     nixvim = {
       url = "github:nix-community/nixvim";
@@ -75,7 +75,7 @@
       home-manager,
       stylix,
       catppuccin,
-      catppuccin-vsc,
+      # catppuccin-vsc,
       flatpaks,
       nixvim,
       lanzaboote,
@@ -85,11 +85,11 @@
       system = "x86_64-linux";
       username = "artur";
       lib = nixpkgs.lib;
-      overlays = [
-        catppuccin-vsc.overlays.default
-      ];
+      # overlays = [
+      #   catppuccin-vsc.overlays.default
+      # ];
       pkgs = import nixpkgs {
-        inherit system overlays;
+        inherit system;
         config.allowUnfreePredicate =
           pkg:
           builtins.elem (nixpkgs.lib.getName pkg) [
@@ -104,7 +104,7 @@
           ];
       };
       pkgs-stable = import nixpkgs-stable {
-        inherit system overlays;
+        inherit system;
         config = {
           allowUnfree = true;
         };
@@ -158,6 +158,7 @@
             # so that home-manager configuration will be deployed automatically when executing `nixos-rebuild switch`
             home-manager.nixosModules.home-manager
             stylix.nixosModules.stylix
+            catppuccin.nixosModules.catppuccin
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
@@ -195,7 +196,7 @@
           flake-inputs = inputs;
           inherit username;
           inherit pkgs-stable;
-          inherit overlays;
+          # inherit overlays;
         };
         modules = [
           ./hosts/ty/home.nix

flake.nix

@@ -5,6 +5,7 @@
 {
   username,
   pkgs,
+  lib,
   ...
 }:
 {
@@ -50,6 +51,7 @@
           efiSupport = true;
           devices = [ "nodev" ];
           useOSProber = true;
+          splashImage = lib.mkForce null;
           extraEntries = ''
             menuentry "Fedora Bazzite" {
               insmod part_gpt
@@ -210,6 +212,10 @@
       };
     };
 
+    catppuccin = {
+      enable = true;
+      flavor = "mocha";
+    };
     # This option defines the first version of NixOS you have installed on this particular machine,
     # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
     #

hosts/desktop/configuration.nix

@@ -36,23 +36,24 @@
           quarto.quarto
         ])
         ++ (with flake-inputs.nix-vscode-extensions.extensions.${pkgs.system}.open-vsx; [
+          catppuccin.catppuccin-vsc
           jeanp413.open-remote-ssh
           hashicorp.terraform
           posit.air-vscode
-        ])
-        ++ [
-          (pkgs.catppuccin-vsc.override {
-            accent = "blue";
-            boldKeywords = true;
-            italicComments = false;
-            italicKeywords = false;
-            extraBordersEnabled = false;
-            workbenchMode = "default";
-            bracketMode = "rainbow";
-            colorOverrides = { };
-            customUIColors = { };
-          })
-        ];
+        ]);
+      # ++ [
+      #   (pkgs.catppuccin-vsc.override {
+      #     accent = "blue";
+      #     boldKeywords = true;
+      #     italicComments = false;
+      #     italicKeywords = false;
+      #     extraBordersEnabled = false;
+      #     workbenchMode = "default";
+      #     bracketMode = "rainbow";
+      #     colorOverrides = { };
+      #     customUIColors = { };
+      #   })
+      # ];
       keybindings = [
         # Insert assignment operator if code is R
         {
@@ -109,9 +110,15 @@
         "files.trimTrailingWhitespace" = true;
         # Disable RedHat telemetry
         "redhat.telemetry.enabled" = false;
+
         # Apply Catppuccin theme
-        "workbench.colorTheme" = "Catppuccin Mocha";
+        "workbench.colorTheme" = "Catppuccin Macchiato";
         "workbench.iconTheme" = "catppuccin-macchiato";
+        # "catppuccin.accentColor" = "blue";
+        # "catppuccin.boldKeywords" = true;
+        "bracketMode" = "rainbow";
+        "italicComments" = false;
+        "italicKeywords" = false;
 
         "window.newWindowDimensions" = "maximized";
 

modules/home-manager/gui/vscodium.nix

@@ -4,6 +4,7 @@
 {
   stylix = {
     enable = true;
+    targets.grub.enable = false; # Disable because it conflicts with catppuccin (?)
     image = ./scarlet_tree.png;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
     cursor = {