Compare commits
4 commits
7ff6be7692
...
2a66cb0014
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a66cb0014 | |||
| be96d1dbf7 | |||
| ff97832d9f | |||
| adcfc52c60 |
9 changed files with 38 additions and 57 deletions
31
flake.lock
generated
31
flake.lock
generated
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelPackages = pkgs.linuxPackages_6_12;
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelPackages = pkgs.linuxPackages_6_12;
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue