mirror of
https://github.com/Theaninova/TheaninovOS.git
synced 2026-02-18 06:22:42 +00:00
Compare commits
13 Commits
de9477ad84
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
1a1211a8fa
|
|||
|
eed1fb7e13
|
|||
|
4e8a6e0136
|
|||
|
04e918cc38
|
|||
|
86e0491a97
|
|||
|
7a30d561c0
|
|||
|
e3e1d93b99
|
|||
|
648380f91b
|
|||
|
6cb301eb81
|
|||
|
63a657fc84
|
|||
|
a8528b7fcd
|
|||
|
0b0b568916
|
|||
|
02103e2585
|
143
flake.lock
generated
143
flake.lock
generated
@@ -24,11 +24,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"lastModified": 1765835352,
|
||||
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -37,24 +37,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -62,11 +44,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764034279,
|
||||
"narHash": "sha256-hZH6EHQYFifVg0bmSBYT8Art5BWhXBXE307uPLnexY0=",
|
||||
"lastModified": 1768984719,
|
||||
"narHash": "sha256-O6nXCW9FN39qw204e5Nl3qgaxKFcSvdpx0bULqfwyTA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "381f4f8a3a5f773cb80d2b7eb8f8d733b8861434",
|
||||
"rev": "d6e3935ec6e43c8f54cd0132276c82d951e1453e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -75,34 +57,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754860581,
|
||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.1.1",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"matugen": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -137,11 +91,11 @@
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764049319,
|
||||
"narHash": "sha256-2CoJsDvc+tHY/Ir3A1CCzpnWSuk82xsnjlVx6bYVNd8=",
|
||||
"lastModified": 1768974509,
|
||||
"narHash": "sha256-V+Uv2EL6MMdYGF4Zg0sWHeRLSgqzC4to01taYDItCNY=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "f86afc6c6a986a15b64f256c0e14f4a0a166299e",
|
||||
"rev": "2f38ab793de773496d2184aa3aa377bc8c99557b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -170,11 +124,11 @@
|
||||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764046829,
|
||||
"narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=",
|
||||
"lastModified": 1768678265,
|
||||
"narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0",
|
||||
"rev": "d7184a04b904e07113f4623610775ae78d32394c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -185,11 +139,11 @@
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1739444422,
|
||||
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
|
||||
"lastModified": 1767983141,
|
||||
"narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
|
||||
"rev": "440818969ac2cbd77bfe025e884d0aa528991374",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -201,11 +155,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1763835633,
|
||||
"narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
|
||||
"lastModified": 1768886240,
|
||||
"narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
|
||||
"rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -217,16 +171,16 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1763948260,
|
||||
"narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=",
|
||||
"lastModified": 1768773494,
|
||||
"narHash": "sha256-XsM7GP3jHlephymxhDE+/TKKO1Q16phz/vQiLBGhpF4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c",
|
||||
"rev": "77ef7a29d276c6d8303aece3444d61118ef71ac2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -237,15 +191,14 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764025877,
|
||||
"narHash": "sha256-DTQIzHUt87dSjJJTNiS1x6KOKHeqfMcVvTyyvI8fsfI=",
|
||||
"lastModified": 1768910181,
|
||||
"narHash": "sha256-YRU0IHMzXluZxr0JDfq9jtblb4DV7MIB5wj2jYMFKQc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "20f7ab0b0cbd3d8be999bd534cb4d8824424af9b",
|
||||
"rev": "5b138edcb2f1c3ed4b29eca3658f04f0639b98b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -254,29 +207,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761730856,
|
||||
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
@@ -334,21 +264,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tidal-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -444,11 +359,11 @@
|
||||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763704521,
|
||||
"narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=",
|
||||
"lastModified": 1768765571,
|
||||
"narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad",
|
||||
"rev": "ed1cef792b4def3321ff9ab5479df09609f17a69",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
boot = {
|
||||
loader.timeout = 0;
|
||||
|
||||
quiet.enable = true;
|
||||
|
||||
kernelPackages = pkgs.linuxPackages_xanmod_stable;
|
||||
@@ -34,16 +36,19 @@
|
||||
|
||||
shell.components = {
|
||||
firefox-pip.enable = true;
|
||||
# grimblast.enable = true;
|
||||
grimblast.enable = true;
|
||||
gnome-keyring.enable = true;
|
||||
# hyprpicker.enable = true;
|
||||
hyprpicker.enable = true;
|
||||
kde-connect.enable = true;
|
||||
kitty.enable = true;
|
||||
swaync.enable = true;
|
||||
walker.enable = true;
|
||||
waybar.enable = true;
|
||||
};
|
||||
desktops.niri.enable = true;
|
||||
desktops.hyprland = {
|
||||
enable = true;
|
||||
scrolling = true;
|
||||
};
|
||||
locale.preset.theaninova.enable = true;
|
||||
|
||||
networking.hosts = {
|
||||
@@ -188,11 +193,22 @@
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
allowedTCPPorts = [ 25565 ];
|
||||
allowedTCPPorts = [
|
||||
25565
|
||||
5173
|
||||
];
|
||||
allowedUDPPorts = [
|
||||
25565
|
||||
50765
|
||||
];
|
||||
/*
|
||||
allowedUDPPortRanges = [
|
||||
{
|
||||
from = 1;
|
||||
to = 65535;
|
||||
}
|
||||
];
|
||||
*/
|
||||
};
|
||||
|
||||
networkmanager = {
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
boot = {
|
||||
loader.timeout = 0;
|
||||
|
||||
quiet.enable = true;
|
||||
|
||||
kernelParams = [ "module_blacklist=i915" ];
|
||||
@@ -71,6 +73,7 @@
|
||||
hardware = {
|
||||
q3279vwf.enable = true;
|
||||
audio.preset.pipewire.enable = true;
|
||||
cc1.enable = true;
|
||||
|
||||
nvidia.preset.proprietary.enable = true;
|
||||
|
||||
@@ -109,7 +112,6 @@
|
||||
config.cudaSupport = true;
|
||||
config.rocmSupport = false;
|
||||
};
|
||||
acceleration = "cuda";
|
||||
};
|
||||
services.open-webui = {
|
||||
enable = false;
|
||||
@@ -179,6 +181,15 @@
|
||||
];
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
allowedUDPPortRanges = [
|
||||
{
|
||||
from = 1;
|
||||
to = 65535;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
plugins = with pkgs; [ networkmanager-openconnect ];
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
/*fileSystems."/home2" =
|
||||
{ device = "/dev/disk/by-uuid/fa017457-fef3-4fac-9348-d37d2cd98656";
|
||||
fsType = "xfs";
|
||||
};
|
||||
};*/
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
gamma-launcher
|
||||
];
|
||||
};
|
||||
wayland.windowManager.hyprland.settings.input.kb_options = [ "lv3:caps_switch" ];
|
||||
services.nextcloud-client.enable = true;
|
||||
systemd.user.services = {
|
||||
blueman-applet = {
|
||||
Unit = {
|
||||
|
||||
@@ -13,13 +13,17 @@ let
|
||||
hyprctl clients -j | jq -r "map(select(.workspace.id == $WORKSPACE) | select(.class == \"$1\") | .address | select(. != $WINDOW)) | .[0]"
|
||||
'';
|
||||
};
|
||||
cfg = osConfig.desktops.hyprland;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf osConfig.desktops.hyprland.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general.allow_tearing = true;
|
||||
general = {
|
||||
allow_tearing = true;
|
||||
layout = lib.mkIf cfg.scrolling "scrolling";
|
||||
};
|
||||
input = {
|
||||
accel_profile = "flat";
|
||||
kb_layout = osConfig.services.xserver.xkb.layout;
|
||||
@@ -32,23 +36,43 @@ in
|
||||
"SUPER,D,fullscreen,1"
|
||||
"SUPER,V,fullscreen,0"
|
||||
|
||||
"SUPER_SHIFT,up,movewindow,u"
|
||||
"SUPER_SHIFT,down,movewindow,d"
|
||||
"SUPER_SHIFT,left,movewindow,l"
|
||||
"SUPER_SHIFT,right,movewindow,r"
|
||||
|
||||
"SUPER,up,movefocus,u"
|
||||
"SUPER,down,movefocus,d"
|
||||
"SUPER,left,movefocus,l"
|
||||
"SUPER,right,movefocus,r"
|
||||
|
||||
"SUPER,f,workspace,r-1"
|
||||
"SUPER,h,workspace,r+1"
|
||||
"SUPER_SHIFT,f,movetoworkspace,r-1"
|
||||
"SUPER_SHIFT,h,movetoworkspace,r+1"
|
||||
"SUPER,mouse_up,workspace,r+1"
|
||||
"SUPER,mouse_down,workspace,r-1"
|
||||
];
|
||||
]
|
||||
++ (
|
||||
if cfg.scrolling then
|
||||
[
|
||||
"SUPER,up,layoutmsg,focus u"
|
||||
"SUPER,down,layoutmsg,focus d"
|
||||
"SUPER,right,layoutmsg,focus r"
|
||||
"SUPER,left,layoutmsg,focus l"
|
||||
|
||||
"SUPER_SHIFT,up,layoutmsg,movewindowto u"
|
||||
"SUPER_SHIFT,down,layoutmsg,movewindowto d"
|
||||
"SUPER_SHIFT,left,layoutmsg,swapcol l"
|
||||
"SUPER_SHIFT,right,layoutmsg,swapcol r"
|
||||
|
||||
"SUPER,mouse_up,layoutmsg,focus r"
|
||||
"SUPER,mouse_down,layoutmsg,focus l"
|
||||
]
|
||||
else
|
||||
[
|
||||
"SUPER_SHIFT,up,movewindow,u"
|
||||
"SUPER_SHIFT,down,movewindow,d"
|
||||
"SUPER_SHIFT,left,movewindow,l"
|
||||
"SUPER_SHIFT,right,movewindow,r"
|
||||
|
||||
"SUPER,up,movefocus,u"
|
||||
"SUPER,down,movefocus,d"
|
||||
"SUPER,left,movefocus,l"
|
||||
"SUPER,right,movefocus,r"
|
||||
|
||||
"SUPER,mouse_up,workspace,r+1"
|
||||
"SUPER,mouse_down,workspace,r-1"
|
||||
]
|
||||
);
|
||||
bindm = [
|
||||
"SUPER,mouse:272,movewindow"
|
||||
"SUPER,mouse:273,resizewindow"
|
||||
|
||||
@@ -43,6 +43,6 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
extraPackages = [ pkgs.nixfmt-rfc-style ];
|
||||
extraPackages = [ pkgs.nixfmt ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
# chat apps
|
||||
vesktop
|
||||
discord
|
||||
element-desktop
|
||||
thunderbird
|
||||
signal-desktop
|
||||
# cinny-desktop
|
||||
@@ -47,17 +46,19 @@
|
||||
# creative
|
||||
gimp3
|
||||
inkscape-with-extensions
|
||||
scribus
|
||||
# audacity
|
||||
# scribus
|
||||
audacity
|
||||
pinta
|
||||
losslesscut-bin
|
||||
shotcut
|
||||
blender-hip
|
||||
pkgsRocm.blender
|
||||
|
||||
# development
|
||||
ghidra
|
||||
kdePackages.kate
|
||||
|
||||
# utils
|
||||
kdePackages.ark
|
||||
libqalculate
|
||||
ranger
|
||||
filezilla
|
||||
|
||||
@@ -104,6 +104,7 @@
|
||||
lsp.servers = {
|
||||
html.enable = true;
|
||||
svelte.enable = true;
|
||||
buf_ls.enable = true;
|
||||
|
||||
dockerls.enable = true;
|
||||
|
||||
|
||||
167
modules/home-manager/theme/nvim/syntax.nix
Normal file
167
modules/home-manager/theme/nvim/syntax.nix
Normal file
@@ -0,0 +1,167 @@
|
||||
# Somewhat adapted from https://github.com/catppuccin/nvim/blob/main/lua/catppuccin/groups/syntax.lua
|
||||
{ C, O }:
|
||||
{
|
||||
Comment.fg = C.outline; # just comments
|
||||
SpecialComment.link = C.keywords; # special things inside a comment
|
||||
Constant.fg = C.constants; # (preferred) any constant
|
||||
String.fg = C.strings; # a string constant: "this is a string"
|
||||
Character.fg = C.keywords; # a character constant: 'c', '\n'
|
||||
Number.fg = C.numbers; # a number constant: 234, 0xff
|
||||
Float.fg = C.numbers; # a floating point constant: 2.3e10
|
||||
Boolean.fg = C.keywords; # a boolean constant: TRUE, false
|
||||
Identifier.fg = C.on_surface; # (preferred) any variable name
|
||||
Function.fg = C.functions; # function name (also: methods for classes)
|
||||
Statement.fg = C.mauve; # (preferred) any statement
|
||||
Conditional.fg = C.keywords; # if, then, else, endif, switch, etc.
|
||||
Repeat.fg = C.keywords; # for, do, while, etc.
|
||||
Label.fg = C.keywords; # case, default, etc.
|
||||
Operator.fg = C.on_surface; # "sizeof", "+", "*", etc.
|
||||
Keyword.fg = C.keywords; # any other keyword
|
||||
Exception.fg = C.keywords; # try, catch, throw
|
||||
|
||||
PreProc.link = C.structures; # (preferred) generic Preprocessor
|
||||
Include.fg = C.keywords; # preprocessor #include
|
||||
Define.fg = C.keywords; # preprocessor #define
|
||||
Macro.fg = C.keywords; # same as Define
|
||||
PreCondit.fg = C.keywords; # preprocessor #if, #else, #endif, etc.
|
||||
|
||||
StorageClass.fg = C.keywords; # static, register, volatile, etc.
|
||||
Structure.fg = C.structures; # struct, union, enum, etc.
|
||||
Special.fg = C.keywords; # (preferred) any special symbol
|
||||
Type.fg = C.types; # (preferred) int, long, char, etc.
|
||||
Typedef.link = "Type"; # A typedef
|
||||
SpecialChar.link = "Special"; # special character in a constant
|
||||
Tag = C.structures; # you can use CTRL-] on this
|
||||
Delimiter.fg = C.on_surface; # character that needs attention
|
||||
Debug.link = "Special"; # debugging statements
|
||||
|
||||
Underlined.style = [ "underline" ]; # (preferred) text that stands out, HTML links
|
||||
Bold.style = [ "bold" ];
|
||||
Italic.style = [ "italic" ];
|
||||
# ("Ignore", below, may be invisible...)
|
||||
# Ignore = { }; # (preferred) left blank, hidden |hl-Ignore|
|
||||
|
||||
Error = {
|
||||
bg = C.danger_container; # (preferred) any erroneous construct
|
||||
fg = C.on_danger_container;
|
||||
};
|
||||
Todo = {
|
||||
bg = C.yellow_container;
|
||||
fg = C.on_yellow_container;
|
||||
}; # (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
|
||||
qfLineNr.fg = C.yellow;
|
||||
qfFileName.fg = C.blue;
|
||||
htmlH1 = {
|
||||
fg = C.pink;
|
||||
style = [ "bold" ];
|
||||
};
|
||||
htmlH2 = {
|
||||
fg = C.blue;
|
||||
style = [ "bold" ];
|
||||
};
|
||||
# mkdHeading = { fg = C.peach; style = [ "bold" ]; };
|
||||
# mkdCode = { bg = C.terminal_black; fg = C.text; };
|
||||
mkdCodeDelimiter = {
|
||||
bg = C.base;
|
||||
fg = C.text;
|
||||
};
|
||||
mkdCodeStart = {
|
||||
fg = C.flamingo;
|
||||
style = [ "bold" ];
|
||||
};
|
||||
mkdCodeEnd = {
|
||||
fg = C.flamingo;
|
||||
style = [ "bold" ];
|
||||
};
|
||||
# mkdLink = { fg = C.blue; style = [ "underline" ]; };
|
||||
|
||||
# debugging
|
||||
debugPC = {
|
||||
bg = if O.transparent_background then C.none else C.crust;
|
||||
}; # used for highlighting the current line in terminal-debug
|
||||
debugBreakpoint = {
|
||||
bg = C.base;
|
||||
fg = C.overlay0;
|
||||
}; # used for breakpoint colors in terminal-debug
|
||||
# illuminate
|
||||
illuminatedWord = {
|
||||
bg = C.surface1;
|
||||
};
|
||||
illuminatedCurWord = {
|
||||
bg = C.surface1;
|
||||
};
|
||||
# diff
|
||||
Added.fg = C.green;
|
||||
Changed.fg = C.blue;
|
||||
diffAdded.fg = C.green;
|
||||
diffRemoved.fg = C.red;
|
||||
diffChanged.fg = C.blue;
|
||||
diffOldFile.fg = C.yellow;
|
||||
diffNewFile.fg = C.peach;
|
||||
diffFile.fg = C.blue;
|
||||
diffLine.fg = C.overlay0;
|
||||
diffIndexLine.fg = C.teal;
|
||||
DiffAdd = {
|
||||
bg = U.darken C.green 0.18 C.base;
|
||||
}; # diff mode: Added line |diff.txt|
|
||||
DiffChange = {
|
||||
bg = U.darken C.blue 0.07 C.base;
|
||||
}; # diff mode: Changed line |diff.txt|
|
||||
DiffDelete = {
|
||||
bg = U.darken C.red 0.18 C.base;
|
||||
}; # diff mode: Deleted line |diff.txt|
|
||||
DiffText = {
|
||||
bg = U.darken C.blue 0.30 C.base;
|
||||
}; # diff mode: Changed text within a changed line |diff.txt|
|
||||
# NeoVim
|
||||
healthError.fg = C.red;
|
||||
healthSuccess.fg = C.teal;
|
||||
healthWarning.fg = C.yellow;
|
||||
# misc
|
||||
|
||||
# glyphs
|
||||
GlyphPalette1.fg = C.red;
|
||||
GlyphPalette2.fg = C.teal;
|
||||
GlyphPalette3.fg = C.yellow;
|
||||
GlyphPalette4.fg = C.blue;
|
||||
GlyphPalette6.fg = C.teal;
|
||||
GlyphPalette7.fg = C.text;
|
||||
GlyphPalette9.fg = C.red;
|
||||
|
||||
# rainbow
|
||||
rainbow1.fg = C.red;
|
||||
rainbow2.fg = C.peach;
|
||||
rainbow3.fg = C.yellow;
|
||||
rainbow4.fg = C.green;
|
||||
rainbow5.fg = C.sapphire;
|
||||
rainbow6.fg = C.lavender;
|
||||
|
||||
# csv
|
||||
csvCol0.fg = C.red;
|
||||
csvCol1.fg = C.peach;
|
||||
csvCol2.fg = C.yellow;
|
||||
csvCol3.fg = C.green;
|
||||
csvCol4.fg = C.sky;
|
||||
csvCol5.fg = C.blue;
|
||||
csvCol6.fg = C.lavender;
|
||||
csvCol7.fg = C.mauve;
|
||||
csvCol8.fg = C.pink;
|
||||
|
||||
# markdown
|
||||
markdownHeadingDelimiter = {
|
||||
fg = C.peach;
|
||||
style = [ "bold" ];
|
||||
};
|
||||
markdownCode.fg = C.flamingo;
|
||||
markdownCodeBlock.fg = C.flamingo;
|
||||
markdownLinkText = {
|
||||
fg = C.blue;
|
||||
style = [ "underline" ];
|
||||
};
|
||||
markdownH1.link = "rainbow1";
|
||||
markdownH2.link = "rainbow2";
|
||||
markdownH3.link = "rainbow3";
|
||||
markdownH4.link = "rainbow4";
|
||||
markdownH5.link = "rainbow5";
|
||||
markdownH6.link = "rainbow6";
|
||||
}
|
||||
415
modules/home-manager/theme/nvim/treesitter.nix
Normal file
415
modules/home-manager/theme/nvim/treesitter.nix
Normal file
@@ -0,0 +1,415 @@
|
||||
{ C, O }:
|
||||
let
|
||||
self = {
|
||||
# Reference: https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md
|
||||
# Identifiers
|
||||
"@variable".fg = C.on_surface; # Any variable name that does not have another highlight.
|
||||
"@variable.builtin".fg = C.keywords; # Variable names that are defined by the languages, like this or self.
|
||||
"@variable.parameter".fg = C.on_surface; # For parameters of a function.
|
||||
"@variable.member".fg = C.properties; # For fields.
|
||||
|
||||
"@constant".fg = C.constants; # For constants
|
||||
"@constant.builtin".fg = C.keywords; # For constant that are built in the language: nil in Lua.
|
||||
"@constant.macro".link = "Macro"; # For constants that are defined by macros: NULL in C.
|
||||
|
||||
"@module".fg = C.structures; # For identifiers referring to modules and namespaces.
|
||||
"@label".link = "Label"; # For labels: label: in C and :label: in Lua.
|
||||
|
||||
# Literals
|
||||
"@string".link = "String"; # For strings.
|
||||
/*
|
||||
"@string.documentation" = {
|
||||
fg = C.teal;
|
||||
style = O.styles.strings or { };
|
||||
}; # For strings documenting code (e.g. Python docstrings).
|
||||
"@string.regexp" = {
|
||||
fg = C.pink;
|
||||
style = O.styles.strings or { };
|
||||
}; # For regexes.
|
||||
"@string.escape" = {
|
||||
fg = C.pink;
|
||||
style = O.styles.strings or { };
|
||||
}; # For escape characters within a string.
|
||||
"@string.special".link = "Special"; # other special strings (e.g. dates)
|
||||
"@string.special.path".link = "Special"; # filenames
|
||||
"@string.special.symbol".fg = C.flamingo; # symbols or atoms
|
||||
"@string.special.url" = {
|
||||
fg = C.blue;
|
||||
style = [
|
||||
"italic"
|
||||
"underline"
|
||||
];
|
||||
}; # urls, links and emails
|
||||
"@punctuation.delimiter.regex" = {
|
||||
link = "@string.regexp";
|
||||
};
|
||||
*/
|
||||
|
||||
"@character".link = "Character"; # character literals
|
||||
"@character.special".link = "SpecialChar"; # special characters (e.g. wildcards)
|
||||
|
||||
"@boolean".link = "Boolean"; # For booleans.
|
||||
"@number".link = "Number"; # For all numbers
|
||||
"@number.float".link = "Float"; # For floats.
|
||||
|
||||
# Types
|
||||
"@type".link = "Type"; # For types.
|
||||
"@type.builtin".fg = C.keywords; # For builtin types.
|
||||
"@type.definition".link = "Type"; # type definitions (e.g. `typedef` in C)
|
||||
|
||||
"@attribute".fg = C.properties; # attribute annotations (e.g. Python decorators)
|
||||
"@property".fg = C.properties; # fields, like accessing `bar` property on `foo.bar`. Overriden later for data languages and CSS.
|
||||
|
||||
# Functions
|
||||
"@function".link = "Function"; # For function (calls and definitions).
|
||||
"@function.builtin" = {
|
||||
fg = C.functions;
|
||||
style = [ "bold" ];
|
||||
}; # For builtin functions: table.insert in Lua.
|
||||
"@function.call".link = "Function"; # function calls
|
||||
"@function.macro".link = "Macro"; # For macro defined functions (calls and definitions): each macro_rules in Rust.
|
||||
|
||||
"@function.method".link = "Function"; # For method definitions.
|
||||
"@function.method.call".link = "Function"; # For method calls.
|
||||
|
||||
"@constructor" = {
|
||||
fg = C.yellow;
|
||||
}; # For constructor calls and definitions: = { } in Lua, and Java constructors.
|
||||
"@operator" = {
|
||||
link = "Operator";
|
||||
}; # For any operator: +, but also -> and * in C.
|
||||
|
||||
# Keywords
|
||||
"@keyword".link = "Keyword"; # For keywords that don't fall in previous categories.
|
||||
"@keyword.modifier".link = "Keyword"; # For keywords modifying other constructs (e.g. `const`, `static`, `public`)
|
||||
"@keyword.type".link = "Keyword"; # For keywords describing composite types (e.g. `struct`, `enum`)
|
||||
"@keyword.coroutine".link = "Keyword"; # For keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)
|
||||
"@keyword.function" = {
|
||||
fg = C.mauve;
|
||||
style = O.styles.keywords or { };
|
||||
}; # For keywords used to define a function.
|
||||
"@keyword.operator" = {
|
||||
fg = C.mauve;
|
||||
style = O.styles.keywords or { };
|
||||
}; # For new keyword operator
|
||||
"@keyword.import" = {
|
||||
link = "Include";
|
||||
}; # For includes: #include in C, use or extern crate in Rust, or require in Lua.
|
||||
"@keyword.repeat" = {
|
||||
link = "Repeat";
|
||||
}; # For keywords related to loops.
|
||||
"@keyword.return" = {
|
||||
fg = C.mauve;
|
||||
style = O.styles.keywords or { };
|
||||
};
|
||||
"@keyword.debug".link = "Exception"; # For keywords related to debugging
|
||||
"@keyword.exception".link = "Exception"; # For exception related keywords.
|
||||
|
||||
"@keyword.conditional".link = "Conditional"; # For keywords related to conditionals.
|
||||
"@keyword.conditional.ternary".link = "Operator"; # For ternary operators (e.g. `?` / `:`)
|
||||
|
||||
"@keyword.directive".link = "PreProc"; # various preprocessor directives & shebangs
|
||||
"@keyword.directive.define".link = "Define"; # preprocessor definition directives
|
||||
"@keyword.export" = {
|
||||
fg = C.mauve;
|
||||
style = O.styles.keywords;
|
||||
}; # JS & derivative
|
||||
|
||||
# Punctuation
|
||||
"@punctuation.delimiter".link = "Delimiter"; # For delimiters (e.g. `;` / `.` / `,`).
|
||||
"@punctuation.bracket".fg = C.overlay2; # For brackets and parenthesis.
|
||||
"@punctuation.special".link = "Special"; # For special punctuation that does not fall in the categories before (e.g. `{}` in string interpolation).
|
||||
|
||||
# Comment
|
||||
"@comment".link = "Comment";
|
||||
"@comment.documentation".link = "Comment"; # For comments documenting code
|
||||
|
||||
"@comment.error" = {
|
||||
fg = C.base;
|
||||
bg = C.red;
|
||||
};
|
||||
"@comment.warning" = {
|
||||
fg = C.base;
|
||||
bg = C.yellow;
|
||||
};
|
||||
"@comment.hint" = {
|
||||
fg = C.base;
|
||||
bg = C.blue;
|
||||
};
|
||||
"@comment.todo" = {
|
||||
fg = C.base;
|
||||
bg = C.flamingo;
|
||||
};
|
||||
"@comment.note" = {
|
||||
fg = C.base;
|
||||
bg = C.rosewater;
|
||||
};
|
||||
|
||||
# Markup
|
||||
"@markup" = {
|
||||
fg = C.text;
|
||||
}; # For strings considerated text in a markup language.
|
||||
"@markup.strong" = {
|
||||
fg = C.red;
|
||||
style = [ "bold" ];
|
||||
}; # bold
|
||||
"@markup.italic" = {
|
||||
fg = C.red;
|
||||
style = [ "italic" ];
|
||||
}; # italic
|
||||
"@markup.strikethrough" = {
|
||||
fg = C.text;
|
||||
style = [ "strikethrough" ];
|
||||
}; # strikethrough text
|
||||
"@markup.underline" = {
|
||||
link = "Underlined";
|
||||
}; # underlined text
|
||||
|
||||
"@markup.heading".fg = C.blue; # titles like: # Example
|
||||
"@markup.heading.markdown".style = [ "bold" ]; # bold headings in markdown, but not in HTML or other markup
|
||||
|
||||
"@markup.math".fg = C.blue; # math environments (e.g. `$ ... $` in LaTeX)
|
||||
"@markup.quote".fg = C.pink; # block quotes
|
||||
"@markup.environment".fg = C.pink; # text environments of markup languages
|
||||
"@markup.environment.name".fg = C.blue; # text indicating the type of an environment
|
||||
|
||||
"@markup.link".fg = C.lavender; # text references, footnotes, citations, etc.
|
||||
"@markup.link.label".fg = C.lavender; # link, reference descriptions
|
||||
"@markup.link.url" = {
|
||||
fg = C.blue;
|
||||
style = [
|
||||
"italic"
|
||||
"underline"
|
||||
];
|
||||
}; # urls, links and emails
|
||||
|
||||
"@markup.raw" = {
|
||||
fg = C.green;
|
||||
}; # used for inline code in markdown and for doc in python (""")
|
||||
|
||||
"@markup.list" = {
|
||||
fg = C.teal;
|
||||
};
|
||||
"@markup.list.checked" = {
|
||||
fg = C.green;
|
||||
}; # todo notes
|
||||
"@markup.list.unchecked" = {
|
||||
fg = C.overlay1;
|
||||
}; # todo notes
|
||||
|
||||
# Diff
|
||||
"@diff.plus" = {
|
||||
link = "diffAdded";
|
||||
}; # added text (for diff files)
|
||||
"@diff.minus" = {
|
||||
link = "diffRemoved";
|
||||
}; # deleted text (for diff files)
|
||||
"@diff.delta" = {
|
||||
link = "diffChanged";
|
||||
}; # deleted text (for diff files)
|
||||
|
||||
# Tags
|
||||
"@tag" = {
|
||||
fg = C.blue;
|
||||
}; # Tags like HTML tag names.
|
||||
"@tag.builtin" = {
|
||||
fg = C.blue;
|
||||
}; # JSX tag names.
|
||||
"@tag.attribute" = {
|
||||
fg = C.yellow;
|
||||
style = O.styles.miscs or [ "italic" ];
|
||||
}; # XML/HTML attributes (foo in foo="bar").
|
||||
"@tag.delimiter" = {
|
||||
fg = C.teal;
|
||||
}; # Tag delimiter like < > /
|
||||
|
||||
# Misc
|
||||
"@error" = {
|
||||
link = "Error";
|
||||
};
|
||||
|
||||
# Language specific:
|
||||
"@function.builtin.bash" = {
|
||||
fg = C.red;
|
||||
style = O.styles.miscs or [ "italic" ];
|
||||
};
|
||||
"@variable.parameter.bash" = {
|
||||
fg = C.green;
|
||||
};
|
||||
|
||||
"@markup.heading.1.markdown".link = "rainbow1";
|
||||
"@markup.heading.2.markdown".link = "rainbow2";
|
||||
"@markup.heading.3.markdown".link = "rainbow3";
|
||||
"@markup.heading.4.markdown".link = "rainbow4";
|
||||
"@markup.heading.5.markdown".link = "rainbow5";
|
||||
"@markup.heading.6.markdown".link = "rainbow6";
|
||||
|
||||
"@markup.heading.html" = {
|
||||
link = "@markup";
|
||||
};
|
||||
"@markup.heading.1.html" = {
|
||||
link = "@markup";
|
||||
};
|
||||
"@markup.heading.2.html" = {
|
||||
link = "@markup";
|
||||
};
|
||||
"@markup.heading.3.html" = {
|
||||
link = "@markup";
|
||||
};
|
||||
"@markup.heading.4.html" = {
|
||||
link = "@markup";
|
||||
};
|
||||
"@markup.heading.5.html" = {
|
||||
link = "@markup";
|
||||
};
|
||||
"@markup.heading.6.html" = {
|
||||
link = "@markup";
|
||||
};
|
||||
|
||||
"@constant.java" = {
|
||||
fg = C.teal;
|
||||
};
|
||||
|
||||
"@property.css" = {
|
||||
fg = C.blue;
|
||||
};
|
||||
"@property.scss" = {
|
||||
fg = C.blue;
|
||||
};
|
||||
"@property.id.css" = {
|
||||
fg = C.yellow;
|
||||
};
|
||||
"@property.class.css" = {
|
||||
fg = C.yellow;
|
||||
};
|
||||
"@type.css" = {
|
||||
fg = C.lavender;
|
||||
};
|
||||
"@type.tag.css" = {
|
||||
fg = C.blue;
|
||||
};
|
||||
"@string.plain.css" = {
|
||||
fg = C.text;
|
||||
};
|
||||
"@number.css" = {
|
||||
fg = C.peach;
|
||||
};
|
||||
"@keyword.directive.css" = {
|
||||
link = "Keyword";
|
||||
}; # CSS at-rules
|
||||
|
||||
"@string.special.url.html" = {
|
||||
fg = C.green;
|
||||
}; # Links in href, src attributes.
|
||||
"@markup.link.label.html" = {
|
||||
fg = C.text;
|
||||
}; # Text between <a></a> tags.
|
||||
"@character.special.html" = {
|
||||
fg = C.red;
|
||||
}; # Symbols such as .
|
||||
|
||||
"@constructor.lua" = {
|
||||
link = "@punctuation.bracket";
|
||||
}; # For constructor calls and definitions: = { } in Lua.
|
||||
"@constructor.python" = {
|
||||
fg = C.sky;
|
||||
}; # __init__(), __new__().
|
||||
"@label.yaml" = {
|
||||
fg = C.yellow;
|
||||
}; # Anchor and alias names.
|
||||
"@string.special.symbol.ruby" = {
|
||||
fg = C.flamingo;
|
||||
};
|
||||
|
||||
"@function.method.php" = {
|
||||
link = "Function";
|
||||
};
|
||||
"@function.method.call.php" = {
|
||||
link = "Function";
|
||||
};
|
||||
|
||||
"@keyword.import.c" = {
|
||||
fg = C.yellow;
|
||||
};
|
||||
"@keyword.import.cpp" = {
|
||||
fg = C.yellow;
|
||||
};
|
||||
"@attribute.c_sharp" = {
|
||||
fg = C.yellow;
|
||||
};
|
||||
"@comment.warning.gitcommit" = {
|
||||
fg = C.yellow;
|
||||
};
|
||||
"@string.special.path.gitignore" = {
|
||||
fg = C.text;
|
||||
};
|
||||
|
||||
gitcommitSummary = {
|
||||
fg = C.rosewater;
|
||||
style = O.styles.miscs or [ "italic" ];
|
||||
};
|
||||
zshKSHFunction = {
|
||||
link = "Function";
|
||||
};
|
||||
|
||||
# Legacy highlights
|
||||
"@parameter" = self."@variable.parameter";
|
||||
"@field" = self."@variable.member";
|
||||
"@namespace" = self."@module";
|
||||
"@float" = self."@number.float";
|
||||
"@symbol" = self."@string.special.symbol";
|
||||
"@string.regex" = self."@string.regexp";
|
||||
|
||||
"@text" = self."@markup";
|
||||
"@text.strong" = self."@markup.strong";
|
||||
"@text.emphasis" = self."@markup.italic";
|
||||
"@text.underline" = self."@markup.underline";
|
||||
"@text.strike" = self."@markup.strikethrough";
|
||||
"@text.uri" = self."@markup.link.url";
|
||||
"@text.math" = self."@markup.math";
|
||||
"@text.environment" = self."@markup.environment";
|
||||
"@text.environment.name" = self."@markup.environment.name";
|
||||
|
||||
"@text.title" = self."@markup.heading";
|
||||
"@text.literal" = self."@markup.raw";
|
||||
"@text.reference" = self."@markup.link";
|
||||
|
||||
"@text.todo.checked" = self."@markup.list.checked";
|
||||
"@text.todo.unchecked" = self."@markup.list.unchecked";
|
||||
|
||||
"@text.todo" = self."@comment.todo";
|
||||
"@text.warning" = self."@comment.warning";
|
||||
"@text.note" = self."@comment.note";
|
||||
"@text.danger" = self."@comment.error";
|
||||
|
||||
"@method" = self."@function.method";
|
||||
"@method.call" = self."@function.method.call";
|
||||
|
||||
"@text.diff.add" = self."@diff.plus";
|
||||
"@text.diff.delete" = self."@diff.minus";
|
||||
|
||||
"@type.qualifier" = self."@keyword.modifier";
|
||||
"@keyword.storage" = self."@keyword.modifier";
|
||||
"@define" = self."@keyword.directive.define";
|
||||
"@preproc" = self."@keyword.directive";
|
||||
"@storageclass" = self."@keyword.storage";
|
||||
"@conditional" = self."@keyword.conditional";
|
||||
"@exception" = self."@keyword.exception";
|
||||
"@include" = self."@keyword.import";
|
||||
"@repeat" = self."@keyword.repeat";
|
||||
|
||||
"@symbol.ruby" = self."@string.special.symbol.ruby";
|
||||
"@variable.member.yaml" = self."@field.yaml";
|
||||
|
||||
"@text.title.1.markdown" = self."@markup.heading.1.markdown";
|
||||
"@text.title.2.markdown" = self."@markup.heading.2.markdown";
|
||||
"@text.title.3.markdown" = self."@markup.heading.3.markdown";
|
||||
"@text.title.4.markdown" = self."@markup.heading.4.markdown";
|
||||
"@text.title.5.markdown" = self."@markup.heading.5.markdown";
|
||||
"@text.title.6.markdown" = self."@markup.heading.6.markdown";
|
||||
|
||||
"@method.php" = self."@function.method.php";
|
||||
"@method.call.php" = self."@function.method.call.php";
|
||||
};
|
||||
in
|
||||
self
|
||||
@@ -19,8 +19,6 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
users.users.${username}.linger = true;
|
||||
boot = {
|
||||
loader.timeout = 0;
|
||||
|
||||
plymouth.enable = true;
|
||||
|
||||
kernelParams = [
|
||||
|
||||
@@ -12,6 +12,7 @@ in
|
||||
{
|
||||
options.desktops.hyprland = {
|
||||
enable = lib.mkEnableOption "Enable a DE based on Hyprland";
|
||||
scrolling = lib.mkEnableOption "Hyprland scrolling wm";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
@@ -32,9 +33,14 @@ in
|
||||
no_update_news = true;
|
||||
no_donation_nag = true;
|
||||
};
|
||||
input.numlock_by_default = true;
|
||||
};
|
||||
plugins = with pkgs.hyprlandPlugins; [
|
||||
];
|
||||
plugins = lib.mkIf cfg.scrolling (
|
||||
with pkgs.hyprlandPlugins;
|
||||
[
|
||||
hyprscrolling
|
||||
]
|
||||
);
|
||||
};
|
||||
home = {
|
||||
packages = with pkgs; [ grim ];
|
||||
@@ -83,6 +89,9 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
security.pam.services.gdm.enableGnomeKeyring = true;
|
||||
security.pam.services.hyprland.enableGnomeKeyring = true;
|
||||
|
||||
services = {
|
||||
kmscon = {
|
||||
enable = true;
|
||||
|
||||
13
modules/nixos/hardware/astro-a50-dock.sh
Normal file
13
modules/nixos/hardware/astro-a50-dock.sh
Normal file
@@ -0,0 +1,13 @@
|
||||
stdbuf -oL hexdump -v -e '32/2 "%x " "\n"' "$HID_DEVICE" | while read -r line; do
|
||||
echo "$line"
|
||||
if [[ $line =~ ^c02[[:space:]]4[[:space:]]13[[:space:]]([0-9a-f]+) ]]; then
|
||||
power_state=${BASH_REMATCH[1]}
|
||||
if [[ $power_state == "0" ]]; then
|
||||
echo "power=on"
|
||||
wpctl set-default "$(pw-cli info "$HEADSET_NAME" | head -n 1 | awk '{print $2}')"
|
||||
else
|
||||
echo "power=off"
|
||||
wpctl set-default "$(pw-cli info "$SPEAKERS_NAME" | head -n 1 | awk '{print $2}')"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@@ -13,34 +13,54 @@ in
|
||||
{
|
||||
options.hardware.astro-a50 = {
|
||||
enable = mkEnableOption "Enable optimisations for the Logitech Astro A50 headset";
|
||||
sinkWhenDocked = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
description = "The PipeWire sink name to switch to when the Astro A50 is docked. If null, no switching will be done.";
|
||||
default = "alsa_output.pci-0000_0a_00.4.analog-stereo";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} =
|
||||
let
|
||||
name = "Astro A50";
|
||||
nick = "A50";
|
||||
filter = bitrate: {
|
||||
"media.class" = "Audio/Sink";
|
||||
"alsa.components" = "USB046d:0b1c";
|
||||
"alsa.resolution_bits" = bitrate;
|
||||
};
|
||||
nodeNameIn = "astro-a50-eq-harman-in";
|
||||
in
|
||||
{
|
||||
config =
|
||||
let
|
||||
name = "Astro A50";
|
||||
nick = "A50";
|
||||
pipewireFilter = bitrate: {
|
||||
"media.class" = "Audio/Sink";
|
||||
"alsa.components" = "USB046d:0b1c";
|
||||
"alsa.resolution_bits" = bitrate;
|
||||
};
|
||||
serviceName = "astro-a50-dock-detection";
|
||||
nodeNameIn = "astro-a50-eq-harman-in";
|
||||
hidrawName = "hidraw_astro_a50";
|
||||
hidrawPath = "/dev/${hidrawName}";
|
||||
deviceUnit = "dev-${hidrawName}.device";
|
||||
in
|
||||
|
||||
mkIf cfg.enable {
|
||||
services.udev.extraRules = lib.strings.join ", " [
|
||||
"KERNEL==\"hidraw*\""
|
||||
"ATTRS{idVendor}==\"046d\""
|
||||
"ATTRS{idProduct}==\"0b1c\""
|
||||
"MODE=\"0660\""
|
||||
"GROUP=\"input\""
|
||||
"TAG+=\"systemd\""
|
||||
"SYMLINK+=\"${hidrawName}\""
|
||||
];
|
||||
users.extraGroups.input.members = [ username ];
|
||||
home-manager.users.${username} = {
|
||||
home.packages = with pkgs; [ zam-plugins ];
|
||||
xdg.configFile = {
|
||||
"wireplumber/wireplumber.conf.d/51-astro-a50.conf".text = builtins.toJSON {
|
||||
"monitor.alsa.rules" = [
|
||||
{
|
||||
matches = [ (filter 16) ];
|
||||
matches = [ (pipewireFilter 16) ];
|
||||
actions.update-props = {
|
||||
"node.description" = "${name} Chat";
|
||||
"node.nick" = "${nick} Chat";
|
||||
};
|
||||
}
|
||||
{
|
||||
matches = [ (filter 24) ];
|
||||
matches = [ (pipewireFilter 24) ];
|
||||
actions.update-props = {
|
||||
"node.description" = name;
|
||||
"node.nick" = nick;
|
||||
@@ -53,12 +73,12 @@ in
|
||||
{
|
||||
name = "libpipewire-module-parametric-equalizer";
|
||||
args = {
|
||||
"equalizer.filepath" = builtins.toString ./astro-a50-harman.txt;
|
||||
"equalizer.filepath" = toString ./astro-a50-harman.txt;
|
||||
"equalizer.description" = "${name} (Harman EQ)";
|
||||
"capture.props" = {
|
||||
"node.name" = nodeNameIn;
|
||||
"filter.smart" = true;
|
||||
"filter.smart.target" = filter 24;
|
||||
"filter.smart.target" = pipewireFilter 24;
|
||||
};
|
||||
"playback.props"."node.name" = "EQ Output";
|
||||
};
|
||||
@@ -66,6 +86,33 @@ in
|
||||
];
|
||||
};
|
||||
};
|
||||
systemd.user.services.${serviceName} = mkIf (cfg.sinkWhenDocked != null) {
|
||||
Unit = {
|
||||
Description = "Astro A50 Dock Detection";
|
||||
StopPropagatedFrom = [ deviceUnit ];
|
||||
};
|
||||
Install.WantedBy = [
|
||||
"default.target"
|
||||
deviceUnit
|
||||
];
|
||||
Service = {
|
||||
Restart = "always";
|
||||
RestartSec = "5";
|
||||
ExecStart = "-${
|
||||
lib.getExe (
|
||||
pkgs.writeShellApplication {
|
||||
name = "astro-dock-detect";
|
||||
runtimeEnv = {
|
||||
HID_DEVICE = hidrawPath;
|
||||
HEADSET_NAME = nodeNameIn;
|
||||
SPEAKERS_NAME = cfg.sinkWhenDocked;
|
||||
};
|
||||
text = builtins.readFile ./astro-a50-dock.sh;
|
||||
}
|
||||
)
|
||||
}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,7 +57,9 @@ in
|
||||
layout.struts.top = 80;
|
||||
};
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
general.layout = "master";
|
||||
plugin.hyprscrolling = lib.mkIf config.desktops.hyprland.scrolling {
|
||||
column_width = 0.4;
|
||||
};
|
||||
master = {
|
||||
orientation = "center";
|
||||
slave_count_for_center_master = 0;
|
||||
@@ -65,19 +67,13 @@ in
|
||||
allow_small_split = true;
|
||||
};
|
||||
render.direct_scanout = 0;
|
||||
/*
|
||||
monitor = [
|
||||
"${monitorline},sdrbrightness,1.3"
|
||||
"DP-3,addreserved,340,0,0,0"
|
||||
];
|
||||
*/
|
||||
monitorv2 = {
|
||||
output = "DP-3";
|
||||
mode = "3840x2160@144";
|
||||
position = "0x0";
|
||||
scale = 1;
|
||||
bitdepth = 10;
|
||||
addreserved = "340,0,0,0";
|
||||
addreserved = "80,0,0,0";
|
||||
cm = if cfg.hdr then "hdredid" else "srgb";
|
||||
sdr_min_luminance = 0.25;
|
||||
sdr_max_luminance = 250;
|
||||
@@ -88,7 +84,7 @@ in
|
||||
min_refresh_rate = 48;
|
||||
no_break_fs_vrr = 1;
|
||||
};
|
||||
experimental.xx_color_management_v4 = true;
|
||||
# experimental.xx_color_management_v4 = true;
|
||||
};
|
||||
|
||||
programs.waybar.settings.mainBar =
|
||||
|
||||
@@ -16,7 +16,6 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
fonts.fontconfig.subpixel.rgba = "bgr";
|
||||
boot.kernelParams = [ "video=2560x1440@75" ];
|
||||
|
||||
home-manager.users.${username}.wayland.windowManager.hyprland.settings = {
|
||||
general.layout = "master";
|
||||
@@ -25,7 +24,10 @@ in
|
||||
mfact = 0.65;
|
||||
always_keep_position = true;
|
||||
};
|
||||
monitor = [ "DP-1,2560x1440@75,0x0,1" ];
|
||||
monitor = [
|
||||
"HDMI-A-1,2560x1440@75,0x0,1"
|
||||
"DP-1,1920x1080@144,auto-center-right,1,transform,3"
|
||||
];
|
||||
xwayland.force_zero_scaling = true;
|
||||
misc.vrr = 0; # VA suffers from VRR flicker
|
||||
};
|
||||
|
||||
@@ -17,24 +17,22 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
windowrulev2 =
|
||||
let
|
||||
firefoxPip = "class:^(firefox)$,title:^(Picture-in-Picture)$";
|
||||
firefoxPipInitial = "class:^(firefox)$,title:^(Firefox)$";
|
||||
pipPadding = toString (homeConfig.theme.md3-evo.padding * 2);
|
||||
in
|
||||
[
|
||||
"keepaspectratio,${firefoxPip}"
|
||||
"noborder,${firefoxPip}"
|
||||
"float,${firefoxPip}"
|
||||
"float,${firefoxPipInitial}"
|
||||
"pin,${firefoxPip}"
|
||||
"pin,${firefoxPipInitial}"
|
||||
"fullscreenstate 2 0,${firefoxPip}"
|
||||
"fullscreenstate 2 0,${firefoxPipInitial}"
|
||||
"move ${pipPadding} ${pipPadding},${firefoxPip}"
|
||||
"move ${pipPadding} ${pipPadding},${firefoxPipInitial}"
|
||||
];
|
||||
windowrule = [
|
||||
{
|
||||
name = "firefox-pip";
|
||||
"match:class" = "^(firefox)$";
|
||||
"match:title" = "^(Picture-in-Picture)$";
|
||||
float = true;
|
||||
no_follow_mouse = true;
|
||||
opaque = true;
|
||||
pin = true;
|
||||
fullscreen_state = "2 0";
|
||||
move = "8 8";
|
||||
keep_aspect_ratio = true;
|
||||
border_size = "0";
|
||||
animation = "fade";
|
||||
}
|
||||
];
|
||||
};
|
||||
programs.niri.settings.window-rules = [
|
||||
{
|
||||
|
||||
@@ -19,11 +19,13 @@ in
|
||||
home-manager.users.${username} = {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
bindr = [ "SUPER,SUPER_L,exec,uwsm app -- ${lib.getExe pkgs.walker}" ];
|
||||
layerrule = [
|
||||
# TODO: Add layer rules for walker
|
||||
"blur, anyrun"
|
||||
"ignorealpha 0.3, anyrun"
|
||||
];
|
||||
/*
|
||||
layerrule = [
|
||||
# TODO: Add layer rules for walker
|
||||
"blur, anyrun"
|
||||
"ignorealpha 0.3, anyrun"
|
||||
];
|
||||
*/
|
||||
};
|
||||
programs.niri.settings.binds."Mod+Space".action.spawn = [ (lib.getExe pkgs.walker) ];
|
||||
home.packages = with pkgs; [
|
||||
|
||||
@@ -28,7 +28,6 @@ in
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
steam
|
||||
cubyz-bin
|
||||
oversteer
|
||||
obs-studio
|
||||
(lutris.override {
|
||||
|
||||
Reference in New Issue
Block a user