diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/grfn/system/home/modules/games.nix | 2 | ||||
| -rw-r--r-- | users/grfn/system/system/iso.nix | 4 | ||||
| -rw-r--r-- | users/sterni/emacs/default.nix | 4 | ||||
| -rw-r--r-- | users/tazjin/emacs/default.nix | 2 | ||||
| -rw-r--r-- | users/tazjin/nixos/modules/physical.nix | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/users/grfn/system/home/modules/games.nix b/users/grfn/system/home/modules/games.nix index 873182663020..5e2800389208 100644 --- a/users/grfn/system/home/modules/games.nix +++ b/users/grfn/system/home/modules/games.nix @@ -11,7 +11,7 @@ let theme = null; enableIntro = false; enableFPS = true; - enableDFHack = false; # Fails to build currently + enableDFHack = true; }); init = runCommand "init.txt" { } '' diff --git a/users/grfn/system/system/iso.nix b/users/grfn/system/system/iso.nix index 9fa8e7ec7e3b..398145f1cfab 100644 --- a/users/grfn/system/system/iso.nix +++ b/users/grfn/system/system/iso.nix @@ -11,6 +11,10 @@ let networking.useDHCP = false; networking.firewall.enable = false; networking.wireless.enable = lib.mkForce false; + + # TODO(grfn): enabling this (in the minimal profile) fails the iso build, + # since gtk+3 needs to be built which fails due to cairo without xlibs + environment.noXlibs = false; }; in (depot.third_party.nixos { diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix index 67cf71161e10..e3da3299480f 100644 --- a/users/sterni/emacs/default.nix +++ b/users/sterni/emacs/default.nix @@ -3,8 +3,8 @@ let inherit (pkgs.stdenv.hostPlatform) is64bit; - # emacsPgtkNativeComp is defined in emacs-overlay - emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp).withPackages (epkgs: [ + # emacsPgtk is defined in emacs-overlay + emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtk).withPackages (epkgs: [ epkgs.bqn-mode #epkgs.elpaPackages.ada-mode epkgs.elpaPackages.rainbow-mode diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 6dfb37bb7e97..23a0f2bed12f 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -3,7 +3,7 @@ { lib, pkgs, ... }: pkgs.makeOverridable - ({ emacs ? pkgs.emacsNativeComp }: + ({ emacs ? pkgs.emacsUnstable }: let emacsWithPackages = (pkgs.emacsPackagesFor emacs).emacsWithPackages; diff --git a/users/tazjin/nixos/modules/physical.nix b/users/tazjin/nixos/modules/physical.nix index 1f8b69438195..410143cb30a5 100644 --- a/users/tazjin/nixos/modules/physical.nix +++ b/users/tazjin/nixos/modules/physical.nix @@ -24,7 +24,7 @@ in direnv dnsutils electrum - emacsNativeComp # emacsclient + emacsUnstable # emacsclient exa fd file |