diff --git a/system/home/emacs/default.nix b/system/home/emacs/default.nix index 063d1270..fbfd5320 100644 --- a/system/home/emacs/default.nix +++ b/system/home/emacs/default.nix @@ -4,6 +4,8 @@ ../shell/default.nix ../shell/git.nix ../gpg/default.nix + ../texlive/default.nix + ../programming/default.nix ]; home.file.".emacs.d/early-init.el".text = '' (setopt use-package-check-before-init t @@ -88,43 +90,5 @@ ghostscript poppler_utils graphviz-nox - - # Customised LaTeX install - (texlive.combine { - inherit (texlive) - scheme-medium - dvisvgm - dvipng - wrapfig - amsmath - ulem - hyperref - capt-of - listings - bera - ; - latex-beamer-ukaea.pkgs = [ (callPackage ./texlive/latex-beamer-ukaea/default.nix { }) ]; - }) - - ## Linters - shellcheck - yamllint - ruff - - ## Formatters - nixfmt-rfc-style - shfmt - stylua - nodePackages.prettier - nodePackages.prettier-plugin-toml - - ## Language servers - nixd - lua-language-server - rust-analyzer - python3Packages.python-lsp-server - nodePackages.typescript-language-server - ]; - xdg.configFile."ruff/pyproject.toml".source = ./ruff.toml; } diff --git a/system/home/programming/default.nix b/system/home/programming/default.nix new file mode 100644 index 00000000..a012f1f4 --- /dev/null +++ b/system/home/programming/default.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: +{ + imports = [ + ./python/default.nix + ./lua/default.nix + ]; + home.packages = with pkgs; [ + ## Linters + shellcheck + yamllint + + ## Formatters + nixfmt-rfc-style + shfmt + nodePackages.prettier + nodePackages.prettier-plugin-toml + + ## Language servers + nixd + rust-analyzer + nodePackages.typescript-language-server + ]; +} diff --git a/system/home/programming/lua/default.nix b/system/home/programming/lua/default.nix new file mode 100644 index 00000000..7b78e4c0 --- /dev/null +++ b/system/home/programming/lua/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + (luajit.withPackages (ps: [ (ps.callPackage ./luarocks/scilua.nix { }) ])) + lua-language-server + stylua + ]; +} diff --git a/system/home/programming/luarocks/graph-toolkit.nix b/system/home/programming/lua/luarocks/graph-toolkit.nix similarity index 100% rename from system/home/programming/luarocks/graph-toolkit.nix rename to system/home/programming/lua/luarocks/graph-toolkit.nix diff --git a/system/home/programming/luarocks/scilua.nix b/system/home/programming/lua/luarocks/scilua.nix similarity index 100% rename from system/home/programming/luarocks/scilua.nix rename to system/home/programming/lua/luarocks/scilua.nix diff --git a/system/home/programming/luarocks/xsys.nix b/system/home/programming/lua/luarocks/xsys.nix similarity index 100% rename from system/home/programming/luarocks/xsys.nix rename to system/home/programming/lua/luarocks/xsys.nix diff --git a/system/home/programming/python/default.nix b/system/home/programming/python/default.nix new file mode 100644 index 00000000..9cb81374 --- /dev/null +++ b/system/home/programming/python/default.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: +# MPLBACKEND +{ + home.packages = with pkgs; [ + (python3.withPackages ( + ps: with ps; [ + python-lsp-server + pylsp-rope + rope + mypy + numpy + xarray + matplotlib + ] + )) + ruff + ]; + xdg.configFile."ruff/pyproject.toml".source = ./ruff.toml; +} diff --git a/system/home/emacs/ruff.toml b/system/home/programming/python/ruff.toml similarity index 100% rename from system/home/emacs/ruff.toml rename to system/home/programming/python/ruff.toml diff --git a/system/home/texlive/default.nix b/system/home/texlive/default.nix new file mode 100644 index 00000000..9f01ace3 --- /dev/null +++ b/system/home/texlive/default.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + (texlive.combine { + inherit (texlive) + scheme-medium + dvisvgm + dvipng + wrapfig + amsmath + ulem + hyperref + capt-of + listings + bera + ; + latex-beamer-ukaea.pkgs = [ (callPackage ./latex-beamer-ukaea/default.nix { }) ]; + }) + ]; +} diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/README.md b/system/home/texlive/latex-beamer-ukaea/README.md similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/README.md rename to system/home/texlive/latex-beamer-ukaea/README.md diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty b/system/home/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty rename to system/home/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty b/system/home/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty rename to system/home/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty b/system/home/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty rename to system/home/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty b/system/home/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty rename to system/home/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/beamerthemeukaea.sty b/system/home/texlive/latex-beamer-ukaea/beamerthemeukaea.sty similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/beamerthemeukaea.sty rename to system/home/texlive/latex-beamer-ukaea/beamerthemeukaea.sty diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/default.nix b/system/home/texlive/latex-beamer-ukaea/default.nix similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/default.nix rename to system/home/texlive/latex-beamer-ukaea/default.nix diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/ukaea-jet.jpg b/system/home/texlive/latex-beamer-ukaea/ukaea-jet.jpg similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/ukaea-jet.jpg rename to system/home/texlive/latex-beamer-ukaea/ukaea-jet.jpg diff --git a/system/home/emacs/texlive/latex-beamer-ukaea/ukaea_logo.png b/system/home/texlive/latex-beamer-ukaea/ukaea_logo.png similarity index 100% rename from system/home/emacs/texlive/latex-beamer-ukaea/ukaea_logo.png rename to system/home/texlive/latex-beamer-ukaea/ukaea_logo.png