emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trying to fix cursors, a little bit of other rando sutff

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-06-24 11:51:17 -04:00
parent f2e82582d6
commit 5dd23ca10b
6 changed files with 72 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -90,11 +90,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1750671239, "lastModified": 1750753596,
"narHash": "sha256-eCO6mRAj2k3l1DfgiQO2u6rzs/vDNSykgIHPwRh093w=", "narHash": "sha256-/XQ4k8fUYrYe+utV0aCSHT9wB0wyw/E2IzwHxYySvGc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "3b85ea2f827634d8d582bdc92e1c1a7eb90794ca", "rev": "b13d55077455690a9b4e25e4077012f3ac724e2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750654717, "lastModified": 1750730235,
"narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +823,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1750689145, "lastModified": 1750735687,
"narHash": "sha256-vlJ0oQsrA68R7UNl+ZujH/LwzNJz6198tBQaXmtkvrc=", "narHash": "sha256-pscxcZpLGcEEJGVjFAM7X77cARABc7M+zVyUN6qsEmU=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "03153ce955a8ad754b0f2bb4fa25cbbcb9832f25", "rev": "a581a91b7406a0b9039ef22e37e5166bd3b1a139",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1044,11 +1044,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1750330365, "lastModified": 1750646418,
"narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1060,11 +1060,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1750400657, "lastModified": 1750622754,
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1076,11 +1076,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1750400657, "lastModified": 1750622754,
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1156,11 +1156,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1750688993, "lastModified": 1750772819,
"narHash": "sha256-paLIjnBu/L6DKEEUxYxj4tfbWGLct8mMmkJxtLXj0Fk=", "narHash": "sha256-P99ZtOI9GxNbrCWe5hKhfCscmoNDp6JMSZxWwuxRWeA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2293f29bf832acc3a576a44a7856ec17f39ba7b", "rev": "1795b08791bf8b17292d23df49474fdcb11dc929",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1614,11 +1614,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1750571237, "lastModified": 1750745566,
"narHash": "sha256-sc6D/HSaArKwdzyDvMbirPQlJPHI2PoqUUh1haVOw5Q=", "narHash": "sha256-uu3LULgJSgVBWYgdf3Za9T/kTNCu394togdfRIEqWdg=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "2b656cb5b931fc32e79421d38a141d1de2f2aeec", "rev": "2deb317ec069b8f94ec1282253faaa71a8d997fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1692,11 +1692,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1750598626, "lastModified": 1750754859,
"narHash": "sha256-ieynNsBpnSrAI5sDft9DxoSeInC0G7fekarQTbG+O+8=", "narHash": "sha256-ae/ey8JH/KSxvXHrtU2AfdqS2zAXSvk4fCh8o5335UE=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "ab0fe931506bb4f9fcbb114f107321a75145ec27", "rev": "590d3367160734cef447ea445e5fb9ef74ca0c05",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -3,6 +3,7 @@
inputs = { inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";

4
homes/emenel/default.nix
View file

@ -135,8 +135,8 @@ in
GSK_RENDERER = "ngl"; GSK_RENDERER = "ngl";
QT_QPA_PLATFORM = "xcb"; QT_QPA_PLATFORM = "xcb";
MOZ_ENABLE_WAYLAND = 1; MOZ_ENABLE_WAYLAND = 1;
XCURSOR_SIZE = 32; # XCURSOR_SIZE = 32;
XCURSOR_THEME = "Bibata-Modern-Classic"; # XCURSOR_THEME = "Bibata-Modern-Classic";
DISPLAY = ":0"; DISPLAY = ":0";
WAYLAND_DISPLAY="wayland-1"; WAYLAND_DISPLAY="wayland-1";
ELECTRON_OZONE_PLATFORM_HINT = "auto"; ELECTRON_OZONE_PLATFORM_HINT = "auto";

53
modules/home/desktop.nix
View file

@ -151,24 +151,25 @@
mangohud mangohud
dualsensectl.out dualsensectl.out
# wpaperd
# inputs.xwayland-satellite.packages.x86_64-linux.default
]; ];
home.pointerCursor = { home.pointerCursor = {
enable = true;
name = pkgs.rice.cursor.name; name = pkgs.rice.cursor.name;
package = pkgs.bibata-cursors; package = pkgs.rice.cursor.package;
size = 32; size = pkgs.rice.cursor.size;
gtk.enable = true; gtk.enable = true;
x11.enable = true; x11.enable = true;
dotIcons.enable = true;
hyprcursor.enable = true;
}; };
gtk = { gtk = {
enable = true; enable = true;
cursorTheme = { cursorTheme = {
name = pkgs.rice.cursor.name; name = pkgs.rice.cursor.name;
package = pkgs.bibata-cursors; package = pkgs.rice.cursor.package;
size = pkgs.rice.cursor.size;
}; };
theme = { theme = {
name = "Colloid"; name = "Colloid";
@ -214,9 +215,13 @@
enable = true; enable = true;
packages = [ packages = [
"com.github.tchx84.Flatseal" "com.github.tchx84.Flatseal"
"dev.qwery.AddWater"
"com.valvesoftware.SteamLink" "com.valvesoftware.SteamLink"
]; ];
overrides = {
global = {
Context.filesystems = [ "/nix/store:ro" ];
};
};
}; };
swayosd = { swayosd = {
enable = true; enable = true;
@ -262,24 +267,24 @@
# }; # };
# }; # };
# xdg.portal = { xdg.portal = {
# enable = true; enable = true;
# configPackages = [ pkgs.niri-unstable ]; configPackages = [ pkgs.niri-unstable ];
# extraPortals = with pkgs; [ extraPortals = with pkgs; [
# xdg-desktop-portal-gnome xdg-desktop-portal-gnome
# xdg-desktop-portal-gtk xdg-desktop-portal-gtk
# xdg-desktop-portal xdg-desktop-portal
# xdg-desktop-portal-wlr xdg-desktop-portal-wlr
# gnome-keyring gnome-keyring
# xdg-desktop-portal-termfilechooser xdg-desktop-portal-termfilechooser
# ]; ];
# config = { config = {
# common = { common = {
# default = [ "gtk" ]; default = [ "gtk" ];
# "org.freedesktop.impl.portal.FileChooser" = "termfilechooser"; # "org.freedesktop.impl.portal.FileChooser" = "termfilechooser";
# }; };
# }; };
# }; };
# home.sessionVariables.TERMCMD = "wezterm --class=file_chooser"; # home.sessionVariables.TERMCMD = "wezterm --class=file_chooser";

19
modules/home/niri.nix
View file

@ -1,6 +1,5 @@
{ {
config, config,
nix-config,
pkgs, pkgs,
... ...
}: }:
@ -17,7 +16,7 @@ in
honor-xdg-activation-with-invalid-serial = []; honor-xdg-activation-with-invalid-serial = [];
}; };
screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; screenshot-path = "~/pictures/screenshots/screenshot-%Y-%m-%d %H-%M-%S.png";
prefer-no-csd = true; prefer-no-csd = true;
spawn-at-startup = [ spawn-at-startup = [
@ -65,6 +64,13 @@ in
accel-profile = "adaptive"; accel-profile = "adaptive";
}; };
trackball = {
natural-scroll = true;
accel-speed = 0.1;
accel-profile = "adaptive";
scroll-method = "on-button-down";
};
workspace-auto-back-and-forth = true; workspace-auto-back-and-forth = true;
}; };
@ -84,12 +90,10 @@ in
width = 3840; width = 3840;
height = 2160; height = 2160;
}; };
# background-color = strPalette.normal.background;
scale = 1; scale = 1;
}; };
"HDMI-A-1" = { "HDMI-A-1" = {
# background-color = strPalette.normal.background;
scale = 1; scale = 1;
}; };
@ -103,8 +107,8 @@ in
}; };
cursor = { cursor = {
theme = "Bibata-Modern-Classic"; theme = pkgs.rice.cursor.name;
# size = 32; size = pkgs.rice.cursor.size;
hide-after-inactive-ms = 10000; hide-after-inactive-ms = 10000;
}; };
@ -198,7 +202,6 @@ in
{ app-id = "polkit-kde-authentication-agent-1"; } { app-id = "polkit-kde-authentication-agent-1"; }
{ app-id = "Zoom Workdplace"; title = ".*menu.*"; } { app-id = "Zoom Workdplace"; title = ".*menu.*"; }
{ app-id = "org.gnome.Evolution"; title = "Appointment$"; } { app-id = "org.gnome.Evolution"; title = "Appointment$"; }
{ app-id = ".MOZ_APP_LAUNCHER.$"; }
]; ];
open-floating = true; open-floating = true;
} }
@ -267,8 +270,8 @@ in
]; ];
switch-events = with config.lib.niri.actions; { switch-events = with config.lib.niri.actions; {
lid-close.action = spawn "niri msg output eDP-1 off";
lid-open.action = spawn "niri msg output eDP-1 on"; lid-open.action = spawn "niri msg output eDP-1 on";
lid-close.action = spawn "niri msg output eDP-1 off";
}; };
binds = binds =

1
overlays/rice.nix
View file

@ -79,6 +79,7 @@ in {
cursor = { cursor = {
package = super.pkgs.bibata-cursors; package = super.pkgs.bibata-cursors;
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
size = 32;
}; };
corner-radius = 8.0; corner-radius = 8.0;
border-width = 2; border-width = 2;