From ddd17455501426bbafc6e01d1b587062cd01aa39 Mon Sep 17 00:00:00 2001 From: Ahurac Date: Tue, 15 Oct 2024 10:46:36 +0200 Subject: [PATCH] feat: delete hyprland related stuff --- ahrc-laptop/home.nix | 30 ------ ahrc-pc/home.nix | 18 ---- common/configuration.nix | 1 - common/home.nix | 207 +-------------------------------------- 4 files changed, 1 insertion(+), 255 deletions(-) diff --git a/ahrc-laptop/home.nix b/ahrc-laptop/home.nix index 8e60667..0a614b5 100644 --- a/ahrc-laptop/home.nix +++ b/ahrc-laptop/home.nix @@ -13,36 +13,6 @@ }; }; - wayland.windowManager.hyprland = { - settings = { - "$col_accentdark" = "rgb(00ff00)"; - "$col_accentlight" = "rgb(80ff80)"; - "$col_inactive" = "rgba(80808040)"; - "$col_urgent" = "rgb(ffd966)"; - - animations = { enabled = false; }; - decoration = { - inactive_opacity = 1.0; - drop_shadow = false; - blur.enabled = false; - }; - gestures.workspace_swipe = true; - input.kb_layout = "fr"; - input.touchpad = { - disable_while_typing = false; - natural_scroll = true; - }; - misc.animate_manual_resizes = false; - bindel = [ - ", XF86AudioRaiseVolume, exec, swayosd-client --output-volume=raise" - ", XF86AudioLowerVolume, exec, swayosd-client --output-volume=lower" - ", XF86AudioMute, exec, swayosd-client --output-volume=mute-toggle" - ", XF86MonBrightnessUp, exec, swayosd-client --brightness=raise" - ", XF86MonBrightnessDown, exec, swayosd-client --brightness=lower" - ]; - }; - }; - programs.niri.settings = { input = { keyboard.xkb.layout = "fr"; diff --git a/ahrc-pc/home.nix b/ahrc-pc/home.nix index 48d5aee..85ef1b1 100644 --- a/ahrc-pc/home.nix +++ b/ahrc-pc/home.nix @@ -11,24 +11,6 @@ }; }; - wayland.windowManager.hyprland = { - settings = { - "$col_accentdark" = "rgb(9933ff)"; - "$col_accentlight" = "rgb(d966ff)"; - "$col_inactive" = "rgba(80808080)"; - - animations.enabled = true; - decoration = { - inactive_opacity = 0.9; - drop_shadow = true; - blur.enabled = true; - }; - input.kb_layout = "us"; - gestures.workspace_swipe = false; - misc.animate_manual_resizes = true; - }; - }; - programs.niri.settings = { input.keyboard.xkb.layout = "us"; outputs."HDMI-1".scale = 1; diff --git a/common/configuration.nix b/common/configuration.nix index 3ba6bb5..f0e9bd9 100644 --- a/common/configuration.nix +++ b/common/configuration.nix @@ -40,7 +40,6 @@ services.libinput.enable = true; services.flatpak.enable = true; - programs.hyprland.enable = true; programs.zsh.enable = true; virtualisation.libvirtd = { diff --git a/common/home.nix b/common/home.nix index 46e07b1..2645fe2 100644 --- a/common/home.nix +++ b/common/home.nix @@ -31,7 +31,6 @@ texliveFull bash-language-server shfmt - hyprnotify libnotify ldns @@ -174,210 +173,6 @@ ''; }; - wayland.windowManager.hyprland = { - enable = true; - plugins = [ pkgs.hyprlandPlugins.hy3 ]; - settings = { - monitor = ", highrr, 0x0, 1"; - - "$col_urgent" = "rgb(ffd966)"; - "$terminal" = "kitty"; - "$browser" = "firefox"; - "$locker" = "hyprlock"; - "$launcher" = "anyrun"; - "$joplin" = "flatpak run net.cozic.joplin_desktop"; - "$matrix_client" = "flatpak run im.riot.Riot"; - "$discord" = "flatpak run io.github.spacingbat3.webcord"; - "$deezer" = "flatpak run dev.aunetx.deezer"; - - exec-once = [ "swayosd-server" "hyprnotify" ]; - - binds = { - scroll_event_delay = 0; - workspace_back_and_forth = false; - allow_workspace_cycles = false; - workspace_center_on = 1; - focus_preferred_method = 1; - movefocus_cycles_fullscreen = false; - }; - decoration = { - dim_inactive = false; - rounding = 10; - active_opacity = 1.0; - fullscreen_opacity = 1.0; - }; - general = { - border_size = 2; - "col.inactive_border" = "$col_inactive"; - "col.nogroup_border" = "$col_inactive"; - "col.active_border" = "$col_accentdark $col_accentlight 90deg"; - resize_on_border = false; - gaps_in = 5; - gaps_out = 10; - gaps_workspaces = 0; - layout = "hy3"; - no_focus_fallback = true; - }; - input = { - numlock_by_default = true; - repeat_rate = 75; - repeat_delay = 300; - kb_options = "compose:rctrl"; - sensitivity = 0.0; - accel_profile = "flat"; - }; - misc = { - disable_hyprland_logo = false; - disable_splash_rendering = false; - layers_hog_keyboard_focus = true; - mouse_move_focuses_monitor = true; - enable_swallow = false; - close_special_on_empty = true; - new_window_takes_over_fullscreen = 2; - }; - plugin.hy3 = { - no_gaps_when_only = false; - node_collapse_policy = 0; - tabs = { - height = 5; - padding = 5; - from_top = true; - rounding = 4; - render_text = false; - "col.active" = "$col_accentdark"; - "col.urgent" = "$col_urgent"; - "col.inactive" = "$col_inactive"; - }; - autotile.enable = true; - }; - xwayland = { force_zero_scaling = true; }; - - env = [ - "QT_QPA_PLATFORM, wayland" - "QT_AUTO_SCREEN_SCALE_FACTOR, 1" - "QT_WAYLAND_DISABLE_WINDOWDECORATION, 1" - "CLUTTER_BACKEND, wayland" - "SDL_VIDEODRIVER, wayland" - "ELM_DISPLAY, wl" - "_JAVA_AWT_WM_NONREPARENTING, 1" - "XDG_SESSION_DESKTOP, Hyprland" - "ELECTRON_OZONE_PLATFORM_HINT, auto" - "HYPRCURSOR_THEME, bibata_modern_ice-hyprcursor" - ]; - - bind = [ - "SUPER, Space, exec, $terminal" - "SUPER SHIFT, Space, exec, $terminal -e sudo -i" - "SUPER, 10, workspace, 1" - "SUPER, 11, workspace, 2" - "SUPER, 12, workspace, 3" - "SUPER, 13, workspace, 4" - "SUPER, R, workspace, 5" - "SUPER, F, workspace, 6" - "SUPER, V, workspace, 7" - "SUPER, C, workspace, 8" - "SUPER, X, workspace, 9" - "SUPER, W, workspace, 10" - "SUPER, mouse_down, workspace, e-1" - "SUPER, mouse_up, workspace, e+1" - "SUPER SHIFT, Q, hy3:killactive" - "SUPER SHIFT, 10, movetoworkspacesilent, 1" - "SUPER SHIFT, 11, movetoworkspacesilent, 2" - "SUPER SHIFT, 12, movetoworkspacesilent, 3" - "SUPER SHIFT, 13, movetoworkspacesilent, 4" - "SUPER SHIFT, R, movetoworkspacesilent, 5" - "SUPER SHIFT, F, movetoworkspacesilent, 6" - "SUPER SHIFT, V, movetoworkspacesilent, 7" - "SUPER SHIFT, C, movetoworkspacesilent, 8" - "SUPER SHIFT, X, movetoworkspacesilent, 9" - "SUPER SHIFT, W, movetoworkspacesilent, 10" - "SUPER SHIFT, A, hy3:movewindow, l" - "SUPER SHIFT, Z, hy3:movewindow, u" - "SUPER SHIFT, S, hy3:movewindow, d" - "SUPER SHIFT, D, hy3:movewindow, r" - "SUPER SHIFT, Return, togglefloating" - "SUPER Alt_L, F, fullscreen" - "SUPER, A, hy3:movefocus, l" - "SUPER, Z, hy3:movefocus, u" - "SUPER, S, hy3:movefocus, d" - "SUPER, D, hy3:movefocus, r" - "SUPER, Q, hy3:makegroup, tab, force_ephemeral" - "SUPER, E, hy3:changegroup, opposite" - "SUPER, B, hy3:changegroup, toggletab" - "SUPER SHIFT, BackSpace, exit" - "SUPER, F1, exec, $launcher" - "SUPER, F2, exec, $joplin" - "SUPER, F3, exec, $matrix_client" - "SUPER, F4, exec, $discord" - "SUPER, F5, exec, $deezer" - "SUPER, G, exec, $browser" - "SUPER, L, exec, $locker" - ]; - bindm = - [ "SUPER, mouse:272, movewindow" "SUPER, mouse:273, resizewindow" ]; - bindn = [ - ", mouse:272, hy3:focustab, mouse" - ", mouse_up, hy3:focustab, r, require_hovered, wrap" - ", mouse_down, hy3:focustab, l, require_hovered, wrap" - ]; - }; - - extraConfig = '' - submap = resize - bind = , escape, submap, reset - bind = SUPER Alt_L, R, submap, reset - binde = , A, resizeactive, -25 0 - binde = , Z, resizeactive, 0 -25 - binde = , S, resizeactive, 0 25 - binde = , D, resizeactive, 25 0 - submap = reset - bind = SUPER Alt_L, R, submap, resize - ''; - }; - - programs.hyprlock = { - enable = true; - settings = { - general = { - disable_loading_bar = true; - hide_cursor = true; - grace = 0; - no_fade_in = true; - no_fade_out = true; - ignore_empty_input = true; - text_trim = true; - fractional_scaling = 2; - }; - - label = { - monitor = ""; - halign = "left"; - valign = "bottom"; - position = "50, 50"; - font_size = 64; - font_family = "Noto Sans"; - text = - ''cmd[update:1000] printf '%s' "$(date +%Y-%m-%d%n%H:%M:%S)"''; - }; - - background = { - monitor = ""; - path = "screenshot"; - blur_passes = 5; - blur_size = 1; - }; - - input-field = { - monitor = ""; - size = "700, 50"; - outline_thickness = 5; - outer_color = "rgba(0, 0, 0, 0)"; - dots_size = 0.5; - placeholder_text = ""; - fail_text = ""; - }; - }; - }; programs.anyrun = { enable = true; @@ -540,7 +335,7 @@ "Mod+Space".action = spawn "alacritty"; "Mod+Shift+Space".action = spawn "alacritty -e sudo -i"; "Mod+F1".action = spawn "anyrun"; - "Mod+L".action = spawn "hyprlock"; + "Mod+L".action = spawn "swaylock"; "Mod+Shift+Q".action = close-window; "Mod+A".action = focus-column-left; "Mod+Z".action = focus-window-or-workspace-up;