Compare commits

..

No commits in common. "a82e77779f88e4b59389930ca481e51bb8d9c191" and "9defb280e1d0b4161e3e829e1900360383ff3583" have entirely different histories.

8 changed files with 105 additions and 139 deletions

138
flake.lock generated
View file

@ -99,11 +99,11 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731949548, "lastModified": 1716150083,
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732603785, "lastModified": 1731768170,
"narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "narHash": "sha256-9Zj2baKY3KaKzs5+nqZgIwr/o/iibhENFxjOnpU+IOU=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "rev": "2bcef10f4319f34ddebadb5f37eaa81ca2510730",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,11 +230,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1673956053,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +305,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1710146030,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -344,11 +344,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1710146030,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -418,11 +418,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732884235, "lastModified": 1731778696,
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "narHash": "sha256-qQYeHamLt0z00G5MTSSxaTw/9zGdebEeYj4MDL+nOCI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "819f682269f4e002884702b87e445c82840c68f2", "rev": "d154a557da07645aaea3b3375317c234cf2eed82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -440,11 +440,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732482255, "lastModified": 1730837930,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -462,11 +462,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1732899308, "lastModified": 1731683711,
"narHash": "sha256-1jsQqcbMbaWuFim3sqEUdB1/E2KqHa0+cHbTzd/GYFE=", "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "2e5780ebc848f3b021f11dd94533b0b68362d989", "rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
"revCount": 16545, "revCount": 16489,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -482,11 +482,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1732053863, "lastModified": 1726716330,
"narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=", "narHash": "sha256-mIuOP4I51eFLquRaxMKx67pHmhatZrcVPjfHL98v/M8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362", "rev": "c8e8ce72442a164d89d3fdeaae0bcc405f8c015a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -505,11 +505,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1732994406, "lastModified": 1731726258,
"narHash": "sha256-mXF8//CnCtl+o7MZU/wAqY0xrKiMbq17dd8V+prapUw=", "narHash": "sha256-hCybwO9VTRC34wG/dE7trehhAkNI0abuQYEd3ebOXgw=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "6d5abeaaa64f4d2815cd412859ff0ec21b72418b", "rev": "8fa219c123e66b7812748a8c380770b7b714bf29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,16 +521,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731483594, "lastModified": 1731164272,
"narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=", "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "75c79116a7e40cbc0e110ce0cdd500e896458679", "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v0.1.10.1", "ref": "v0.1.10",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -538,11 +538,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732946256, "lastModified": 1731575130,
"narHash": "sha256-6t73BeNVkSVLjXBKxOROITomX3M/emxbSR491Y/gUbM=", "narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "8b84afbd38e057c6dd378bdd42b9467d8a7baa24", "rev": "1a0612cbfd0abee0796efa86470226686ae78f21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,11 +787,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1732749044, "lastModified": 1731652201,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -834,11 +834,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1731890469, "lastModified": 1726481836,
"narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5083ec887760adfe12af64830a66807423a859a7", "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -850,11 +850,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1731319897,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -866,11 +866,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1731319897,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -897,10 +897,10 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1731319897, "lastModified": 1731139594,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"path": "/nix/store/4r8s42c9mwfvgdlxv0izb1cmlzrsb5nz-source", "path": "/nix/store/0sxsfzswhjck7f4sbsvznz285s4i7y64-source",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -968,11 +968,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1732064976, "lastModified": 1725961608,
"narHash": "sha256-fpMi458X6ktTDRRsZiL6qkoU1fAsyndM3+93Dvrw1OE=", "narHash": "sha256-w5wBoO9jTgzgiAE/K+VfMvirt3kB2+TGE9TORq3ouQc=",
"owner": "openXC7", "owner": "openXC7",
"repo": "toolchain-nix", "repo": "toolchain-nix",
"rev": "f5bab9f12b0f5535ed3365f0cb9775335313bdea", "rev": "3ecf230d16fe46fca02ee321d9a1a66c04bffacf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1027,11 +1027,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731983527, "lastModified": 1726453838,
"narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1075,11 +1075,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1732993760, "lastModified": 1732261424,
"narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", "rev": "b667a340730dd3d0596083aa7c949eef01367c62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1237,11 +1237,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729501581, "lastModified": 1696725902,
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1288,11 +1288,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732233710, "lastModified": 1731123454,
"narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -35,11 +35,8 @@
) )
]; ];
# Enable espanso, when not on wayland. # Enable espanso, when possible.
services.espanso = { services.espanso.enable = true;
enable = true;
wayland = false;
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wtype wtype

View file

@ -48,8 +48,8 @@
[ ]; [ ];
}; };
# Allow Olm, as this is just remarking that Matrix is inherently nixpkgs.config.permittedInsecurePackages = [
# not as secure as it claims to be. ~~lol, w/e, it's matrix~~ "olm-3.2.16"
nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; ];
} }

View file

@ -45,11 +45,6 @@ let
if verb == "lights/off": if verb == "lights/off":
print("[I] Got a 'lights out' request. Making things quiet.") print("[I] Got a 'lights out' request. Making things quiet.")
# Turn off monitors for any X11 anything.
for auth in g`/tmp/xauth_*`:
print(f"[I] Turning off monitors on X instance with auth file {auth}.")
!(env DISPLAY=:0 XAUTHORITY=@(auth) xset dpms force off)
# Turn off monitors on each niri session, # Turn off monitors on each niri session,
sockets = g`/var/run/user/1000/niri*.sock` sockets = g`/var/run/user/1000/niri*.sock`
for socket in sockets: for socket in sockets:

