refactor: update stylix cursor config and kitty cursor

style: update stylix theming, remove catppuccin
feat: switch to stylix for theming
2024-11-24 17:53:51 -08:00 · 2024-10-31 01:09:48 -07:00 · 2024-10-31 01:01:48 -07:00 · 2024-10-31 01:01:47 -07:00 · 2024-10-31 01:01:47 -07:00
15 changed files with 419 additions and 120 deletions
--- a/flake.lock
+++ b/flake.lock
@ -38,6 +38,72 @@
        "type": "github"
      }
    },
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1708890466,
+        "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "665b3c6748534eb766c777298721cece9453fdae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16-fish": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1622559957,
+        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725860795,
+        "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716150083,
+        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "type": "github"
+      }
+    },
    "blink-cmp": {
      "inputs": {
        "fenix": "fenix",
@ -78,21 +144,6 @@
        "type": "github"
      }
    },
-    "catppuccin": {
-      "locked": {
-        "lastModified": 1730036420,
-        "narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
    "crane": {
      "inputs": {
        "nixpkgs": [
@ -184,6 +235,22 @@
        "type": "github"
      }
    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": "nixpkgs-lib"
@ -297,7 +364,28 @@
    },
    "flake-utils_4": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": [
+          "stylix",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_5": {
+      "inputs": {
+        "systems": "systems_5"
      },
      "locked": {
        "lastModified": 1710146030,
@ -328,6 +416,22 @@
        "type": "github"
      }
    },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1689549921,
+        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@ -350,6 +454,23 @@
        "type": "github"
      }
    },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713702291,
+        "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "ref": "46.1",
+        "repo": "gnome-shell",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -370,6 +491,27 @@
        "type": "github"
      }
    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
    "homebrew-cask": {
      "flake": false,
      "locked": {
@ -432,15 +574,15 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1720626042,
-        "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=",
-        "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed",
+        "lastModified": 1729298361,
+        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
      }
    },
    "lix-module": {
@ -453,15 +595,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1720641669,
-        "narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=",
-        "rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257",
+        "lastModified": 1729360442,
+        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
+        "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
      }
    },
    "nix-darwin": {
@ -609,6 +751,22 @@
        "type": "github"
      }
    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1725194671,
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "plugins-lsp-progress": {
      "flake": false,
      "locked": {
@ -672,7 +830,6 @@
      "inputs": {
        "apple-firmware": "apple-firmware",
        "apple-silicon": "apple-silicon",
-        "catppuccin": "catppuccin",
        "flake-parts": "flake-parts",
        "home-manager": "home-manager",
        "homebrew-cask": "homebrew-cask",
@ -683,6 +840,7 @@
        "nix-homebrew": "nix-homebrew",
        "nixpkgs": "nixpkgs_2",
        "spicetify": "spicetify",
+        "stylix": "stylix",
        "vesktop-bin": "vesktop-bin",
        "viminal": "viminal",
        "wallpapers": "wallpapers",
@ -768,6 +926,36 @@
        "type": "github"
      }
    },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-helix": "base16-helix",
+        "base16-vim": "base16-vim",
+        "flake-compat": "flake-compat_4",
+        "flake-utils": "flake-utils_4",
+        "gnome-shell": "gnome-shell",
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_4",
+        "tinted-foot": "tinted-foot",
+        "tinted-kitty": "tinted-kitty",
+        "tinted-tmux": "tinted-tmux"
+      },
+      "locked": {
+        "lastModified": 1729963473,
+        "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "danth",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -828,9 +1016,73 @@
        "type": "github"
      }
    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "tinted-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725948,
+        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "type": "github"
+      }
+    },
+    "tinted-kitty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716423189,
+        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725902,
+        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
    "vesktop-bin": {
      "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
        "nixpkgs": [
          "nixpkgs"
        ]
--- a/flake.nix
+++ b/flake.nix
@ -33,15 +33,13 @@
      flake = false;
    };

-    catppuccin.url = "github:catppuccin/nix";
-
    lanzaboote = {
      url = "github:nix-community/lanzaboote/v0.4.1";
      inputs.nixpkgs.follows = "nixpkgs";
    };

    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@ -73,6 +71,8 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    stylix.url = "github:danth/stylix";
