Migrate away from stylix and gruvbox

This commit is contained in:
caem 2024-06-23 14:40:05 +02:00
parent 1284acef2f
commit 4d2c712bb7
Signed by: caem
GPG key ID: 69A830D03203405F
11 changed files with 127 additions and 382 deletions

View file

@ -1,7 +1,6 @@
{ config, pkgs, ... }:
{
stylix.targets.firefox.enable = false;
programs.firefox = {
enable = true;
package = pkgs.firefox-esr;

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ ... }:
{
programs.foot = {
@ -6,6 +6,7 @@
settings = {
main = {
pad = "8x8 center";
font = "Go Mono Nerd Font:size=12";
};
mouse = {
@ -15,6 +16,10 @@
scrollback = {
lines = 10000;
};
colors = {
alpha = 0.9;
};
};
};
}

View file

@ -1,16 +1,29 @@
{ pkgs, ... }:
{
stylix.targets.gtk.enable = false;
home.pointerCursor = {
gtk.enable = true;
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 24;
};
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
};
};
gtk = {
enable = true;
theme = {
name = "Gruvbox-Dark-BL-LB";
package = pkgs.gruvbox-gtk-theme;
name = "adw-gtk3-dark";
package = pkgs.adw-gtk3;
};
iconTheme = {
name = "elementary";
package = pkgs.pantheon.elementary-icon-theme;
name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme;
};
};
}

View file

@ -1,101 +1,107 @@
{ ... }:
{
wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.systemd.enable = true;
wayland.windowManager.hyprland.systemd.variables = ["--all"];
wayland.windowManager.hyprland.settings = {
"$mod" = "SUPER";
"$terminal" = "foot";
"$menu" = "rofi -show drun";
monitor = "DP-1,1920x1080@144,auto,1";
input = {
kb_layout = "gb:altgr-intl";
follow_mouse = 1;
};
general = {
gaps_in = 5;
gaps_out = 10;
border_size = 1;
layout = "master";
allow_tearing = true;
};
master = {
new_is_master = false;
mfact = 0.5;
};
decoration = {
rounding = 5;
blur = {
enabled = true;
size = 3;
passes = 1;
};
};
bindm = [
"$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow"
];
bind = [
"$mod, P, exec, $menu"
"$mod, RETURN, exec, $terminal"
"$mod SHIFT, C, killactive"
"$mod, SPACE, togglefloating"
"$mod SHIFT, M, exit,"
"$mod SHIFT, RETURN, layoutmsg, swapwithmaster"
"$mod SHIFT, h, layoutmsg, mfact -0.05"
"$mod SHIFT, l, layoutmsg, mfact +0.05"
"$mod, h, movefocus, l"
"$mod, j, movefocus, d"
"$mod, k, movefocus, u"
"$mod, l, movefocus, r"
"$mod, 1, workspace, 1"
"$mod, 2, workspace, 2"
"$mod, 3, workspace, 3"
"$mod, 4, workspace, 4"
"$mod, 5, workspace, 5"
"$mod, 6, workspace, 6"
"$mod, 7, workspace, 7"
"$mod, 8, workspace, 8"
"$mod, 9, workspace, 9"
"$mod SHIFT, 1, movetoworkspace, 1"
"$mod SHIFT, 2, movetoworkspace, 2"
"$mod SHIFT, 3, movetoworkspace, 3"
"$mod SHIFT, 4, movetoworkspace, 4"
"$mod SHIFT, 5, movetoworkspace, 5"
"$mod SHIFT, 6, movetoworkspace, 6"
"$mod SHIFT, 7, movetoworkspace, 7"
"$mod SHIFT, 8, movetoworkspace, 8"
"$mod SHIFT, 9, movetoworkspace, 9"
];
exec-once = [
"ags"
];
};
services.hyprpaper = {
enable = true;
settings = {
ipc = "off";
ipc = "on";
splash = false;
preload = [
"/nix/config/assets/wallpaper.png"
"/nix/config/assets/wallpaper.jpg"
];
wallpaper = [
",/nix/config/assets/wallpaper.png"
",/nix/config/assets/wallpaper.jpg"
];
};
};
wayland.windowManager.hyprland = {
enable = true;
systemd = {
enable = true;
variables = [ "--all" ];
};
settings = {
"$mod" = "SUPER";
"$terminal" = "foot";
"$menu" = "rofi -show drun";
monitor = "DP-1,1920x1080@144,auto,1";
input = {
kb_layout = "gb:intl";
follow_mouse = 1;
};
general = {
gaps_in = 5;
gaps_out = 10;
border_size = 1;
layout = "master";
allow_tearing = true;
"col.inactive_border" = "rgb(242424)";
"col.active_border" = "rgb(3584E4)";
};
master = {
new_is_master = false;
mfact = 0.5;
};
decoration = {
rounding = 5;
blur = {
enabled = true;
size = 3;
passes = 1;
};
};
bindm = [
"$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow"
];
bind = [
"$mod, P, exec, $menu"
"$mod, RETURN, exec, $terminal"
"$mod SHIFT, C, killactive"
"$mod, SPACE, togglefloating"
"$mod SHIFT, M, exit,"
"$mod SHIFT, RETURN, layoutmsg, swapwithmaster"
"$mod SHIFT, h, layoutmsg, mfact -0.05"
"$mod SHIFT, l, layoutmsg, mfact +0.05"
"$mod, h, movefocus, l"
"$mod, j, movefocus, d"
"$mod, k, movefocus, u"
"$mod, l, movefocus, r"
"$mod, 1, workspace, 1"
"$mod, 2, workspace, 2"
"$mod, 3, workspace, 3"
"$mod, 4, workspace, 4"
"$mod, 5, workspace, 5"
"$mod, 6, workspace, 6"
"$mod, 7, workspace, 7"
"$mod, 8, workspace, 8"
"$mod, 9, workspace, 9"
"$mod SHIFT, 1, movetoworkspace, 1"
"$mod SHIFT, 2, movetoworkspace, 2"
"$mod SHIFT, 3, movetoworkspace, 3"
"$mod SHIFT, 4, movetoworkspace, 4"
"$mod SHIFT, 5, movetoworkspace, 5"
"$mod SHIFT, 6, movetoworkspace, 6"
"$mod SHIFT, 7, movetoworkspace, 7"
"$mod SHIFT, 8, movetoworkspace, 8"
"$mod SHIFT, 9, movetoworkspace, 9"
];
exec-once = [
"ags"
];
};
};

View file

@ -1,10 +1,10 @@
{ pkgs, ... }:
{ ... }:
{
qt = {
enable = true;
style = {
};
platformTheme = "gnome";
style = "adwaita-dark";
};
}

View file

@ -1,10 +1,9 @@
{ config, pkgs, stylix, ... }:
{ pkgs, ... }:
{
stylix.targets.rofi.enable = false;
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
theme = "gruvbox-dark-hard";
theme = "sidebar";
};
}

View file

@ -1,40 +0,0 @@
{ pkgs, ... }:
{
stylix = {
image = ../../../assets/wallpaper.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
fonts = {
monospace = {
package = pkgs.nerdfonts;
name = "Go Mono Nerd Font";
};
};
fonts = {
sizes = {
terminal = 13;
popups = 13;
applications = 10;
};
};
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
};
targets = {
grub.enable = false;
gtk.enable = false;
};
opacity = {
terminal = 0.9;
popups = 0.9;
};
};
}