fix: update to fix hyprland related breaking changes
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
db80035e96
commit
0e04478eae
4 changed files with 40 additions and 107 deletions
|
@ -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
|
||||||
|
|
66
flake.lock
66
flake.lock
|
@ -283,24 +283,6 @@
|
||||||
"type": "github"
|
"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": {
|
"git-theme-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -416,15 +398,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708294481,
|
"lastModified": 1708354127,
|
||||||
"narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=",
|
"narHash": "sha256-upcUfwI5BDrM4AoyJNYqeatGcFMOVJc1zAlPNwe5EFk=",
|
||||||
"owner": "nix-community",
|
"owner": "matt1432",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438",
|
"rev": "c64bd6d784d4eb4ab69fd5b9a6535ed9789c8c2f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "matt1432",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -1290,7 +1272,6 @@
|
||||||
"spotifywm-src": "spotifywm-src",
|
"spotifywm-src": "spotifywm-src",
|
||||||
"touch-gestures-src": "touch-gestures-src",
|
"touch-gestures-src": "touch-gestures-src",
|
||||||
"trash-d-src": "trash-d-src",
|
"trash-d-src": "trash-d-src",
|
||||||
"tree-sitter-hyprlang": "tree-sitter-hyprlang",
|
|
||||||
"xresources-theme-src": "xresources-theme-src"
|
"xresources-theme-src": "xresources-theme-src"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -1429,21 +1410,6 @@
|
||||||
"type": "github"
|
"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": {
|
"touch-gestures-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -1476,28 +1442,6 @@
|
||||||
"type": "github"
|
"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": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
14
flake.nix
14
flake.nix
|
@ -93,7 +93,8 @@
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
type = "github";
|
type = "github";
|
||||||
owner = "nix-community";
|
# FIXME: wait for https://github.com/nix-community/home-manager/pull/5038
|
||||||
|
owner = "matt1432";
|
||||||
repo = "home-manager";
|
repo = "home-manager";
|
||||||
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
@ -222,17 +223,6 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
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
|
# Nix tools
|
||||||
nurl = {
|
nurl = {
|
||||||
type = "github";
|
type = "github";
|
||||||
|
|
|
@ -3,34 +3,35 @@
|
||||||
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))
|
|
||||||
// {
|
settings = {
|
||||||
input = {
|
input = {
|
||||||
kb_layout = xkb.layout;
|
kb_layout = xkb.layout;
|
||||||
kb_variant = xkb.variant;
|
kb_variant = xkb.variant;
|
||||||
follow_mouse = true;
|
follow_mouse = true;
|
||||||
accel_profile = "flat";
|
|
||||||
|
|
||||||
touchpad = {
|
touchpad = {
|
||||||
natural_scroll = true;
|
natural_scroll = true;
|
||||||
|
|
Loading…
Reference in a new issue