From d53c87045341d69fb403b6ebced53f30a7dcff03 Mon Sep 17 00:00:00 2001 From: chaos Date: Thu, 11 Apr 2024 14:02:04 +0100 Subject: [PATCH] remove obsidian & session for desktops for now, add some more nix tools, use nom in rebuild --- outputs.nix | 1 + presets/nixos/desktopBase.nix | 4 ++-- profiles/base/nix.nix | 2 +- scripts/rebuild.sh | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/outputs.nix b/outputs.nix index 92760c7..d07a848 100644 --- a/outputs.nix +++ b/outputs.nix @@ -41,6 +41,7 @@ in bat nix vault-bin + nix-tree nix-output-monitor ]) ++ (with self.packages."${system}"; [ diff --git a/presets/nixos/desktopBase.nix b/presets/nixos/desktopBase.nix index d0e0d23..ad53b10 100644 --- a/presets/nixos/desktopBase.nix +++ b/presets/nixos/desktopBase.nix @@ -26,10 +26,10 @@ home.apps.telegram home.apps.thunderbird home.apps.quassel - home.apps.session + #home.apps.session home.apps.toot-cli - home.apps.obsidian + #home.apps.obsidian home.apps.libreoffice home.apps.strawberry diff --git a/profiles/base/nix.nix b/profiles/base/nix.nix index cd0e7a7..9f6e53b 100644 --- a/profiles/base/nix.nix +++ b/profiles/base/nix.nix @@ -9,7 +9,7 @@ inherit (lib.lists) optional; inherit (lib.modules) mkIf; in { - environment.systemPackages = with pkgs; [nix-output-monitor]; + environment.systemPackages = with pkgs; [nix-tree nix-output-monitor]; nix = { nixPath = ["nixpkgs=${inputs.nixpkgs}"]; diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh index 4c82b4e..80e9311 100755 --- a/scripts/rebuild.sh +++ b/scripts/rebuild.sh @@ -19,4 +19,5 @@ fi sudo cpupower frequency-set -g performance +nix build -K --log-format internal-json -v "${REPO_ROOT}#nixosConfigurations.$(hostname).config.system.build.toplevel" "$@" 2>&1 | nom --json nixos-rebuild --fast --flake "${REPO_ROOT}#$(hostname)" "$MODE" "$@"