From 1f1a71b7dfaa1f2b2837971a8628d33e509dc076 Mon Sep 17 00:00:00 2001 From: Jade Date: Sun, 8 Jan 2023 22:22:19 +0100 Subject: [PATCH] a --- build-mac.sh | 2 +- common.nix | 3 +-- monosodium-glutamate-g/configuration.nix | 2 +- potatobook-g/configuration.nix | 12 ++++++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build-mac.sh b/build-mac.sh index 8e6aea3..765e0d0 100755 --- a/build-mac.sh +++ b/build-mac.sh @@ -1 +1 @@ -sudo nixos-rebuild switch --flake . --impure --override-input mac-brcm-fw path:/home/jade/mac-brcm-fw +sudo nixos-rebuild switch --flake . --impure --override-input mac-brcm-fw path:/home/jade/mac-brcm-fw --build-host 192.168.178.119 --no-build-nix diff --git a/common.nix b/common.nix index 4fddf51..0bae144 100644 --- a/common.nix +++ b/common.nix @@ -60,7 +60,6 @@ with builtins; nixpkgs.config.packageOverrides = pkgs: { sudo = pkgs.sudo.override { withInsults = true; }; - blender-hip = pkgs.blender-hip.override { spaceNavSupport = true; }; }; security.sudo.extraConfig = "Defaults insults"; @@ -156,7 +155,7 @@ users.users.jade = { libsecret gh xorg.xhost helvum xdg-desktop-portal-gtk nheko obsidian nix-prefetch-scripts audacity rustup easyeffects virt-manager evince direnv nix-direnv fzf openrgb krita gmic-qt-krita gimp-with-plugins - inkscape-with-extensions blender-hip virglrenderer ddccontrol-db glab + inkscape-with-extensions virglrenderer ddccontrol-db glab firebird-emu obs-studio kdenlive openal mullvad mullvad-vpn sl lolcat ifuse diff --git a/monosodium-glutamate-g/configuration.nix b/monosodium-glutamate-g/configuration.nix index 0ccff0e..801545e 100644 --- a/monosodium-glutamate-g/configuration.nix +++ b/monosodium-glutamate-g/configuration.nix @@ -41,7 +41,7 @@ # TODO: clean up. prismlauncher nvtop-amd - libGL + libGL blender-hip ]; environment.pathsToLink = [ diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix index 0d0913a..33ddb97 100644 --- a/potatobook-g/configuration.nix +++ b/potatobook-g/configuration.nix @@ -84,7 +84,7 @@ # missing: menu-qalc picom-jonaburg environment.systemPackages = with pkgs; [ # TODO: clean up. - miraclecast + miraclecast blender ]; environment.pathsToLink = [ @@ -191,11 +191,11 @@ # fsType = "btrfs"; # options = [ "subvol=swap" "noatime" ]; #}; - systemd.services.nix-daemon.environment.NIX_SSHOPTS = let - knownHosts = pkgs.writeText "known-hosts" '' - ${builtins.readFile ../secret-data/ssh-desktop-knownhosts-thingies} - ''; - in "-oIdentityFile=/home/jade/.ssh/id_rsa -oUserKnownHostsFile=/home/jade/.ssh/known_hosts"; + #systemd.services.nix-daemon.environment.NIX_SSHOPTS = let + #knownHosts = pkgs.writeText "known-hosts" '' + #${builtins.readFile ../secret-data/ssh-desktop-knownhosts-thingies} + #''; + #in builtins.trace "-oIdentityFile=/home/jade/.ssh/id_rsa -oUserKnownHostsFile=${knownHosts}" "-v -oIdentityFile=/home/jade/.ssh/id_rsa -oUserKnownHostsFile=/home/jade/nix-configs/secret-data/ssh-desktop-knownhosts-thingies"; }