From ec6533a7825dce97ed2828b391c5ac668316cfbd Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Tue, 24 Jan 2023 11:37:03 +0530 Subject: [PATCH] wayland: add initial config for hyprland and XDPH and implement new colors Signed-off-by: Amneesh Singh --- home/natto/config/foot/foot.ini | 26 +++++ home/natto/config/hypr/hyprland.conf | 147 +++++++++++++++++++++++++++ home/natto/default.nix | 1 + home/natto/gtk.nix | 18 ++++ home/natto/programs.nix | 30 +++++- home/natto/wayland.nix | 3 +- hosts/modules/sound.nix | 9 +- hosts/satori/wayland.nix | 8 ++ 8 files changed, 231 insertions(+), 11 deletions(-) create mode 100644 home/natto/config/foot/foot.ini create mode 100644 home/natto/config/hypr/hyprland.conf create mode 100644 home/natto/gtk.nix create mode 100644 hosts/satori/wayland.nix diff --git a/home/natto/config/foot/foot.ini b/home/natto/config/foot/foot.ini new file mode 100644 index 0000000..7219506 --- /dev/null +++ b/home/natto/config/foot/foot.ini @@ -0,0 +1,26 @@ +[colors] +background=11111B +bright0=585B70 +bright1=F38BA8 +bright2=A6E3A1 +bright3=F9E2AF +bright4=89B4FA +bright5=F5C2E7 +bright6=94E2D5 +bright7=A6ADC8 +foreground=CDD6F4 +regular0=45475A +regular1=F38BA8 +regular2=A6E3A1 +regular3=F9E2AF +regular4=89B4FA +regular5=F5C2E7 +regular6=94E2D5 +regular7=BAC2DE + +[main] +font=Fira Mono:style=Regular:pixelsize=12 +font-bold=Fira Mono:style=Bold:pixelsize=12 + +[scrollback] +lines=4000 diff --git a/home/natto/config/hypr/hyprland.conf b/home/natto/config/hypr/hyprland.conf new file mode 100644 index 0000000..6e64285 --- /dev/null +++ b/home/natto/config/hypr/hyprland.conf @@ -0,0 +1,147 @@ +exec-once=/nix/store/x6xkqqa5caslrmbz36m2hxg5b3pzzydy-dbus-1.14.4/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && systemctl --user start hyprland-session.target +monitor=,preferred,auto,1 +input { + kb_layout = us + kb_variant = colemak_dh + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = yes + } + + repeat_delay = 300 +} + +general { + gaps_in = 5 + gaps_out = 10 + border_size = 2 + + # home-manager is going to override these + col.active_border = rgba(b4befeee) rgba(f5c2e7ff) 135deg + col.inactive_border = rgba(595959ff) + + layout = dwindle +} + +decoration { + rounding = 1 + blur = yes + blur_size = 6 + blur_passes = 1 + blur_new_optimizations = on + blur_xray = yes + drop_shadow = yes + inactive_opacity = 0.8 +} + +animations { + enabled = yes + + bezier =overshot,0.01, 0.9, 0.1, 1.05 + bezier =easeoutexpo,0.16, 1, 0.3, 1 + + animation = windows, 1, 7, overshot, popin 50% + animation = windowsOut, 1, 7, easeoutexpo, popin 50% + animation = border, 1, 10, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, overshot +} + +dwindle { + pseudotile = yes + preserve_split = yes +} + +master { + new_is_master = false +} + +gestures { + workspace_swipe = off +} + +$mainMod = SUPER + +binde=$mainMod, RETURN, exec, foot +bindr=SUPER, D, exec, pkill wofi || wofi + +bind=$mainMod, P, exec, mpc toggle +bind=, XF86AudioNext, exec, mpc seek +00:00:05 +bind=, XF86AudioPrev, exec, mpc seek -00:00:05 +bind=$mainMod, XF86AudioNext, exec, mpc next +bind=$mainMod, XF86AudioPrev, exec, mpc prev +binde=, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ +bindl=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bind=,XF86AudioMute,exec,wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle + +binde=, XF86MonBrightnessUp, exec, light -A 5 +binde=, XF86MonBrightnessDown, exec, light -U 5 + +bind=$mainMod SHIFT, F1, exec, setxkbmap us colemak_dh +bind=$mainMod SHIFT, F2, exec, setxkbmap us basic +bind=$mainMod SHIFT, F3, exec, setxkbmap in deva +bind=$mainMod SHIFT, F4, exec, setxkbmap in guru +bind=$mainMod SHIFT, F5, exec, setxkbmap colemak dhz + +binde=$mainMod SHIFT, Q, killactive, +bind=$mainMod ALT, e, exit, +bind=$mainMod SHIFT, t, pseudo, +bind=$mainMod, f, fullscreen, +bind=$mainMod, t, togglefloating, + +bindm=SUPER, mouse:272, movewindow +bindm=SUPER, mouse:273, resizewindow + +bind=$mainMod, left, movefocus, l +bind=$mainMod, m, movefocus, l +bind=$mainMod, right, movefocus, r +bind=$mainMod, i, movefocus, r +bind=$mainMod, up, movefocus, u +bind=$mainMod, e, movefocus, u +bind=$mainMod, down, movefocus, d +bind=$mainMod, n, movefocus, d + +binde=$mainMod SHIFT, left, movewindow, l +binde=$mainMod SHIFT, m, movewindow, l +binde=$mainMod SHIFT, right, movewindow, r +binde=$mainMod SHIFT, i, movewindow, r +binde=$mainMod SHIFT, up, movewindow, u +binde=$mainMod SHIFT, e, movewindow, u +binde=$mainMod SHIFT, down, movewindow, d +binde=$mainMod SHIFT, n, movewindow, d + +binde=SHIFT ALT, left, resizeactive, -10 0 +binde=SHIFT ALT, m, resizeactive, -10 0 +binde=SHIFT ALT, right, resizeactive, 10 0 +binde=SHIFT ALT, i, resizeactive, 10 0 +binde=SHIFT ALT, up, resizeactive, 0 -10 +binde=SHIFT ALT, e, resizeactive, 0 -10 +binde=SHIFT ALT, down, resizeactive, 0 10 +binde=SHIFT ALT, n, resizeactive, 0 10 + +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 + +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 diff --git a/home/natto/default.nix b/home/natto/default.nix index fbb2aba..09c21d6 100644 --- a/home/natto/default.nix +++ b/home/natto/default.nix @@ -14,6 +14,7 @@ ./pkgs.nix ./stuff.nix ./emacs.nix + ./gtk.nix ./dunst.nix ./git.nix ./mpd.nix diff --git a/home/natto/gtk.nix b/home/natto/gtk.nix new file mode 100644 index 0000000..05f16b3 --- /dev/null +++ b/home/natto/gtk.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: +{ + gtk = { + enable = true; + theme = { + name = "Catppuccin-Mocha-Standard-Teal-Dark"; + package = pkgs.catppuccin-gtk.override { + accents = [ "teal" ]; + variant = "mocha"; + }; + }; + iconTheme = { + package = pkgs.zafiro-icons; + name = "Zafiro-icons-Dark"; + }; + }; + qt.platformTheme = "gtk"; +} diff --git a/home/natto/programs.nix b/home/natto/programs.nix index 737d5de..155a0a4 100644 --- a/home/natto/programs.nix +++ b/home/natto/programs.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, config, colors, ... }: { programs = { home-manager.enable = true; @@ -25,7 +25,33 @@ password-store.enable = true; direnv.enable = true; foot = { - enable = false; + enable = true; + settings = { + main = { + font = "Fira Mono:style=Regular:pixelsize=18"; + font-bold = "Fira Mono:style=Bold:pixelsize=18"; + }; + scrollback.lines = 4000; + colors = with colors.default; { + inherit foreground background; + regular0 = surface1; + regular1 = red; + regular2 = green; + regular3 = yellow; + regular4 = blue; + regular5 = pink; + regular6 = teal; + regular7 = subtext1; + bright0 = surface2; + bright1 = red; + bright2 = green; + bright3 = yellow; + bright4 = blue; + bright5 = pink; + bright6 = teal; + bright7 = subtext0; + }; + }; }; }; } diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix index 6968b77..e39106c 100644 --- a/home/natto/wayland.nix +++ b/home/natto/wayland.nix @@ -6,12 +6,13 @@ enable = true; }; hyprland = { - enable = false; + enable = true; xwayland = { enable = true; hidpi = true; }; nvidiaPatches = true; + extraConfig = builtins.readFile ./config/hypr/hyprland.conf; }; }; }; diff --git a/hosts/modules/sound.nix b/hosts/modules/sound.nix index df0bb30..c002579 100644 --- a/hosts/modules/sound.nix +++ b/hosts/modules/sound.nix @@ -9,8 +9,8 @@ support32Bit = true; }; pulse.enable = true; - # jack.enable = true; socketActivation = true; + wireplumber.enable = true; config.pipewire = { context.objects = [ @@ -78,11 +78,4 @@ }; }; sound.enable = true; - /* hardware = { - pulseaudio = { - enable = true; - support32Bit = true; - package = pkgs.pulseaudio.override { jackaudioSupport = true; }; - }; - };*/ } diff --git a/hosts/satori/wayland.nix b/hosts/satori/wayland.nix new file mode 100644 index 0000000..59d78b3 --- /dev/null +++ b/hosts/satori/wayland.nix @@ -0,0 +1,8 @@ +{ inputs, pkgs, ... }: + +{ + xdg.portal = { + enable = true; + extraPortals = [ inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; + }; +}