From 453e984ed1f48daf23a90ee9d2c4d1fdf70d15c2 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 31 Oct 2024 01:01:22 -0700 Subject: [PATCH] style: update stylix theming, remove catppuccin --- flake.lock | 16 ---------------- flake.nix | 2 -- hosts/callisto/default.nix | 3 +-- hosts/demeter/default.nix | 2 -- modules/linux/stylix/default.nix | 7 ++++--- users/youwen/linux/hyprland/common.nix | 11 ++++++----- users/youwen/linux/packages/common-packages.nix | 2 +- users/youwen/linux/theming/stylix.nix | 1 - 8 files changed, 12 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 307eb3a..f170447 100755 --- a/flake.lock +++ b/flake.lock @@ -144,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": [ @@ -845,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", diff --git a/flake.nix b/flake.nix index d11518f..ba32fd0 100755 --- a/flake.nix +++ b/flake.nix @@ -33,8 +33,6 @@ flake = false; }; - catppuccin.url = "github:catppuccin/nix"; - lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.1"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/callisto/default.nix b/hosts/callisto/default.nix index e3b77ae..ab69199 100644 --- 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 ]; }; } diff --git a/hosts/demeter/default.nix b/hosts/demeter/default.nix index c38ef0c..b378100 100644 --- 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 ]; }; } diff --git a/modules/linux/stylix/default.nix b/modules/linux/stylix/default.nix index 64ae8fd..558d682 100644 --- a/modules/linux/stylix/default.nix +++ b/modules/linux/stylix/default.nix @@ -6,9 +6,10 @@ stylix = { enable = true; - image = "${inputs.wallpapers}/aesthetic/afterglow_city_skyline_at_night.png"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; - polarity = "dark"; + # 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 = { diff --git a/users/youwen/linux/hyprland/common.nix b/users/youwen/linux/hyprland/common.nix index bf67afb..6235366 100644 --- a/users/youwen/linux/hyprland/common.nix +++ b/users/youwen/linux/hyprland/common.nix @@ -18,7 +18,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"; @@ -36,10 +36,10 @@ [ # 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 +170,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 +277,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"; }; diff --git a/users/youwen/linux/packages/common-packages.nix b/users/youwen/linux/packages/common-packages.nix index 41d8392..9cbf84c 100644 --- 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 diff --git a/users/youwen/linux/theming/stylix.nix b/users/youwen/linux/theming/stylix.nix index 51dca8d..055d289 100644 --- a/users/youwen/linux/theming/stylix.nix +++ b/users/youwen/linux/theming/stylix.nix @@ -1,7 +1,6 @@ { stylix.targets = { waybar.enable = false; - hyprland.enable = false; kitty.variant256Colors = true; neovim.enable = false; kde.enable = true;