summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archetypes/collections/desktop/xserver.nix10
-rw-r--r--archetypes/collections/utilities.nix2
-rw-r--r--pkgs/st/overrides.nix2
3 files changed, 7 insertions, 7 deletions
diff --git a/archetypes/collections/desktop/xserver.nix b/archetypes/collections/desktop/xserver.nix
index 050c9d4..9d62048 100644
--- a/archetypes/collections/desktop/xserver.nix
+++ b/archetypes/collections/desktop/xserver.nix
@@ -18,16 +18,16 @@ in {
# Install basic X utilities
environment.systemPackages = with pkgs; lib.optionals cfg.utilities.enable [
+ setxkbmap
unclutter-desktop-entry
unclutter-xfixes
xcape
xclip
xdotool
- xorg.setxkbmap
- xorg.xinput
- xorg.xkill
- xorg.xrandr
- xorg.xset
+ xinput
+ xkill
+ xrandr
+ xset
xwallpaper
];
};
diff --git a/archetypes/collections/utilities.nix b/archetypes/collections/utilities.nix
index 24d61f6..1597d75 100644
--- a/archetypes/collections/utilities.nix
+++ b/archetypes/collections/utilities.nix
@@ -29,7 +29,7 @@
vimv-rs
wget
wireguard-tools
- xxHash
+ xxhash
yt-dlp
];
diff --git a/pkgs/st/overrides.nix b/pkgs/st/overrides.nix
index 15a35a9..744cbf8 100644
--- a/pkgs/st/overrides.nix
+++ b/pkgs/st/overrides.nix
@@ -9,7 +9,7 @@ final: prev: {
};
makeFlags = previousAttrs.makeFlags ++ [ "CFLAGS=-Ofast" ];
- buildInputs = with prev.pkgs.xorg; previousAttrs.buildInputs ++ [ libXcursor libXext ];
+ buildInputs = with prev.pkgs; previousAttrs.buildInputs ++ [ libxcursor libxext ];
meta = with prev.lib; previousAttrs.meta // {
homepage = "https://git.tjkeller.xyz/st";