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