diff --git a/nix-os/shell.nix b/nix-os/shell.nix index 891e3b9..73476af 100644 --- a/nix-os/shell.nix +++ b/nix-os/shell.nix @@ -131,20 +131,7 @@ in programs.starship = { enable = true; settings = { - format = lib.concatStrings [ - "$all" - "\${custom.sshAuthSocket}" - "$line_break" - "\${custom.ranger}" - "$jobs" - "$battery" - "$time" - "$status" - "$os" - "$container" - "$shell" - "$character" - ]; + format = "$all$line_break\${custom.ranger}$jobs$battery$time$status$os$container$shell$character"; directory = { truncation_length = 5; truncation_symbol = "…/"; @@ -161,12 +148,6 @@ in command = "echo \"✦\""; style = "bold 208"; }; - custom.sshAuthSocket = { - when = "test -S \"$SSH_AUTH_SOCK\""; - command = "echo -e \"SSH Auth Agent\""; - style = "124"; - format = "with [$output]($style) "; - }; }; }; }; diff --git a/update-list.nix b/update-list.nix index ce8c49b..dd007cf 100644 --- a/update-list.nix +++ b/update-list.nix @@ -5,10 +5,13 @@ self: inputsWithPackages = import self.inputsPath { pkgs = self.packagesForSystem builtins.currentSystem; }; -in self.lib.concatMapAttrs (name: value: { - "inputs/${name}" = value; -}) inputsWithPackages -) +in { + "inputs/nixpkgs" = inputsWithPackages.nixpkgs; + "inputs/nixpkgs-unstable" = inputsWithPackages.nixpkgs-unstable; + "inputs/nix-bitcoin" = inputsWithPackages.nix-bitcoin; + "inputs/cosmic-modules" = inputsWithPackages.cosmic-modules; + "inputs/nixos-vscode-server" = inputsWithPackages.nixos-vscode-server; +}) # MARK: NixOS modules // ( let