From 7cd647c4490d0f92280505e27e2e6bf2d2268b5d Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 13 May 2023 21:02:25 -0500 Subject: [PATCH] Separated langs and game apps into other files --- user/app/games/games.nix | 18 ++++ user/home.nix | 154 ++------------------------- user/lang/android/android.nix | 9 ++ user/lang/cc/cc.nix | 13 +++ user/lang/godot/godot.nix | 8 ++ user/lang/haskell/haskell.nix | 9 ++ user/lang/python/python-packages.nix | 80 ++++++++++++++ user/lang/python/python.nix | 10 ++ 8 files changed, 157 insertions(+), 144 deletions(-) create mode 100644 user/app/games/games.nix create mode 100644 user/lang/android/android.nix create mode 100644 user/lang/cc/cc.nix create mode 100644 user/lang/godot/godot.nix create mode 100644 user/lang/haskell/haskell.nix create mode 100644 user/lang/python/python-packages.nix create mode 100644 user/lang/python/python.nix diff --git a/user/app/games/games.nix b/user/app/games/games.nix new file mode 100644 index 00000000..087d87b6 --- /dev/null +++ b/user/app/games/games.nix @@ -0,0 +1,18 @@ +{ config, pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Games + #TODO need flatpak steam + gamehub + retroarch + libretro.mgba + libretro.desmume + libretro.dolphin + libretro.citra + libretro.genesis-plus-gx + airshipper + qjoypad + # TODO need flatpak minecraft + ]; +} diff --git a/user/home.nix b/user/home.nix index 5f549657..497e2339 100644 --- a/user/home.nix +++ b/user/home.nix @@ -14,6 +14,12 @@ ./bin/phoenix.nix # My nix command wrapper ./app/git/git.nix # My git config ./style/stylix.nix # Styling and themes for my apps + ./lang/cc/cc.nix # C and C++ tools + ./lang/python/python.nix # Python + ./lang/python/python-packages.nix # Extra Python packages I want + ./lang/haskell/haskell.nix # Haskell tools + ./lang/android/android.nix # Android developement + ./lang/godot/godot.nix # Game development ]; home.stateVersion = "22.11"; # Please read the comment before changing. @@ -42,7 +48,6 @@ gnome.geary autokey protonmail-bridge - syncthingtray-minimal # File Managers ranger @@ -68,19 +73,6 @@ # TODO need ytsub somehow (sarowish/ytsub) audio-recorder - # Games - #TODO need flatpak steam - gamehub - retroarch - libretro.mgba - libretro.desmume - libretro.dolphin - libretro.citra - libretro.genesis-plus-gx - airshipper - qjoypad - # TODO need flatpak minecraft - # Command Line neofetch lolcat cowsay gnugrep gnused @@ -99,114 +91,14 @@ pandoc nodePackages.mermaid-cli - # Development - - # Android - android-tools - android-udev-rules - - # CC - gcc - gnumake - cmake - autoconf - automake - libtool - - # Python - python310Full - imath - pystring - python310Packages.cffi - python310Packages.dbus-python - python310Packages.wheel - python310Packages.pyyaml - python310Packages.zipp - python310Packages.xlib - python310Packages.libvirt - python310Packages.pybind11 - python310Packages.pyatspi - python310Packages.attrs - python310Packages.autocommand - python310Packages.bcrypt - python310Packages.pycairo - python310Packages.certifi - python310Packages.chardet - python310Packages.click - python310Packages.cryptography - python310Packages.cssselect - python310Packages.python-dateutil - python310Packages.distro - python310Packages.dnspython - python310Packages.evdev - python310Packages.ewmh - python310Packages.fastjsonschema - python310Packages.fido2 - python310Packages.python-gnupg - python310Packages.pygobject3 - python310Packages.idna - python310Packages.importlib-metadata - python310Packages.inflect - python310Packages.isodate - python310Packages.jeepney - python310Packages.keyring - python310Packages.lxml - python310Packages.markdown - python310Packages.markupsafe - python310Packages.more-itertools - python310Packages.numpy - python310Packages.ordered-set - python310Packages.packaging - python310Packages.pillow - python310Packages.pip - python310Packages.platformdirs - python310Packages.ply - python310Packages.prettytable - python310Packages.proton-client - python310Packages.protonvpn-nm-lib - python310Packages.psutil - python310Packages.pulsectl - python310Packages.pycparser - python310Packages.pycups - python310Packages.pycurl - python310Packages.pydantic - python310Packages.pyinotify - python310Packages.pyopenssl - python310Packages.pyparsing - python310Packages.pyqt5 - python310Packages.pyqt5_sip - python310Packages.pyscard - python310Packages.pythondialog - python310Packages.pyxdg - python310Packages.rdflib - python310Packages.requests - python310Packages.secretstorage - python310Packages.setproctitle - python310Packages.setuptools - python310Packages.six - python310Packages.systemd - python310Packages.tomli - python310Packages.urllib3 - python310Packages.wcwidth - python310Packages.websockets - python310Packages.python-zbar - - # Haskell - haskellPackages.haskell-language-server - haskellPackages.stack - - # Gamedev - godot - - # Other - texinfo - libffi zlib - nodePackages.ungit + # Various dev packages + texinfo + libffi zlib + nodePackages.ungit # Compositor and Desktop Utils picom alttab - xwinwrap xorg.xcursorthemes # X Utils @@ -216,7 +108,6 @@ sct caffeine-ng twmn - networkmanagerapplet # Wayland Utils xdg-desktop-portal-wlr @@ -287,31 +178,6 @@ pref("webgl"webgl.disabled",false); ''; - # Home Manager is pretty good at managing dotfiles. The primary way to manage - # plain files is through 'home.file'. - home.file = { - # # Building this configuration will create a copy of 'dotfiles/screenrc' in - # # the Nix store. Activating the configuration will then make '~/.screenrc' a - # # symlink to the Nix store copy. - # ".screenrc".source = dotfiles/screenrc; - - # # You can also set the file content immediately. - # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 - # ''; - }; - - # You can also manage environment variables but you will have to manually - # source - # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # /etc/profiles/per-user/emmet/etc/profile.d/hm-session-vars.sh - # - # if you don't want to manage your shell through Home Manager. home.sessionVariables = { EDITOR = "emacsclient"; }; diff --git a/user/lang/android/android.nix b/user/lang/android/android.nix new file mode 100644 index 00000000..762d6a22 --- /dev/null +++ b/user/lang/android/android.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Android + android-tools + android-udev-rules + ]; +} diff --git a/user/lang/cc/cc.nix b/user/lang/cc/cc.nix new file mode 100644 index 00000000..b5c13ddb --- /dev/null +++ b/user/lang/cc/cc.nix @@ -0,0 +1,13 @@ +{ config, pkgs, ... }: + +{ + home.packages = with pkgs; [ + # CC + gcc + gnumake + cmake + autoconf + automake + libtool + ]; +} diff --git a/user/lang/godot/godot.nix b/user/lang/godot/godot.nix new file mode 100644 index 00000000..04502114 --- /dev/null +++ b/user/lang/godot/godot.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Gamedev + godot + ]; +} diff --git a/user/lang/haskell/haskell.nix b/user/lang/haskell/haskell.nix new file mode 100644 index 00000000..bd1ce41e --- /dev/null +++ b/user/lang/haskell/haskell.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Haskell + haskellPackages.haskell-language-server + haskellPackages.stack + ]; +} diff --git a/user/lang/python/python-packages.nix b/user/lang/python/python-packages.nix new file mode 100644 index 00000000..bd314d0c --- /dev/null +++ b/user/lang/python/python-packages.nix @@ -0,0 +1,80 @@ +{ config, pkgs, ... }: + +{ + # Python packages + home.packages = with pkgs.python310Packages; [ + cffi + dbus-python + wheel + pyyaml + zipp + xlib + libvirt + pybind11 + pyatspi + attrs + autocommand + bcrypt + pycairo + certifi + chardet + click + cryptography + cssselect + python-dateutil + distro + dnspython + evdev + ewmh + fastjsonschema + fido2 + python-gnupg + pygobject3 + idna + importlib-metadata + inflect + isodate + jeepney + keyring + lxml + markdown + markupsafe + more-itertools + numpy + ordered-set + packaging + pillow + pip + platformdirs + ply + prettytable + proton-client + protonvpn-nm-lib + psutil + pulsectl + pycparser + pycups + pycurl + pydantic + pyinotify + pyopenssl + pyparsing + pyqt5 + pyqt5_sip + pyscard + pythondialog + pyxdg + rdflib + requests + secretstorage + setproctitle + setuptools + six + systemd + tomli + urllib3 + wcwidth + websockets + python-zbar + ]; +} diff --git a/user/lang/python/python.nix b/user/lang/python/python.nix new file mode 100644 index 00000000..d6ee2ee3 --- /dev/null +++ b/user/lang/python/python.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Python setup + python310Full + imath + pystring + ]; +}