bchmnn/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add macOS Monterey cursor

Browse source
This commit is contained in:
Jacob Bachmann 2024-04-19 18:58:01 +02:00
parent 9bafd5f618
commit 36f625d387
Signed by: bchmnn
GPG key ID: 732A612DAD28067D
5 changed files with 56 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

106
flake.lock generated
View file

@ -61,11 +61,11 @@
]
},
"locked": {
"lastModified": 1712206005,
"narHash": "sha256-9RyEO3HtRzgRGZ05g33+bA2ohMZuWYppgCuH1mXHXqU=",
"lastModified": 1712655750,
"narHash": "sha256-uTvoGFzbBJfVKZVZ/+nIPP93E8EnGXwmVPIqgRlT14I=",
"owner": "outfoxxed",
"repo": "hy3",
"rev": "b22f13640f72e5740b31c78a7236b360cfe8c19f",
"rev": "7d988d310f2b15eea5f2b9998f777a9590c4d1d9",
"type": "github"
},
"original": {
@ -76,7 +76,10 @@
},
"hyprcursor": {
"inputs": {
"hyprlang": "hyprlang",
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
@ -87,11 +90,11 @@
]
},
"locked": {
"lastModified": 1711466786,
"narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
"lastModified": 1713214463,
"narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
"rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0",
"type": "github"
},
"original": {
@ -104,22 +107,23 @@
"inputs": {
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang_2",
"hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_2",
"systems": "systems_2",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1712216965,
"narHash": "sha256-U1cFbnIrzyf+1IUrVBLH8U5r1vVcQ07lVVukwuFbgZU=",
"lastModified": 1713120508,
"narHash": "sha256-piBUBQsQ8R20/lX9GMJjwdntal6yfJZMVCIi21XCZ8Y=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "81766647f2dc34013a62066edd191426b8f16a42",
"rev": "e93fbd7c4f991cb8ef03e433ccc4d43587923e15",
"type": "github"
},
"original": {
"owner": "hyprwm",
"ref": "v0.39.0",
"repo": "Hyprland",
"type": "github"
}
@ -150,29 +154,6 @@
}
},
"hyprlang": {
"inputs": {
"nixpkgs": [
"hyprland",
"hyprcursor",
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_2": {
"inputs": {
"nixpkgs": [
"hyprland",
@ -184,11 +165,11 @@
]
},
"locked": {
"lastModified": 1711250455,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
@ -231,11 +212,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github"
},
"original": {
@ -303,21 +284,6 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"waybar": {
"inputs": {
"flake-compat": "flake-compat",
@ -340,20 +306,18 @@
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1709983277,
"narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
"type": "gitlab"
"lastModified": 1712935342,
"narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
"type": "github"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
"type": "gitlab"
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
"type": "github"
}
},
"xdph": {
@ -376,11 +340,11 @@
]
},
"locked": {
"lastModified": 1709299639,
"narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
"lastModified": 1713214484,
"narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "2d2fb547178ec025da643db57d40a971507b82fe",
"rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61",
"type": "github"
},
"original": {

5
flake.nix
View file

@ -10,7 +10,10 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "github:hyprwm/Hyprland";
hyprland = {
url = "github:hyprwm/Hyprland?ref=v0.39.0";
inputs.hyprland.follows = "nixpkgs";
};
hy3 = {
url = "github:outfoxxed/hy3";
inputs.hyprland.follows = "hyprland";

9
users/gandalf/modules/gui/cursor.nix Normal file
View file

@ -0,0 +1,9 @@
{ pkgs, ... }: {
home.pointerCursor = {
name = "macOS-Monterey";
package = pkgs.apple-cursor;
size = 32;
gtk.enable = true;
x11.enable = true;
};
}

1
users/gandalf/modules/gui/default.nix
View file

@ -3,6 +3,7 @@
imports = with lib; with nixosConfig.bchmnn;
optionals gui.enable [
./ags
./cursor.nix
./gtk.nix
./programs
] ++ optionals (gui.enable && elem "sway" gui.flavour) [

7
users/gandalf/modules/gui/hyprland/default.nix
View file

@ -68,6 +68,13 @@ in
disable_logs = false;
};
env = with lib; with nixosConfig.bchmnn; [
# "HYPRCURSOR_THEME,hypr-macOS-Monterey"
# "HYPRCURSOR_SIZE,32"
"XCURSOR_THEME,macOS-Monterey"
"XCURSOR_SIZE,32"
"CLUTTER_BACKEND,wayland"
"GDK_BACKEND,wayland"
"GDK_DPI_SCALE,1"