View file

@ -55,39 +55,38 @@
# Disable the NVIDIA GPU unless we explicitly request it. # Disable the NVIDIA GPU unless we explicitly request it.
hardware.nvidiaOptimus.disable = true; hardware.nvidiaOptimus.disable = true;
# TEMPORARILY DISABLED DUE TO KERNEL WONK specialisation.optimus.configuration = {
#specialisation.optimus.configuration = { system.nixos.tags = [ "NVIDIA" ];
# system.nixos.tags = [ "NVIDIA" ]; services.xserver.videoDrivers = [ "nvidia" ];
# services.xserver.videoDrivers = [ "nvidia" ];
# # Set up the NVIDIA half of the GPU setup. # Set up the NVIDIA half of the GPU setup.
# # These are used only in the "enabled" configuration. # These are used only in the "enabled" configuration.
# hardware.nvidia = { hardware.nvidia = {
# modesetting.enable = true; modesetting.enable = true;
# # Prefer the open NVIDIA driver. # Prefer the open NVIDIA driver.
# open = true; open = true;
# # Enable the nvidia-settings command. # Enable the nvidia-settings command.
# nvidiaSettings = true; nvidiaSettings = true;
# # Offloading setup: use GPU when asked for by command, and not otherwise. # Offloading setup: use GPU when asked for by command, and not otherwise.
# prime = { prime = {
# sync.enable = true; sync.enable = true;
# # Specify how to find our GPUs. # Specify how to find our GPUs.
# intelBusId = "PCI:0:2:0"; intelBusId = "PCI:0:2:0";
# nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
# }; };
# }; };
# # Include the NVIDIA X11 driver. # Include the NVIDIA X11.
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
# # Don't disable optimus on this config. # Don't disable optimus on this config.
# hardware.nvidiaOptimus.disable = lib.mkForce false; hardware.nvidiaOptimus.disable = lib.mkForce false;
#}; };
# Provide memtest86, since that's nice. # Provide memtest86, since that's nice.
boot.loader.systemd-boot.memtest86.enable = true; boot.loader.systemd-boot.memtest86.enable = true;
@ -104,7 +103,7 @@
boot.kernelPatches = [ boot.kernelPatches = [
{ {
name = "enable-dell-privacy"; name = "enable-dell-privacy";
patch = null; patch = ./00-support-dell-smbios.patch;
extraStructuredConfig = with lib.kernel; { extraStructuredConfig = with lib.kernel; {
DELL_WMI_PRIVACY = yes; DELL_WMI_PRIVACY = yes;

View file

@ -1,13 +0,0 @@
diff --git a/dlls/user32/text.c b/dlls/user32/text.c
index 1896627..a114773 100644
--- a/dlls/user32/text.c
+++ b/dlls/user32/text.c
@@ -743,7 +743,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
/* If we are here after a path ellipsification it must be
* because even the ellipsis itself didn't fit.
*/
- assert (pellip->under == 0 && pellip->after == 0);
+ //assert (pellip->under == 0 && pellip->after == 0);
pellip->before = before;
pellip->len = len_ellipsis;
/* pellip->after remains as zero as does

View file

@ -10,18 +10,6 @@
niri, niri,
... ...
}: }:
let
# Hack wine to not explode when starting MLO.
wineWayland = (pkgs.wineWowPackages.stableFull.override { waylandSupport = true; });
wine = wineWayland.overrideAttrs (prev: {
patches = prev.patches ++ [
../overlays/fixup-wine/00-remove-ellipse-assert.patch
];
});
in
with pkgs; with pkgs;
[ [
wezterm wezterm
@ -47,9 +35,9 @@ with pkgs;
/set weechat.bar.buffers.position top /set weechat.bar.buffers.position top
/set buflist.format.buffer "\''${format_number}\''${indent}\''${cut:20,...,\''${format_nick_prefix}\''${format_name}}" /set buflist.format.buffer "\''${format_number}\''${indent}\''${cut:20,...,\''${format_nick_prefix}\''${format_name}}"
/set buflist.look.sort active /set buflist.look.sort active
/remote add deprekated https://irc.ktemk.in:8001 /remote add deprekages https://irc.ktemk.in:8001
/set relay.remote.deprekated.password "\''${sec.data.remote}" /set relay.remote.deprekages.password "\''${sec.data.remote}"
/remote connect deprekated /remote connect deprekages
''; '';
}; };
@ -159,7 +147,7 @@ with pkgs;
if pkgs.stdenv.isx86_64 then if pkgs.stdenv.isx86_64 then
[ [
jupyter # For now. jupyter # For now.
wine (wineWowPackages.stableFull.override { waylandSupport = true; })
winetricks winetricks
zoom-us zoom-us
masterpdfeditor masterpdfeditor

View file

@ -208,9 +208,9 @@ config = {
font_overrides = { font_overrides = {
miko = 10, miko = 10,
hinata = 16, hinata = 16,
valere = 12, valere = 10,
utol = 13, utol = 13,
trailblazer = 10, trailblazer = 12,
kanbaru = 12, kanbaru = 12,
aigis = 12; aigis = 12;
} }