From ae43e4ff7ab6407282dd98c720e2d9132e2f738e Mon Sep 17 00:00:00 2001 From: Fuwn Date: Wed, 3 Jul 2024 00:05:55 -0700 Subject: f --- home/fuwn/cli/core/bat/default.nix | 6 - home/fuwn/cli/core/default.nix | 12 - home/fuwn/cli/core/eza/default.nix | 7 - home/fuwn/cli/default.nix | 12 - home/fuwn/cli/meta/ai/default.nix | 11 - home/fuwn/cli/meta/default.nix | 9 - home/fuwn/cli/meta/git/default.nix | 7 - home/fuwn/cli/meta/irc/default.nix | 6 - .../cli/meta/scripting/charmbracelet/default.nix | 6 - home/fuwn/cli/meta/scripting/default.nix | 11 - home/fuwn/cli/meta/scripting/ripgrep/default.nix | 7 - home/fuwn/cli/meta/shell/default.nix | 13 - home/fuwn/cli/meta/shell/fish/default.nix | 151 ----- home/fuwn/cli/meta/shell/starship/default.nix | 305 ---------- home/fuwn/cli/nethogs/default.nix | 5 - home/fuwn/cli/nvtop/default.nix | 5 - home/fuwn/cli/other/default.nix | 6 - home/fuwn/cli/sloc/default.nix | 5 - home/fuwn/cli/tealdeer/default.nix | 5 - home/fuwn/cli/todo/default.nix | 5 - home/fuwn/home.nix | 1 - home/fuwn/meta/communication/default.nix | 11 + home/fuwn/meta/communication/discord/default.nix | 9 + .../meta/communication/discord/vesktop/default.nix | 649 +++++++++++++++++++++ home/fuwn/meta/communication/irc/default.nix | 7 + home/fuwn/meta/default.nix | 4 +- .../desktop/wayland/hyprland/hyprland/general.nix | 4 +- .../wayland/hyprland/hyprland/workspaces.nix | 4 +- .../desktop/wayland/hyprland/hyprlock/default.nix | 2 +- home/fuwn/meta/development/default.nix | 3 +- home/fuwn/meta/development/git/default.nix | 8 + home/fuwn/meta/development/http/default.nix | 6 - home/fuwn/meta/development/languages/default.nix | 2 +- home/fuwn/meta/development/tcp/default.nix | 7 - home/fuwn/meta/development/tools/default.nix | 1 + home/fuwn/meta/filesystem/core/bat/default.nix | 6 + home/fuwn/meta/filesystem/core/default.nix | 12 + home/fuwn/meta/filesystem/core/eza/default.nix | 7 + home/fuwn/meta/filesystem/default.nix | 4 + home/fuwn/meta/multimedia/image/default.nix | 2 + home/fuwn/meta/network/default.nix | 6 + home/fuwn/meta/network/smolnet/bollux/default.nix | 67 +++ .../network/smolnet/bollux/fix_lesskey_nag.patch | 13 + home/fuwn/meta/network/smolnet/default.nix | 12 + home/fuwn/meta/network/tools/default.nix | 6 + home/fuwn/meta/network/tools/http/default.nix | 6 + home/fuwn/meta/network/tools/tcp/default.nix | 8 + home/fuwn/meta/rice/default.nix | 1 + home/fuwn/meta/smolnet/bollux/default.nix | 67 --- .../fuwn/meta/smolnet/bollux/fix_lesskey_nag.patch | 13 - home/fuwn/meta/smolnet/default.nix | 12 - home/fuwn/meta/system/default.nix | 1 + home/fuwn/meta/system/shell/default.nix | 15 + home/fuwn/meta/system/shell/fish/default.nix | 151 +++++ .../shell/scripting/charmbracelet/default.nix | 6 + home/fuwn/meta/system/shell/scripting/default.nix | 11 + .../system/shell/scripting/ripgrep/default.nix | 7 + home/fuwn/meta/system/shell/starship/default.nix | 305 ++++++++++ home/fuwn/meta/utility/ai/default.nix | 11 + home/fuwn/meta/utility/default.nix | 12 + 60 files changed, 1364 insertions(+), 709 deletions(-) delete mode 100644 home/fuwn/cli/core/bat/default.nix delete mode 100644 home/fuwn/cli/core/default.nix delete mode 100644 home/fuwn/cli/core/eza/default.nix delete mode 100644 home/fuwn/cli/default.nix delete mode 100644 home/fuwn/cli/meta/ai/default.nix delete mode 100644 home/fuwn/cli/meta/default.nix delete mode 100644 home/fuwn/cli/meta/git/default.nix delete mode 100644 home/fuwn/cli/meta/irc/default.nix delete mode 100644 home/fuwn/cli/meta/scripting/charmbracelet/default.nix delete mode 100644 home/fuwn/cli/meta/scripting/default.nix delete mode 100644 home/fuwn/cli/meta/scripting/ripgrep/default.nix delete mode 100644 home/fuwn/cli/meta/shell/default.nix delete mode 100644 home/fuwn/cli/meta/shell/fish/default.nix delete mode 100644 home/fuwn/cli/meta/shell/starship/default.nix delete mode 100644 home/fuwn/cli/nethogs/default.nix delete mode 100644 home/fuwn/cli/nvtop/default.nix delete mode 100644 home/fuwn/cli/other/default.nix delete mode 100644 home/fuwn/cli/sloc/default.nix delete mode 100644 home/fuwn/cli/tealdeer/default.nix delete mode 100644 home/fuwn/cli/todo/default.nix create mode 100644 home/fuwn/meta/communication/default.nix create mode 100644 home/fuwn/meta/communication/discord/default.nix create mode 100644 home/fuwn/meta/communication/discord/vesktop/default.nix create mode 100644 home/fuwn/meta/communication/irc/default.nix create mode 100644 home/fuwn/meta/development/git/default.nix delete mode 100644 home/fuwn/meta/development/http/default.nix delete mode 100644 home/fuwn/meta/development/tcp/default.nix create mode 100644 home/fuwn/meta/filesystem/core/bat/default.nix create mode 100644 home/fuwn/meta/filesystem/core/default.nix create mode 100644 home/fuwn/meta/filesystem/core/eza/default.nix create mode 100644 home/fuwn/meta/network/default.nix create mode 100644 home/fuwn/meta/network/smolnet/bollux/default.nix create mode 100644 home/fuwn/meta/network/smolnet/bollux/fix_lesskey_nag.patch create mode 100644 home/fuwn/meta/network/smolnet/default.nix create mode 100644 home/fuwn/meta/network/tools/default.nix create mode 100644 home/fuwn/meta/network/tools/http/default.nix create mode 100644 home/fuwn/meta/network/tools/tcp/default.nix delete mode 100644 home/fuwn/meta/smolnet/bollux/default.nix delete mode 100644 home/fuwn/meta/smolnet/bollux/fix_lesskey_nag.patch delete mode 100644 home/fuwn/meta/smolnet/default.nix create mode 100644 home/fuwn/meta/system/shell/default.nix create mode 100644 home/fuwn/meta/system/shell/fish/default.nix create mode 100644 home/fuwn/meta/system/shell/scripting/charmbracelet/default.nix create mode 100644 home/fuwn/meta/system/shell/scripting/default.nix create mode 100644 home/fuwn/meta/system/shell/scripting/ripgrep/default.nix create mode 100644 home/fuwn/meta/system/shell/starship/default.nix create mode 100644 home/fuwn/meta/utility/ai/default.nix create mode 100644 home/fuwn/meta/utility/default.nix diff --git a/home/fuwn/cli/core/bat/default.nix b/home/fuwn/cli/core/bat/default.nix deleted file mode 100644 index c1dad3f..0000000 --- a/home/fuwn/cli/core/bat/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - programs.bat = { - enable = true; - config.pager = "less -FR"; - }; -} diff --git a/home/fuwn/cli/core/default.nix b/home/fuwn/cli/core/default.nix deleted file mode 100644 index 5585e65..0000000 --- a/home/fuwn/cli/core/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./bat - ./eza - ]; - - home.packages = with pkgs; [ - dogdns - fd - rm-improved - ]; -} diff --git a/home/fuwn/cli/core/eza/default.nix b/home/fuwn/cli/core/eza/default.nix deleted file mode 100644 index a8d2f57..0000000 --- a/home/fuwn/cli/core/eza/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - programs.eza = { - enable = true; - icons = true; - enableFishIntegration = true; - }; -} diff --git a/home/fuwn/cli/default.nix b/home/fuwn/cli/default.nix deleted file mode 100644 index 45912f4..0000000 --- a/home/fuwn/cli/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -_: { - imports = [ - ./core - ./meta - ./nethogs - # ./nvtop - ./other - ./sloc - ./tealdeer - ./todo - ]; -} diff --git a/home/fuwn/cli/meta/ai/default.nix b/home/fuwn/cli/meta/ai/default.nix deleted file mode 100644 index 7513348..0000000 --- a/home/fuwn/cli/meta/ai/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - ollama-cuda - shell-gpt - ]; - - # services.ollama = { - # enable = true; - # acceleration = "cuda"; - # }; -} diff --git a/home/fuwn/cli/meta/default.nix b/home/fuwn/cli/meta/default.nix deleted file mode 100644 index a7abbbb..0000000 --- a/home/fuwn/cli/meta/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -_: { - imports = [ - ./ai - ./git - ./irc - ./scripting - ./shell - ]; -} diff --git a/home/fuwn/cli/meta/git/default.nix b/home/fuwn/cli/meta/git/default.nix deleted file mode 100644 index 630285c..0000000 --- a/home/fuwn/cli/meta/git/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - gh - onefetch - gitoxide - ]; -} diff --git a/home/fuwn/cli/meta/irc/default.nix b/home/fuwn/cli/meta/irc/default.nix deleted file mode 100644 index adde57d..0000000 --- a/home/fuwn/cli/meta/irc/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - catgirl - pounce - ]; -} diff --git a/home/fuwn/cli/meta/scripting/charmbracelet/default.nix b/home/fuwn/cli/meta/scripting/charmbracelet/default.nix deleted file mode 100644 index e3b78df..0000000 --- a/home/fuwn/cli/meta/scripting/charmbracelet/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - gum - mods - ]; -} diff --git a/home/fuwn/cli/meta/scripting/default.nix b/home/fuwn/cli/meta/scripting/default.nix deleted file mode 100644 index fb6e062..0000000 --- a/home/fuwn/cli/meta/scripting/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./charmbracelet - ./ripgrep - ]; - - home.packages = with pkgs; [ - moreutils - pup - ]; -} diff --git a/home/fuwn/cli/meta/scripting/ripgrep/default.nix b/home/fuwn/cli/meta/scripting/ripgrep/default.nix deleted file mode 100644 index 00de07f..0000000 --- a/home/fuwn/cli/meta/scripting/ripgrep/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: { - programs.ripgrep.enable = true; - - home.packages = with pkgs; [ - ripgrep-all - ]; -} diff --git a/home/fuwn/cli/meta/shell/default.nix b/home/fuwn/cli/meta/shell/default.nix deleted file mode 100644 index e304479..0000000 --- a/home/fuwn/cli/meta/shell/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./fish - ./starship - ]; - - home.packages = with pkgs; [ - asciinema - navi - shellclear - zoxide - ]; -} diff --git a/home/fuwn/cli/meta/shell/fish/default.nix b/home/fuwn/cli/meta/shell/fish/default.nix deleted file mode 100644 index 291e5a4..0000000 --- a/home/fuwn/cli/meta/shell/fish/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ pkgs, ... }: { - programs.fish = { - enable = true; - - shellInit = '' - if status is-interactive - set fish_greeting - - fish_vi_key_bindings - - starship init fish | source - - function fish_postexec --on-event fish_postexec - if test "$argv" != "clear" - echo - end - end - - function vpn - env BIND_INTERFACE=wgpia0 LD_PRELOAD=/usr/lib/bindToInterface.so $argv - end - - cat ~/.cache/wal/sequences - end - - set -l config_home (set -q XDG_CONFIG_HOME; and echo $XDG_CONFIG_HOME; or echo $HOME/.config) - - set HISTSIZE -1 - set HISTFILESIZE -1 - set SAVEHIST -1 - - source "$config_home/shell/profile" - bass source "~/.nix-profile/etc/profile.d/hm-session-vars.sh" - - bind \ce edit_command_buffer - - zoxide init fish | source - ''; - - plugins = [ - { - name = "fzf.fish"; - - src = pkgs.fetchFromGitHub { - owner = "patrickf1"; - repo = "fzf.fish"; - rev = "8920367cf85eee5218cc25a11e209d46e2591e7a"; - sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM="; - }; - } - { - name = "bass"; - - src = pkgs.fetchFromGitHub { - owner = "edc"; - repo = "bass"; - rev = "79b62958ecf4e87334f24d6743e5766475bcf4d0"; - sha256 = "sha256-3d/qL+hovNA4VMWZ0n1L+dSM1lcz7P5CQJyy+/8exTc="; - }; - } - { - name = "nvm.fish"; - - src = pkgs.fetchFromGitHub { - owner = "jorgebucaran"; - repo = "nvm.fish"; - rev = "b8edb1ee24cbbf7259196b0cb3c6c4ab65b07929"; - sha256 = "sha256-7JxIQSseBv81SSpWH1pufx8fh9EQhbo3r2nVVREwc58="; - }; - } - { - name = "sponge"; - - src = pkgs.fetchFromGitHub { - owner = "meaningful-ooo"; - repo = "sponge"; - rev = "384299545104d5256648cee9d8b117aaa9a6d7be"; - sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; - }; - } - { - name = "autopair.fish"; - - src = pkgs.fetchFromGitHub { - owner = "jorgebucaran"; - repo = "autopair.fish"; - rev = "4d1752ff5b39819ab58d7337c69220342e9de0e2"; - sha256 = "sha256-qt3t1iKRRNuiLWiVoiAYOu+9E7jsyECyIqZJ/oRIT1A="; - }; - } - ]; - - shellAliases = { - # Verbosity - cp = "cp -iv"; - mv = "mv -iv"; - # rm = "rm -vI"; - bc = "bc -ql"; - rsync = "rsync -vrPlu"; - mkd = "mkdir -pv"; - yt = "yt-dlp --embed-metadata -i"; - yta = "yt -x -f bestaudio/best"; - ytt = "yt --skip-download --write-thumbnail"; - ffmpeg = "ffmpeg -hide_banner"; - wdic = "wdic --homophones --kanji --color --pager"; - hakuneko = "hakuneko-desktop --no-sandbox"; - fastfetch = "clear && /usr/bin/env fastfetch"; - - # Modern Alternatives & Alias Rewrites - sxiv = "nsxiv"; - unzip = "ripunzip unzip-file"; - nvim = "lvim"; - vim = "lvim"; - vimdiff = "lvim -d"; - rm = "rip"; - - # Colourise - ls = "exa -h --no-quotes --color=auto --group-directories-first"; - grep = "grep --color=auto"; - diff = "diff --color=auto"; - ccat = "highlight --out-format=ansi"; - ip = "ip -color=auto"; - - # Abbreviations - ka = "killall"; - g = "git"; - sdn = "shutdown -h now"; - e = "$EDITOR"; - v = "$EDITOR"; - ff = "fastfetch"; - - # Other - pacbins = "comm -23 <(yay -Qqett | sort) <(yay -Qqg base -g base-devel | sort | uniq)"; - chan = "chan-downloader -c 10"; - taiga = "bottles-cli run -b Taiga -p Taiga"; - rotd = "systemctl --user restart opentabledriver.service"; - ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'"; - def = "myougiden"; - suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ~/Documents/Code/Git/Fuwn/suzuri/suzuri"; - manga-cli = "bash <(curl -s 'https://raw.githubusercontent.com/justchokingaround/manga-cli/master/manga-cli')"; - "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow"; - shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && nsxiv /tmp/shinobu"; - auto_subtitle = "source $HOME/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True"; - steamy = "mangohud gamemoderun steam-runtime"; - koix = "koi -f"; - seamonkey = "$HOME/.local/src/seamonkey/seamonkey-bin"; - doom = "$HOME/.config/emacs/bin/doom"; - lagrange = "SDL_VIDEODRIVER=x11 /usr/bin/lagrange"; - }; - }; -} diff --git a/home/fuwn/cli/meta/shell/starship/default.nix b/home/fuwn/cli/meta/shell/starship/default.nix deleted file mode 100644 index 0088038..0000000 --- a/home/fuwn/cli/meta/shell/starship/default.nix +++ /dev/null @@ -1,305 +0,0 @@ -{ 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/home/fuwn/cli/nethogs/default.nix b/home/fuwn/cli/nethogs/default.nix deleted file mode 100644 index 7934eb8..0000000 --- a/home/fuwn/cli/nethogs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - nethogs - ]; -} diff --git a/home/fuwn/cli/nvtop/default.nix b/home/fuwn/cli/nvtop/default.nix deleted file mode 100644 index 929f5e5..0000000 --- a/home/fuwn/cli/nvtop/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - nvtopPackages.nvidia - ]; -} diff --git a/home/fuwn/cli/other/default.nix b/home/fuwn/cli/other/default.nix deleted file mode 100644 index f23f7f4..0000000 --- a/home/fuwn/cli/other/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - fontpreview - ripunzip - ]; -} diff --git a/home/fuwn/cli/sloc/default.nix b/home/fuwn/cli/sloc/default.nix deleted file mode 100644 index 6249b05..0000000 --- a/home/fuwn/cli/sloc/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - sloc - ]; -} diff --git a/home/fuwn/cli/tealdeer/default.nix b/home/fuwn/cli/tealdeer/default.nix deleted file mode 100644 index 7ee39f1..0000000 --- a/home/fuwn/cli/tealdeer/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - tealdeer - ]; -} diff --git a/home/fuwn/cli/todo/default.nix b/home/fuwn/cli/todo/default.nix deleted file mode 100644 index f1c841d..0000000 --- a/home/fuwn/cli/todo/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - todo - ]; -} diff --git a/home/fuwn/home.nix b/home/fuwn/home.nix index 3d0ca02..205fe77 100644 --- a/home/fuwn/home.nix +++ b/home/fuwn/home.nix @@ -82,7 +82,6 @@ programs.home-manager.enable = true; imports = [ - ./cli ./meta ]; diff --git a/home/fuwn/meta/communication/default.nix b/home/fuwn/meta/communication/default.nix new file mode 100644 index 0000000..8252cc8 --- /dev/null +++ b/home/fuwn/meta/communication/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + imports = [ + ./discord + ./irc + ]; + + home.packages = with pkgs; [ + zoom-us + revolt-desktop + ]; +} diff --git a/home/fuwn/meta/communication/discord/default.nix b/home/fuwn/meta/communication/discord/default.nix new file mode 100644 index 0000000..5e8f79d --- /dev/null +++ b/home/fuwn/meta/communication/discord/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + imports = [ + ./vesktop + ]; + + home.packages = with pkgs; [ + # discord-canary + ]; +} diff --git a/home/fuwn/meta/communication/discord/vesktop/default.nix b/home/fuwn/meta/communication/discord/vesktop/default.nix new file mode 100644 index 0000000..edae1bc --- /dev/null +++ b/home/fuwn/meta/communication/discord/vesktop/default.nix @@ -0,0 +1,649 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + vesktop + ]; + + services.arrpc.enable = false; + + xdg.configFile."vesktop/settings.json".text = '' + { + "discordBranch": "canary", + "arRPC": "on", + "splashColor": "rgba(255, 255, 255, 0.6)", + "splashBackground": "rgba(21, 14, 13, 0.52)", + "enableMenu": false, + "splashTheming": true, + "staticTitle": false, + "disableMinSize": true, + "minimizeToTray": false, + "tray": false, + "appBadge": false + } + ''; + + xdg.configFile."vesktop/settings/quickCss.css".text = '' + /** + * @name Dark Matter + * @author Tropical#8908, Hammock#3110 + * @version 3.0.0 + * @description A cold, dark & frosty theme. + * @source https://github.com/DiscordStyles/DarkMatter/ + */ + + @import url('https://DiscordStyles.github.io/DarkMatter/src/base.css'); + + /* Variables */ + :root { + --avatar-size: 32px; + --background-image: url('https://images6.alphacoders.com/109/1093313.jpg'); + --home-image: url('https://shinobu.fuwn.workers.dev/shinobu'); + --background-solid: #150e0d85; + --background-solid-dark: #0f0a0985; + --background-solid-darker: #0b070685; + --accent: 216, 161, 110; + --accent-alt: 196, 141, 90; + } + ''; + + xdg.configFile."vesktop/settings/settings.json".text = '' + { + "notifyAboutUpdates": true, + "autoUpdate": true, + "autoUpdateNotification": true, + "useQuickCss": true, + "themeLinks": [], + "enabledThemes": [], + "enableReactDevtools": true, + "frameless": true, + "transparent": false, + "winCtrlQ": false, + "macosTranslucency": false, + "disableMinSize": false, + "winNativeTitleBar": false, + "plugins": { + "BadgeAPI": { + "enabled": true + }, + "CommandsAPI": { + "enabled": true + }, + "ContextMenuAPI": { + "enabled": true + }, + "MemberListDecoratorsAPI": { + "enabled": true + }, + "MessageAccessoriesAPI": { + "enabled": true + }, + "MessageDecorationsAPI": { + "enabled": true + }, + "MessageEventsAPI": { + "enabled": true + }, + "MessagePopoverAPI": { + "enabled": true + }, + "NoticesAPI": { + "enabled": true + }, + "ServerListAPI": { + "enabled": true + }, + "NoTrack": { + "enabled": true + }, + "Settings": { + "enabled": true, + "settingsLocation": "aboveActivity" + }, + "SupportHelper": { + "enabled": true + }, + "AlwaysAnimate": { + "enabled": true + }, + "AlwaysTrust": { + "enabled": true + }, + "AnonymiseFileNames": { + "enabled": true, + "method": 0, + "randomisedLength": 7, + "consistent": "image" + }, + "WebRichPresence (arRPC)": { + "enabled": true + }, + "BANger": { + "enabled": false + }, + "BetterFolders": { + "enabled": false, + "sidebar": true, + "showFolderIcon": 1, + "closeAllHomeButton": false, + "keepIcons": false, + "sidebarAnim": true, + "closeOthers": false, + "closeAllFolders": false, + "forceOpen": false + }, + "BetterGifAltText": { + "enabled": true + }, + "BetterNotesBox": { + "enabled": false + }, + "BetterRoleDot": { + "enabled": false + }, + "BetterUploadButton": { + "enabled": true + }, + "BiggerStreamPreview": { + "enabled": true + }, + "BlurNSFW": { + "enabled": false + }, + "CallTimer": { + "enabled": true, + "format": "human" + }, + "ClearURLs": { + "enabled": true + }, + "ColorSighted": { + "enabled": true + }, + "ConsoleShortcuts": { + "enabled": false + }, + "CopyUserURLs": { + "enabled": true + }, + "CrashHandler": { + "enabled": true, + "attemptToPreventCrashes": true, + "attemptToNavigateToHome": true + }, + "CustomRPC": { + "enabled": false + }, + "Dearrow": { + "enabled": true + }, + "EmoteCloner": { + "enabled": true + }, + "Experiments": { + "enabled": true, + "enableIsStaff": false + }, + "F8Break": { + "enabled": false + }, + "FakeNitro": { + "enabled": false, + "enableEmojiBypass": true, + "emojiSize": 48, + "transformEmojis": true, + "enableStickerBypass": true, + "stickerSize": 160, + "transformStickers": true, + "transformCompoundSentence": false, + "enableStreamQualityBypass": true + }, + "FakeProfileThemes": { + "enabled": false + }, + "FavoriteEmojiFirst": { + "enabled": true + }, + "FavoriteGifSearch": { + "enabled": true + }, + "FixSpotifyEmbeds": { + "enabled": true, + "volume": 5 + }, + "ForceOwnerCrown": { + "enabled": false + }, + "FriendInvites": { + "enabled": false + }, + "GameActivityToggle": { + "enabled": true + }, + "GifPaste": { + "enabled": false + }, + "GreetStickerPicker": { + "enabled": true + }, + "HideAttachments": { + "enabled": false + }, + "iLoveSpam": { + "enabled": false + }, + "IgnoreActivities": { + "enabled": false + }, + "ImageZoom": { + "enabled": true, + "saveZoomValues": true, + "invertScroll": true, + "nearestNeighbour": false, + "square": false, + "zoom": 2, + "size": 100, + "zoomSpeed": 0.5 + }, + "InvisibleChat": { + "enabled": true, + "savedPasswords": "password, Password" + }, + "KeepCurrentChannel": { + "enabled": false + }, + "LastFMRichPresence": { + "enabled": false + }, + "LoadingQuotes": { + "enabled": true, + "replaceEvents": true + }, + "MemberCount": { + "enabled": true + }, + "MessageClickActions": { + "enabled": false + }, + "MessageLinkEmbeds": { + "enabled": true, + "automodEmbeds": "never", + "listMode": "blacklist", + "idList": "" + }, + "MessageLogger": { + "enabled": true, + "deleteStyle": "text", + "ignoreBots": false, + "ignoreSelf": false, + "ignoreUsers": "", + "ignoreChannels": "", + "ignoreGuilds": "" + }, + "MessageTags": { + "enabled": false + }, + "MoreCommands": { + "enabled": true + }, + "MoreKaomoji": { + "enabled": true + }, + "MoreUserTags": { + "enabled": false + }, + "Moyai": { + "enabled": false, + "volume": 0.5, + "quality": "Normal", + "triggerWhenUnfocused": true, + "ignoreBots": true, + "ignoreBlocked": true + }, + "MutualGroupDMs": { + "enabled": true + }, + "NoBlockedMessages": { + "enabled": false + }, + "NoDevtoolsWarning": { + "enabled": true + }, + "NoF1": { + "enabled": true + }, + "NoMosaic": { + "enabled": false + }, + "NoPendingCount": { + "enabled": false + }, + "NoProfileThemes": { + "enabled": false + }, + "NoReplyMention": { + "enabled": false + }, + "NoScreensharePreview": { + "enabled": true + }, + "NoTypingAnimation": { + "enabled": true + }, + "NoUnblockToJump": { + "enabled": true + }, + "NormalizeMessageLinks": { + "enabled": true + }, + "NSFWGateBypass": { + "enabled": false + }, + "OnePingPerDM": { + "enabled": true, + "channelToAffect": "both_dms", + "allowMentions": false, + "allowEveryone": false + }, + "oneko": { + "enabled": true + }, + "OpenInApp": { + "enabled": false + }, + "PermissionFreeWill": { + "enabled": false + }, + "PermissionsViewer": { + "enabled": true, + "permissionsSortOrder": 0, + "defaultPermissionsDropdownState": false + }, + "petpet": { + "enabled": true + }, + "PictureInPicture": { + "enabled": false + }, + "PinDMs": { + "enabled": false + }, + "PlainFolderIcon": { + "enabled": false + }, + "PlatformIndicators": { + "enabled": true, + "list": true, + "badges": true, + "messages": true, + "colorMobileIndicator": true + }, + "PreviewMessage": { + "enabled": false + }, + "PronounDB": { + "enabled": true, + "pronounsFormat": "LOWERCASE", + "pronounSource": 0, + "showSelf": true, + "showInMessages": true, + "showInProfile": true + }, + "QuickMention": { + "enabled": false + }, + "QuickReply": { + "enabled": false + }, + "ReactErrorDecoder": { + "enabled": true + }, + "ReadAllNotificationsButton": { + "enabled": true + }, + "RelationshipNotifier": { + "enabled": true, + "offlineRemovals": true, + "groups": true, + "servers": true, + "notices": false, + "friends": true, + "friendRequestCancels": true + }, + "RevealAllSpoilers": { + "enabled": false + }, + "ReverseImageSearch": { + "enabled": true + }, + "RoleColorEverywhere": { + "enabled": true, + "chatMentions": true, + "memberList": true, + "voiceUsers": true + }, + "SearchReply": { + "enabled": true + }, + "SecretRingToneEnabler": { + "enabled": true + }, + "SendTimestamps": { + "enabled": false + }, + "ServerListIndicators": { + "enabled": true, + "mode": 2 + }, + "ShikiCodeblocks": { + "enabled": true, + "theme": "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json", + "tryHljs": "SECONDARY", + "useDevIcon": "GREYSCALE", + "bgOpacity": 100 + }, + "ShowAllMessageButtons": { + "enabled": false + }, + "ShowConnections": { + "enabled": true, + "iconSpacing": 1, + "iconSize": 32 + }, + "ShowHiddenChannels": { + "enabled": true, + "hideUnreads": true, + "showMode": 0, + "defaultAllowedUsersAndRolesDropdownState": true + }, + "ShowMeYourName": { + "enabled": true, + "mode": "nick-user", + "displayNames": false, + "inReplies": false + }, + "SilentMessageToggle": { + "enabled": false + }, + "SilentTyping": { + "enabled": true, + "showIcon": true, + "isEnabled": true + }, + "SortFriendRequests": { + "enabled": true, + "showDates": true + }, + "SpotifyControls": { + "enabled": true, + "hoverControls": true, + "useSpotifyUris": true + }, + "SpotifyCrack": { + "enabled": true, + "noSpotifyAutoPause": true, + "keepSpotifyActivityOnIdle": false + }, + "SpotifyShareCommands": { + "enabled": true + }, + "StartupTimings": { + "enabled": true + }, + "TextReplace": { + "enabled": false + }, + "ThemeAttributes": { + "enabled": false + }, + "TimeBarAllActivities": { + "enabled": false + }, + "Translate": { + "enabled": true, + "autoTranslate": false + }, + "TypingIndicator": { + "enabled": false + }, + "TypingTweaks": { + "enabled": false + }, + "Unindent": { + "enabled": false + }, + "UnsuppressEmbeds": { + "enabled": false + }, + "UrbanDictionary": { + "enabled": false + }, + "UserVoiceShow": { + "enabled": true + }, + "USRBG": { + "enabled": false, + "nitroFirst": true, + "voiceBackground": true + }, + "ValidUser": { + "enabled": false + }, + "VoiceChatDoubleClick": { + "enabled": true + }, + "VcNarrator": { + "enabled": false + }, + "VencordToolbox": { + "enabled": false + }, + "ViewIcons": { + "enabled": false + }, + "ViewRaw": { + "enabled": false + }, + "VoiceMessages": { + "enabled": false + }, + "WebContextMenus": { + "enabled": true, + "addBack": true + }, + "WebKeybinds": { + "enabled": true + }, + "WhoReacted": { + "enabled": false + }, + "Wikisearch": { + "enabled": false + }, + "SuperReactionTweaks": { + "enabled": false + }, + "ChatInputButtonAPI": { + "enabled": true + }, + "BetterGifPicker": { + "enabled": false + }, + "ClientTheme": { + "enabled": false + }, + "Decor": { + "enabled": false + }, + "FixCodeblockGap": { + "enabled": false + }, + "FixYoutubeEmbeds": { + "enabled": false + }, + "DisableCallIdle": { + "enabled": true + }, + "NewGuildSettings": { + "enabled": true, + "guild": true, + "everyone": true, + "role": true + }, + "ShowHiddenThings": { + "enabled": false + }, + "PartyMode": { + "enabled": false, + "superIntensePartyMode": 0 + }, + "MessageUpdaterAPI": { + "enabled": true + }, + "AutomodContext": { + "enabled": false + }, + "BetterRoleContext": { + "enabled": false + }, + "BetterSessions": { + "enabled": false + }, + "BetterSettings": { + "enabled": false + }, + "CtrlEnterSend": { + "enabled": false + }, + "CustomIdle": { + "enabled": false + }, + "DontRoundMyTimestamps": { + "enabled": false + }, + "FriendsSince": { + "enabled": false + }, + "ImageLink": { + "enabled": false + }, + "ImplicitRelationships": { + "enabled": false + }, + "ServerInfo": { + "enabled": true + } + }, + "notifications": { + "timeout": 5000, + "position": "bottom-right", + "useNative": "not-focused", + "logLimit": 50 + }, + "cloud": { + "authenticated": false, + "url": "https://api.vencord.dev/", + "settingsSync": false, + "settingsSyncVersion": 1717817629006 + } + } + ''; +} diff --git a/home/fuwn/meta/communication/irc/default.nix b/home/fuwn/meta/communication/irc/default.nix new file mode 100644 index 0000000..61a2ebf --- /dev/null +++ b/home/fuwn/meta/communication/irc/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + catgirl + litterbox + pounce + ]; +} diff --git a/home/fuwn/meta/default.nix b/home/fuwn/meta/default.nix index fca7414..cd07eaf 100644 --- a/home/fuwn/meta/default.nix +++ b/home/fuwn/meta/default.nix @@ -1,15 +1,17 @@ _: { imports = [ + ./communication ./desktop ./development ./education ./filesystem # ./gaming ./multimedia + ./network ./rice ./scripts - ./smolnet ./steam ./system + ./utility ]; } diff --git a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix index 5e413dd..92d7c67 100644 --- a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix +++ b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix @@ -1,4 +1,4 @@ -_: { +{ config, ... }: { wayland.windowManager.hyprland = { settings = { monitor = [ @@ -7,7 +7,7 @@ _: { "DP-1, 1920x1080@144.00, 3840x0, 1" ]; - source = "/home/fuwn/.cache/wal/colors-hyprland"; + source = "${config.home.homeDirectory}/.cache/wal/colors-hyprland"; general = { gaps_in = 5; diff --git a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix index f5ac557..d77a24b 100644 --- a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix +++ b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix @@ -1,4 +1,4 @@ -_: { +{ config, ... }: { wayland.windowManager.hyprland.settings.workspace = ( let generateWorkspaces = monitor: workspaces: offset: @@ -31,7 +31,7 @@ _: { ) ++ [ "special:simple_terminal, on-created-empty:[float;center;size 50% 65%] kitty --class simple_terminal" "special:simple_calculator, on-created-empty:[float;center;size 50% 50%] kitty --class simple_calculator -e bc -lq" - "special:chatgpt, on-created-empty:[float;center;size 65% 75%] thorium-browser --user-data-dir=~/.local/share/thorium-browser-chatgpt --app='https://chatgpt.com/'" + "special:chatgpt, on-created-empty:[float;center;size 65% 75%] thorium-browser --user-data-dir=${config.home.homeDirectory}/.local/share/thorium-browser-chatgpt --app='https://chatgpt.com/'" "special:spotify, on-created-empty:[float;center;size 65% 90%] spotify" "special:calculator, on-created-empty:[float;center;size 50% 50%] qalculate-gtk" ]; diff --git a/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix b/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix index 03ccb3d..727ced0 100644 --- a/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix +++ b/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix @@ -12,7 +12,7 @@ background = [ { - path = "/home/fuwn/.local/share/bg"; + path = "${config.home.homeDirectory}/.local/share/bg"; } ]; diff --git a/home/fuwn/meta/development/default.nix b/home/fuwn/meta/development/default.nix index e08677f..7666be8 100644 --- a/home/fuwn/meta/development/default.nix +++ b/home/fuwn/meta/development/default.nix @@ -1,10 +1,9 @@ _: { imports = [ - ./http + ./git ./infrastructure ./languages ./nix - ./tcp ./tools ]; } diff --git a/home/fuwn/meta/development/git/default.nix b/home/fuwn/meta/development/git/default.nix new file mode 100644 index 0000000..260b0f6 --- /dev/null +++ b/home/fuwn/meta/development/git/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + delta + gh + onefetch + gitoxide + ]; +} diff --git a/home/fuwn/meta/development/http/default.nix b/home/fuwn/meta/development/http/default.nix deleted file mode 100644 index b917245..0000000 --- a/home/fuwn/meta/development/http/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - httpie - httpie-desktop - ]; -} diff --git a/home/fuwn/meta/development/languages/default.nix b/home/fuwn/meta/development/languages/default.nix index 1ec2f16..fe5d437 100644 --- a/home/fuwn/meta/development/languages/default.nix +++ b/home/fuwn/meta/development/languages/default.nix @@ -6,7 +6,7 @@ _: { ./cobol ./gleam ./go - ./hare + # ./hare ./javascript # ./jvm ./protobuf diff --git a/home/fuwn/meta/development/tcp/default.nix b/home/fuwn/meta/development/tcp/default.nix deleted file mode 100644 index ad648f1..0000000 --- a/home/fuwn/meta/development/tcp/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - netcat-openbsd - inetutils - whois - ]; -} diff --git a/home/fuwn/meta/development/tools/default.nix b/home/fuwn/meta/development/tools/default.nix index e52d2ec..b78b25f 100644 --- a/home/fuwn/meta/development/tools/default.nix +++ b/home/fuwn/meta/development/tools/default.nix @@ -2,5 +2,6 @@ home.packages = with pkgs; [ clang-tools highlight + sloc ]; } diff --git a/home/fuwn/meta/filesystem/core/bat/default.nix b/home/fuwn/meta/filesystem/core/bat/default.nix new file mode 100644 index 0000000..c1dad3f --- /dev/null +++ b/home/fuwn/meta/filesystem/core/bat/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + programs.bat = { + enable = true; + config.pager = "less -FR"; + }; +} diff --git a/home/fuwn/meta/filesystem/core/default.nix b/home/fuwn/meta/filesystem/core/default.nix new file mode 100644 index 0000000..5585e65 --- /dev/null +++ b/home/fuwn/meta/filesystem/core/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: { + imports = [ + ./bat + ./eza + ]; + + home.packages = with pkgs; [ + dogdns + fd + rm-improved + ]; +} diff --git a/home/fuwn/meta/filesystem/core/eza/default.nix b/home/fuwn/meta/filesystem/core/eza/default.nix new file mode 100644 index 0000000..a8d2f57 --- /dev/null +++ b/home/fuwn/meta/filesystem/core/eza/default.nix @@ -0,0 +1,7 @@ +_: { + programs.eza = { + enable = true; + icons = true; + enableFishIntegration = true; + }; +} diff --git a/home/fuwn/meta/filesystem/default.nix b/home/fuwn/meta/filesystem/default.nix index 42dccca..81f0ed7 100644 --- a/home/fuwn/meta/filesystem/default.nix +++ b/home/fuwn/meta/filesystem/default.nix @@ -1,4 +1,8 @@ { pkgs, ... }: { + imports = [ + ./core + ]; + programs.nnn.enable = true; home.packages = with pkgs; [ diff --git a/home/fuwn/meta/multimedia/image/default.nix b/home/fuwn/meta/multimedia/image/default.nix index 83242d2..58961ac 100644 --- a/home/fuwn/meta/multimedia/image/default.nix +++ b/home/fuwn/meta/multimedia/image/default.nix @@ -2,8 +2,10 @@ home.packages = with pkgs; [ ahoviewer feh + gallery-dl gthumb nsxiv + pngcrush viewnior viu ]; diff --git a/home/fuwn/meta/network/default.nix b/home/fuwn/meta/network/default.nix new file mode 100644 index 0000000..a7ea06e --- /dev/null +++ b/home/fuwn/meta/network/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./smolnet + ./tools + ]; +} diff --git a/home/fuwn/meta/network/smolnet/bollux/default.nix b/home/fuwn/meta/network/smolnet/bollux/default.nix new file mode 100644 index 0000000..2079052 --- /dev/null +++ b/home/fuwn/meta/network/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/home/fuwn/meta/network/smolnet/bollux/fix_lesskey_nag.patch b/home/fuwn/meta/network/smolnet/bollux/fix_lesskey_nag.patch new file mode 100644 index 0000000..329b886 --- /dev/null +++ b/home/fuwn/meta/network/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/home/fuwn/meta/network/smolnet/default.nix b/home/fuwn/meta/network/smolnet/default.nix new file mode 100644 index 0000000..0843979 --- /dev/null +++ b/home/fuwn/meta/network/smolnet/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: { + imports = [ + ./bollux + ]; + + home.packages = with pkgs; [ + amfora + geopard + gmni + phetch + ]; +} diff --git a/home/fuwn/meta/network/tools/default.nix b/home/fuwn/meta/network/tools/default.nix new file mode 100644 index 0000000..4e369ac --- /dev/null +++ b/home/fuwn/meta/network/tools/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./http + ./tcp + ]; +} diff --git a/home/fuwn/meta/network/tools/http/default.nix b/home/fuwn/meta/network/tools/http/default.nix new file mode 100644 index 0000000..b917245 --- /dev/null +++ b/home/fuwn/meta/network/tools/http/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + httpie + httpie-desktop + ]; +} diff --git a/home/fuwn/meta/network/tools/tcp/default.nix b/home/fuwn/meta/network/tools/tcp/default.nix new file mode 100644 index 0000000..a468382 --- /dev/null +++ b/home/fuwn/meta/network/tools/tcp/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + netcat-openbsd + nethogs + inetutils + whois + ]; +} diff --git a/home/fuwn/meta/rice/default.nix b/home/fuwn/meta/rice/default.nix index 25ae26c..d89dfe5 100644 --- a/home/fuwn/meta/rice/default.nix +++ b/home/fuwn/meta/rice/default.nix @@ -11,5 +11,6 @@ home.packages = with pkgs; [ cpufetch iotop + # nvtopPackages.nvidia ]; } diff --git a/home/fuwn/meta/smolnet/bollux/default.nix b/home/fuwn/meta/smolnet/bollux/default.nix deleted file mode 100644 index 2079052..0000000 --- a/home/fuwn/meta/smolnet/bollux/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ 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/home/fuwn/meta/smolnet/bollux/fix_lesskey_nag.patch b/home/fuwn/meta/smolnet/bollux/fix_lesskey_nag.patch deleted file mode 100644 index 329b886..0000000 --- a/home/fuwn/meta/smolnet/bollux/fix_lesskey_nag.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/home/fuwn/meta/smolnet/default.nix b/home/fuwn/meta/smolnet/default.nix deleted file mode 100644 index 0843979..0000000 --- a/home/fuwn/meta/smolnet/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./bollux - ]; - - home.packages = with pkgs; [ - amfora - geopard - gmni - phetch - ]; -} diff --git a/home/fuwn/meta/system/default.nix b/home/fuwn/meta/system/default.nix index 6698785..8fee2ce 100644 --- a/home/fuwn/meta/system/default.nix +++ b/home/fuwn/meta/system/default.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { imports = [ ./bitwarden + ./shell ./terminal ]; diff --git a/home/fuwn/meta/system/shell/default.nix b/home/fuwn/meta/system/shell/default.nix new file mode 100644 index 0000000..95345e6 --- /dev/null +++ b/home/fuwn/meta/system/shell/default.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: { + imports = [ + ./fish + ./starship + ./scripting + ]; + + home.packages = with pkgs; [ + asciinema + navi + shellclear + watchexec + zoxide + ]; +} diff --git a/home/fuwn/meta/system/shell/fish/default.nix b/home/fuwn/meta/system/shell/fish/default.nix new file mode 100644 index 0000000..291e5a4 --- /dev/null +++ b/home/fuwn/meta/system/shell/fish/default.nix @@ -0,0 +1,151 @@ +{ pkgs, ... }: { + programs.fish = { + enable = true; + + shellInit = '' + if status is-interactive + set fish_greeting + + fish_vi_key_bindings + + starship init fish | source + + function fish_postexec --on-event fish_postexec + if test "$argv" != "clear" + echo + end + end + + function vpn + env BIND_INTERFACE=wgpia0 LD_PRELOAD=/usr/lib/bindToInterface.so $argv + end + + cat ~/.cache/wal/sequences + end + + set -l config_home (set -q XDG_CONFIG_HOME; and echo $XDG_CONFIG_HOME; or echo $HOME/.config) + + set HISTSIZE -1 + set HISTFILESIZE -1 + set SAVEHIST -1 + + source "$config_home/shell/profile" + bass source "~/.nix-profile/etc/profile.d/hm-session-vars.sh" + + bind \ce edit_command_buffer + + zoxide init fish | source + ''; + + plugins = [ + { + name = "fzf.fish"; + + src = pkgs.fetchFromGitHub { + owner = "patrickf1"; + repo = "fzf.fish"; + rev = "8920367cf85eee5218cc25a11e209d46e2591e7a"; + sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM="; + }; + } + { + name = "bass"; + + src = pkgs.fetchFromGitHub { + owner = "edc"; + repo = "bass"; + rev = "79b62958ecf4e87334f24d6743e5766475bcf4d0"; + sha256 = "sha256-3d/qL+hovNA4VMWZ0n1L+dSM1lcz7P5CQJyy+/8exTc="; + }; + } + { + name = "nvm.fish"; + + src = pkgs.fetchFromGitHub { + owner = "jorgebucaran"; + repo = "nvm.fish"; + rev = "b8edb1ee24cbbf7259196b0cb3c6c4ab65b07929"; + sha256 = "sha256-7JxIQSseBv81SSpWH1pufx8fh9EQhbo3r2nVVREwc58="; + }; + } + { + name = "sponge"; + + src = pkgs.fetchFromGitHub { + owner = "meaningful-ooo"; + repo = "sponge"; + rev = "384299545104d5256648cee9d8b117aaa9a6d7be"; + sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; + }; + } + { + name = "autopair.fish"; + + src = pkgs.fetchFromGitHub { + owner = "jorgebucaran"; + repo = "autopair.fish"; + rev = "4d1752ff5b39819ab58d7337c69220342e9de0e2"; + sha256 = "sha256-qt3t1iKRRNuiLWiVoiAYOu+9E7jsyECyIqZJ/oRIT1A="; + }; + } + ]; + + shellAliases = { + # Verbosity + cp = "cp -iv"; + mv = "mv -iv"; + # rm = "rm -vI"; + bc = "bc -ql"; + rsync = "rsync -vrPlu"; + mkd = "mkdir -pv"; + yt = "yt-dlp --embed-metadata -i"; + yta = "yt -x -f bestaudio/best"; + ytt = "yt --skip-download --write-thumbnail"; + ffmpeg = "ffmpeg -hide_banner"; + wdic = "wdic --homophones --kanji --color --pager"; + hakuneko = "hakuneko-desktop --no-sandbox"; + fastfetch = "clear && /usr/bin/env fastfetch"; + + # Modern Alternatives & Alias Rewrites + sxiv = "nsxiv"; + unzip = "ripunzip unzip-file"; + nvim = "lvim"; + vim = "lvim"; + vimdiff = "lvim -d"; + rm = "rip"; + + # Colourise + ls = "exa -h --no-quotes --color=auto --group-directories-first"; + grep = "grep --color=auto"; + diff = "diff --color=auto"; + ccat = "highlight --out-format=ansi"; + ip = "ip -color=auto"; + + # Abbreviations + ka = "killall"; + g = "git"; + sdn = "shutdown -h now"; + e = "$EDITOR"; + v = "$EDITOR"; + ff = "fastfetch"; + + # Other + pacbins = "comm -23 <(yay -Qqett | sort) <(yay -Qqg base -g base-devel | sort | uniq)"; + chan = "chan-downloader -c 10"; + taiga = "bottles-cli run -b Taiga -p Taiga"; + rotd = "systemctl --user restart opentabledriver.service"; + ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'"; + def = "myougiden"; + suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ~/Documents/Code/Git/Fuwn/suzuri/suzuri"; + manga-cli = "bash <(curl -s 'https://raw.githubusercontent.com/justchokingaround/manga-cli/master/manga-cli')"; + "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow"; + shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && nsxiv /tmp/shinobu"; + auto_subtitle = "source $HOME/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True"; + steamy = "mangohud gamemoderun steam-runtime"; + koix = "koi -f"; + seamonkey = "$HOME/.local/src/seamonkey/seamonkey-bin"; + doom = "$HOME/.config/emacs/bin/doom"; + lagrange = "SDL_VIDEODRIVER=x11 /usr/bin/lagrange"; + }; + }; +} diff --git a/home/fuwn/meta/system/shell/scripting/charmbracelet/default.nix b/home/fuwn/meta/system/shell/scripting/charmbracelet/default.nix new file mode 100644 index 0000000..e3b78df --- /dev/null +++ b/home/fuwn/meta/system/shell/scripting/charmbracelet/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + gum + mods + ]; +} diff --git a/home/fuwn/meta/system/shell/scripting/default.nix b/home/fuwn/meta/system/shell/scripting/default.nix new file mode 100644 index 0000000..fb6e062 --- /dev/null +++ b/home/fuwn/meta/system/shell/scripting/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + imports = [ + ./charmbracelet + ./ripgrep + ]; + + home.packages = with pkgs; [ + moreutils + pup + ]; +} diff --git a/home/fuwn/meta/system/shell/scripting/ripgrep/default.nix b/home/fuwn/meta/system/shell/scripting/ripgrep/default.nix new file mode 100644 index 0000000..00de07f --- /dev/null +++ b/home/fuwn/meta/system/shell/scripting/ripgrep/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + programs.ripgrep.enable = true; + + home.packages = with pkgs; [ + ripgrep-all + ]; +} diff --git a/home/fuwn/meta/system/shell/starship/default.nix b/home/fuwn/meta/system/shell/starship/default.nix new file mode 100644 index 0000000..0088038 --- /dev/null +++ b/home/fuwn/meta/system/shell/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/home/fuwn/meta/utility/ai/default.nix b/home/fuwn/meta/utility/ai/default.nix new file mode 100644 index 0000000..7513348 --- /dev/null +++ b/home/fuwn/meta/utility/ai/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + ollama-cuda + shell-gpt + ]; + + # services.ollama = { + # enable = true; + # acceleration = "cuda"; + # }; +} diff --git a/home/fuwn/meta/utility/default.nix b/home/fuwn/meta/utility/default.nix new file mode 100644 index 0000000..4c5da73 --- /dev/null +++ b/home/fuwn/meta/utility/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: { + imports = [ + ./ai + ]; + + home.packages = with pkgs; [ + fontpreview + tealdeer + todo + ripunzip + ]; +} -- cgit v1.2.3