nix: use stylix GNOME 46 branch

This reverts commit a7fd7ba30d.

flake.lock

@@ -409,16 +409,16 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1698794309,
-        "narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=",
+        "lastModified": 1713702291,
+        "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7",
+        "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "45.1",
+        "ref": "46.1",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -853,15 +853,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1714555012,
-        "narHash": "sha256-WVUrm3TGVj6c8g5aG20OjJRHMvUtAZjpHQgukDhyOT8=",
+        "lastModified": 1715155431,
+        "narHash": "sha256-o9l1FYGkvj47eIocHhDaqCiqaq6Qob43rFZjyrgL6Zg=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "43d23b1609b87f6a4100db2a09bd118c52c78766",
+        "rev": "980e931849afe79be8e0914c388d0a0e16dabb9b",
         "type": "github"
       },
       "original": {
         "owner": "danth",
+        "ref": "refs/pull/357/merge",
         "repo": "stylix",
         "type": "github"
       }

flake.nix

@@ -209,7 +209,7 @@
     srvos.url = "github:nix-community/srvos";
     srvos.inputs.nixpkgs.follows = "nixpkgs";
 
-    stylix.url = "github:danth/stylix";
+    stylix.url = "github:danth/stylix/refs/pull/357/merge";
     stylix.inputs.flake-compat.follows = "flake-compat";
     stylix.inputs.home-manager.follows = "home-manager";
     stylix.inputs.nixpkgs.follows = "nixpkgs";

modules/home/wezterm/default.nix

@@ -20,8 +20,8 @@ in
         local wezterm = require 'wezterm'
         local config = wezterm.config_builder()
 
-        -- Use the in-built Darcula theme
-        config.color_scheme = 'Dracula (Official)'
+        -- Use the in-built 'Catppuccin Mocha' theme
+        config.color_scheme = 'catppuccin-mocha'
 
         -- Disable Wayland since it causes the program to not launch
         config.enable_wayland = false

modules/nixos/profiles/desktop/cinnamon.nix

@@ -45,12 +45,11 @@ in
     snowfallorg.users.msfjarvis.home.config = {
       dconf.settings = {
         "org/cinnamon/theme" = {
-          name = "Dracula";
+          name = "Catppuccin Mocha";
         };
         "org/cinnamon/desktop/interface" = with config.stylix.fonts; {
           cursor-theme = "Bibata-Modern-Classic";
           font-name = "${sansSerif.name} ${toString sizes.applications}";
-          icon-theme = "Dracula";
         };
         "org/cinnamon/desktop/background" = {
           color-shading-type = "solid";
@@ -59,9 +58,8 @@ in
           picture-uri-dark = "file://${config.stylix.image}";
         };
         "org/gnome/desktop/interface" = with config.stylix.fonts; {
-          theme = "Dracula";
+          theme = "Catppuccin Mocha";
           cursor-theme = "Bibata-Modern-Classic";
-          icon-theme = "Dracula";
           font-name = "${sansSerif.name} ${toString sizes.applications}";
           document-font-name = "${serif.name} ${toString (sizes.applications - 1)}";
           monospace-font-name = "${monospace.name} ${toString sizes.terminal}";
@@ -80,7 +78,7 @@ in
           volume-sound-enabled = false;
         };
       };
-      home.sessionVariables.GTK_THEME = "Dracula";
+      home.sessionVariables.GTK_THEME = "Catppuccin Mocha";
       programs.gnome-terminal = {
         enable = true;
         showMenubar = false;
@@ -88,7 +86,7 @@ in
         profile = {
           "b1dcc9dd-5262-4d8d-a863-c897e6d979b9" = {
             default = true;
-            visibleName = "Dracula";
+            visibleName = "Catppuccin Mocha";
             colors = with config.lib.stylix.colors.withHashtag; {
               foregroundColor = base05;
               backgroundColor = base00;

modules/nixos/profiles/desktop/default.nix

@@ -62,7 +62,7 @@ in
     stylix = {
       autoEnable = false;
       image = inputs.wallpaper;
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
       cursor = {
         package = pkgs.bibata-cursors;
         name = "Bibata-Modern-Classic";
@@ -96,6 +96,7 @@ in
       polarity = "dark";
       targets = {
         console.enable = true;
+        nixos-icons.enable = true;
       };
     };
 

x

@@ -28,11 +28,10 @@ case "${ARG}" in
     cleanup_generations
     ;;
   darwin-check)
-    nom build .#darwinConfigurations.Harshs-MacBook-Pro.system
+    darwin-rebuild build --print-build-logs --flake .
     ;;
   darwin-switch)
-    nom build .#darwinConfigurations.Harshs-MacBook-Pro.system
-    sudo nix-env -p /nix/var/nix/profiles/system --set ./result
+    darwin-rebuild switch --print-build-logs --flake .
     ;;
   home-boot)
     nh os boot .