diff --git a/flake.lock b/flake.lock index 0622507..3b5e897 100644 --- a/flake.lock +++ b/flake.lock @@ -702,6 +702,36 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland-git" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1771865848, + "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -1461,6 +1491,7 @@ "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", + "hyprland-plugins": "hyprland-plugins", "iamb": "iamb", "mango": "mango", "microvm": "microvm_2", diff --git a/flake.nix b/flake.nix index c8d8688..757fed7 100644 --- a/flake.nix +++ b/flake.nix @@ -40,10 +40,10 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - # hyprland-plugins = { - # url = "github:hyprwm/hyprland-plugins"; - # inputs.hyprland.follows = "hyprland-git"; - # }; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland-git"; + }; mango = { url = "github:DreamMaoMao/mangowc"; diff --git a/homes/modules/de/waybar/style.css b/homes/modules/de/waybar/style.css index 54ae077..254e789 100644 --- a/homes/modules/de/waybar/style.css +++ b/homes/modules/de/waybar/style.css @@ -37,7 +37,6 @@ tooltip label { #network, #workspaces, #taskbar, -#submap, #cpu, #pulseaudio, #privacy, @@ -75,7 +74,6 @@ right-side modules #cpu, #pulseaudio, #tray, -#submap, #privacy { margin: 4px 0px 4px 4px; } @@ -98,10 +96,6 @@ right-side modules border: none; } -#submap.name { - color: @colorfg; -} - /* connects the workspace and taskbar together :3 */ @@ -120,7 +114,7 @@ right-side modules */ #cpu { - margin: 4px 0 4px 4px; + margin: 4px 0 4px 0; border-radius: 32px 0px 0px 32px; } #memory { diff --git a/homes/modules/de/waybar/waybar.nix b/homes/modules/de/waybar/waybar.nix index d1da186..71e1f20 100644 --- a/homes/modules/de/waybar/waybar.nix +++ b/homes/modules/de/waybar/waybar.nix @@ -8,7 +8,7 @@ height = 20; modules-left = ["hyprland/workspaces" "wlr/taskbar" "custom/media"]; modules-center = ["clock"]; - modules-right = ["hyprland/submap" "cpu" "memory" "network" "pulseaudio" "privacy" "tray"]; + modules-right = ["cpu" "memory" "network" "pulseaudio" "privacy" "tray"]; # left "hyprland/workspaces" = { @@ -39,13 +39,6 @@ }; # right - "hyprland/submap" = { - format = "{}"; - # always-on = true; - # default-submap = "normal"; - max-length = 12; - tooltip = false; - }; "cpu" = { format = " {usage}%"; interval = 1; diff --git a/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf b/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf index d396c7e..076c602 100644 --- a/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf +++ b/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf @@ -1,7 +1,7 @@ # a submap for emulating keys/buttons/functions on the keyboard or mouse -bind = $mod+shift, c, submap, cursor -submap = cursor +bind = $mod+shift+alt, a, submap, virtual +submap = virtual # exit submap bind = , escape, submap, reset @@ -38,6 +38,6 @@ binde = alt, e, exec, wlrctl pointer scroll -15 0 # scroll left binde = alt, y, exec, wlrctl pointer scroll 0 15 # scroll right # catches all other keys and keeps us in the submap -bind = , catchall, submap, cursor +bind = , catchall, submap, virtual submap = reset diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index 5cd6dc7..de7deee 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -4,6 +4,10 @@ package = null; portalPackage = null; + plugins = [ + #inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling + ]; + xwayland.enable = true; extraConfig = '' @@ -60,16 +64,16 @@ layout = "dwindle"; }; - dwindle = { - preserve_split = true; + plugin = { + # options at https://github.com/hyprwm/hyprland-plugins/tree/main/hyprscrolling + hyprscrolling = { + fullscreen_on_one_column = false; + column_width = 1.0; + }; }; - scrolling = { - fullscreen_on_one_column = true; - column_width = 0.9; - wrap_focus = true; - wrap_swapcol = true; - direction = "right"; + dwindle = { + preserve_split = true; }; decoration = { diff --git a/hosts/arcturus/default.nix b/hosts/arcturus/default.nix index 0f2ab89..dde69a2 100644 --- a/hosts/arcturus/default.nix +++ b/hosts/arcturus/default.nix @@ -13,7 +13,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_6_12; + kernelPackages = pkgs.linuxPackages_latest; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; diff --git a/hosts/lyra/default.nix b/hosts/lyra/default.nix index 9a1f982..28ea912 100644 --- a/hosts/lyra/default.nix +++ b/hosts/lyra/default.nix @@ -13,7 +13,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_6_12; + kernelPackages = pkgs.linuxPackages_latest; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 4e9c5cd..a86e456 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -23,8 +23,8 @@ # kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4; # TODO: idk make this a toggle or smth idfk # kernelPackages = upkgs.linuxPackages_zen; - # FIX: kernel bug - kernelPackages = upkgs.linuxPackages_6_12; + # FIX: it said my disk was full + kernelPackages = upkgs.linuxPackages_latest; kernelModules = ["v4l2loopback"]; # force kernel to use dGPU kernelParams = [ @@ -32,10 +32,7 @@ "video=PCI:0000:03:00.0:e" "initcall_blacklist=simpledrm_platform_driver_init" "fbcon=map:0" - - # fixes nvme drive not waking up - # "nvme_core.default_ps_max_latency_us=0" - # "pcie_port_pm=off" + "pci=assign-busses" ]; extraModulePackages = with kernelPackages; [v4l2loopback];