diff --git a/.gitignore b/.gitignore index 3c352b0..121ff13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ result +results +result-* +results-* /configuration.nix /hardware-configuration.nix .direnv diff --git a/.remoteignore.toml b/.remoteignore.toml index 4cd5b34..6bf4c75 100644 --- a/.remoteignore.toml +++ b/.remoteignore.toml @@ -7,5 +7,12 @@ exclude = ["*"] include = [ ".sops.yaml" ] [both] -exclude = [ ".remote.toml", "result", ".direnv"] +exclude = [ + ".remote.toml", + "result", + "results", + "result-*", + "results-*", + ".direnv", +] include = [] diff --git a/base.nix b/base.nix index 30db8e6..da339f8 100644 --- a/base.nix +++ b/base.nix @@ -72,6 +72,7 @@ nix.settings.experimental-features = [ "nix-command" "flakes" + "pipe-operator" ]; #nix.settings.allowed-users = [ "@builders" ]; # TODO: this nix.settings.allowed-users = [ "root" "pbsds" "@wheel" ]; # default is [ "*" ] diff --git a/flake.nix b/flake.nix index cb25ac9..35f72db 100644 --- a/flake.nix +++ b/flake.nix @@ -273,8 +273,7 @@ }; in builtins.mapAttrs (hostname: curried: curried hostname) { #hostname "domain" "system" inputs "state" [ modules ... ] - /* asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ hw.starfive-visionfive-2 ]; */ - asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ "${nixos-hardware}/starfive/visionfive/v2/default.nix" ]; + asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ hw.starfive-visionfive-2 ]; noximilien = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au tse intel ]; brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au amd nspawn ]; nord = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au ts intel-novga hw.common-gpu-intel-sandy-bridge rocm hidpi ]; diff --git a/users/pbsds/home/profiles/desktop/zed/default.nix b/users/pbsds/home/profiles/desktop/zed/default.nix index 85b7cce..684d058 100644 --- a/users/pbsds/home/profiles/desktop/zed/default.nix +++ b/users/pbsds/home/profiles/desktop/zed/default.nix @@ -11,5 +11,6 @@ #.config/zed/keymap.json #.config/zed/settings.json #.config/zed/themes + # https://github.com/adorabilis/melange-zed } diff --git a/users/pbsds/home/profiles/git.nix b/users/pbsds/home/profiles/git.nix index f8da481..3532963 100644 --- a/users/pbsds/home/profiles/git.nix +++ b/users/pbsds/home/profiles/git.nix @@ -68,6 +68,7 @@ gbrm = "git fetch origin; git branch --merged | cut -c3- | grep -vE '^(main|master)$' | gum choose --no-limit --header 'Which branches to delete:' | xargs git branch -D"; #gb = "git blame"; #gpo = "git push origin"; + #gpf = "git push --force-with-lease --force-if-includes"; }; }