From 6b8636e2d979532d98b10a4a8393165ba2d5864c Mon Sep 17 00:00:00 2001 From: Fuwn Date: Tue, 25 Jun 2024 18:36:11 -0700 Subject: hi --- cli/ani-cli/default.nix | 5 + cli/asciinema/default.nix | 5 + cli/bat/default.nix | 6 + cli/default.nix | 21 ++ cli/dog/default.nix | 5 + cli/eza/default.nix | 7 + cli/fd/default.nix | 5 + cli/meta/ai/default.nix | 6 + cli/meta/default.nix | 10 + cli/meta/git/default.nix | 7 + cli/meta/irc/default.nix | 6 + cli/meta/scripting/charmbracelet/default.nix | 6 + cli/meta/scripting/default.nix | 11 + cli/meta/scripting/ripgrep/default.nix | 7 + cli/meta/shell/default.nix | 5 + cli/meta/smolnet/bollux/default.nix | 67 ++++++ cli/meta/smolnet/bollux/fix_lesskey_nag.patch | 13 ++ cli/meta/smolnet/default.nix | 11 + cli/navi/default.nix | 5 + cli/ncdu/default.nix | 5 + cli/nethogs/default.nix | 5 + cli/nnn/default.nix | 3 + cli/nvtop/default.nix | 5 + cli/rm-improved/default.nix | 5 + cli/sloc/default.nix | 5 + cli/starship/default.nix | 305 ++++++++++++++++++++++++++ cli/tealdeer/default.nix | 5 + cli/todo/default.nix | 5 + 28 files changed, 551 insertions(+) create mode 100644 cli/ani-cli/default.nix create mode 100644 cli/asciinema/default.nix create mode 100644 cli/bat/default.nix create mode 100644 cli/default.nix create mode 100644 cli/dog/default.nix create mode 100644 cli/eza/default.nix create mode 100644 cli/fd/default.nix create mode 100644 cli/meta/ai/default.nix create mode 100644 cli/meta/default.nix create mode 100644 cli/meta/git/default.nix create mode 100644 cli/meta/irc/default.nix create mode 100644 cli/meta/scripting/charmbracelet/default.nix create mode 100644 cli/meta/scripting/default.nix create mode 100644 cli/meta/scripting/ripgrep/default.nix create mode 100644 cli/meta/shell/default.nix create mode 100644 cli/meta/smolnet/bollux/default.nix create mode 100644 cli/meta/smolnet/bollux/fix_lesskey_nag.patch create mode 100644 cli/meta/smolnet/default.nix create mode 100644 cli/navi/default.nix create mode 100644 cli/ncdu/default.nix create mode 100644 cli/nethogs/default.nix create mode 100644 cli/nnn/default.nix create mode 100644 cli/nvtop/default.nix create mode 100644 cli/rm-improved/default.nix create mode 100644 cli/sloc/default.nix create mode 100644 cli/starship/default.nix create mode 100644 cli/tealdeer/default.nix create mode 100644 cli/todo/default.nix (limited to 'cli') diff --git a/cli/ani-cli/default.nix b/cli/ani-cli/default.nix new file mode 100644 index 0000000..723bfb9 --- /dev/null +++ b/cli/ani-cli/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + ani-cli + ]; +} diff --git a/cli/asciinema/default.nix b/cli/asciinema/default.nix new file mode 100644 index 0000000..750c52d --- /dev/null +++ b/cli/asciinema/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + asciinema + ]; +} diff --git a/cli/bat/default.nix b/cli/bat/default.nix new file mode 100644 index 0000000..c1dad3f --- /dev/null +++ b/cli/bat/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + programs.bat = { + enable = true; + config.pager = "less -FR"; + }; +} diff --git a/cli/default.nix b/cli/default.nix new file mode 100644 index 0000000..4d14257 --- /dev/null +++ b/cli/default.nix @@ -0,0 +1,21 @@ +_: { + imports = [ + ./ani-cli + ./asciinema + ./bat + ./dog + ./eza + ./fd + ./meta + ./navi + ./ncdu + ./nethogs + ./nnn + # ./nvtop + ./rm-improved + ./sloc + ./starship + ./tealdeer + ./todo + ]; +} diff --git a/cli/dog/default.nix b/cli/dog/default.nix new file mode 100644 index 0000000..437a1a0 --- /dev/null +++ b/cli/dog/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + dogdns + ]; +} diff --git a/cli/eza/default.nix b/cli/eza/default.nix new file mode 100644 index 0000000..a8d2f57 --- /dev/null +++ b/cli/eza/default.nix @@ -0,0 +1,7 @@ +_: { + programs.eza = { + enable = true; + icons = true; + enableFishIntegration = true; + }; +} diff --git a/cli/fd/default.nix b/cli/fd/default.nix new file mode 100644 index 0000000..92e0e28 --- /dev/null +++ b/cli/fd/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + fd + ]; +} diff --git a/cli/meta/ai/default.nix b/cli/meta/ai/default.nix new file mode 100644 index 0000000..fe42707 --- /dev/null +++ b/cli/meta/ai/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + ollama-cuda + shell-gpt + ]; +} diff --git a/cli/meta/default.nix b/cli/meta/default.nix new file mode 100644 index 0000000..073fc94 --- /dev/null +++ b/cli/meta/default.nix @@ -0,0 +1,10 @@ +_: { + imports = [ + ./ai + ./git + ./irc + ./scripting + ./shell + ./smolnet + ]; +} diff --git a/cli/meta/git/default.nix b/cli/meta/git/default.nix new file mode 100644 index 0000000..630285c --- /dev/null +++ b/cli/meta/git/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + gh + onefetch + gitoxide + ]; +} diff --git a/cli/meta/irc/default.nix b/cli/meta/irc/default.nix new file mode 100644 index 0000000..adde57d --- /dev/null +++ b/cli/meta/irc/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + catgirl + pounce + ]; +} diff --git a/cli/meta/scripting/charmbracelet/default.nix b/cli/meta/scripting/charmbracelet/default.nix new file mode 100644 index 0000000..e3b78df --- /dev/null +++ b/cli/meta/scripting/charmbracelet/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + gum + mods + ]; +} diff --git a/cli/meta/scripting/default.nix b/cli/meta/scripting/default.nix new file mode 100644 index 0000000..fb6e062 --- /dev/null +++ b/cli/meta/scripting/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + imports = [ + ./charmbracelet + ./ripgrep + ]; + + home.packages = with pkgs; [ + moreutils + pup + ]; +} diff --git a/cli/meta/scripting/ripgrep/default.nix b/cli/meta/scripting/ripgrep/default.nix new file mode 100644 index 0000000..00de07f --- /dev/null +++ b/cli/meta/scripting/ripgrep/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + programs.ripgrep.enable = true; + + home.packages = with pkgs; [ + ripgrep-all + ]; +} diff --git a/cli/meta/shell/default.nix b/cli/meta/shell/default.nix new file mode 100644 index 0000000..0d60ba0 --- /dev/null +++ b/cli/meta/shell/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + shellclear + ]; +} diff --git a/cli/meta/smolnet/bollux/default.nix b/cli/meta/smolnet/bollux/default.nix new file mode 100644 index 0000000..2079052 --- /dev/null +++ b/cli/meta/smolnet/bollux/default.nix @@ -0,0 +1,67 @@ +{ pkgs, lib, ... }: +let + bollux = + pkgs.stdenvNoCC.mkDerivation rec { + pname = "bollux"; + version = "0.4.1"; + + nativeBuildInputs = [ + pkgs.makeWrapper + ]; + + buildInputs = [ + pkgs.bashInteractive + ]; + + dontBuild = true; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + src = pkgs.fetchFromGitea { + domain = "tildegit.org"; + owner = "acdw"; + repo = "bollux"; + rev = "f472e60f1164f0dc025d06db2a13ff4e8ebee1a2"; + hash = "sha256-mo2qWCPfW+dUaYcJLsos/vR5nJ8n1eABy8Zy8OZsfVg="; + }; + + runtimeDependencies = [ + pkgs.bashInteractive + pkgs.iconv + pkgs.openssl + pkgs.less + pkgs.coreutils + ]; + + patches = [ + # https://tildegit.org/acdw/bollux/issues/13#issuecomment-9786 + ./fix_lesskey_nag.patch + ]; + + postInstall = '' + wrapProgram $out/bin/bollux --prefix PATH : ${lib.makeBinPath runtimeDependencies} + ''; + + meta = with lib; { + description = "a Gemini browser in like, idk, 96% pure Bash"; + homepage = "https://tildegit.org/acdw/bollux"; + license = licenses.mit; + platforms = platforms.all; + mainProgram = "bollux"; + }; + }; +in +{ + home.packages = [ + # I'll update this later and move the above derivation to its own package + # once I push my entire NixOS system configuration. + # (pkgs.callPackage /path/to/pkgs/bollux.nix { + # src = bollux; + # }) + bollux + ]; + + xdg.configFile."bollux/bollux.conf".text = ''''; +} diff --git a/cli/meta/smolnet/bollux/fix_lesskey_nag.patch b/cli/meta/smolnet/bollux/fix_lesskey_nag.patch new file mode 100644 index 0000000..329b886 --- /dev/null +++ b/cli/meta/smolnet/bollux/fix_lesskey_nag.patch @@ -0,0 +1,13 @@ +diff --git i/bollux w/bollux +index 267418e..090217e 100755 +--- i/bollux ++++ w/bollux +@@ -1130,7 +1130,7 @@ display() { # display METADATA [TITLE] + # text, and pre-formatted text shouldn't wrap. + less_cmd+=(-S) + # Load the keybindings (see `lesskey'). +- mklesskey && less_cmd+=(-k "$BOLLUX_LESSKEY") ++ mklesskey && less_cmd+=(--lesskey-src="$BOLLUX_LESSKEY") + local helpline="${KEY_OPEN}:open, " + helpline+="${KEY_GOTO}/" + helpline+="${KEY_GOTO_FROM}:goto, " diff --git a/cli/meta/smolnet/default.nix b/cli/meta/smolnet/default.nix new file mode 100644 index 0000000..8cb44a6 --- /dev/null +++ b/cli/meta/smolnet/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + imports = [ + ./bollux + ]; + + home.packages = with pkgs; [ + amfora + gmni + phetch + ]; +} diff --git a/cli/navi/default.nix b/cli/navi/default.nix new file mode 100644 index 0000000..5b462b5 --- /dev/null +++ b/cli/navi/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + navi + ]; +} diff --git a/cli/ncdu/default.nix b/cli/ncdu/default.nix new file mode 100644 index 0000000..1c0bfca --- /dev/null +++ b/cli/ncdu/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + ncdu + ]; +} diff --git a/cli/nethogs/default.nix b/cli/nethogs/default.nix new file mode 100644 index 0000000..7934eb8 --- /dev/null +++ b/cli/nethogs/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + nethogs + ]; +} diff --git a/cli/nnn/default.nix b/cli/nnn/default.nix new file mode 100644 index 0000000..06fa7c9 --- /dev/null +++ b/cli/nnn/default.nix @@ -0,0 +1,3 @@ +{ pkgs, ... }: { + programs.nnn.enable = true; +} diff --git a/cli/nvtop/default.nix b/cli/nvtop/default.nix new file mode 100644 index 0000000..929f5e5 --- /dev/null +++ b/cli/nvtop/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + nvtopPackages.nvidia + ]; +} diff --git a/cli/rm-improved/default.nix b/cli/rm-improved/default.nix new file mode 100644 index 0000000..d4a5fc1 --- /dev/null +++ b/cli/rm-improved/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + rm-improved + ]; +} diff --git a/cli/sloc/default.nix b/cli/sloc/default.nix new file mode 100644 index 0000000..6249b05 --- /dev/null +++ b/cli/sloc/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + sloc + ]; +} diff --git a/cli/starship/default.nix b/cli/starship/default.nix new file mode 100644 index 0000000..0088038 --- /dev/null +++ b/cli/starship/default.nix @@ -0,0 +1,305 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + starship + ]; + + programs.starship = { + enable = true; + enableFishIntegration = true; + + # I CBA to update the formatting to match the rest of the expressions, since + # this is a one-off that I tend to import over directly from starship. + settings = { + format = "[term%](bold green) "; + right_format = "$character$all"; + add_newline = false; + + line_break = { + disabled = true; + }; + + character = { + success_symbol = "[i](bold green)"; + error_symbol = "[x](bold red)"; + vimcmd_symbol = "[n](bold green)"; + vimcmd_visual_symbol = "[v](bold green)"; + vimcmd_replace_symbol = "[R](bold green)"; + vimcmd_replace_one_symbol = "[r](bold green)"; + }; + + git_commit = { + tag_symbol = " tag "; + }; + + git_status = { + ahead = ">"; + behind = "<"; + diverged = "<>"; + renamed = "r"; + deleted = "x"; + }; + + aws = { + symbol = "aws "; + }; + + azure = { + symbol = "az "; + }; + + bun = { + symbol = "bun "; + }; + + c = { + symbol = "C "; + }; + + cobol = { + symbol = "cobol "; + }; + + conda = { + symbol = "conda "; + }; + + crystal = { + symbol = "cr "; + }; + + cmake = { + symbol = "cmake "; + }; + + daml = { + symbol = "daml "; + }; + + dart = { + symbol = "dart "; + }; + + deno = { + symbol = "deno "; + }; + + dotnet = { + symbol = ".NET "; + }; + + directory = { + read_only = " ro"; + }; + + docker_context = { + symbol = "docker "; + }; + + elixir = { + symbol = "exs "; + }; + + elm = { + symbol = "elm "; + }; + + fennel = { + symbol = "fnl "; + }; + + fossil_branch = { + symbol = "fossil "; + }; + + gcloud = { + symbol = "gcp "; + }; + + git_branch = { + symbol = "git "; + }; + + golang = { + symbol = "go "; + }; + + gradle = { + symbol = "gradle "; + }; + + guix_shell = { + symbol = "guix "; + }; + + hg_branch = { + symbol = "hg "; + }; + + java = { + symbol = "java "; + }; + + julia = { + symbol = "jl "; + }; + + kotlin = { + symbol = "kt "; + }; + + lua = { + symbol = "lua "; + }; + + nodejs = { + symbol = "nodejs "; + }; + + memory_usage = { + symbol = "memory "; + }; + + meson = { + symbol = "meson "; + }; + + nim = { + symbol = "nim "; + }; + + nix_shell = { + symbol = "nix "; + }; + + ocaml = { + symbol = "ml "; + }; + + opa = { + symbol = "opa "; + }; + + os = { + symbols = { + Alpaquita = "alq "; + Alpine = "alp "; + Amazon = "amz "; + Android = "andr "; + Arch = "rch "; + Artix = "atx "; + CentOS = "cent "; + Debian = "deb "; + DragonFly = "dfbsd "; + Emscripten = "emsc "; + EndeavourOS = "ndev "; + Fedora = "fed "; + FreeBSD = "fbsd "; + Garuda = "garu "; + Gentoo = "gent "; + HardenedBSD = "hbsd "; + Illumos = "lum "; + Linux = "lnx "; + Mabox = "mbox "; + Macos = "mac "; + Manjaro = "mjo "; + Mariner = "mrn "; + MidnightBSD = "mid "; + Mint = "mint "; + NetBSD = "nbsd "; + NixOS = "nix "; + OpenBSD = "obsd "; + OpenCloudOS = "ocos "; + openEuler = "oeul "; + openSUSE = "osuse "; + OracleLinux = "orac "; + Pop = "pop "; + Raspbian = "rasp "; + Redhat = "rhl "; + RedHatEnterprise = "rhel "; + Redox = "redox "; + Solus = "sol "; + SUSE = "suse "; + Ubuntu = "ubnt "; + Unknown = "unk "; + Windows = "win "; + }; + }; + + package = { + symbol = "pkg "; + }; + + perl = { + symbol = "pl "; + }; + + php = { + symbol = "php "; + }; + + pijul_channel = { + symbol = "pijul "; + }; + + pulumi = { + symbol = "pulumi "; + }; + + purescript = { + symbol = "purs "; + }; + + python = { + symbol = "py "; + }; + + raku = { + symbol = "raku "; + }; + + ruby = { + symbol = "rb "; + }; + + rust = { + symbol = "rs "; + }; + + scala = { + symbol = "scala "; + }; + + spack = { + symbol = "spack "; + }; + + solidity = { + symbol = "solidity "; + }; + + status = { + symbol = "[x](bold red) "; + }; + + sudo = { + symbol = "sudo "; + }; + + swift = { + symbol = "swift "; + }; + + typst = { + symbol = "typst "; + }; + + terraform = { + symbol = "terraform "; + }; + + zig = { + symbol = "zig "; + }; + }; + }; +} diff --git a/cli/tealdeer/default.nix b/cli/tealdeer/default.nix new file mode 100644 index 0000000..7ee39f1 --- /dev/null +++ b/cli/tealdeer/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + tealdeer + ]; +} diff --git a/cli/todo/default.nix b/cli/todo/default.nix new file mode 100644 index 0000000..f1c841d --- /dev/null +++ b/cli/todo/default.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + todo + ]; +} -- cgit v1.2.3