From f05db9179ae7c1cb4045fd8d9a0f30e5e5934cbe Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 25 Mar 2025 00:33:10 +0100 Subject: [PATCH] dsakdsakdsak --- flake.nix | 3 ++- profiles/known-hosts/default.nix | 11 ++++------- profiles/known-hosts/hosts.toml | 16 ++++++++-------- users/pbsds/default.nix | 5 ++--- users/pbsds/home/profiles/bashrc.d/nix-search.sh | 14 ++++++++++++-- .../home/profiles/bashrc.d/zeditor-remote.sh | 2 +- users/pbsds/home/profiles/shell.nix | 10 +++++++++- 7 files changed, 38 insertions(+), 23 deletions(-) diff --git a/flake.nix b/flake.nix index 7c4e95b..c393369 100644 --- a/flake.nix +++ b/flake.nix @@ -173,7 +173,7 @@ mkModule = extra-modules: domain: system: inputs: stateVersion: modules: hostname: ({ lib, ... }: { system.stateVersion = lib.mkDefault stateVersion; # TODO: home-manager - imports = let ifExists = p: if builtins.pathExists p then p else {}; in [ + imports = [ ./base.nix "${self}/hosts/nixos/${hostname}/configuration.nix" inputs.home-manager.nixosModules.default @@ -222,6 +222,7 @@ inherit inputs; }; modules = [ + # TODO: specify this in mkModule? { nixpkgs.system = system; # workaround nixpkgs.hostPlatform.system = system; diff --git a/profiles/known-hosts/default.nix b/profiles/known-hosts/default.nix index 4971d21..aa776b4 100644 --- a/profiles/known-hosts/default.nix +++ b/profiles/known-hosts/default.nix @@ -4,10 +4,7 @@ let inherit (builtins) - map - fromTOML toString - readFile elem attrNames attrValues @@ -39,13 +36,13 @@ let )) (lib.mapAttrsToList (fqdn: host: let - allHostnames = [ fqdn ] ++ host.aliases; + allHostNames = [ fqdn ] ++ host.aliases; in - lib.forEach allHostnames (alias: + lib.forEach allHostNames (alias: lib.nameValuePair alias (host // { - aliases = lib.remove alias allHostnames; + aliases = lib.remove alias allHostNames; isAlias = fqdn != alias; }) ) @@ -54,7 +51,7 @@ let lib.listToAttrs ]; hostNames = attrNames known-hosts; - thisHost = known-hosts.${config.networking.fqdn}; + thisHost = known-hosts.${config.networking.fqdn} or known-hosts.${config.networking.hostName}; thisHostIsBuilder = thisHost.buildMachine.maxJobs > 0 && thisHost.ssh ? listenPublicKey; thisHostIsBuildee = thisHost.ssh ? userPublicKey; thisHostIsHopHost = elem config.networking.fqdn (lib.forEach (attrValues known-hosts) (host: host.ssh.proxyJump or null)); diff --git a/profiles/known-hosts/hosts.toml b/profiles/known-hosts/hosts.toml index 0b4963a..71892cf 100644 --- a/profiles/known-hosts/hosts.toml +++ b/profiles/known-hosts/hosts.toml @@ -87,8 +87,8 @@ ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ3QhTGS03Sqm6OeCEz5A ssh.userPublicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7fYndgIXJM+tLSfkbprWc8ClOI58wlaZCg6I+wMYINeOwxLU24BmIyQAhNeqhHYBdXiyIAl5KN3+YajN1nx6zq2XPXLut31Xtf+0yMdRMX4rXgqOnsBeG4eTfNsPx+v7VNANth8dIADpk59Y9ioWB6JI6NF0wfkqrCSTpt2q9gpTA35MBe41hlaxqxYGq+PlfZyJbN4TJCORZROkjw1P6K+EoYUHTHmduMZSAnpzx5bTHL2r1VK1jLRL4q2O1LP9G7eVYUsZKxKznJqtAeoOGBL4OX2JeIXT51/pXTW0NNyVPELD6aUUZjK8aVK2JDXupXegYO8cHqwLaz7rZj3G8evGamSlGvAYR4Gwvvp4Du8ZRZVM3Gt1allhPMTLnm/gy9Lta35D8SHH0IUKWD3buo5HZliZgSMAvoSrT03vpuGILLoWEkTjpPT0qKIlBd/qlACBzKC9Wwmda5WWgMsfe0zP4zNLVdves5nkMrbY91TYSFM0FuDCaRsK5Mrhx7i0= root@noximilien" # wakeonlan 18:03:73:1f:f5:5f -["sopp.tail9aac63.ts.net"] # gtx 1080 -# aliases = [ "sopp.pbsds.net" ] +["sopp"] # gtx 1080 +aliases = [ "sopp.tail9aac63.ts.net" ] # "sopp.pbsds.net", # buildMachine.maxJobs = 2 # 8 threads 32GB buildMachine.speedFactor = 2 # i7-4790K buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda"] @@ -100,8 +100,8 @@ ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6eTQkxO/1XflHpGf3478+ # wakeonlan 44:8a:5b:9c:2b:ae # wakeonlan 12:d2:be:e0:c5:f5 wireless -["nord.tail9aac63.ts.net"] # rx 580 -# aliases = [ "nord.pbsds.net" ] +["nord"] # rx 580 +aliases = [ "nord.tail9aac63.ts.net" ] # "nord.pbsds.net", # buildMachine.maxJobs = 1 # 4 threads 32GB buildMachine.speedFactor = 1 # i5-2500 buildMachine.supportedFeatures = ["kvm", "nixos-test"] @@ -125,14 +125,14 @@ ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJCbXQ2q/cCe2wgUT4d0qH6 ["knut.pbsds.net"] # Intel(R) Celeron(R) CPU G3950 # wakeonlan 1c:1b:0d:9a:34:71 -["bjarte.tail9aac63.ts.net"] -# aliases = [ "bjarte.pbsds.net" ] +["bjarte"] +aliases = [ "bjarte.tail9aac63.ts.net" ] # "bjarte.pbsds.net", buildMachine.maxJobs = 2 # 8 threads 16GB ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4v1+FbiEa6Mohpf3/Una5ahKeKSG9yZ9iU5TC7ddL5 root@bjarte" # wakeonlan f8:75:a4:58:f1:35 -["FuriPhoneFLX1.tail9aac63.ts.net"] -# aliases = [ "FuriPhoneFLX1.pbsds.net" ] +["FuriPhoneFLX1"] +aliases = [ "FuriPhoneFLX1.tail9aac63.ts.net" ] # "FuriPhoneFLX1.pbsds.net", ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsBuczprbq2seyfZ4UCoX8DeRmyCg+LfBzrY4tfUhjK root@FuriPhoneFLX1" # wakeonlan 1c:9f:4e:57:85:58 wireless diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix index 04cfcfe..8556613 100644 --- a/users/pbsds/default.nix +++ b/users/pbsds/default.nix @@ -27,9 +27,8 @@ #nix.trusted-users = [ "pbsds" ]; home-manager.users.pbsds = if config.services.xserver.desktopManager.gnome.enable - then import ./home/gnome.nix - else import ./home; - + then ./home/gnome.nix + else ./home; nix.settings.allowed-users = [ "pbsds" ]; nix.settings.trusted-users = [ "pbsds" ]; diff --git a/users/pbsds/home/profiles/bashrc.d/nix-search.sh b/users/pbsds/home/profiles/bashrc.d/nix-search.sh index a2e10cc..c6be533 100644 --- a/users/pbsds/home/profiles/bashrc.d/nix-search.sh +++ b/users/pbsds/home/profiles/bashrc.d/nix-search.sh @@ -54,11 +54,21 @@ nix-search() ( trace "Preprocessing..." trace "+ jq ..." - jq <"$packages_json" 'to_entries[] | "--\t\(.key)\t\((.value.meta.description // .value.meta.longDescription // "" | split("\n") | .[0]))\t\(({version: (.value.version)} // {}) + (.value.meta // {}))"' -r \ + time jq <"$packages_json" 'to_entries[] | [ + "--", + .key, + .value.meta.description // .value.meta.longDescription // "" | split("\n") | .[0], + ({version: (.value.version)} // {}) + (.value.meta // {}), + ] | @tsv' -r \ | tr '0123456789' '9876543210' | sort | tr '0123456789' '9876543210' \ > "$packages_tsv" - printf "%s\n" "$nixpkgs" > "$storepath" + printf "%s\n" "$nixpkgs" > "$storepath"; + fi + + if [[ ! -t 0 && "$?" -eq 0 ]]; then + echo asd + return 0 fi show-package() { diff --git a/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh b/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh index 3e0eda7..143988a 100644 --- a/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh +++ b/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh @@ -76,7 +76,7 @@ zeditor-remote() { worker() { local host="$1" # TODO: this assumes remote hosts has 'fd', use 'find' instead? - fdargs=(--hidden --max-depth 5) + fdargs=(--hidden --no-ignore --max-depth 5) # accept all, persist nothing, to scan hosts we've yet to trust, zed will still complain however sshargs=(-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null) if [[ "$host" = localhost ]]; then diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index 3040b9a..28ca12d 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -105,7 +105,15 @@ in home.shellAliases.dushd = "du -shc * .[!.]?* | sort -h"; home.shellAliases.open = "xdg-open"; - home.shellAliases.rwhich = mkArgsAlias ''which "$@" | xargs realpath --''; + home.shellAliases.rwhich = mkArgsAlias ''which "$@" | xargs realpath --''; + home.shellAliases.rwhichcd = mkArgsAlias '' + local dir=$(which "$@" | xargs realpath -- | cut -d/ -f-4 | grep ^/nix/store/ | fzf --height=15) + if [[ -n "$dir" && -d "$dir" ]]; then + # history -s "$(printf "cd %q\n" "$dir")" + # history -a + cd "$dir" + fi + ''; home.shellAliases.grep = "grep --color"; home.shellAliases.diff = "diff -u --color"; # eyo