From e3db2dcd9a7bb589986c1a34992fc1114d3c0902 Mon Sep 17 00:00:00 2001 From: Miran Bastaja Date: Mon, 10 Mar 2025 13:37:09 +0100 Subject: refactor: split developer tools out of hyprdesktop --- hosts/underworld/home.nix | 1 + share/hm-modules/hyprdesktop.nix | 34 ---------------------------- share/home/dev-stuff.nix | 49 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 share/home/dev-stuff.nix diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix index 5f1f612..2c1689f 100644 --- a/hosts/underworld/home.nix +++ b/hosts/underworld/home.nix @@ -19,6 +19,7 @@ imports = [ (flakeRoot + /share/cfg) (flakeRoot + /share/cfg/senpai.nix) + (flakeRoot + /share/home/dev-stuff.nix) ]; custom.hyprdesktop = { enable = true; diff --git a/share/hm-modules/hyprdesktop.nix b/share/hm-modules/hyprdesktop.nix index f312f0d..790d756 100644 --- a/share/hm-modules/hyprdesktop.nix +++ b/share/hm-modules/hyprdesktop.nix @@ -14,16 +14,6 @@ let lists ; cfg = config.custom.hyprdesktop; - python = pkgs.python313.withPackages ( - python-pkgs: with python-pkgs; [ - beautifulsoup4 - types-beautifulsoup4 - requests - python-lsp-server - ruff - rdflib - ] - ); in { imports = [ ../home/minimal.nix ]; @@ -103,28 +93,6 @@ in yt-dlp pkgs.nur.repos.sorre.lightnovel-crawler - # Developer stuff - git - gitui - scheme-manpages - guile - gcc - rustup - just - gnumake - uv - web-ext - nodejs_23 - bun - python - (llama-cpp.override { - openclSupport = true; - vulkanSupport = true; - }) - postgresql_17 # for the CLI tools - pgcli - podman-compose - # TUI/GUI programs thunderbird # email client nsxiv # image viewer @@ -134,7 +102,6 @@ in zathura # document reader foliate nyxt - zed-editor bitwarden discord element-desktop @@ -145,7 +112,6 @@ in haruna anki calibre - koboldcpp qutebrowser mullvad-vpn diff --git a/share/home/dev-stuff.nix b/share/home/dev-stuff.nix new file mode 100644 index 0000000..c998891 --- /dev/null +++ b/share/home/dev-stuff.nix @@ -0,0 +1,49 @@ +{ pkgs, ... }: +let + python = pkgs.python313.withPackages ( + python-pkgs: with python-pkgs; [ + beautifulsoup4 + types-beautifulsoup4 + requests + python-lsp-server + ruff + rdflib + ] + ); + llama-cpp = pkgs.llama-cpp.override { + openclSupport = true; + vulkanSupport = true; + + }; +in +{ + home.packages = + [ + python + llama-cpp + ] + ++ builtins.attrValues { + inherit (pkgs) + git + gitui + scheme-manpages + guile + gcc + rustup + just + gnumake + uv + web-ext + nodejs_23 + bun + postgresql_17 # for the CLI tools + pgcli + podman-compose + + # TUI/GUI + zed-editor + koboldcpp + ; + }; + +} -- cgit v1.3.1