This commit is contained in:
Matt Nish-Lapidus 2025-03-18 10:23:57 -04:00
parent 432ed2287c
commit 8643c8b23a
5 changed files with 50 additions and 30 deletions

48
flake.lock generated
View file

@ -70,11 +70,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1742228686, "lastModified": 1742306570,
"narHash": "sha256-5Rg4Ew3RePdKDuBS2vHW08chCXNLTzzrbLe1JPWvKgI=", "narHash": "sha256-Lb4kJSRlpT3QjfC8IDbNP8QLyeKDCkCM1IH2K8DBWvo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d706c55c58c012dc917be46b9f973b048ea4cb53", "rev": "3d30a184b68deddb95990a24c95f821f82c5abbe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -339,11 +339,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742246081, "lastModified": 1742305478,
"narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", "rev": "fb74bb76d94a6c55632376c931fc108131260ee9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -726,11 +726,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1742220949, "lastModified": 1742305115,
"narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=", "narHash": "sha256-EJu/9UNo8ndiZ7AUVTazWQOA4lHUaTkorvgVExo2LLs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9", "rev": "bc4f3a4d3d0fb9be399faf525caffd5b664c5d31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -759,11 +759,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742103165, "lastModified": 1742276600,
"narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", "narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "287480b541e85b13ff6419d372f82fa8e42c603c", "rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,11 +963,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1741862977, "lastModified": 1742268799,
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "rev": "da044451c6a70518db5b730fe277b70f494188f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -995,11 +995,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1742136038, "lastModified": 1742268799,
"narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", "rev": "da044451c6a70518db5b730fe277b70f494188f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1463,11 +1463,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742083780, "lastModified": 1742249030,
"narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", "narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "f9ec97b007547ad80147404335ed22e880dbd69d", "rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1485,11 +1485,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1742199163, "lastModified": 1742288780,
"narHash": "sha256-LBmuV18HLukixHmbAKGqgHN9I5tAso0QnuFb18d2nfc=", "narHash": "sha256-6nJO2SlIvXs0y1DhKjTebj7+qoDmagDXzaPBkaTV+4c=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "c5808a0db43f8924b014b1f4c3653683a207fa57", "rev": "7632163678b1a24f39d0513a5ff4781056723bdb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -26,6 +26,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
xwayland-satellite = {
url = "github:Supreeeme/xwayland-satellite";
inputs.nixpkgs.follows = "nixpkgs";
};
yazi = { yazi = {
url = "github:sxyazi/yazi"; url = "github:sxyazi/yazi";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -58,7 +58,7 @@
]; ];
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cache.garnix.io" # "https://cache.garnix.io"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
@ -150,7 +150,7 @@
# glfw-wayland # glfw-wayland
# openssl # openssl
appimage-run appimage-run
xwayland-satellite inputs.xwayland-satellite.xwayland-satellite
xwayland-run xwayland-run
cifs-utils cifs-utils
# samba # samba
@ -221,6 +221,15 @@
}; };
hardware = { hardware = {
sane = {
enable = true;
extraBackends = [
pkgs.hplipWithPlugin
pkgs.sane-airscan
pkgs.epkowa
pkgs.utsushi
];
};
i2c.enable = true; i2c.enable = true;
uinput.enable = true; uinput.enable = true;
openrazer = { openrazer = {
@ -311,6 +320,8 @@
pkgs.vial pkgs.vial
pkgs.ddcutil pkgs.ddcutil
pkgs.game-devices-udev-rules pkgs.game-devices-udev-rules
pkgs.sane-airscan
pkgs.utsushi
(pkgs.writeTextFile { (pkgs.writeTextFile {
name = "on-battery"; name = "on-battery";
@ -564,7 +575,7 @@
libressl.out libressl.out
libudev-zero.out libudev-zero.out
mesa.out mesa.out
gtk4.out # gtk4.out
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
glib glib
@ -650,6 +661,8 @@
"openrazer" "openrazer"
"plugdev" "plugdev"
"i2c-dev" "i2c-dev"
"scanner"
"lp"
]; ];
packages = with pkgs; [ packages = with pkgs; [
git git

View file

@ -9,7 +9,6 @@
shikane shikane
mpv mpv
gnome gnome
hyprlock hyprlock
hypridle hypridle
]; ];
@ -172,13 +171,15 @@
}; };
iconTheme = { iconTheme = {
name = "Colloid"; name = "Colloid";
package = pkgs.colloid-icon-theme; package = pkgs.colloid-icon-theme.override {
colorVariants = [ "grey" ];
schemeVariants = [ "nord" ];
};
}; };
}; };
qt = { qt = {
enable = true; enable = true;
platformTheme.name = "gtk3";
style = { style = {
package = pkgs.adwaita-qt; package = pkgs.adwaita-qt;
name = "adwaita-dark"; name = "adwaita-dark";

View file

@ -25,6 +25,7 @@
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
color-scheme = "prefer-dark"; color-scheme = "prefer-dark";
# gtk-theme = "Colloid-Grey-Dark-Nord";
}; };
"org/gnome/shell/keybindings" = { "org/gnome/shell/keybindings" = {