matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: update to fix hyprland related breaking changes
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-02-19 09:53:55 -05:00
parent db80035e96
commit 0e04478eae
4 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/home/neovim/default.nix
View file

@ -4,14 +4,12 @@
lib, lib,
nvim-theme-src, nvim-theme-src,
coc-stylelintplus, coc-stylelintplus,
tree-sitter-hyprlang,
... ...
}: let }: let
inherit (config.vars) neovimIde; inherit (config.vars) neovimIde;
inherit (lib) fileContents hasAttr optionalAttrs optionals; inherit (lib) fileContents hasAttr optionalAttrs optionals;
javaSdk = pkgs.temurin-bin-17; javaSdk = pkgs.temurin-bin-17;
nvim-treesitter-hyprlang = tree-sitter-hyprlang.packages.${pkgs.system}.default;
coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default; coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default;
in { in {
home = optionalAttrs neovimIde { home = optionalAttrs neovimIde {
@ -258,7 +256,6 @@ in {
++ (with pkgs.vimPlugins; [ ++ (with pkgs.vimPlugins; [
nvim-treesitter-context nvim-treesitter-context
nvim-treesitter-textobjects nvim-treesitter-textobjects
nvim-treesitter-hyprlang
{ {
type = "viml"; type = "viml";
config = fileContents ./plugins/treesitter.vim; config = fileContents ./plugins/treesitter.vim;
@ -288,6 +285,7 @@ in {
p.groovy p.groovy
p.haskell p.haskell
p.haskell_persistent p.haskell_persistent
p.hyprlang
p.html p.html
p.ini p.ini
p.java p.java

BIN
flake.lock
View file

Binary file not shown.

BIN
flake.nix
View file

Binary file not shown.

63
modules/hyprland/inputs.nix
View file

@ -3,51 +3,52 @@
osConfig, osConfig,
... ...
}: let }: let
inherit (lib) genAttrs optionals; inherit (lib) optionals;
inherit (osConfig.services.xserver) xkb; inherit (osConfig.services.xserver) xkb;
inherit (osConfig.vars) mainMonitor; inherit (osConfig.vars) mainMonitor;
nagaProNames = [ nagaProNames = [
# Wireless # Wireless
"device:razer-razer-naga-pro" "razer-razer-naga-pro"
# Wired (it always changes) # Wired (it always changes)
"device:razer-razer-naga-pro-1" "razer-razer-naga-pro-1"
"device:razer-naga-pro" "razer-naga-pro"
"device:razer-naga-pro-1" "razer-naga-pro-1"
"device:razer-naga-pro-2" "razer-naga-pro-2"
"device:razer-naga-pro-3" "razer-naga-pro-3"
]; ];
nagaConf = { nagaConf = name: {
inherit name;
sensitivity = 0; sensitivity = 0;
accel_profile = "flat";
}; };
in { in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = device = map (d: (nagaConf d)) nagaProNames;
(genAttrs nagaProNames (n: nagaConf))
// {
input = {
kb_layout = xkb.layout;
kb_variant = xkb.variant;
follow_mouse = true;
accel_profile = "flat";
touchpad = { settings = {
natural_scroll = true; input = {
disable_while_typing = false; kb_layout = xkb.layout;
}; kb_variant = xkb.variant;
follow_mouse = true;
touchpad = {
natural_scroll = true;
disable_while_typing = false;
}; };
bind = [
",XF86AudioPlay, exec, playerctl play-pause"
",XF86AudioStop, exec, playerctl stop"
",XF86AudioNext, exec, playerctl next"
",XF86AudioPrev, exec, playerctl previous"
];
exec-once =
optionals (! isNull mainMonitor)
["hyprctl dispatch focusmonitor ${mainMonitor}"];
}; };
bind = [
",XF86AudioPlay, exec, playerctl play-pause"
",XF86AudioStop, exec, playerctl stop"
",XF86AudioNext, exec, playerctl next"
",XF86AudioPrev, exec, playerctl previous"
];
exec-once =
optionals (! isNull mainMonitor)
["hyprctl dispatch focusmonitor ${mainMonitor}"];
};
}; };
} }