trying to make cursors consistent

This commit is contained in:
Matt Nish-Lapidus 2025-02-09 22:09:10 -05:00
parent 3e20dab73d
commit db603ea0a8
10 changed files with 42 additions and 210 deletions

203
flake.lock generated
View file

@ -44,27 +44,6 @@
"url": "https://gt.emenel.ca/emenel/audio.nix.git"
}
},
"crane": {
"inputs": {
"nixpkgs": [
"shikane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1716745752,
"narHash": "sha256-8K1R9Yg4r08rYk86Yq+lu3E9L3uRUb4xMqYHgl0VGS0=",
"owner": "ipetkov",
"repo": "crane",
"rev": "19ca94ec2d288de334ae932107816b4a97736cd8",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"elemental-wine-source": {
"flake": false,
"locked": {
@ -103,28 +82,6 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"shikane",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1716704729,
"narHash": "sha256-Yk0L1JdBTdC9ZtDreqcMMolOtTp0XnPjrACT8oTw2Wg=",
"owner": "nix-community",
"repo": "fenix",
"rev": "aaa27b4cf3729b6562cd4dd65ba24eeda3731002",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1733328505,
@ -228,41 +185,6 @@
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_8"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@ -277,9 +199,9 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_3": {
"inputs": {
"systems": "systems_9"
"systems": "systems_7"
},
"locked": {
"lastModified": 1731533236,
@ -790,11 +712,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1739042449,
"narHash": "sha256-9zLFUpEebwhjCgtznsI61gTzefI3+fuXATHUOFzJi5w=",
"lastModified": 1739136145,
"narHash": "sha256-KgADxpdWMVevqNaxpJzlocRU+DclrFSyzvUiGFsARcQ=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "98e3666a9dc4143cbf93d957a15d749b5acef046",
"rev": "c5a3826e2bf96f3092b79415e17703a7b194e1a8",
"type": "github"
},
"original": {
@ -1006,11 +928,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1738843498,
"narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
"lastModified": 1739055578,
"narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
"rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
"type": "github"
},
"original": {
@ -1132,27 +1054,6 @@
"type": "github"
}
},
"paperwm": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1736333499,
"narHash": "sha256-sbwsbUU4D7jEk1rf+NNgiFEPTM/NXFzPHVxryKcuVjQ=",
"owner": "paperwm",
"repo": "PaperWM",
"rev": "07214b0ed9983806aa827f6b371431f4a5e58bd8",
"type": "github"
},
"original": {
"owner": "paperwm",
"repo": "PaperWM",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
@ -1240,30 +1141,11 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable_4",
"paperwm": "paperwm",
"shikane": "shikane",
"sops-nix": "sops-nix",
"wezterm": "wezterm",
"yazi": "yazi"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1716572615,
"narHash": "sha256-mVUbarr4PNjERDk+uaoitPq7eL7De0ythZehezAzug8=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "a55e8bf09cdfc25066b77823cc98976a51af8a8b",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
@ -1306,29 +1188,6 @@
"type": "github"
}
},
"shikane": {
"inputs": {
"crane": "crane",
"fenix": "fenix",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1726140768,
"narHash": "sha256-vTALSsk6/No07QgECgyd0YavXIH/bXOtKev9C6NqyA0=",
"ref": "refs/heads/master",
"rev": "ca9fa2489a83a096227f2a1bfb62ee80aad9b607",
"revCount": 232,
"type": "git",
"url": "https://gitlab.com/w0lff/shikane.git"
},
"original": {
"type": "git",
"url": "https://gitlab.com/w0lff/shikane.git"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
@ -1475,36 +1334,6 @@
"type": "github"
}
},
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_9": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"uv2nix": {
"inputs": {
"nixpkgs": [
@ -1532,7 +1361,7 @@
},
"wezterm": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_2",
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
@ -1544,11 +1373,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1738902298,
"narHash": "sha256-q9uy1uxEtykA/mfgZnzNR156M/jKMj1QL1Zy9mfk1Do=",
"lastModified": 1739151822,
"narHash": "sha256-eyyHM1h0wU5o5OFIUJ8E/PO/VLLF6EaGSOQ/nislPCo=",
"owner": "wez",
"repo": "wezterm",
"rev": "5c5d2c8a628d655d6ec0c58e210d478a5a6b8ade",
"rev": "0c7a8fc8166900694c505ecdd3a1d49dc2b6c968",
"type": "github"
},
"original": {
@ -1593,18 +1422,18 @@
},
"yazi": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1738917769,
"narHash": "sha256-f8+C+L8eOugnyx4Zm2y3qAXH33BsI5F1JWecigPKuMg=",
"lastModified": 1739083819,
"narHash": "sha256-GVapniFyZHtKVxIxgIZihpTRzYjBN9461qN4R48uJ84=",
"owner": "sxyazi",
"repo": "yazi",
"rev": "17ff1e8812304d52aab56eb5dd6a220578a0dd74",
"rev": "793c90f021fd5d0491575d43ee68f92169ba2eb5",
"type": "github"
},
"original": {

View file

@ -19,11 +19,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
shikane = {
url = "git+https://gitlab.com/w0lff/shikane.git";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay.url = "github:nix-community/emacs-overlay";
nix-rice = {
@ -76,11 +71,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
paperwm = {
url = "github:paperwm/PaperWM";
inputs.nixpkgs.follows = "nixpkgs";
};
niri = {
url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -133,6 +133,8 @@
sessionVariables = {
GSK_RENDERER = "ngl";
MOZ_ENABLE_WAYLAND = 1;
XCURSOR_SIZE = 32;
XCURSOR_THEME = "Bibata-Modern-Classic";
};
};

View file

@ -46,16 +46,13 @@ config.enable_wayland = false;
config.font_size = 14
config.font = wezterm.font {
family = 'JetBrains Mono',
-- weight = 'Normal'
}
-- config.enable_scroll_bar = true
config.color_scheme = 'One Half Black (Gogh)'
-- config.color_scheme = 'Adventure'
-- config.color_scheme = 'Monokai Pro Ristretto (Gogh)'
-- config.color_scheme = 'Afterglow'
config.colors = {
-- config.colors = {
-- background = "#111111",
-- tab_bar = {
-- background = "#111111",
@ -64,7 +61,7 @@ config.colors = {
-- bg_color = "#111111"
-- }
-- }
}
-- }
-- config.background = {
-- {
@ -77,6 +74,7 @@ config.colors = {
-- }
-- }
config.check_for_updates = false
config.window_decorations = "RESIZE"
config.window_padding = {

View file

@ -85,6 +85,7 @@
appimage-run
xwayland-satellite
xwayland-run
bibata-cursors
];
# Bootloader.

View file

@ -121,14 +121,24 @@
];
home.pointerCursor = {
package = pkgs.rice.cursor.package;
name = pkgs.rice.cursor.name;
size = 24;
package = pkgs.bibata-cursors;
size = 32;
gtk.enable = true;
x11.enable = true;
};
gtk.cursorTheme = pkgs.rice.cursor;
gtk = {
enable = true;
cursorTheme = {
name = pkgs.rice.cursor.name;
package = pkgs.bibata-cursors;
};
};
qt = {
enable = true;
};
fonts = {
fontconfig = {

View file

@ -65,11 +65,13 @@
xdg.desktopEntries = {
bitwig-labwc = {
name = "Bitwig (labwc)";
exec = "labwc - S bitwig-studio";
exec = "${pkgs.labwc}/bin/labwc -S bitwig-studio";
categories = [ "Application" "Audio" "Music" ];
};
};
# xdg.configFile."labwx/rc.xml"
home.file.".local/share/The Usual Suspects/Vavra" = {
recursive = true;
source = ../../packages/the-usual-suspects/vavra;

View file

@ -79,8 +79,8 @@ in {
};
cursor = {
theme = pkgs.rice.cursor.name;
size = 32;
theme = "Bibata-Modern-Classic";
# size = 32;
hide-after-inactive-ms = 30000;
};

View file

@ -68,7 +68,7 @@
nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted
nodePackages.prettier
nodePackages.javascript-typescript-langserver
# nodePackages.javascript-typescript-langserver
nodePackages.stylelint
nodePackages.svelte-language-server
nodePackages.typescript

View file

@ -67,7 +67,7 @@ in {
};
};
cursor = {
package = self.bibata-cursors;
package = super.pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
};
};