summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Keller <tjk@tjkeller.xyz>2026-09-15 19:33:16 -0500
committerTim Keller <tjk@tjkeller.xyz>2026-09-15 19:33:16 -0500
commit6a24271e1ae899979b15f6d7d2ebfa8ca5a42818 (patch)
tree094255a19dab6b508fdfd910095d5173f256dccc
parentecc1382af3a272c6ee9766bb4f7cfa1543d9fc3c (diff)
downloadnixos-6a24271e1ae899979b15f6d7d2ebfa8ca5a42818.tar.xz
nixos-6a24271e1ae899979b15f6d7d2ebfa8ca5a42818.zip
add package awesome-git and revert to modesetting driver on X230HEADmaster
-rw-r--r--hosts/X230/configuration.nix2
-rw-r--r--nixos/programs/awesome.nix2
-rw-r--r--pkgs/default.nix17
3 files changed, 19 insertions, 2 deletions
diff --git a/hosts/X230/configuration.nix b/hosts/X230/configuration.nix
index 22856f2..f54b174 100644
--- a/hosts/X230/configuration.nix
+++ b/hosts/X230/configuration.nix
@@ -30,7 +30,7 @@
};
# Use intel driver for better performance and vsync
- services.xserver.videoDrivers = [ "intel" ];
+ #services.xserver.videoDrivers = [ "intel" ];
# Configure home
home-manager.users.timmy = {
diff --git a/nixos/programs/awesome.nix b/nixos/programs/awesome.nix
index 580aec1..7c0b114 100644
--- a/nixos/programs/awesome.nix
+++ b/nixos/programs/awesome.nix
@@ -13,7 +13,7 @@ in {
luaModules = with pkgs.luajitPackages; [
lgi
];
- package = with pkgs; awesome.override {
+ package = with pkgs; awesome-git.override {
gtk3Support = true;
gtk3 = gtk3;
lua = luajit;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1de13ff..c1e2206 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,6 +6,23 @@
workcentre-7800-series = (callPackage ./xerox-workcentre-7800-series-driver {});
unclutter-desktop-entry = (callPackage ./unclutter-desktop-entry {});
+ # Update awesome
+ awesome-git = prev.awesome.overrideAttrs (oldAttrs: {
+ pname = "awesome-git";
+ version = "git-20260828-0a5e50c";
+ src = fetchFromGitHub {
+ owner = "awesomeWM";
+ repo = "awesome";
+ rev = "0a5e50cf7ee214fae47159e0e976ab4a78d2ed4f";
+ sha256 = "sha256-GUX1jHdLpEe9hfABBVgaoHc+l83/uZ+IP+3zdHb/U7E=";
+ };
+ patches = [];
+ postPatch = ''
+ patchShebangs tests/examples/_postprocess.lua
+ '';
+ env.FONTCONFIG_FILE = pkgs.makeFontsConf { fontDirectories = [ ]; };
+ });
+
# Use my vimv-rs until pr gets merged
vimv-rs = prev.vimv-rs.overrideAttrs (oldAttrs: {
src = fetchFromGitHub {