aboutsummaryrefslogtreecommitdiffstats
path: root/hosts
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2026-02-08 23:30:21 -0800
committerMark Nipper <nipsy@bitgnome.net>2026-02-08 23:30:21 -0800
commitc16813564d4378626f04f049de19ffba59424a51 (patch)
treee178e513a3780acd810501d5f78d38d6aab787d1 /hosts
parent2730b6d5c0e08cbb7dd31064184120c080fbe4b4 (diff)
downloadnix-c16813564d4378626f04f049de19ffba59424a51.tar
nix-c16813564d4378626f04f049de19ffba59424a51.tar.gz
nix-c16813564d4378626f04f049de19ffba59424a51.tar.bz2
nix-c16813564d4378626f04f049de19ffba59424a51.tar.lz
nix-c16813564d4378626f04f049de19ffba59424a51.tar.xz
nix-c16813564d4378626f04f049de19ffba59424a51.tar.zst
nix-c16813564d4378626f04f049de19ffba59424a51.zip
Revert to nixos-unstable nix version and fix xorg deprecations
Diffstat (limited to 'hosts')
-rw-r--r--hosts/caladan/default.nix4
-rw-r--r--hosts/common/core/nix.nix4
-rw-r--r--hosts/common/optional/gui.nix8
3 files changed, 8 insertions, 8 deletions
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 8e47960..1c8af52 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -168,8 +168,8 @@
pkgs.nss
pkgs.pango
pkgs.vulkan-loader
- pkgs.xorg.libXcomposite
- pkgs.xorg.libXdamage
+ pkgs.libxcomposite
+ pkgs.libxdamage
];
};
};
diff --git a/hosts/common/core/nix.nix b/hosts/common/core/nix.nix
index 4760af0..7370241 100644
--- a/hosts/common/core/nix.nix
+++ b/hosts/common/core/nix.nix
@@ -1,4 +1,4 @@
-{ inputs, lib, pkgs, ... }:
+{ inputs, lib, ... }:
{
nix = {
gc = {
@@ -7,7 +7,7 @@
options = "--delete-older-than 7d";
randomizedDelaySec = "5min";
};
- package = pkgs.nixVersions.latest;
+ #package = pkgs.nixVersions.latest;
settings = {
auto-optimise-store = lib.mkDefault true;
experimental-features = [ "nix-command" "flakes" ];
diff --git a/hosts/common/optional/gui.nix b/hosts/common/optional/gui.nix
index 215bbe3..56650ff 100644
--- a/hosts/common/optional/gui.nix
+++ b/hosts/common/optional/gui.nix
@@ -32,10 +32,10 @@
pkgs.wireshark
pkgs.xclip
pkgs.xdotool
- pkgs.xorg.appres
- pkgs.xorg.editres
- pkgs.xorg.xdpyinfo
- pkgs.xorg.xev
+ pkgs.appres
+ pkgs.editres
+ pkgs.xdpyinfo
+ pkgs.xev
pkgs.xsnow
pkgs.xterm
];