Merge branch 'main' of https://git.xenia.me.uk/pixelifytica/nixos
This commit is contained in:
commit
ec83bb0ba6
|
@ -97,8 +97,8 @@
|
|||
showToolTips = "true";
|
||||
launchers = [
|
||||
"applications:org.kde.konsole.desktop"
|
||||
"applications:emacs.desktop"
|
||||
"preferred://filemanager"
|
||||
"applications:emacs.desktop"
|
||||
"preferred://browser"
|
||||
];
|
||||
};
|
||||
|
|
|
@ -70,7 +70,6 @@
|
|||
# Customised LaTeX install
|
||||
(texlive.combine
|
||||
{inherit (pkgs.texlive) scheme-medium dvisvgm dvipng wrapfig amsmath ulem hyperref capt-of;})
|
||||
python3Packages.pygments
|
||||
|
||||
# Development tools
|
||||
## Code screenshots
|
||||
|
@ -79,15 +78,15 @@
|
|||
## Linters
|
||||
shellcheck
|
||||
yamllint
|
||||
ruff
|
||||
nodePackages.eslint
|
||||
|
||||
## Formatters
|
||||
alejandra
|
||||
shfmt
|
||||
ruff
|
||||
stylua
|
||||
black
|
||||
isort
|
||||
stylua
|
||||
nodePackages.prettier
|
||||
|
||||
## Language servers
|
||||
|
@ -97,10 +96,8 @@
|
|||
nodePackages.typescript-language-server
|
||||
|
||||
## Interpreters
|
||||
(python3.withPackages
|
||||
(ps: with ps; [tkinter numpy scipy xarray matplotlib]))
|
||||
(luajit.withPackages
|
||||
(ps: [(ps.callPackage ./luarocks/scilua.nix {})]))
|
||||
lua
|
||||
python3Full
|
||||
];
|
||||
xdg.configFile = {
|
||||
"ruff/pyproject.toml".source = ./ruff.toml;
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
# Clone ~/.emacs.d/ if it doesn't exist
|
||||
# Clone ~/.emacs.d/ if it doesn't exist, fast-forward pull
|
||||
EMACS_DIR="$HOME/.emacs.d/"
|
||||
if [ ! -d "$EMACS_DIR" ]; then
|
||||
git clone "https://git.xenia.me.uk/pixelifytica/emacs.git" "$EMACS_DIR"
|
||||
fi
|
||||
git -C "$EMACS_DIR" pull --ff --ff-only
|
||||
|
||||
# Sync common directories, setting url to ensure it's up-to-date first
|
||||
SYNC_DIRS=(
|
||||
|
|
Loading…
Reference in a new issue