mirror of
https://github.com/thegeneralist01/config.git
synced 2026-05-30 08:37:01 +02:00
Update local config changes
This commit is contained in:
parent
5e709810e2
commit
5371cb191a
4 changed files with 3 additions and 34 deletions
|
|
@ -29,5 +29,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
system.primaryUser = "central";
|
||||||
system.stateVersion = 6;
|
system.stateVersion = 6;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 ];
|
|
||||||
}
|
|
||||||
|
|
@ -20,7 +20,7 @@ let
|
||||||
|
|
||||||
unstable = import (builtins.fetchTarball {
|
unstable = import (builtins.fetchTarball {
|
||||||
url = "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz";
|
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; };
|
}) { system = pkgs.stdenv.hostPlatform.system; };
|
||||||
package = unstable.nushell;
|
package = unstable.nushell;
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
homebrew.enable = true;
|
homebrew.enable = true;
|
||||||
# homebrew.brews = [ "mole" ];
|
# homebrew.brews = [ "mole" ];
|
||||||
homebrew.casks = [ "google-chrome" ];
|
# homebrew.casks = [ "google-chrome" ];
|
||||||
environment.systemPackages = [ pkgs.iina ];
|
environment.systemPackages = [ pkgs.iina ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue