stylix update, a lot is styled now :D

This commit is contained in:
Charlie Root 2024-05-26 02:36:36 +02:00
commit facf9f5b4b
6 changed files with 74 additions and 105 deletions

View file

@ -66,6 +66,7 @@
agenix.url = "github:ryantm/agenix";
waybar.url = "github:Alexays/Waybar";
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -6,8 +6,7 @@
}:
with lib; let
cfg = config.modules.editors.kakoune;
username = config.modules.other.system.username;
# inherit (inputs.kakoune.packages.${pkgs.system}) kakoun;
inherit (config.modules.other.system) username;
in {
options.modules.editors.kakoune.enable = mkEnableOption "kakoune";
@ -15,15 +14,12 @@ in {
home-manager.users.${username} = {
programs.kakoune = {
enable = true;
# extraConfig = builtins.readFile
# package = kakoun;
plugins = with pkgs.kakounePlugins; [
auto-pairs-kak
fzf-kak
powerline-kak
byline-kak
kakoune-lsp
# luar-kak
];
config = {
ui = {
@ -31,13 +27,6 @@ in {
enableMouse = true;
assistant = "none";
};
# numberLines.enable = true;
# numberLines.relative = true;
# numberLines.highlightCursor = true;
# numberLines.separator = " ";
# showMatching = true;
# indentWidth = 2;
# tabStop = 2;
scrollOff.lines = 1;
scrollOff.columns = 3;
keyMappings = [

View file

@ -65,9 +65,9 @@ in {
};
config = lib.mkIf cfg.enable {
programs.nixvim.enable = true;
theme = "gruvbox";
programs.nixvim.extraConfigLua = ''
_G.theme = "${config.theme}"
'';
# theme = "gruvbox";
# programs.nixvim.extraConfigLua = ''
# _G.theme = "${config.theme}"
#'';
};
}

View file

@ -3,82 +3,61 @@
pkgs,
lib,
...
}:
with lib; let
}: let
cfg = config.modules.programs.stylix;
username = config.modules.other.system.username;
in {
options.modules.programs.stylix.enable = mkEnableOption "stylix";
config = mkIf cfg.enable {
home-manager.users.${username} = {
stylix = {
polarity = "dark";
image = ../../assets/wallpapers/mafu_trad_wall.png;
base16Scheme =
#"${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
"${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml";
autoEnable = true;
targets = {
btop.enable = true;
fish.enable = true;
dunst.enable = false;
emacs.enable = true;
firefox.enable = false;
kitty.enable = true;
lazygit.enable = true;
rofi.enable = true;
foot.enable = true;
tmux.enable = true;
waybar.enable = true;
vim.enable = true;
zathura.enable = true;
gtk.enable = true;
hyprland.enable = true;
options.modules.programs.stylix.enable = lib.mkEnableOption "stylix";
config = lib.mkIf cfg.enable {
stylix = {
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml";
image = ../../assets/wallpapers/tiredgod.png;
polarity = "dark";
autoEnable = true;
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
};
fonts = {
sizes = {
terminal = 14;
popups = 14;
};
opacity = {
applications = 0.9;
popups = 0.9;
desktop = 0.9;
terminal = 0.85;
monospace = {
package =
pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
name = "JetBrainsMono";
};
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
serif = {
package = pkgs.noto-fonts;
name = "Noto Serif";
};
fonts = {
sizes = {
terminal = 14;
popups = 14;
};
monospace = {
package =
pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
name = "JetBrainsMono";
};
serif = {
package = pkgs.noto-fonts;
name = "Noto Serif";
};
sansSerif = {
package = pkgs.lexend;
name = "Lexend";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
sansSerif = {
package = pkgs.lexend;
name = "Lexend";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
};
};
stylix = {
image = ../../assets/wallpapers/FreeBSD.png;
polarity = "dark";
targets.plymouth.enable = false;
base16Scheme =
#"${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
"${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml";
opacity = {
applications = 0.9;
popups = 0.9;
desktop = 0.9;
terminal = 0.85;
};
targets = {
console.enable = true;
fish.enable = true;
grub.enable = true;
grub.useImage = true;
gtk.enable = true;
lightdm.enable = true;
nixos-icons.enable = true;
nixvim.enable = true;
plymouth.logoAnimated = true;
};
};
};
}

View file

@ -38,11 +38,11 @@ in {
separator_height = 2;
padding = 10;
frame_width = 3;
frame_color = "#89B4FA";
separator_color = "frame";
# frame_color = "#89B4FA";
# separator_color = "frame";
highlight = "#89DCEB";
sort = "yes";
font = "JetBrains Mono 12";
# font = "JetBrains Mono 12";
line_height = 0;
markup = "full";
format = "<b>%s</b>%b";
@ -73,22 +73,22 @@ in {
mouse_right_click = "close_all";
};
experimental = {per_monitor_dpi = false;};
urgency_low = {
background = "#1E1E2E";
foreground = "#CDD6F4";
timeout = 5;
};
urgency_normal = {
background = "#1E1E2E";
foreground = "#CDD6F4";
timeout = 6;
};
urgency_critical = {
background = "#1E1E2E";
foreground = "#CDD6F4";
frame_color = "#FAB387";
timeout = 0;
};
# urgency_low = {
# background = "#1E1E2E";
# foreground = "#CDD6F4";
# timeout = 5;
# };
# urgency_normal = {
# background = "#1E1E2E";
# foreground = "#CDD6F4";
# timeout = 6;
# };
# urgency_critical = {
# background = "#1E1E2E";
# foreground = "#CDD6F4";
# frame_color = "#FAB387";
# timeout = 0;
# };
};
};
};

View file

@ -6,7 +6,7 @@
...
}: let
cfg = config.modules.wms.wayland.hyprland;
username = config.modules.other.system.username;
inherit (config.modules.other.system) username;
inherit (inputs.hyprland.packages.${pkgs.system}) hyprland;
inherit (inputs.anyrun.packages.${pkgs.system}) anyrun;
inherit