+
    wallpapers = {
      url = "git+https://code.youwen.dev/youwen5/wallpapers";
      flake = false;
--- a/hosts/adrastea/default.nix
+++ b/hosts/adrastea/default.nix
@ -1,45 +1,45 @@
 {
  inputs,
-  system,
  ...
 }:
 {
-  imports = with inputs; [
-    ./configuration.nix
-    ../../modules/linux/gaming
-    ../../modules/linux/audio
-    ../../modules/linux/networking
-    ../../modules/linux/fonts
-    ../../modules/linux/greeter
-    ../../modules/linux/core
-    ../../modules/linux/desktop-portal
-    ../../modules/linux/desktop-portal
-    ../../modules/linux/audio-prod
-    ../../modules/linux/wine
-    ../../overlays
-
-    catppuccin.nixosModules.catppuccin
-    lix-module.nixosModules.default
-    home-manager.nixosModules.home-manager
-    {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.backupFileExtension = "backup";
-      home-manager.extraSpecialArgs = {
-        inherit inputs;
-      };
-      home-manager.users.youwen = {
-        imports = [
-          ./home-manager-extras
-          ../../users/youwen/linux/laptop
-          ../../users/youwen/linux/packages/x86_64
-          ../../users/youwen/linux/programs
-          ../../users/youwen/common
-          ../../users/youwen/linux/spicetify
-          ../../users/youwen/common/fastfetch
-          catppuccin.homeManagerModules.catppuccin
-        ];
-      };
-    }
-  ];
+  imports =
+    [
+      ./configuration.nix
+      ../../modules/linux/gaming
+      ../../modules/linux/audio
+      ../../modules/linux/networking
+      ../../modules/linux/fonts
+      ../../modules/linux/greeter
+      ../../modules/linux/core
+      ../../modules/linux/desktop-portal
+      ../../modules/linux/desktop-portal
+      ../../modules/linux/audio-prod
+      ../../modules/linux/wine
+      ../../modules/linux/stylix
+      ../../overlays
+      {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.backupFileExtension = "backup";
+        home-manager.extraSpecialArgs = {
+          inherit inputs;
+        };
+        home-manager.users.youwen = {
+          imports = [
+            ./home-manager-extras
+            ../../users/youwen/linux/laptop
+            ../../users/youwen/linux/packages/x86_64
+            ../../users/youwen/linux/programs
+            ../../users/youwen/common
+            ../../users/youwen/linux/spicetify
+            ../../users/youwen/common/fastfetch
+          ];
+        };
+      }
+    ]
+    ++ (with inputs; [
+      lix-module.nixosModules.default
+      home-manager.nixosModules.home-manager
+    ]);
 }
--- a/hosts/callisto/default.nix
+++ b/hosts/callisto/default.nix
@ -12,10 +12,10 @@
    ../../modules/linux/greeter
    ../../modules/linux/core
    ../../modules/linux/desktop-portal
+    ../../modules/linux/stylix
    ../../overlays

    apple-silicon.nixosModules.apple-silicon-support
-    catppuccin.nixosModules.catppuccin
    lix-module.nixosModules.default
    home-manager.nixosModules.home-manager
    {
@ -33,7 +33,6 @@
          ../../users/youwen/linux/packages/aarch-64
          ../../users/youwen/common/fastfetch
          ./home-manager-extras
-          catppuccin.homeManagerModules.catppuccin
        ];
      };
    }
--- a/hosts/demeter/default.nix
+++ b/hosts/demeter/default.nix
@ -19,7 +19,6 @@
    ../../modules/linux/wine
    ../../overlays

-    catppuccin.nixosModules.catppuccin
    lix-module.nixosModules.default
    lanzaboote.nixosModules.lanzaboote
    home-manager.nixosModules.home-manager
@ -40,7 +39,6 @@
          ../../users/youwen/common
          ../../users/youwen/linux/spicetify
          ./home-manager-extras
-          catppuccin.homeManagerModules.catppuccin
        ];
      };
    }
--- a/modules/linux/fonts/default.nix
+++ b/modules/linux/fonts/default.nix
@ -2,17 +2,17 @@
 {
  fonts = {
    enableDefaultPackages = true;
-    fontconfig = {
-      defaultFonts = {
-        serif = [ "Noto Serif" ];
-        sansSerif = [ "Noto Sans" ];
-      };
-    };
+    # fontconfig = {
+    #   defaultFonts = {
+    #     serif = [ "Noto Serif" ];
+    #     sansSerif = [ "Noto Sans" ];
+    #   };
+    # };
    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "CascadiaCode" ]; })
+      # noto-fonts
+      # noto-fonts-cjk-sans
+      # noto-fonts-emoji
+      # (nerdfonts.override { fonts = [ "CascadiaCode" ]; })
      (google-fonts.override { fonts = [ "Lora" ]; })
    ];
  };
