diff --git a/hyprland/settings.nix b/hyprland/settings.nix index f12a8ed..368c1fa 100644 --- a/hyprland/settings.nix +++ b/hyprland/settings.nix @@ -3,7 +3,145 @@ let terminal = "kitty"; in { - home-manager.users.zoe.xdg.configFile."hypr/hyprland.conf".text = '' - + home-manager.users.zoe.xdg.configFile."hypr/hyprland.conf".text = '' + exec-once dunst + input { + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = false + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + } + + general { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + gaps_in = 5 + gaps_out = 20 + border_size = 2 + col.active_border = rgb(${config.color.green}) + col.inactive_border = rgb(${config.color.cyan}) + + layout = dwindle + } + + decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 10 + blur = true + blur_size = 3 + blur_passes = 1 + blur_new_optimizations = true + + drop_shadow = true + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) + } + + animations { + enabled = true + + # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default + } + + dwindle { + # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more + pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true # you probably want this + } + + master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + new_is_master = true + } + + gestures { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + workspace_swipe = false + } + + # Example per-device config + # See https://wiki.hyprland.org/Configuring/Keywords/#executing for mor + device:epic mouse V1 { + sensitivity = -0.5 + } + + # Example windowrule v1 + # windowrule = float, ^(kitty)$ + # Example windowrule v2 + # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ + # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more + + + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + $mainMod = ALT + + # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + bind = $mainMod, return, exec, kitty + bind = $mainMod, C, killactive, + bind = $mainMod, M, exit, + bind = $mainMod, E, exec, dolphin + bind = $mainMod, V, togglefloating, + bind = $mainMod, D, exec, rofi -combi-modi window#drun#ssh -show-icons -show combi -modi combi + bind = $mainMod, P, pseudo, # dwindle + bind = $mainMod, J, togglesplit, # dwindle + + # Move focus with mainMod + arrow keys + bind = $mainMod, left, movefocus, l + bind = $mainMod, right, movefocus, r + bind = $mainMod, up, movefocus, u + bind = $mainMod, down, movefocus, d + + # Switch workspaces with mainMod + [0-9] + bind = $mainMod, 1, workspace, 1 + bind = $mainMod, 2, workspace, 2 + bind = $mainMod, 3, workspace, 3 + bind = $mainMod, 4, workspace, 4 + bind = $mainMod, 5, workspace, 5 + bind = $mainMod, 6, workspace, 6 + bind = $mainMod, 7, workspace, 7 + bind = $mainMod, 8, workspace, 8 + bind = $mainMod, 9, workspace, 9 + bind = $mainMod, 0, workspace, 10 + + # Move active window to a workspace with mainMod + SHIFT + [0-9] + bind = $mainMod SHIFT, 1, movetoworkspace, 1 + bind = $mainMod SHIFT, 2, movetoworkspace, 2 + bind = $mainMod SHIFT, 3, movetoworkspace, 3 + bind = $mainMod SHIFT, 4, movetoworkspace, 4 + bind = $mainMod SHIFT, 5, movetoworkspace, 5 + bind = $mainMod SHIFT, 6, movetoworkspace, 6 + bind = $mainMod SHIFT, 7, movetoworkspace, 7 + bind = $mainMod SHIFT, 8, movetoworkspace, 8 + bind = $mainMod SHIFT, 9, movetoworkspace, 9 + bind = $mainMod SHIFT, 0, movetoworkspace, 10 + + # Scroll through existing workspaces with mainMod + scroll + bind = $mainMod, mouse_down, workspace, e+1 + bind = $mainMod, mouse_up, workspace, e-1 + + # Move/resize windows with mainMod + LMB/RMB and dragging + bindm = $mainMod, mouse:272, movewindow + bindm = $mainMod, mouse:273, resizewindow + ''; } diff --git a/i3/config.nix b/i3/config.nix index 8285a0e..d30e215 100644 --- a/i3/config.nix +++ b/i3/config.nix @@ -2,12 +2,12 @@ let mod = "Mod4"; term = "kitty"; - color_bg = config.color.background; - color_fg = config.color.foreground; - color_active = config.color.green; - color_inactive = config.color.cyan; - color_indicator = config.color.magenta; - color_evil = config.color.red; + color_bg = "#${config.color.background}"; + color_fg = "#${config.color.foreground}"; + color_active = "#${config.color.green}"; + color_inactive = "#${config.color.cyan}"; + color_indicator = "#${config.color.magenta}"; + color_evil = "#${config.color.red}"; in { home-manager.users.zoe.xsession.windowManager.i3.config = { modifier = mod; diff --git a/i3/mainbar.nix b/i3/mainbar.nix index 5480efc..dd21c04 100644 --- a/i3/mainbar.nix +++ b/i3/mainbar.nix @@ -58,20 +58,20 @@ overrides = { separator = ""; # background - good_bg = config.color.background; - critical_bg = config.color.background; - idle_bg = config.color.background; - info_bg = config.color.background; - seperator_bg = config.color.background; - warning_bg = config.color.background; + good_bg = "#${config.color.background}"; + critical_bg = "#${config.color.background}"; + idle_bg = "#${config.color.background}"; + info_bg = "#${config.color.background}"; + seperator_bg = "#${config.color.background}"; + warning_bg = "#${config.color.background}"; # foreground - critical_fg = config.color.red; - good_fg = config.color.green; - info_fg = config.color.foreground; - idle_fg = config.color.cyan; - separator_fg = config.color.foreground; - warning_fg = config.color.yellow; + critical_fg = "#${config.color.red}"; + good_fg = "#${config.color.green}"; + info_fg = "#${config.color.foreground}"; + idle_fg = "#${config.color.cyan}"; + separator_fg = "#${config.color.foreground}"; + warning_fg = "#${config.color.yellow}"; }; }; }; diff --git a/kitty/settings.nix b/kitty/settings.nix index 7f8a89d..1463e04 100644 --- a/kitty/settings.nix +++ b/kitty/settings.nix @@ -29,40 +29,40 @@ window_margin_width = 0; window_padding_width = 0; - color0 = config.color.black; - color8 = config.color.black_dull; - color1 = config.color.red; - color9 = config.color.red_dull; - color2 = config.color.green; - color10 = config.color.green_dull; - color3 = config.color.yellow; - color11 = config.color.yellow_dull; - color4 = config.color.blue; - color12 = config.color.blue_dull; - color5 = config.color.magenta; - color13 = config.color.magenta_dull; - color6 = config.color.cyan; - color14 = config.color.cyan_dull; - color7 = config.color.white; - color15 = config.color.white_dull; + color0 = "#${config.color.black}"; + color8 = "#${config.color.black_dull}"; + color1 = "#${config.color.red}"; + color9 = "#${config.color.red_dull}"; + color2 = "#${config.color.green}"; + color10 = "#${config.color.green_dull}"; + color3 = "#${config.color.yellow}"; + color11 = "#${config.color.yellow_dull}"; + color4 = "#${config.color.blue}"; + color12 = "#${config.color.blue_dull}"; + color5 = "#${config.color.magenta}"; + color13 = "#${config.color.magenta_dull}"; + color6 = "#${config.color.cyan}"; + color14 = "#${config.color.cyan_dull}"; + color7 = "#${config.color.white}"; + color15 = "#${config.color.white_dull}"; - foreground = config.color.foreground; - background = config.color.background; + foreground = "#${config.color.foreground}"; + background = "#${config.color.background}"; background_opacity = "0.92"; - selection_foreground = config.color.background; - selection_background = config.color.foreground; + selection_foreground = "#${config.color.background}"; + selection_background = "#${config.color.foreground}"; - url_color = config.color.magenta; + url_color = "#${config.color.magenta}"; - active_tab_foreground = config.color.green; - active_tab_background = config.color.background; + active_tab_foreground = "#${config.color.green}"; + active_tab_background = "#${config.color.background}"; - inactive_tab_foreground = config.color.background; - inactive_tab_background = config.color.green; + inactive_tab_foreground = "#${config.color.background}"; + inactive_tab_background = "#${config.color.green}"; - tab_bar_background = config.color.green; + tab_bar_background = "#${config.color.green}"; }; font = { diff --git a/rofi/settings.nix b/rofi/settings.nix index 03eb274..e59e4f5 100644 --- a/rofi/settings.nix +++ b/rofi/settings.nix @@ -3,8 +3,8 @@ let inherit (config.home-manager.users.zoe.lib.formats.rasi) mkLiteral; rofi-theme = { "*" = { - background-color = mkLiteral config.color.background; - text-color = mkLiteral config.color.foreground; + background-color = mkLiteral "#${config.color.background}"; + text-color = mkLiteral "#${config.color.background}"; margin = 0; padding = 4; @@ -15,16 +15,16 @@ let width = mkLiteral "100%"; height = mkLiteral "100%"; border = mkLiteral "4px"; - border-color = mkLiteral config.color.green; + border-color = mkLiteral "#${config.color.green}"; }; "element-text" = { - highlight = mkLiteral "underline ${config.color.green}"; + highlight = mkLiteral "underline #${config.color.green}"; }; "element selected" = { border = mkLiteral "4px"; - border-color = mkLiteral config.color.green; + border-color = mkLiteral "#${config.color.green}"; }; }; in diff --git a/variables.nix b/variables.nix index 9fadfee..af6fe00 100644 --- a/variables.nix +++ b/variables.nix @@ -11,75 +11,75 @@ with lib; { }; color.background = mkOption { type = types.str; - default = "#303446"; + default = "303446"; }; color.foreground = mkOption { type = types.str; - default = "#C6D0F5"; + default = "C6D0F5"; }; color.black = mkOption { type = types.str; - default = "#51576D"; + default = "51576D"; }; color.black_dull = mkOption { type = types.str; - default = "#626880"; + default = "626880"; }; color.red = mkOption { type = types.str; - default = "#E78284"; + default = "E78284"; }; color.red_dull = mkOption { type = types.str; - default = "#E78284"; + default = "E78284"; }; color.green = mkOption { type = types.str; - default = "#A6D189"; + default = "A6D189"; }; color.green_dull = mkOption { type = types.str; - default = "#A6D189"; + default = "A6D189"; }; color.yellow = mkOption { type = types.str; - default = "#E5C890"; + default = "E5C890"; }; color.yellow_dull = mkOption { type = types.str; - default = "#E5C890"; + default = "E5C890"; }; color.blue = mkOption { type = types.str; - default = "#8CAAEE"; + default = "8CAAEE"; }; color.blue_dull = mkOption { type = types.str; - default = "#8CAAEE"; + default = "8CAAEE"; }; color.magenta = mkOption { type = types.str; - default = "#F4B8E4"; + default = "F4B8E4"; }; color.magenta_dull = mkOption { type = types.str; - default = "#F4B8E4"; + default = "F4B8E4"; }; color.cyan = mkOption { type = types.str; - default = "#81C8BE"; + default = "81C8BE"; }; color.cyan_dull = mkOption { type = types.str; - default = "#81C8BE"; + default = "81C8BE"; }; color.white = mkOption { type = types.str; - default = "#B5BFE2"; + default = "B5BFE2"; }; color.white_dull = mkOption { type = types.str; - default = "#A5ADCE"; + default = "A5ADCE"; }; }; }