From 819ba11061ec0d5d98d3c3dfd3424610c40fbcc1 Mon Sep 17 00:00:00 2001 From: joy Date: Fri, 5 Jul 2024 19:26:11 +0200 Subject: [PATCH] stylix --- flake.nix | 1 - home/alacritty/default.nix | 40 ------------- home/default.nix | 15 +---- home/gtk/default.nix | 105 +---------------------------------- home/rofi/default.nix | 4 +- modules/packages/default.nix | 1 + modules/stylix/default.nix | 26 +++++---- 7 files changed, 23 insertions(+), 169 deletions(-) diff --git a/flake.nix b/flake.nix index 2d3f024..101fa71 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs"; - nix-colors.url = "github:misterio77/nix-colors"; ags.url = "github:Aylur/ags"; stylix.url = "github:danth/stylix"; diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix index 3c48c39..5741f1f 100644 --- a/home/alacritty/default.nix +++ b/home/alacritty/default.nix @@ -4,46 +4,6 @@ programs.alacritty = { enable = true; settings = { - # Font settings - font = { - size = 14; - }; - - # Color scheme - colors = { - primary = { - background = "0x282828"; - foreground = "0xebdbb2"; - }; - normal = { - black = "0x665c54"; - blue = "0x458588"; - cyan = "0x689d6a"; - green = "0x98971a"; - magenta = "0xb16286"; - red = "0xcc241d"; - white = "0xa89984"; - yellow = "0xd79921"; - }; - bright = { - black = "0x7c6f64"; - blue = "0x83a598"; - cyan = "0x8ec07c"; - green = "0xb8bb26"; - magenta = "0xd3869b"; - red = "0xfb4934"; - white = "0xbdae93"; - yellow = "0xfabd2f"; - }; - }; - - # Cursor settings - cursor = { - style = "Block"; - vi_mode_style = "Block"; - }; - - # Window padding window = { padding = { x = 5; diff --git a/home/default.nix b/home/default.nix index 83cc4a2..fe98f2f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,22 +2,16 @@ { imports = [ - # ./rofi -# ./alacritty + ./rofi + ./alacritty ./hyprland ./zsh - # ./gtk + ./gtk ./git ./ags - inputs.nix-colors.homeManagerModules.default inputs.ags.homeManagerModules.default ]; - programs.alacritty.enable = true; -programs.rofi = { - enable = true; - package = pkgs.rofi-wayland; -}; home.username = "joy"; home.homeDirectory = "/home/joy"; home.stateVersion = "23.11"; @@ -26,7 +20,4 @@ programs.rofi = { EDITOR = "nvim"; }; - - colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-medium; - } diff --git a/home/gtk/default.nix b/home/gtk/default.nix index e4a13ec..fc6e275 100644 --- a/home/gtk/default.nix +++ b/home/gtk/default.nix @@ -4,115 +4,12 @@ ... }: let gruvboxPlus = import ./gruvbox-plus.nix {inherit pkgs;}; -in let - cssContent = with config.colorScheme.palette; '' - @define-color accent_color #${base0D}; - @define-color accent_bg_color mix(#${base0D}, #${base00},0.3); - @define-color accent_fg_color #${base00}; - @define-color destructive_color #${base0C}; - @define-color destructive_bg_color mix(#${base0C}, #${base00},0.3); - @define-color destructive_fg_color #${base00}; - @define-color success_color #${base0B}; - @define-color success_bg_color mix(#${base0B}, black,0.6); - @define-color success_fg_color #${base00}; - @define-color warning_color #${base0A}; - @define-color warning_bg_color mix(#${base0A}, black,0.6); - @define-color warning_fg_color rgba(0, 0, 0, 0.8); - @define-color error_color #${base08}; - @define-color error_bg_color mix(#${base0C}, #${base00},0.3); - @define-color error_fg_color #${base02}; - @define-color window_bg_color #${base00}; - @define-color window_fg_color #${base04}; - @define-color view_bg_color #${base00}; - @define-color view_fg_color #${base04}; - @define-color headerbar_bg_color mix(#${base00},black,0.2); - @define-color headerbar_fg_color #${base04}; - @define-color headerbar_border_color #${base00}; - @define-color headerbar_backdrop_color @window_bg_color; - @define-color headerbar_shade_color rgba(0, 0, 0, 0.36); - @define-color card_bg_color rgba(255, 255, 255, 0.08); - @define-color card_fg_color #${base04}; - @define-color card_shade_color rgba(0, 0, 0, 0.36); - @define-color dialog_bg_color #${base00}; - @define-color dialog_fg_color #${base04}; - @define-color popover_bg_color #${base00}; - @define-color popover_fg_color #${base04}; - @define-color shade_color rgba(0,0,0,0.36); - @define-color scrollbar_outline_color rgba(0,0,0,0.5); - @define-color blue_1 #${base0D}; - @define-color blue_2 #${base0D}; - @define-color blue_3 #${base0D}; - @define-color blue_4 #${base0D}; - @define-color blue_5 #${base0D}; - @define-color green_1 #${base0B}; - @define-color green_2 #${base0B}; - @define-color green_3 #${base0B}; - @define-color green_4 #${base0B}; - @define-color green_5 #${base0B}; - @define-color yellow_1 #${base0A}; - @define-color yellow_2 #${base0A}; - @define-color yellow_3 #${base0A}; - @define-color yellow_4 #${base0A}; - @define-color yellow_5 #${base0A}; - @define-color orange_1 #${base09}; - @define-color orange_2 #${base09}; - @define-color orange_3 #${base09}; - @define-color orange_4 #${base09}; - @define-color orange_5 #${base09}; - @define-color red_1 #${base08}; - @define-color red_2 #${base08}; - @define-color red_3 #${base08}; - @define-color red_4 #${base08}; - @define-color red_5 #${base08}; - @define-color purple_1 #${base0E}; - @define-color purple_2 #${base0E}; - @define-color purple_3 #${base0E}; - @define-color purple_4 #${base0E}; - @define-color purple_5 #${base0E}; - @define-color brown_1 #${base0F}; - @define-color brown_2 #${base0F}; - @define-color brown_3 #${base0F}; - @define-color brown_4 #${base0F}; - @define-color brown_5 #${base0F}; - @define-color light_1 #${base00}; - @define-color light_2 #f6f5f4; - @define-color light_3 #deddda; - @define-color light_4 #c0bfbc; - @define-color light_5 #9a9996; - @define-color dark_1 mix(#${base00},white,0.5); - @define-color dark_2 mix(#${base00},white,0.2); - @define-color dark_3 #${base00}; - @define-color dark_4 mix(#${base00},black,0.2); - @define-color dark_5 mix(#${base00},black,0.4); - ''; in { home.file = { ".local/share/icons/GruvboxPlus".source = "${gruvboxPlus}"; }; - home.pointerCursor.name = "Bibata-Modern-Ice"; - home.pointerCursor.package = pkgs.bibata-cursors; - gtk.enable = true; - - gtk.theme.package = pkgs.adw-gtk3; - gtk.theme.name = "adw-gtk3"; - - gtk.cursorTheme.package = pkgs.bibata-cursors; - gtk.cursorTheme.name = "Bibata-Modern-Ice"; - gtk.cursorTheme.size = 24; - gtk.iconTheme.package = gruvboxPlus; gtk.iconTheme.name = "GruvboxPlus"; - - xdg.configFile."gtk-4.0/gtk.css" = { - text = cssContent; - }; - - xdg.configFile."gtk-3.0/gtk.css" = { - text = cssContent; - }; - qt.enable = true; - qt.platformTheme.name= "gtk3"; - qt.style.name = "Gruvbox"; - } +} diff --git a/home/rofi/default.nix b/home/rofi/default.nix index 249a5d6..b3ab157 100644 --- a/home/rofi/default.nix +++ b/home/rofi/default.nix @@ -4,14 +4,14 @@ programs.rofi = { enable = true; package = pkgs.rofi-wayland; - theme = "~/nix/home/rofi/gruvbox-material.rasi"; + #theme = "~/nix/home/rofi/gruvbox-material.rasi"; extraConfig = { modi = "drun"; icon-theme = "Oranchelo"; show-icons = true; terminal = "alacritty"; drun-display-format = "{icon} {name}"; - location = 1; + # location = 5; disable-history = false; hide-scrollbar = true; display-drun = "  Apps "; diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 9c570cc..41c7e10 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -6,6 +6,7 @@ #Games prismlauncher mangohud + lutris #hackerman fastfetch freshfetch diff --git a/modules/stylix/default.nix b/modules/stylix/default.nix index 292828a..6ef1f15 100644 --- a/modules/stylix/default.nix +++ b/modules/stylix/default.nix @@ -1,9 +1,9 @@ { pkgs, ... }: { - stylix.enable = true; - - stylix.base16Scheme = { + stylix = { + enable = true; + base16Scheme = { base00 = "282828"; base01 = "3c3836"; base02 = "504945"; @@ -12,15 +12,21 @@ base05 = "d5c4a1"; base06 = "ebdbb2"; base07 = "fbf1c7"; - base08 = "fb4934"; + base08 = "cc241d"; base09 = "fe8019"; - base0A = "fabd2f"; - base0B = "b8bb26"; - base0C = "8ec07c"; - base0D = "83a598"; - base0E = "d3869b"; + base0A = "d78821"; + base0B = "98971a"; + base0C = "689d6a"; + base0D = "458588"; + base0E = "b16286"; base0F = "d65d0e"; }; + image = ./wallpaper.png; + fonts.sizes.terminal = 14; + targets.chromium.enable = false; + cursor.name = "Bibata-Modern-Ice"; + cursor.package = pkgs.bibata-cursors; + cursor.size = 24; - stylix.image = ./wallpaper.png; + }; }