From adcfc52c60de7a3f1f1d3ad367c07a80d3c2666d Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 16:00:41 +0000 Subject: [PATCH 1/4] added submap to taskbar for hyprland :3 --- homes/modules/de/waybar/style.css | 8 +++++++- homes/modules/de/waybar/waybar.nix | 9 ++++++++- homes/modules/wm/hyprland/hypr/keybinds/virtual.conf | 6 +++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/homes/modules/de/waybar/style.css b/homes/modules/de/waybar/style.css index 254e789..54ae077 100644 --- a/homes/modules/de/waybar/style.css +++ b/homes/modules/de/waybar/style.css @@ -37,6 +37,7 @@ tooltip label { #network, #workspaces, #taskbar, +#submap, #cpu, #pulseaudio, #privacy, @@ -74,6 +75,7 @@ right-side modules #cpu, #pulseaudio, #tray, +#submap, #privacy { margin: 4px 0px 4px 4px; } @@ -96,6 +98,10 @@ right-side modules border: none; } +#submap.name { + color: @colorfg; +} + /* connects the workspace and taskbar together :3 */ @@ -114,7 +120,7 @@ right-side modules */ #cpu { - margin: 4px 0 4px 0; + margin: 4px 0 4px 4px; border-radius: 32px 0px 0px 32px; } #memory { diff --git a/homes/modules/de/waybar/waybar.nix b/homes/modules/de/waybar/waybar.nix index 71e1f20..d1da186 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 = ["cpu" "memory" "network" "pulseaudio" "privacy" "tray"]; + modules-right = ["hyprland/submap" "cpu" "memory" "network" "pulseaudio" "privacy" "tray"]; # left "hyprland/workspaces" = { @@ -39,6 +39,13 @@ }; # 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 076c602..d396c7e 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+alt, a, submap, virtual -submap = virtual +bind = $mod+shift, c, submap, cursor +submap = cursor # 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, virtual +bind = , catchall, submap, cursor submap = reset From ff97832d9f9b9d697100cf6ad6e7ddc52ded1d39 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 19:11:14 +0000 Subject: [PATCH 2/4] put servers on 6.12 LTS <3 --- hosts/arcturus/default.nix | 2 +- hosts/lyra/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/arcturus/default.nix b/hosts/arcturus/default.nix index dde69a2..0f2ab89 100644 --- a/hosts/arcturus/default.nix +++ b/hosts/arcturus/default.nix @@ -13,7 +13,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_6_12; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; diff --git a/hosts/lyra/default.nix b/hosts/lyra/default.nix index 28ea912..9a1f982 100644 --- a/hosts/lyra/default.nix +++ b/hosts/lyra/default.nix @@ -13,7 +13,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_6_12; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; From be96d1dbf77faf310dc55a586fb7c693898df715 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 19:12:11 +0000 Subject: [PATCH 3/4] nvme ssd power stage bug? switched to 6.12 on nixarawrui <3 --- hosts/nixarawrui/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index a86e456..4e9c5cd 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: it said my disk was full - kernelPackages = upkgs.linuxPackages_latest; + # FIX: kernel bug + kernelPackages = upkgs.linuxPackages_6_12; kernelModules = ["v4l2loopback"]; # force kernel to use dGPU kernelParams = [ @@ -32,7 +32,10 @@ "video=PCI:0000:03:00.0:e" "initcall_blacklist=simpledrm_platform_driver_init" "fbcon=map:0" - "pci=assign-busses" + + # fixes nvme drive not waking up + # "nvme_core.default_ps_max_latency_us=0" + # "pcie_port_pm=off" ]; extraModulePackages = with kernelPackages; [v4l2loopback]; From 2a66cb0014c665905db28467c1bc8cb697434ed8 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 19:25:28 +0000 Subject: [PATCH 4/4] removed hyprland plugins as scrolling is now in hyprland!! :3 --- flake.lock | 31 -------------------------- flake.nix | 8 +++---- homes/modules/wm/hyprland/hyprland.nix | 20 +++++++---------- 3 files changed, 12 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 3b5e897..0622507 100644 --- a/flake.lock +++ b/flake.lock @@ -702,36 +702,6 @@ "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": [ @@ -1491,7 +1461,6 @@ "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 757fed7..c8d8688 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/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index de7deee..5cd6dc7 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -4,10 +4,6 @@ package = null; portalPackage = null; - plugins = [ - #inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling - ]; - xwayland.enable = true; extraConfig = '' @@ -64,18 +60,18 @@ layout = "dwindle"; }; - plugin = { - # options at https://github.com/hyprwm/hyprland-plugins/tree/main/hyprscrolling - hyprscrolling = { - fullscreen_on_one_column = false; - column_width = 1.0; - }; - }; - dwindle = { preserve_split = true; }; + scrolling = { + fullscreen_on_one_column = true; + column_width = 0.9; + wrap_focus = true; + wrap_swapcol = true; + direction = "right"; + }; + decoration = { rounding = 8;