From ea3da7ddc6ab836e1b8c9958514b95797cc8cf71 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 22 Sep 2024 01:46:52 +0200 Subject: [PATCH] wrapped fish: init --- modules/programs/module.nix | 6 +++ modules/programs/other/nix-index.nix | 16 +++++++ parts/pkgs/extraPackages/fish/default.nix | 31 ++++++++++++++ parts/pkgs/extraPackages/fish/packages.nix | 50 ++++++++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 modules/programs/module.nix create mode 100644 modules/programs/other/nix-index.nix create mode 100644 parts/pkgs/extraPackages/fish/default.nix create mode 100644 parts/pkgs/extraPackages/fish/packages.nix diff --git a/modules/programs/module.nix b/modules/programs/module.nix new file mode 100644 index 0000000..72a6eb6 --- /dev/null +++ b/modules/programs/module.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + programs.command-not-found = { + enable = true; + dbPath = pkgs.sqlite; + }; +} diff --git a/modules/programs/other/nix-index.nix b/modules/programs/other/nix-index.nix new file mode 100644 index 0000000..099381c --- /dev/null +++ b/modules/programs/other/nix-index.nix @@ -0,0 +1,16 @@ +{pkgs, ...}: { + programs = { + command-not-found = { + # TODO fix this + enable = false; + dbPath = pkgs.sqlite; + }; + nix-index = { + enable = true; + package = pkgs.nix-index; + enableBashIntegration = true; + enableZshIntegration = true; + enableFishIntegration = true; + }; + }; +} diff --git a/parts/pkgs/extraPackages/fish/default.nix b/parts/pkgs/extraPackages/fish/default.nix new file mode 100644 index 0000000..230c90a --- /dev/null +++ b/parts/pkgs/extraPackages/fish/default.nix @@ -0,0 +1,31 @@ +{ + inputs, + lib, + pkgs, + ... +}: let + inherit (lib) concatStringsSep mapAttrsToList; + aliases = import ./aliases.nix {inherit pkgs;}; + + aliasesAsString = + concatStringsSep "\n" + (mapAttrsToList (k: v: "alias ${k}=\"${v}\"") aliases); + + packages = import ./packages.nix {inherit pkgs;}; + + fish-wrapped = inputs.wrapper-manager.lib.build { + inherit pkgs; + modules = [ + { + wrappers.fish-wrapped = { + basePackage = pkgs.fish; + pathAdd = packages; + flags = [ + + ]; + }; + } + ]; + }; +in + fish-wrapped diff --git a/parts/pkgs/extraPackages/fish/packages.nix b/parts/pkgs/extraPackages/fish/packages.nix new file mode 100644 index 0000000..6291cc2 --- /dev/null +++ b/parts/pkgs/extraPackages/fish/packages.nix @@ -0,0 +1,50 @@ +{pkgs}: (with pkgs; [ + # better cd + zoxide + #better ls + eza + + # better cat + bat + + # better grep + ripgrep + + # better dig + dogdns + + # simply the best fetch tool out there + microfetch + + fzf + +carapace + difftastic + hexyl + gitui + iputils + gnumake + gping + asciinema + inetutils + scc + starship + onefetch + wget + cpufetch + yt-dlp + tealdeer + glow + hyperfine + imagemagick + ffmpeg-full + catimg + nmap + wget + fd + jq + rsync + figlet + unzip + zip +])