diff --git a/modules/desktop-environment/home/eww/configDir/eww.css b/modules/desktop-environment/home/eww/configDir/eww.css index 2d36825..90d015d 100644 --- a/modules/desktop-environment/home/eww/configDir/eww.css +++ b/modules/desktop-environment/home/eww/configDir/eww.css @@ -2,12 +2,18 @@ label { font: 14pt "Departure Mono Nerd Font"; } +button { + border-radius: 0px; + padding: 0; +} + .background { background-color: #1d2021; } .workspaces button { border: 0px; + padding: 0 3px; } .workspaces button.focused { diff --git a/modules/desktop-environment/home/niri/screenshot.nix b/modules/desktop-environment/home/niri/screenshot.nix index e39a0e9..bba65b2 100644 --- a/modules/desktop-environment/home/niri/screenshot.nix +++ b/modules/desktop-environment/home/niri/screenshot.nix @@ -4,7 +4,10 @@ binds = { "Print".action.screenshot = []; "Ctrl+Print".action.screenshot-screen = []; - "Alt+Print".action.screenshot-window = []; + "Shift+Print".action.screenshot-window = []; + "Mod+S".action.screenshot = []; + "Mod+Ctrl+S".action.screenshot-screen = []; + "Mod+Shift+S".action.screenshot-window = []; }; }; } diff --git a/modules/desktop-environment/home/terminal.nix b/modules/desktop-environment/home/terminal.nix index e050429..6b14f2e 100644 --- a/modules/desktop-environment/home/terminal.nix +++ b/modules/desktop-environment/home/terminal.nix @@ -1,34 +1,32 @@ {...}: { programs.kitty = { enable = true; - font = { - name = "Departure Mono Nerd Font"; - size = 12; - }; + font.size = 12; + font.name = "Departure Mono Nerd Font"; shellIntegration.enableFishIntegration = false; keybindings = { "ctrl+shift+n" = "new_os_window_with_cwd"; }; settings = rec { - #adjust_column_width = "70%"; - # color0 = "#282828"; - # color8 = "#928374"; - # color1 = "#cc241d"; - # color9 = "#fb4934"; - # color2 = "#98971a"; - # color10 = "#b8bb26"; - # color3 = "#d79921"; - # color11 = "#fabd2f"; - # color4 = "#458588"; - # color12 = "#83a598"; - # color5 = "#b16286"; - # color13 = "#d3869b"; - # color6 = "#689d6a"; - # color14 = "#8ec07c"; - # color7 = "#a89984"; - # color15 = "#ebdbb2"; - # foreground = color15; - # background = "#1d2021"; + adjust_column_width = "95%"; + color0 = "#282828"; + color8 = "#928374"; + color1 = "#cc241d"; + color9 = "#fb4934"; + color2 = "#98971a"; + color10 = "#b8bb26"; + color3 = "#d79921"; + color11 = "#fabd2f"; + color4 = "#458588"; + color12 = "#83a598"; + color5 = "#b16286"; + color13 = "#d3869b"; + color6 = "#689d6a"; + color14 = "#8ec07c"; + color7 = "#a89984"; + color15 = "#ebdbb2"; + foreground = color15; + background = "#1d2021"; confirm_os_window_close = 0; hide_window_decorations = true; }; diff --git a/modules/desktop-environment/stylix.nix b/modules/desktop-environment/stylix.nix index 99ee80e..4d2d991 100644 --- a/modules/desktop-environment/stylix.nix +++ b/modules/desktop-environment/stylix.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { stylix = { enable = true; + polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; fonts = { serif = { @@ -9,13 +10,13 @@ }; sansSerif = { - package = pkgs.b612; - name = "B612"; + package = pkgs.atkinson-hyperlegible; + name = "Atkinson Hyperlegible"; }; monospace = { - package = pkgs.departure-mono; - name = "Departure Mono"; + package = pkgs.nerd-fonts.departure-mono; + name = "Departure Mono Nerd Font"; }; emoji = { @@ -24,4 +25,18 @@ }; }; }; + home-manager.users.jade = {pkgs, ...}: { + stylix.targets = { + firefox = { + profileNames = ["jade"]; + }; + helix.enable = false; + btop.enable = false; + nushell.enable = false; + starship.enable = false; + kitty.enable = false; + dunst.enable = false; + wofi.enable = false; + }; + }; } diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 90db752..adfda34 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -21,7 +21,7 @@ enable = true; defaultEditor = true; settings = { - # theme = "gruvbox_dark_hard"; + theme = "gruvbox_dark_hard"; editor = { line-number = "relative"; bufferline = "multiple";