diff --git a/hosts/dunamis/stylix.nix b/hosts/dunamis/stylix.nix index f9ab444..4ba3d23 100644 --- a/hosts/dunamis/stylix.nix +++ b/hosts/dunamis/stylix.nix @@ -19,7 +19,7 @@ name = "GoogleDot-Blue"; size = 24; }; - image = ../../wallpapers/wallhaven-zylmoo.jpg; + image = ../../wallpapers/wallhaven-9djzww.jpg; opacity.terminal = 0.9; fonts = { sizes = { diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix index 24f02ea..fcc38f6 100644 --- a/hosts/dunamis/users/user/programs.nix +++ b/hosts/dunamis/users/user/programs.nix @@ -48,6 +48,7 @@ fend # calc in rust tree # tree util rbw # bitwarden cli in rust + pinentry-qt # pinentry for rbw zip # zip util vial # qmk keyboard configuring app unzip # unzip util diff --git a/hosts/sarien/users/user/programs.nix b/hosts/sarien/users/user/programs.nix index 99d4eac..24f02ea 100644 --- a/hosts/sarien/users/user/programs.nix +++ b/hosts/sarien/users/user/programs.nix @@ -8,11 +8,25 @@ programs = { bat.enable = true; + btop = { + enable = true; + settings.update_ms = 200; + }; eza.enable = true; + fd.enable = true; fzf.enable = true; - btop.enable = true; - yazi.enable = true; gitui.enable = true; + git = { + enable = true; + delta.enable = true; + signing.format = "ssh"; + aliases = { + cl = "clone"; + co = "checkout"; + pom = "push origin main"; + }; + }; + ripgrep.enable = true; }; terminal = { diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index 853af09..cb304f7 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -72,8 +72,8 @@ in { # "EDITOR,hx" "ELECTRON_OZONE_PLATFORM_HINT,auto" "QT_QPA_PLATFORM,wayland" - # "QT_QPA_PLATFORMTHEME,gtk3" - "XCURSOR_SIZE,32" + "QT_QPA_PLATFORMTHEME,gtk3" + "XCURSOR_SIZE,24" #"GTK_THEME,adw-gtk3" "GSK_RENDERER,ngl" # "DISPLAY,:123" @@ -107,6 +107,15 @@ in { # }; plugin = [ { + overview = { + gapsIn = 12; + gapsOut = 24; + exitOnClick = true; + centerAligned = true; + showNewWorkspace = false; + showEmptyWorkspace = false; + affectStrut = false; + }; hyprexpo = { columns = 3; gap_size = 8; @@ -137,9 +146,9 @@ in { "col.active.text" = "0xff${config.lib.stylix.colors.base0D}"; "col.inactive.text" = "0xff${config.lib.stylix.colors.base05}"; "col.urgent.text" = "0xff${config.lib.stylix.colors.base09}"; - "col.active.border" = "0xff${config.lib.stylix.colors.base0D}"; - "col.inactive.border" = "0xff${config.lib.stylix.colors.base05}"; - "col.urgent.border" = "0xff${config.lib.stylix.colors.base09}"; + "col.active.border" = "0xff${config.lib.stylix.colors.base00}"; + "col.inactive.border" = "0xff${config.lib.stylix.colors.base00}"; + "col.urgent.border" = "0xff${config.lib.stylix.colors.base00}"; }; }; } @@ -200,6 +209,7 @@ in { "$modCtrl, Q, killactive" "$modCtrl, M, fullscreen" "$modCtrl, G, togglefloating" + "$mod, G, pin" # "$mod,T, togglegroup" # "$mod, period, changegroupactive, f" @@ -344,14 +354,14 @@ in { workspace = [ "1, defaultName:general" - "2, defaultName:browse" + "2, defaultName:web" "3, defaultName:chat" "4, defaultName:code" "5, defaultName:uni" "6, defaultName:games" - "7, defaultName:sysadmin" + "7, defaultName:system" "8, defaultName:media" - "9, defaultName:bg" + "9, defaultName:tray" # "10, defaultName:" ]; windowrulev2 = [ @@ -455,7 +465,7 @@ in { }; qt = { enable = true; - # platformTheme.name = "gtk3"; + platformTheme.name = lib.mkDefault "gtk3"; #style.name = "gtk2"; }; dconf.settings = { @@ -473,7 +483,7 @@ in { }; settings = { bar-0 = { - layer = "top"; + layer = "bottom"; position = "bottom"; height = 40; spacing = 6; @@ -509,14 +519,14 @@ in { "9" = "IX"; "10" = "X"; general = "󰾞"; - browse = "󰜏"; - chat = "󰭹"; + web = "󰖟"; + chat = "󰻞"; code = "󰅩"; - uni = "󰁰"; - games = "󰺵"; - sysadmin = "󰒓"; - media = "󱖑"; - bg = "󰣆"; + uni = "󱆀"; + games = "󰺶"; + system = "󰢻"; + media = "󱜐"; + tray = "󱊖"; #focused = "󰗝"; #active = "󰻃"; #default = "󰄰"; @@ -532,11 +542,6 @@ in { interval = "once"; tooltip = false; }; - "custom/text" = { - format = "here will be workspaces"; - interval = "once"; - tooltip = false; - }; "group/hypr" = { orientation = "inherit"; modules = [ @@ -1810,7 +1815,7 @@ in { }; }; systemd.user.settings.Manager.DefaultEnvironment = { - # QT_QPA_PLATFORMTHEME = "gtk3"; + QT_QPA_PLATFORMTHEME = "gtk3"; QT_QPA_PLATFORM = "wayland"; }; systemd.user.targets.tray = {