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

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

66
flake.lock
View file

@ -283,24 +283,6 @@
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-theme-src": {
"flake": false,
"locked": {
@ -416,15 +398,15 @@
]
},
"locked": {
"lastModified": 1708294481,
"narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=",
"owner": "nix-community",
"lastModified": 1708354127,
"narHash": "sha256-upcUfwI5BDrM4AoyJNYqeatGcFMOVJc1zAlPNwe5EFk=",
"owner": "matt1432",
"repo": "home-manager",
"rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438",
"rev": "c64bd6d784d4eb4ab69fd5b9a6535ed9789c8c2f",
"type": "github"
},
"original": {
"owner": "nix-community",
"owner": "matt1432",
"repo": "home-manager",
"type": "github"
}
@ -1290,7 +1272,6 @@
"spotifywm-src": "spotifywm-src",
"touch-gestures-src": "touch-gestures-src",
"trash-d-src": "trash-d-src",
"tree-sitter-hyprlang": "tree-sitter-hyprlang",
"xresources-theme-src": "xresources-theme-src"
}
},
@ -1429,21 +1410,6 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"touch-gestures-src": {
"flake": false,
"locked": {
@ -1476,28 +1442,6 @@
"type": "github"
}
},
"tree-sitter-hyprlang": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1705683253,
"narHash": "sha256-x7l6V93lq6SLThLrJa2fLdEUyOOjE3dNu3FWkARZAhA=",
"owner": "luckasRanarison",
"repo": "tree-sitter-hyprlang",
"rev": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee",
"type": "github"
},
"original": {
"owner": "luckasRanarison",
"repo": "tree-sitter-hyprlang",
"rev": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [

14
flake.nix
View file

@ -93,7 +93,8 @@
home-manager = {
type = "github";
owner = "nix-community";
# FIXME: wait for https://github.com/nix-community/home-manager/pull/5038
owner = "matt1432";
repo = "home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@ -222,17 +223,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
tree-sitter-hyprlang = {
type = "github";
owner = "luckasRanarison";
repo = "tree-sitter-hyprlang";
# FIXME: remove this input once hyprlang makes it to nixpkgs
rev = "e60fc858e6327a15c0b26f99ec96945fecd1e4ee";
inputs.nixpkgs.follows = "nixpkgs";
};
# Nix tools
nurl = {
type = "github";

63
modules/hyprland/inputs.nix
View file

@ -3,51 +3,52 @@
osConfig,
...
}: let
inherit (lib) genAttrs optionals;
inherit (lib) optionals;
inherit (osConfig.services.xserver) xkb;
inherit (osConfig.vars) mainMonitor;
nagaProNames = [
# Wireless
"device:razer-razer-naga-pro"
"razer-razer-naga-pro"
# Wired (it always changes)
"device:razer-razer-naga-pro-1"
"device:razer-naga-pro"
"device:razer-naga-pro-1"
"device:razer-naga-pro-2"
"device:razer-naga-pro-3"
"razer-razer-naga-pro-1"
"razer-naga-pro"
"razer-naga-pro-1"
"razer-naga-pro-2"
"razer-naga-pro-3"
];
nagaConf = {
nagaConf = name: {
inherit name;
sensitivity = 0;
accel_profile = "flat";
};
in {
wayland.windowManager.hyprland = {
settings =
(genAttrs nagaProNames (n: nagaConf))
// {
input = {
kb_layout = xkb.layout;
kb_variant = xkb.variant;
follow_mouse = true;
accel_profile = "flat";
device = map (d: (nagaConf d)) nagaProNames;
touchpad = {
natural_scroll = true;
disable_while_typing = false;
};
settings = {
input = {
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}"];
};
};
}