--- a/modules/linux/stylix/default.nix
+++ b/modules/linux/stylix/default.nix
@ -0,0 +1,39 @@
+{ inputs, pkgs, ... }:
+{
+  imports = [
+    inputs.stylix.nixosModules.stylix
+  ];
+
+  stylix = {
+    enable = true;
+    # image = "${inputs.wallpapers}/aesthetic/afterglow_city_skyline_at_night.png";
+    image = "${inputs.wallpapers}/aesthetic/afterglow_sand_dunes.jpg";
+    # base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
+    # polarity = "dark";
+
+    fonts = {
+      serif = {
+        name = "Noto Serif";
+        package = pkgs.noto-fonts;
+      };
+      sansSerif = {
+        name = "Noto Sans";
+        package = pkgs.noto-fonts;
+      };
+      emoji = {
+        name = "Noto Color Emoji";
+        package = pkgs.noto-fonts-emoji;
+      };
+      monospace = {
+        name = "CaskaydiaCove Nerd Font";
+        package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
+      };
+    };
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+      size = 26;
+    };
+  };
+}
--- a/users/youwen/common/core.nix
+++ b/users/youwen/common/core.nix
@ -161,7 +161,7 @@ in
  programs.btop = {
    enable = true;
    settings = {
-      color_theme = "tokyo-night";
+      # color_theme = "tokyo-night";
      vim_keys = true;
      theme_background = false;
    };
--- a/users/youwen/linux/home.nix
+++ b/users/youwen/linux/home.nix
@ -54,7 +54,7 @@
  # Notification daemon
  services.dunst = {
    enable = true;
-    catppuccin.enable = true;
+    # catppuccin.enable = true;
    iconTheme = {
      name = "Papirus-Dark";
      package = pkgs.papirus-icon-theme;
@ -67,7 +67,7 @@
  programs.rofi = {
    enable = true;
    package = pkgs.rofi-wayland;
-    theme = "gruvbox-dark";
+    # theme = "gruvbox-dark";
  };

  # Let home Manager install and manage itself.
--- a/users/youwen/linux/hyprland/common.nix
+++ b/users/youwen/linux/hyprland/common.nix
@ -7,7 +7,6 @@
    wl-clipboard
    swaybg

-    bibata-cursors
    libsForQt5.qtstyleplugin-kvantum
    libsForQt5.qt5ct
    papirus-icon-theme
@ -18,7 +17,7 @@
    enable = true;
    settings = {
      exec-once = [
-        "${pkgs.waypaper}/bin/waypaper --restore"
+        # "${pkgs.waypaper}/bin/waypaper --restore"
        "[workspace 2 silent] ${pkgs.kitty}/bin/kitty"
      ];
      "$mod" = "SUPER";
@ -26,20 +25,20 @@
      "$Right" = "L";
      "$Up" = "K";
      "$Down" = "J";
-      env = [
-        "HYPRCURSOR_THEME,Bibata-Modern-Ice"
-        "HYPRCURSOR_SIZE,26"
-        "XCURSOR_THEME,Bibata-Modern-Ice"
-        "XCURSOR_SIZE,26"
-      ];
+      # env = [
+      #   "HYPRCURSOR_THEME,Bibata-Modern-Ice"
+      #   "HYPRCURSOR_SIZE,26"
+      #   "XCURSOR_THEME,Bibata-Modern-Ice"
+      #   "XCURSOR_SIZE,26"
+      # ];
      bind =
        [
          # Application Keybinds
          "$mod, T, exec, ${pkgs.kitty}/bin/kitty"
-          "$mod, E, exec, ${pkgs.dolphin}/bin/dolphin"
+          "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar"
          "$mod, R, exec, ${pkgs.pavucontrol}/bin/pavucontrol -t 3" # open pavucontrol on 'outputs' tab
          "$mod, M, exec, ${pkgs.thunderbird}/bin/thunderbird"
-          "$mod, B, exec, ${pkgs.waypaper}/bin/waypaper"
+          # "$mod, B, exec, ${pkgs.waypaper}/bin/waypaper"
          "$mod, A, exec, ${pkgs.neovide}/bin/neovide"

          # Window actions
@ -170,6 +169,7 @@
        "opacity 0.80 0.80,class:^(kitty)$"
        "opacity 0.80 0.80,class:^(neovide)$"
        "opacity 0.80 0.80,class:^(org.kde.dolphin)$"
+        "opacity 0.80 0.80,class:^(thunar)$"
        "opacity 0.80 0.80,class:^(org.kde.ark)$"
        "opacity 0.80 0.80,class:^(nwg-look)$"
        "opacity 0.80 0.80,class:^(qt5ct)$"
@ -276,8 +276,8 @@
        border_size = "2";
        #
        # the dot is a hyprland name, not nix syntax, so we escape it
-        "col.active_border" = "rgba(ca9ee6ff) rgba(f2d5cfff) 45deg";
-        "col.inactive_border" = "rgba(b4befecc) rgba(6c7086cc) 45deg";
+        "col.active_border" = pkgs.lib.mkForce "rgba(ca9ee6ff) rgba(f2d5cfff) 45deg";
+        "col.inactive_border" = pkgs.lib.mkForce "rgba(b4befecc) rgba(6c7086cc) 45deg";
        layout = "dwindle";
        resize_on_border = "true";
      };
--- a/users/youwen/linux/packages/common-packages.nix
+++ b/users/youwen/linux/packages/common-packages.nix
@ -23,7 +23,7 @@ pkgs: with pkgs; [
  # bitwarden-cli

  # desktop apps
-  dolphin
+  xfce.thunar
  thunderbird

  # messengers
--- a/users/youwen/linux/programs/default.nix
+++ b/users/youwen/linux/programs/default.nix
@ -1,7 +1,8 @@
+{ pkgs, ... }:
 {
  programs.kitty = {
    enable = true;
-    themeFile = "rose-pine";
+    # themeFile = "rose-pine";
    font.name = "CaskaydiaCove Nerd Font";
    shellIntegration.enableFishIntegration = true;
    shellIntegration.enableBashIntegration = true;
@ -10,12 +11,12 @@
      window_padding_width = "8 8 0";
      confirm_os_window_close = -1;
      enable_audio_bell = "no";
-      background_opacity = "0.8";
+      background_opacity = pkgs.lib.mkForce "0.8";
      allow_remote_control = "socket-only";
      listen_on = "unix:/tmp/kitty";
      scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "'';
-      cursor = "#c0caf5";
-      cursor_text_color = "#1a1b26";
+      cursor = pkgs.lib.mkForce "#c0caf5";
+      cursor_text_color = pkgs.lib.mkForce "#1a1b26";
    };
    keybindings = {
      "kitty_mod+h" = "show_scrollback";
--- a/users/youwen/linux/spicetify/default.nix
+++ b/users/youwen/linux/spicetify/default.nix
@ -13,8 +13,8 @@ in

  programs.spicetify = {
    enable = true;
-    theme = spicepkgs.themes.dribbblish;
-    colorScheme = "rosepine";
+    # theme = spicepkgs.themes.dribbblish;
+    # colorScheme = "rosepine";
    enabledExtensions = with spicepkgs.extensions; [
      lastfm
      fullAppDisplayMod
--- a/users/youwen/linux/theming/default.nix
+++ b/users/youwen/linux/theming/default.nix
@ -1,6 +1,8 @@
 { pkgs, ... }:
 {
-  imports = [ ./catppuccin.nix ];
+  # imports = [ ./catppuccin.nix ];
+  #
+  imports = [ ./stylix.nix ];

  gtk = {
    enable = true;
@ -11,20 +13,20 @@
    iconTheme = {
      name = "Papirus-Dark";
    };
-    theme = {
-      name = "rose-pine";
-      package = pkgs.rose-pine-gtk-theme;
-    };
+    # theme = {
+    #   name = "rose-pine";
+    #   package = pkgs.rose-pine-gtk-theme;
+    # };
  };

-  qt = {
-    enable = true;
-    platformTheme.name = "gtk";
-    style.name = "gtk2";
-  };
+  # qt = {
+  #   enable = true;
+  #   platformTheme.name = "gtk";
+  #   style.name = "gtk2";
+  # };

-  home.file.".config/kdeglobals".text = ''
-    [Colors:View]
-    BackgroundNormal=#191724
-  '';
+  # home.file.".config/kdeglobals".text = ''
+  #   [Colors:View]
+  #   BackgroundNormal=#191724
+  # '';
 }
--- a/users/youwen/linux/theming/stylix.nix
+++ b/users/youwen/linux/theming/stylix.nix
@ -0,0 +1,8 @@
+{
+  stylix.targets = {
+    waybar.enable = false;
+    kitty.variant256Colors = true;
+    neovim.enable = false;
+    kde.enable = true;
+  };
+}
Author	SHA1	Message	Date
Youwen Wu	9171c9c09c	refactor: update stylix cursor config and kitty cursor	2024-10-31 01:09:48 -07:00
Youwen Wu	453e984ed1	style: update stylix theming, remove catppuccin	2024-10-31 01:01:48 -07:00
Youwen Wu	e11db09e24	feat: switch to stylix for theming	2024-10-31 01:01:47 -07:00
Youwen Wu	404e6c6366	chore: use new lix module	2024-10-31 01:01:47 -07:00