diff --git a/config/hardware/limina.nix b/config/hardware/limina.nix index ae5ee8d..5c3c47b 100644 --- a/config/hardware/limina.nix +++ b/config/hardware/limina.nix @@ -19,7 +19,7 @@ with lib; { }; supportedFilesystems = [ "zfs" ]; - kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_latest; }; fileSystems = { diff --git a/config/hardware/plato.nix b/config/hardware/plato.nix index 9c5d32b..8b0ae54 100644 --- a/config/hardware/plato.nix +++ b/config/hardware/plato.nix @@ -17,7 +17,7 @@ with lib; { }; supportedFilesystems = [ "zfs" ]; - kernelPackages = pkgs.linuxPackages.zfs; + # kernelPackages = pkgs.linuxPackages.zfs; }; fileSystems = { diff --git a/config/host-config/limina.nix b/config/host-config/limina.nix index 7255b42..27c58a1 100644 --- a/config/host-config/limina.nix +++ b/config/host-config/limina.nix @@ -15,6 +15,8 @@ let in { config = { + boot.zfs.enableUnstable = true; + networking = { interfaces = { enp1s0 = { useDHCP = true; }; diff --git a/config/hosts/lambda.nix b/config/hosts/lambda.nix index 33bee8b..c73e0ae 100644 --- a/config/hosts/lambda.nix +++ b/config/hosts/lambda.nix @@ -2,10 +2,10 @@ description = "sea.fudo.org experiment server."; docker-server = false; ssh-fingerprints = [ - "1 1 128919958a358d44d1c8d76d29b1fa1514f9ad35" - "1 2 cd0ae0bb7e65f4058efdb2d7073de97ac403b1ef6f1527a23c60390d9a6bad88" - "4 1 a689caa9f1e75c6378efed592bc0d623e4b7d199" - "4 2 5856ae661077203fba74a226dd77a17d69d6fda8ab960bfeb22a14c253f4472f" + "1 1 01c67478e2cc7a386a2468adb9d4627a53d69af5" + "1 2 750bc70f88a6c774077f20603a143b9f07436d9d074af78875850ae4df8971eb" + "4 1 fdb3da40dc48540a3f5644e360db9225a584f64e" + "4 2 310115023c1f98ae88ac94eb38dd529352f3036048d72c87e87c0ab53f186438" ]; rp = "niten"; admin-email = "niten@fudo.org"; @@ -13,6 +13,6 @@ site = "seattle"; profile = "server"; ssh-pubkey = - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvgQsinDcoBZzneroy0QsCJUdiT8KdcI0YKWbSc++w8"; + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPB5JY6jnHCRLxjqWKYkK8Xpmfyq2nA+0noPazYGd9a+"; enable-gui = false; } diff --git a/config/profile-config/common-ui.nix b/config/profile-config/common-ui.nix index 19f7eb8..2483112 100644 --- a/config/profile-config/common-ui.nix +++ b/config/profile-config/common-ui.nix @@ -57,13 +57,17 @@ in { bluetooth.enable = true; opengl = mkIf enable-gui { + enable = true; driSupport = true; driSupport32Bit = true; }; }; sound.enable = true; - hardware.pulseaudio.enable = true; + hardware.pulseaudio = { + enable = true; + support32Bit = config.hardware.pulseaudio.enable; + }; console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-g18n.psf.gz"; @@ -73,7 +77,9 @@ in { gnome-user-share.enable = mkForce false; }; - programs.steam.enable = enable-gui; + services.flatpak.enable = enable-gui; + + # programs.steam.enable = enable-gui; fonts = mkIf enable-gui { fontDir.enable = true; diff --git a/home-manager/niten.nix b/home-manager/niten.nix index 1fe42cd..611c135 100644 --- a/home-manager/niten.nix +++ b/home-manager/niten.nix @@ -14,30 +14,30 @@ let url = "https://github.com/vlaci/nix-doom-emacs.git"; rev = "3893c50877a9d2d5d4aeee524ba1539f22115f1f"; sha256 = "1jz8mxh143a4470mq303ng6dh3bxi6mcppqli4z0m13qhqssh4fx"; - }) { - doomPrivateDir = "${pkgs.doom-emacs-config}/"; - }; + }) { doomPrivateDir = "${pkgs.doom-emacs-config}/"; }; + doom-emacs = doom-emacs-minus-deps.overrideAttrs (old: + { + #buildInputs = old.buildInputs ++ [ pkgs.clang pkgs.cmake pkgs.libclang ]; + }); - doom-emacs = doom-emacs-minus-deps.overrideAttrs (old: rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.clang - pkgs.cmake - pkgs.libclang + gui-packages = with pkgs; + let + steam-with-pipewire = + (steam.override { extraLibraries = pkgs: [ pkgs.pipewire ]; }); + in [ + exodus + firefox + jq + nyxt + openttd + redshift + signal-desktop + spotify + steam-with-pipewire + steam-with-pipewire.run + xclip ]; - }); - - gui-packages = with pkgs; [ - exodus - firefox - jq - nyxt - openttd - redshift - signal-desktop - spotify - xclip - ]; common-packages = with pkgs; [ ant @@ -52,7 +52,7 @@ let clojure cmake curl - # doom-emacs + # doom-emacs-minus-deps doom-emacs-config doomEmacsInit enca @@ -144,9 +144,10 @@ in { ".local/share/openttd/baseset" = mkIf enable-gui { source = "${pkgs.openttd-data}/data"; }; - ".emacs.d/init.el".text = '' - (load "default.el") - ''; + # For nixified emacs + # ".emacs.d/init.el".text = '' + # (load "default.el") + # ''; # ".xsessions" = { # mode = "0554"; diff --git a/nixops/seattle.nix b/nixops/seattle.nix index 359ad70..46c647d 100644 --- a/nixops/seattle.nix +++ b/nixops/seattle.nix @@ -12,7 +12,7 @@ in { }; limina = define-host "10.0.0.1" "limina"; - # lambda = define-host "10.0.0.11" "lambda"; + lambda = define-host "10.0.0.11" "lambda"; nostromo = define-host "10.0.0.10" "nostromo"; plato = define-host "10.0.0.21" "plato"; spark = define-host "10.0.0.108" "spark"; diff --git a/packages/default.nix b/packages/default.nix index 8e4c23f..e2060b9 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -176,5 +176,10 @@ in { rev = "278a90f7ce219e36e5de0a80b540e469a9bce912"; sha256 = "06qns3ayc84mamdgn0jw652rvx60wy9km1vxm2361mzmx2zk89iw"; }; + + hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ + libva + pipewire + ]; }; }