diff options
Diffstat (limited to '.config/nixpkgs/config.nix')
| -rw-r--r-- | .config/nixpkgs/config.nix | 273 |
1 files changed, 182 insertions, 91 deletions
diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix index 078c351..a95debd 100644 --- a/.config/nixpkgs/config.nix +++ b/.config/nixpkgs/config.nix @@ -2,13 +2,19 @@ let pkgs = import <nixpkgs> { }; + system = builtins.currentSystem; + + previous = import (builtins.fetchTarball { + url = "https://releases.nixos.org/nixos/22.11/nixos-22.11.466.596a8e828c5/nixexprs.tar.xz"; + sha256 = "1367bad5zz0mfm4czb6p0s0ni38f0x1ffh02z76rx4nranipqbgg"; }) { inherit system; }; + stable = import (builtins.fetchTarball { - url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz"; - sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj"; }) {}; + url = "https://releases.nixos.org/nixos/23.11/nixos-23.11.6510.a5e4bbcb4780/nixexprs.tar.xz"; + sha256 = "0f73pbh4j89wgk7rn9xp0q8ybw15zkhw0prjz5r37aaryjs8hnbd"; }) { inherit system; }; unstable = import (builtins.fetchTarball { - url = "https://releases.nixos.org/nixos/unstable/nixos-22.05pre353770.23d785aa6f8/nixexprs.tar.xz"; - sha256 = "1n50i34h3yj2a44x3gl2xk27z8r12lzgj2m8n5j1c4k6kh4z1b22"; }) {}; + url = "https://releases.nixos.org/nixos/unstable/nixos-24.05pre615148.6143fc5eeb9c/nixexprs.tar.xz"; + sha256 = "0bymwq04dxl3ljjjzw21aspdnwwfm56pqi218lg0vdwargy8yxm8"; }) { inherit system; }; in @@ -25,9 +31,9 @@ in Woodpecker = pkgs.buildEnv { name = "woodpecker"; paths = [ - Terminal Graphical Xorg Awesome Fonts Audio LaTeX Dictionary - Android JavaScript Python PHP Lua Elixir HTML Shell Haskell - Perl Nix C Golang Rust CSS SQL YAML Ruby Nim Themes Emulators + Terminal Graphical Xorg Wayland Awesome Fonts Audio LaTeX Dictionary Android + JavaScript Python PHP Lua Elixir HTML Shell Haskell Perl Nix C Golang Rust CSS + SQL YAML HTTP Ruby Nim Themes Emulators Clojure Lisp ]; }; @@ -64,27 +70,33 @@ in Terminal = pkgs.buildEnv { name = "terminal"; paths = [ - (callPackage ./packages/chromexup/default.nix {}) - (callPackage ./packages/hugo/default.nix {}) - (callPackage ./packages/rxvt-unicode/default.nix {}) - (callPackage ./packages/systemd2nix/default.nix {}) - (callPackage ./packages/validatornu/default.nix {}) - (callPackage ./packages/youtube-dl/default.nix {}) - (unstable.pass.withExtensions (ext: with ext; [ pass-import pass-audit pass-otp ])) - unstable.amfora - unstable.emacs - unstable.fzf - unstable.quickemu + (callPackage ./packages/chromexup/package.nix { }) + (callPackage ./packages/emacs-batch-indent/package.nix { }) + (callPackage ./packages/pdf2htmlex/package.nix { }) + (callPackage ./packages/systemd2nix/package.nix { }) + (pass.withExtensions (ext: with ext; [ pass-import pass-audit pass-otp ])) + unstable.hugo + unstable.piper-tts + unstable.validator-nu + unstable.vimHugeX + unstable.yt-dlp + unstable.ios-webkit-debug-proxy + unstable.libimobiledevice aerc + alacritty alsaUtils + amfora ansi2html ansible + atftp atool bat + bind bleachbit - calcurse cava + cloc csvkit + curlftpfs davmail desktop-file-utils diceware @@ -92,23 +104,27 @@ in docker-compose dtrx electrum + emacs encfs entr - exercism expect + fdupes ffmpeg flashrom fortune + fzf gettext gifsicle git groff + hexedit hexyl highlight ideviceinstaller imagemagick img2pdf jpegoptim + jq keychain kjv libqalculate @@ -119,19 +135,26 @@ in monolith neofetch netcat-openbsd + nethogs newsboat nnn + nodePackages.mermaid-cli ocrmypdf pandoc - picotts + pdsh pipes + plantuml pngnq pngquant poppler_utils + pssh + quickemu ranger rclone ripgrep - sbcl + rxvt-unicode + s-tui + sfeed silver-searcher sshfs subversion @@ -139,19 +162,19 @@ in tcl tesseract tmux + toipe trash-cli units vale - vault vcal ventoy-bin - vimHugeX vnstat w3m wavemon weechat woof xdg-user-dirs + xterm zbar ]; pathsToLink = [ "/etc" "/share" "/bin" ]; @@ -160,24 +183,21 @@ in Graphical = pkgs.buildEnv { name = "graphical"; paths = [ - (callPackage ./packages/beaker-browser/default.nix {}) - (callPackage ./packages/boomer/default.nix {}) - (callPackage ./packages/dmenu/default.nix {}) - (callPackage ./packages/gnaural/default.nix {}) - (callPackage ./packages/ntrviewer/default.nix {}) - (callPackage ./packages/planner/default.nix {}) - (callPackage ./packages/scribus/default.nix {}) - (callPackage ./packages/sowon/default.nix {}) - (callPackage ./packages/tilp2/default.nix {}) + (callPackage ./packages/boomer/package.nix { }) + (callPackage ./packages/dmenu/package.nix { }) + (callPackage ./packages/rofi/package.nix { }) + (callPackage ./packages/sowon/package.nix { }) (mplayer.override { v4lSupport = true; }) - unstable.claws-mail - unstable.fsearch - unstable.nyxt + previous.code-server + previous.qownnotes + previous.recoll + unstable.firefox + unstable.google-chrome unstable.ungoogled-chromium aegisub anki blender - code-server + claws-mail corrscope dconf diffpdf @@ -185,15 +205,18 @@ in evince exiftool feh - firefox flameshot freerdp + fsearch gImageReader gcolor2 gimp - google-chrome + gnaural gparted gromit-mpx + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer i3lock-fancy kcharselect keepassxc @@ -203,30 +226,25 @@ in liferea mate.engrampa meld - mupdf + mupdf_1_17 mypaint - palemoon pavucontrol peek - qownnotes qrencode - recoll redshift - rofi scrcpy screenkey + sent sigil skippy-xd spaceFM + stalonetray sublime3 sxiv syncthing - tabula tigervnc transmission-gtk treesheets - treesheets - vimb virt-manager vlc vscodium @@ -241,7 +259,8 @@ in Emulators = pkgs.buildEnv { name = "emulators"; paths = [ - (callPackage ./packages/tiemu/default.nix {}) + (callPackage ./packages/ntrviewer/package.nix { }) + (callPackage ./packages/tiemu/package.nix { }) desmume mgba ]; @@ -250,13 +269,11 @@ in Xorg = pkgs.buildEnv { name = "xorg"; paths = [ - (callPackage ./packages/x11vnc/default.nix {}) - (callPackage ./packages/xprintidle/default.nix {}) autocutsel glxinfo unclutter-xfixes - weston wmctrl + x11vnc xbindkeys xdotool xorg.xauth @@ -276,14 +293,26 @@ in xorg.xrdb xorg.xset xorg.xsetroot + xprintidle xsel xzoom ]; }; + Wayland = pkgs.buildEnv { + name = "wayland"; + paths = [ + (callPackage ./packages/wf-shell/package.nix { }) + wayfire + weston + wev + wofi + ]; + }; + Awesome = pkgs.buildEnv { name = "awesome"; - paths = [ awesome ]; + paths = [ (callPackage ./packages/awesome/package.nix { }) ]; }; Xfce = pkgs.buildEnv { @@ -314,7 +343,7 @@ in Fonts = pkgs.buildEnv { name = "fonts"; paths = [ - (callPackage ./packages/nerdfonts-dejavu-sans-mono/default.nix {}) + (callPackage ./packages/nerdfonts-dejavu-sans-mono/package.nix { }) cm_unicode cooper-hewitt corefonts @@ -325,10 +354,12 @@ in fira-mono font-awesome_4 ibm-plex + inter noto-fonts noto-fonts-cjk noto-fonts-emoji source-code-pro + source-sans-pro source-serif-pro yanone-kaffeesatz ]; @@ -337,11 +368,16 @@ in Themes = pkgs.buildEnv { name = "themes"; paths = [ + glib + gnome.dconf-editor + gnome.gnome-themes-extra gtk-engine-murrine + gtk3.dev librsvg lxappearance papirus-icon-theme - qt4 + qt5ct + unstable.nwg-look vanilla-dmz ]; }; @@ -349,10 +385,11 @@ in Dictionary = pkgs.buildEnv { name = "dictionary"; paths = [ - aspell - aspellDicts.en - aspellDicts.en-computers - aspellDicts.en-science + (aspellWithDicts (dictionary: [ + dictionary.en + dictionary.en-computers + dictionary.en-science + ])) hunspell hunspellDicts.en_US-large hyphen @@ -362,39 +399,45 @@ in Audio = pkgs.buildEnv { name = "audio"; - paths = [ pulseeffects-pw pulsemixer audacity ardour qjackctl ]; + paths = [ + (callPackage ./packages/qprompt/package.nix { }) + ardour + pulsemixer + qjackctl + tenacity + ]; }; Design = pkgs.buildEnv { name = "design"; - paths = [ freecadStable kicad ]; + paths = [ kicad freecadStable openscad librecad ]; }; Android = pkgs.buildEnv { name = "android"; paths = [ - (callPackage ./packages/edl/default.nix {}) - (callPackage ./packages/mkbootfs/default.nix {}) - (callPackage ./packages/mkbootimg/default.nix {}) + (callPackage ./packages/mkbootfs/package.nix { }) + (callPackage ./packages/mkbootimg/package.nix { }) + edl abootimg ]; }; LaTeX = pkgs.buildEnv { name = "latex"; - paths = [ gummi texworks texlive.combined.scheme-full ]; + paths = [ gummi texlive.combined.scheme-full previous.texworks ]; }; JavaScript = pkgs.buildEnv { name = "javascript"; paths = [ - nodejs unstable.deno - nodePackages.bower2nix + unstable.swc + esbuild nodePackages.eslint nodePackages.jsonlint - nodePackages.node2nix nodePackages.prettier + nodejs ]; pathsToLink = [ "/bin" ]; }; @@ -402,25 +445,48 @@ in Python = pkgs.buildEnv { name = "python"; paths = [ - (python39.withPackages (ps: with ps; [ bandit black mypy pylint pyflakes flake8 pygments ])) + (python3.withPackages (ps: with ps; [ + bandit + black + flake8 + mypy + pyflakes + pygments + pylint + ])) + ruff ]; }; PHP = pkgs.buildEnv { name = "php"; paths = [ - php - phpPackages.psysh - phpPackages.psalm + (php.buildEnv { + extensions = ({ enabled, all }: enabled ++ (with all; [ xdebug ])); + extraConfig = '' + xdebug.mode=develop,debug + xdebug.start_with_request=yes + ''; + }) + (callPackage ./packages/phar-composer/package.nix { }) + graphviz + kcachegrind + phpPackages.composer phpPackages.phpcbf phpPackages.phpstan - phpPackages.composer + phpPackages.psalm + phpPackages.psysh ]; }; Lua = pkgs.buildEnv { name = "lua"; - paths = [ lua luaPackages.luacheck luaformatter ]; + paths = [ + (callPackage ./packages/redbean/package.nix { }) + lua + luaPackages.luacheck + luaformatter + ]; }; Elixir = pkgs.buildEnv { @@ -434,6 +500,7 @@ in html-tidy html-xml-utils libxml2 + libxslt xmlstarlet ]; }; @@ -445,22 +512,27 @@ in Haskell = pkgs.buildEnv { name = "haskell"; - paths = [ ghc ghcid haskellPackages.hlint haskellPackages.brittany ]; + paths = [ ghc ghcid haskellPackages.hlint previous.haskellPackages.brittany ]; + }; + + Clojure = pkgs.buildEnv { + name = "clojure"; + paths = [ clojure leiningen ]; }; Perl = pkgs.buildEnv { name = "perl"; - paths = [ rakudo (perl.withPackages (ps: with ps; [ PerlCritic PerlTidy TextLorem ])) ]; + paths = [ rakudo (perl.withPackages (ps: with ps; [ PerlCritic PerlTidy TextLorem LaTeXML ])) ]; }; Nix = pkgs.buildEnv { name = "nix"; - paths = [ nixos-generators nix-index nix-linter nixfmt nixpkgs-fmt nixpkgs-lint ]; + paths = [ nix-index previous.nix-linter nixfmt nixpkgs-fmt nixpkgs-lint ]; }; Ruby = pkgs.buildEnv { name = "ruby"; - paths = [ (callPackage ./packages/rufo/default.nix {}) rubocop ruby ]; + paths = [ rubocop ruby ]; }; C = pkgs.buildEnv { @@ -470,7 +542,7 @@ in Golang = pkgs.buildEnv { name = "golang"; - paths = [ go unstable.gore ]; + paths = [ go gore ]; }; Rust = pkgs.buildEnv { @@ -483,11 +555,30 @@ in paths = [ nim ]; }; + Lisp = pkgs.buildEnv { + name = "lisp"; + paths = [ + (pkgs.writeScriptBin "guile" '' + export GUILE_LOAD_PATH="${pkgs.lib.concatStrings [ + "${unstable.guile-gnutls}/share/guile/site/3.0:" + "$GUILE_LOAD_PATH" + ]}" + ${unstable.guile_3_0}/bin/guile "$@" + '') + sbcl + ]; + }; + + HTTP = pkgs.buildEnv { + name = "http"; + paths = [ caddy apacheHttpd httpie ]; + }; + CSS = pkgs.buildEnv { name = "css"; paths = [ - (callPackage ./packages/csstidy/default.nix {}) - (callPackage ./packages/stylelint/default.nix {}) + (previous.callPackage ./packages/csstidy/package.nix { }) + nodePackages.stylelint csslint sassc ]; @@ -496,21 +587,21 @@ in SQL = pkgs.buildEnv { name = "sql"; paths = [ - (callPackage ./packages/skeema/default.nix {}) - (callPackage ./packages/sqldef/default.nix {}) pgformatter + skeema sqlfluff sqlint sqlite sqlitebrowser + unstable.sqldef ]; }; YAML = pkgs.buildEnv { name = "yaml"; paths = [ - (callPackage ./packages/ruamel.yaml.cmd/default.nix {}) - (callPackage ./packages/yaml2nix/default.nix {}) + (previous.callPackage ./packages/yaml2nix/package.nix { }) + (callPackage ./packages/ruamel.yaml.cmd/package.nix { }) python39Packages.yamllint yj ]; @@ -519,11 +610,10 @@ in Xorg-Aarch64 = pkgs.buildEnv { name = "xorg-aarch64"; paths = [ - (callPackage ./packages/x11vnc/default.nix {}) - (callPackage ./packages/xprintidle/default.nix {}) glxinfo unclutter-xfixes wmctrl + x11vnc xbindkeys xdotool xorg.xauth @@ -539,6 +629,7 @@ in xorg.xrdb xorg.xset xorg.xsetroot + xprintidle xsel xzoom ]; @@ -570,16 +661,16 @@ in Graphical-Aarch64 = pkgs.buildEnv { name = "graphical-aarch64"; paths = [ - unstable.fsearch + unstable.firefox + unstable.ungoogled-chromium audacity - firefox freerdp + fsearch galculator gpicview pavucontrol pcmanfm sylpheed - ungoogled-chromium xsane ]; }; @@ -587,15 +678,15 @@ in Terminal-Aarch64 = pkgs.buildEnv { name = "terminal-aarch64"; paths = [ - unstable.fzf + unstable.vimHugeX alsaUtils + fzf libnotify redshift rofi rxvt-unicode skippy-xd tigervnc - vimHugeX ]; }; }; |