diff --git a/profiles/auto-upgrade.nix b/profiles/auto-upgrade.nix index 375a25d..dd5420b 100644 --- a/profiles/auto-upgrade.nix +++ b/profiles/auto-upgrade.nix @@ -23,7 +23,7 @@ in # inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like derivation lib.filterAttrs (key: val: !builtins.elem key ["outPath"]) (input.sourceInfo or {}) // { store-path = builtins.unsafeDiscardStringContext input.outPath; } # use this line instead if you want to retain a store reference to the flake inputs, but don't make it a part of the closure - ##// { store-path = input.outPath; } # use this line instead if you want to retain a store reference to the flake inputs + # // { store-path = input.outPath; } # use this line instead if you want to retain a store reference to the flake inputs ) ); diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 444cfe2..d242770 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -48,6 +48,8 @@ # TODO: selectively whitelist nixpkgs.config.allowUnfree = true; + # nixpkgs.config.allowAliases = false; + # nixpkgs.config.warnAliases = true; nixpkgs.config.allowUnfreePredicate = pkg: true; nixpkgs.config.nonfreeLicensing = true; # used by ffmpeg diff --git a/profiles/known-hosts/hosts.toml b/profiles/known-hosts/hosts.toml index 3672f87..7953aad 100644 --- a/profiles/known-hosts/hosts.toml +++ b/profiles/known-hosts/hosts.toml @@ -52,7 +52,8 @@ aliases = [ "bolle.tail9aac63.ts.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] buildMachine.maxJobs = 3 # 12 threads 32GB buildMachine.speedFactor = 4 # ??? -buildMachine.supportedFeatures = ["kvm", "nixos-test", "ccache" ] +buildMachine.supportedFeatures = ["kvm", "nixos-test" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache +buildMachine.protocol = "ssh-ng" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkkJZaQduBo+4+km2Qbj4ebd/k" ssh.proxyJump = "login.pvv.ntnu.no" # wakeonlan e4:54:e8:51:8c:e9 @@ -73,7 +74,7 @@ aliases = [ "garp.tail9aac63.ts.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] buildMachine.maxJobs = 2 # 8 threads 32GB buildMachine.speedFactor = 4 # i7-6700 -buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda", "ccache" ] +buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx" ssh.proxyJump = "login.pvv.ntnu.no" # wakeonlan 4c:cc:6a:61:d0:20 diff --git a/users/pbsds/home/profiles/desktop/zed/remote.nix b/users/pbsds/home/profiles/desktop/zed/remote.nix index 1f8c782..d100f6f 100644 --- a/users/pbsds/home/profiles/desktop/zed/remote.nix +++ b/users/pbsds/home/profiles/desktop/zed/remote.nix @@ -29,6 +29,7 @@ typos-lsp # typos tinymist # typst zls # zig + typos # spell checker # I prefer these in shell.nix / virtual environments # python3Packages.python-lsp-server # pylsp diff --git a/users/pbsds/home/profiles/nix.nix b/users/pbsds/home/profiles/nix.nix index b9f8cce..31fc17f 100644 --- a/users/pbsds/home/profiles/nix.nix +++ b/users/pbsds/home/profiles/nix.nix @@ -26,7 +26,7 @@ in /* unstable.nixtract */ unstable.nixfmt-rfc-style nurl - manix + # manix #comma # collides with nix-index-database devenv nix-fast-build @@ -34,12 +34,14 @@ in ]; home.shellAliases = { - - manix-fzf = ''manix "" 2>/dev/null | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix''; + # manix-fzf = ''manix "" 2>/dev/null | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix''; denix = "sed -E 's@/nix/store/[^ /]+@@g'"; denix-ellipsis = "sed -E 's@/nix/store/[^ /-]+-?@/nix/store/...@g'"; + # nix-eval = "nix eval --impure --expr"; + # nix-eval-nixpkgs = mkArgsAlias ''nix eval --impure --expr "with import (builtins.getFlake "nixpkgs") {}; $1" "''${@:2}"''; + nom-instantiate = "nix-instantiate"; inom = mkArgsAlias ''nom "$@" --system i686-linux -j0''; @@ -75,9 +77,6 @@ in dnix-build = "nix-build --system x86_64-darwin -j0"; danom-build = "nom-build --system aarch64-darwin -j0"; danix-build = "nix-build --system aarch64-darwin -j0"; - - nix-eval = "nix eval --impure --expr"; - nix-eval-nixpkgs = mkArgsAlias ''nix eval --impure --expr "with import (builtins.getFlake "nixpkgs") {}; $1" "''${@:2}"''; }; programs.bash.initExtra = ''