feat: make gtk thingies dark again, move gtk to hyprland to centralise options

This commit is contained in:
Ahwx 2024-10-11 20:27:57 +02:00
parent 3bc04cd74b
commit ef400c9a0d
3 changed files with 47 additions and 39 deletions

View file

@ -3,7 +3,6 @@
[(import ./bat.nix)] # better cat command [(import ./bat.nix)] # better cat command
++ [(import ./git.nix)] # version control ++ [(import ./git.nix)] # version control
++ [(import ./security.nix)] # yubikey-touch-detector for now ++ [(import ./security.nix)] # yubikey-touch-detector for now
++ [(import ./gtk.nix)] # gtk theme
++ [(import ./hyprland)] # window manager ++ [(import ./hyprland)] # window manager
++ [(import ./kitty.nix)] # terminal ++ [(import ./kitty.nix)] # terminal
++ [(import ./mako.nix)] # notification deamon ++ [(import ./mako.nix)] # notification deamon

View file

@ -1,34 +0,0 @@
{ pkgs, ... }:
{
fonts.fontconfig.enable = true;
home.packages = [
pkgs.nerdfonts
(pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
pkgs.twemoji-color-font
pkgs.noto-fonts-emoji
];
gtk = {
enable = true;
font = {
name = "JetBrainsMono Nerd Font";
size = 11;
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
flavor = "mocha";
accent = "lavender";
};
};
theme = {
name = "Catppuccin-Mocha-Compact-Lavender-Dark";
package = pkgs.catppuccin-gtk.override {
accents = [ "lavender" ];
size = "compact";
# tweaks = [ "rimless" ];
variant = "mocha";
};
};
};
}

View file

@ -1,5 +1,50 @@
{ ... }: { pkgs, ... }:
{ {
fonts.fontconfig.enable = true;
home.packages = [
pkgs.nerdfonts
(pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
pkgs.twemoji-color-font
pkgs.noto-fonts-emoji
];
gtk = {
enable = true;
theme = {
name = "orchis-theme";
package = pkgs.orchis-theme;
};
iconTheme = {
name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme;
};
cursorTheme = {
name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme;
};
font = {
name = "JetBrainsMono Nerd Font";
size = 11;
};
};
# home.pointerCursor = {
# gtk.enable = true;
# # x11.enable = true;
# package = pkgs.bibata-cursors;
# name = "Bibata-Modern-Classic";
# size = 16;
# };
dconf = {
enable = true;
settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
};
};
};
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
@ -128,9 +173,6 @@
}; };
bind = [ bind = [
# show keybinds list
"$mainMod, F1, exec, show-keybinds"
# keybindings # keybindings
"$mainMod, Return, exec, kitty" "$mainMod, Return, exec, kitty"
"$mainMod, Q, killactive," "$mainMod, Q, killactive,"
@ -147,6 +189,7 @@
"$mainMod SHIFT, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy" "$mainMod SHIFT, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy"
"$mainMod SHIFT, F, exec, firefox" "$mainMod SHIFT, F, exec, firefox"
"$mainMod SHIFT, W, exec, wdisplays"
"$mainMod SHIFT, T, exec, thunderbird" "$mainMod SHIFT, T, exec, thunderbird"
"$mainMod SHIFT, P, exec, pavucontrol-qt" "$mainMod SHIFT, P, exec, pavucontrol-qt"