From b57ed98bbc2a274b0d261399442ec49a3f7cfa4c Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 29 Oct 2024 18:47:55 +0100 Subject: [PATCH] removing dead code and changing cnixpad to latest kernel version --- hosts/cnixpad/modules.nix | 2 +- .../hyprland/toothpick/appearance.nix | 60 --------- .../programs/hyprland/toothpick/default.nix | 44 ------- .../programs/hyprland/toothpick/inputs.nix | 81 ------------ .../programs/hyprland/toothpick/keybinds.nix | 115 ------------------ .../programs/hyprland/toothpick/rules.nix | 59 --------- .../programs/hyprland/toothpick/startup.nix | 29 ----- 7 files changed, 1 insertion(+), 389 deletions(-) delete mode 100644 modules/home/programs/hyprland/toothpick/appearance.nix delete mode 100644 modules/home/programs/hyprland/toothpick/default.nix delete mode 100644 modules/home/programs/hyprland/toothpick/inputs.nix delete mode 100644 modules/home/programs/hyprland/toothpick/keybinds.nix delete mode 100644 modules/home/programs/hyprland/toothpick/rules.nix delete mode 100644 modules/home/programs/hyprland/toothpick/startup.nix diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix index 8f484bac..39f8959d 100644 --- a/hosts/cnixpad/modules.nix +++ b/hosts/cnixpad/modules.nix @@ -5,7 +5,7 @@ extraBlacklistedModules = []; extraKernelParams = []; hardware = "amd"; - variant = "stable"; + variant = "latest"; }; loader = { default = { diff --git a/modules/home/programs/hyprland/toothpick/appearance.nix b/modules/home/programs/hyprland/toothpick/appearance.nix deleted file mode 100644 index f2d0ed85..00000000 --- a/modules/home/programs/hyprland/toothpick/appearance.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - config, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.programs.hyprland.toothpick.appearance; -in { - options = { - home.programs.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; - }; - config = mkIf cfg.enable { - wayland.windowManager.hyprland.settings = { - general = { - gaps_in = 2; - gaps_out = 4; - border_size = 3; - #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - #col.inactive_border = rgba(595959aa) - "col.active_border" = "rgb(4c7a5d)"; # rgba(b16286ee) 45deg - "col.inactive_border" = "rgb(504945)"; - layout = "dwindle"; - allow_tearing = false; - resize_on_border = true; - }; - decoration = { - rounding = 0; - blur = { - enabled = true; - size = 8; - passes = 1; - vibrancy = 0.1696; - }; - drop_shadow = false; - shadow_range = 4; - shadow_render_power = 3; - # col.shadow = rgba(1a1a1aee) - }; - animations = { - enabled = true; - bezier = [ - "myBezier,0.05, 0.9, 0.1, 1.05" - ]; - animation = [ - "windows, 1, 3, myBezier" - "windowsOut, 1, 3, default, popin 80%" - "border, 1, 3, default" - "borderangle, 1, 8, default" - "fade, 1, 7, default" - "workspaces, 1, 3, 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 - }; - }; - }; -} diff --git a/modules/home/programs/hyprland/toothpick/default.nix b/modules/home/programs/hyprland/toothpick/default.nix deleted file mode 100644 index 2a52b9b7..00000000 --- a/modules/home/programs/hyprland/toothpick/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - inputs, - config, - lib, - pkgs, - umodPath, - ... -}: let - inherit (lib) mkIf mkEnableOption mkDefault; - cfg = config.home.programs.hyprland.toothpick; -in { - imports = [ - "${umodPath}/programs/hyprland/toothpick/appearance.nix" - "${umodPath}/programs/hyprland/toothpick/inputs.nix" - "${umodPath}/programs/hyprland/toothpick/keybinds.nix" - "${umodPath}/programs/hyprland/toothpick/rules.nix" - "${umodPath}/programs/hyprland/toothpick/startup.nix" - ]; - - options = { - home.programs.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland"; - }; - - config = mkIf cfg.enable { - home.programs.hyprland.toothpick = { - appearance.enable = mkDefault cfg.enable; - inputs.enable = mkDefault cfg.enable; - keybinds.enable = mkDefault cfg.enable; - rules.enable = mkDefault cfg.enable; - startup.enable = mkDefault cfg.enable; - }; - wayland.windowManager.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.system}.default; - systemd = { - variables = ["--all"]; - extraCommands = [ - "systemctl --user stop graphical-session.target" - "systemctl --user start hyprland-session.target" - ]; - }; - }; - }; -} diff --git a/modules/home/programs/hyprland/toothpick/inputs.nix b/modules/home/programs/hyprland/toothpick/inputs.nix deleted file mode 100644 index f4564c35..00000000 --- a/modules/home/programs/hyprland/toothpick/inputs.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - config, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.programs.hyprland.toothpick.inputs; -in { - options = { - home.programs.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; - }; - config = mkIf cfg.enable { - wayland.windowManager.hyprland.settings = { - monitor = map ( - m: "${m.name},${ - if m.enabled - then "${toString m.width}x${toString m.height}@${toString m.refreshRate},${m.position},1${ - if m.bitDepth != null - then ",bitdepth,${toString m.bitDepth}" - else "" - }" - else "disable" - }" - ) (config.monitors); - workspace = map ( - m: "name:${m.workspace},monitor:${m.name}" - ) (lib.filter (m: m.enabled && m.workspace != null) config.monitors); - - env = [ - "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" - ]; - - input = { - kb_layout = "se"; - kb_variant = "nodeadkeys"; - - follow_mouse = 1; - accel_profile = "flat"; - sensitivity = 0; # -1.0 - 1.0, 0 means no modification. - - touchpad = { - natural_scroll = true; - disable_while_typing = true; - clickfinger_behavior = true; - scroll_factor = 0.5; - }; - }; - gestures = { - workspace_swipe = true; - workspace_swipe_distance = 400; - workspace_swipe_fingers = 3; - workspace_swipe_cancel_ratio = 0.2; - workspace_swipe_min_speed_to_force = 5; - workspace_swipe_direction_lock = true; - workspace_swipe_direction_lock_threshold = 10; - workspace_swipe_create_new = true; - }; - misc = { - vrr = 0; - mouse_move_enables_dpms = 1; - key_press_enables_dpms = 0; - force_default_wallpaper = 0; - disable_hyprland_logo = true; - disable_splash_rendering = true; - }; - xwayland = { - force_zero_scaling = false; - }; - render = { - explicit_sync = 0; - explicit_sync_kms = 0; - direct_scanout = false; - }; - cursor = { - no_hardware_cursors = true; - # no_break_fs_vrr = true; - # min_refresh_rate = 60; - }; - }; - }; -} diff --git a/modules/home/programs/hyprland/toothpick/keybinds.nix b/modules/home/programs/hyprland/toothpick/keybinds.nix deleted file mode 100644 index 744f3927..00000000 --- a/modules/home/programs/hyprland/toothpick/keybinds.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.programs.hyprland.toothpick.keybinds; -in { - options = { - home.programs.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; - }; - config = mkIf cfg.enable { - wayland.windowManager.hyprland.settings = { - "$terminal" = "foot"; - "$fileManager" = "thunar"; - "$passwordManager" = "keepassxc"; - "$tuirun" = "tuirun-toggle.sh"; - "$menu" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --"; - "$browser" = "firefox"; - "$browserinc" = "firefox --private-window"; - "$ranger" = "rangerscript"; - - # See https://wiki.hyprland.org/Configuring/Keywords/ for more - "$mod" = "ALT_L"; - - bind = let - grimblast = lib.getExe pkgs.grimblast; - tesseract = lib.getExe pkgs.tesseract; - notify-send = lib.getExe' pkgs.libnotify "notify-send"; - in [ - # Custom binds - "$mod SHIFT, B, exec, pkill -SIGUSR2 waybar" # Reload waybar - - # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more - "$mod, A, exec, pkill -SIGUSR1 waybar" - "$mod, T, exec, $terminal" - "$mod, W, exec, $browser" - "$mod, K, exec, $passwordManager" - "$mod SHIFT, W, exec, $browserinc" - "$mod, Q, killactive," - #bind = $mod, M, exec, hyprctl dispatch exit - #bind = $mod, E, exec, $fileManager - "$mod, E, exec, $fileManager" - "$mod SHIFT, E, exec, $ranger" - "$mod, F, fullscreen," - "$mod SHIFT, F, togglefloating," - "$mod, SPACE, exec, $tuirun" - "$mod, P, pseudo," # dwindle - "$mod, J, togglesplit," # dwindle - "$mod, C, exec, hyprctl dispatch exec copyq toggle" - - # Move focus with mainMod + arrow keys - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - - # Switch workspaces with mainMod + [0-9] - "$mod, 1, workspace, 1" - "$mod, 2, workspace, 2" - "$mod, 3, workspace, 3" - "$mod, 4, workspace, 4" - "$mod, 5, workspace, 5" - "$mod, 6, workspace, 6" - "$mod, 7, workspace, 7" - "$mod, 8, workspace, 8" - "$mod, 9, workspace, 9" - "$mod, 0, workspace, 10" - - # Move active window to a workspace with mainMod + SHIFT + [0-9] - "$mod SHIFT, 1, movetoworkspace, 1" - "$mod SHIFT, 2, movetoworkspace, 2" - "$mod SHIFT, 3, movetoworkspace, 3" - "$mod SHIFT, 4, movetoworkspace, 4" - "$mod SHIFT, 5, movetoworkspace, 5" - "$mod SHIFT, 6, movetoworkspace, 6" - "$mod SHIFT, 7, movetoworkspace, 7" - "$mod SHIFT, 8, movetoworkspace, 8" - "$mod SHIFT, 9, movetoworkspace, 9" - "$mod SHIFT, 0, movetoworkspace, 10" - - # Laptop controls - ",XF86AudioLowerVolume, exec, pamixer -d 5" - ",XF86AudioRaiseVolume, exec, pamixer -i 5" - ",XF86AudioMute, exec, pamixer -m" - ",XF86AudioMicMute, exec, pactl -- set-source-mute 0 toggle" - ",XF86MonBrightnessDown, exec, brightnessctl s 10%-" - ",XF86MonBrightnessUp, exec, brightnessctl s +10%" - - "$mod, XF86MonBrightnessUp, exec, hyprctl dispatch dpms on" - "$mod, XF86MonBrightnessDown, exec, hyprctl dispatch dpms off" - - # Screenshotting - ",Print,exec,${grimblast} --notify --freeze copysave area" - "SHIFT,Print,exec,${grimblast} --notify --freeze copysave output" - # To OCR - "ALT,Print,exec,${grimblast} --freeze save area - | ${tesseract} - - | wl-copy && ${notify-send} -t 3000 'OCR result copied to buffer'" - - # Example special workspace (scratchpad) - "$mod, S, togglespecialworkspace, magic" - "$mod SHIFT, S, movetoworkspace, special:magic" - - # Scroll through existing workspaces with mainMod + scroll - # bind = $mod, mouse_down, workspace, e+1 - # bind = $mod, mouse_up, workspace, e-1 - ]; - # Move/resize windows with mainMod + LMB/RMB and dragging - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - }; - }; -} diff --git a/modules/home/programs/hyprland/toothpick/rules.nix b/modules/home/programs/hyprland/toothpick/rules.nix deleted file mode 100644 index b0fbdb2b..00000000 --- a/modules/home/programs/hyprland/toothpick/rules.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - config, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.programs.hyprland.toothpick.rules; -in { - options = { - home.programs.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; - }; - config = mkIf cfg.enable { - wayland.windowManager.hyprland.settings = { - # CALCURSE SETTINGS - windowrulev2 = [ - "float,initialTitle:(floatcal)" - "size 843 650,initialTitle:(floatcal)" - "move 100%-w-20 40,initialTitle:(floatcal)" - "float,initialTitle:(tuirun)" - "size 600 300,initialTitle:(tuirun)" - "center,initialTitle:(tuirun)" - # "workspace special:tuirun,initialTitle:(tuirun)" - "noborder,initialTitle:(tuirun)" - #windowrulev2 = move 1708 32,class:(floatcal) - "float,class:(org.keepassxc.KeePassXC)" - "size 843 530,class:(org.keepassxc.KeePassXC)" - "move 100%-w-20 40,class:(org.keepassxc.KeePassXC)" - - # RANGER/NNN SETTINGS - "float,class:(floatranger)" - "float,class:(floatnnn)" - #windowrulev2 = size 843 650,class:(floatranger) - #windowrulev2 = move 1708 32,class:(floatranger) - #windowrulev2 = move 1708 32;size 843 650;dimaround;float,class:^(kitty)$,title:^(kitty)$ - # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - "suppressevent maximize, class:.* # You'll probably like this." - #windowrulev2 = noshadow, floating:0 - "float,class:^(imv)$" - "float,class:^(com.github.hluk.copyq)$" - "float,class:^(blueman-manager)$" - "center,class:^(nwg-look)$" - "float,class:^(nwg-look)$" - "float,class:^(Lxappearance)$" - "float,class:(pavucontrol)$" - "move 100%-w-20 40,class:(pavucontrol)$" - "float,class:^(polkit-gnome-authentication-agent-1)$" - "float,class:^(org.gnome.Calculator)$" - "size 741 585,class:(pavucontrol)$" - "float,class:^(org.corectrl.CoreCtrl)$" - "float,class:^(feh)$" - ]; - windowrule = [ - "center, ^(xarchiver)$" - "float, ^(xarchiver)$" - "float, ^(org.gnome.FileRoller)$" - ]; - }; - }; -} diff --git a/modules/home/programs/hyprland/toothpick/startup.nix b/modules/home/programs/hyprland/toothpick/startup.nix deleted file mode 100644 index 75329ed4..00000000 --- a/modules/home/programs/hyprland/toothpick/startup.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - config, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.programs.hyprland.toothpick.startup; -in { - options = { - home.programs.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; - }; - config = mkIf cfg.enable { - wayland.windowManager.hyprland.settings = { - exec-once = [ - # STARTUP - # exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - "systemctl --user start polkit-gnome-authentication-agent-1" - # exec-once = lxqt-policykit-agent & - "mullvad-vpn" - "pamixer --set-volume 50" - # exec-once = swaybg -i ~/media/images/wallpaper.png - "wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'" - # exec-once = hyprctl dispatch exec "sleep 4s && copyq --start-server" - "hyprctl dispatch exec 'sleep 5s && keepassxc'" - "hyprctl dispatch exec 'sleep 3s && solaar -w hide'" - ]; - }; - }; -}