From 5371cb191a7d5070a5a5c330f2578f1f8641622c Mon Sep 17 00:00:00 2001 From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com> Date: Tue, 19 May 2026 20:52:06 +0200 Subject: [PATCH] Update local config changes --- .../configuration.nix | 1 + modules/common/amp.nix | 32 ------------------- modules/common/shell/0_nushell.nix | 2 +- modules/darwin/packages.nix | 2 +- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 modules/common/amp.nix diff --git a/hosts/thegeneralist-central-mbp/configuration.nix b/hosts/thegeneralist-central-mbp/configuration.nix index a6ffb2f..704563d 100644 --- a/hosts/thegeneralist-central-mbp/configuration.nix +++ b/hosts/thegeneralist-central-mbp/configuration.nix @@ -29,5 +29,6 @@ }; }; + system.primaryUser = "central"; system.stateVersion = 6; } diff --git a/modules/common/amp.nix b/modules/common/amp.nix deleted file mode 100644 index c788a25..0000000 --- a/modules/common/amp.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - config, - lib, - ... -}: -let - enableAmp = (!config.onLinux) || (!config.isServer); - ampHomeModule = - { lib, pkgs, ... }: - { - home.sessionPath = [ "$HOME/.amp/bin" ]; - home.activation.ampInstall = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - amp_bin="$HOME/.amp/bin/amp" - if [ ! -x "$amp_bin" ]; then - export PATH="${ - lib.makeBinPath [ - pkgs.coreutils - pkgs.gnugrep - pkgs.curl - pkgs.bash - ] - }:$PATH" - - # Prevent installer from trying to mutate shell rc files (Home Manager manages those). - SHELL="amp-installer" ${pkgs.curl}/bin/curl -fsSL https://ampcode.com/install.sh | ${pkgs.bash}/bin/bash - fi - ''; - }; -in -lib.mkIf enableAmp { - home-manager.sharedModules = [ ampHomeModule ]; -} diff --git a/modules/common/shell/0_nushell.nix b/modules/common/shell/0_nushell.nix index bd573e6..8ef77c6 100644 --- a/modules/common/shell/0_nushell.nix +++ b/modules/common/shell/0_nushell.nix @@ -20,7 +20,7 @@ let unstable = import (builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; - sha256 = if (config.isServer) then "sha256:18ggs7jwmpi58k7xza4axy3cjs17c596ihq5y70h6sryz2hypgba" else (if (config.onLinux) then "sha256:03plivnr4cg0h8v7djf9g2jra09r45pmdiirmy4lvl2n1d4yb7ac" else "sha256:16xi1yijq2ccbp8254zc0b5fgz0igxvyf4yn349wj2ggk4cl6dgn"); + sha256 = if (config.isServer) then "sha256:18ggs7jwmpi58k7xza4axy3cjs17c596ihq5y70h6sryz2hypgba" else (if (config.onLinux) then "sha256:03plivnr4cg0h8v7djf9g2jra09r45pmdiirmy4lvl2n1d4yb7ac" else "sha256:1485vqhb8cwym1m75v61i10j427vazszaklkwj2wmm80k8sijjyz"); }) { system = pkgs.stdenv.hostPlatform.system; }; package = unstable.nushell; in diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index 6186e0d..194e1b4 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { homebrew.enable = true; # homebrew.brews = [ "mole" ]; - homebrew.casks = [ "google-chrome" ]; + # homebrew.casks = [ "google-chrome" ]; environment.systemPackages = [ pkgs.iina ]; }