small tweaks hopefully
This commit is contained in:
parent
122429ba78
commit
c82a8683ab
5 changed files with 33 additions and 18 deletions
|
@ -120,9 +120,7 @@ end
|
||||||
alias xpy '~/Aims/rust/x.py'
|
alias xpy '~/Aims/rust/x.py'
|
||||||
# alias sbcl "rlwrap sbcl"
|
# alias sbcl "rlwrap sbcl"
|
||||||
# alias guile "rlwrap guile"
|
# alias guile "rlwrap guile"
|
||||||
alias chez "rlwrap chez"
|
|
||||||
#alias clj 'clojure -Sdeps "{:deps {com.bhauman/rebel-readline {:mvn/version \"0.1.4\"} $args}}" -m rebel-readline.main'
|
#alias clj 'clojure -Sdeps "{:deps {com.bhauman/rebel-readline {:mvn/version \"0.1.4\"} $args}}" -m rebel-readline.main'
|
||||||
alias csi "rlwrap chicken-csi"
|
|
||||||
|
|
||||||
# zig
|
# zig
|
||||||
alias zb "zig build"
|
alias zb "zig build"
|
||||||
|
|
|
@ -100,7 +100,10 @@
|
||||||
packages.x86_64-linux = {
|
packages.x86_64-linux = {
|
||||||
iso = nixos-generators.nixosGenerate {
|
iso = nixos-generators.nixosGenerate {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = modules;
|
modules = modules ++ [{
|
||||||
|
nix.registry.nixpkgs.flake = nixpkgs;
|
||||||
|
virtualisation.diskSize = 20 * 1024;
|
||||||
|
}];
|
||||||
format = "iso";
|
format = "iso";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
10
home.nix
10
home.nix
|
@ -45,11 +45,13 @@ in
|
||||||
cabal-install
|
cabal-install
|
||||||
sbcl
|
sbcl
|
||||||
chez
|
chez
|
||||||
|
chicken
|
||||||
guile
|
guile
|
||||||
gambit
|
gambit
|
||||||
clojure
|
clojure
|
||||||
ruby_3_3
|
ruby_3_3
|
||||||
ruby-lsp
|
ruby-lsp
|
||||||
|
elixir
|
||||||
rubocop
|
rubocop
|
||||||
lua
|
lua
|
||||||
maxima
|
maxima
|
||||||
|
@ -76,6 +78,7 @@ in
|
||||||
ffmpeg
|
ffmpeg
|
||||||
libjxl
|
libjxl
|
||||||
exiftool
|
exiftool
|
||||||
|
gnupg
|
||||||
|
|
||||||
akku
|
akku
|
||||||
ripgrep
|
ripgrep
|
||||||
|
@ -268,6 +271,7 @@ in
|
||||||
};
|
};
|
||||||
core.autocrlf = false;
|
core.autocrlf = false;
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
|
user.signingkey = "8CD6E1438A00F55363157881E333EC1335FFCCDB";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -354,18 +358,19 @@ in
|
||||||
|
|
||||||
programs.emacs = {
|
programs.emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.emacs29-pgtk;
|
package = pkgs.emacs30-pgtk;
|
||||||
extraPackages = epkgs: with epkgs; [
|
extraPackages = epkgs: with epkgs; [
|
||||||
lsp-mode
|
lsp-mode
|
||||||
markdown-mode
|
markdown-mode
|
||||||
yaml-mode
|
yaml-mode
|
||||||
json-mode
|
json-mode
|
||||||
elixir-mode
|
|
||||||
clojure-mode
|
clojure-mode
|
||||||
haskell-mode
|
haskell-mode
|
||||||
zig-mode
|
zig-mode
|
||||||
python-mode
|
python-mode
|
||||||
|
|
||||||
|
treesit-grammars.with-all-grammars
|
||||||
|
|
||||||
quack
|
quack
|
||||||
|
|
||||||
which-key
|
which-key
|
||||||
|
@ -388,7 +393,6 @@ in
|
||||||
#eshell
|
#eshell
|
||||||
orderless
|
orderless
|
||||||
magit
|
magit
|
||||||
eglot
|
|
||||||
org
|
org
|
||||||
org-roam
|
org-roam
|
||||||
paredit
|
paredit
|
||||||
|
|
32
init.el.nix
32
init.el.nix
|
@ -219,6 +219,12 @@ If the new path's directories does not exist, create them."
|
||||||
;; Nice line wrapping when working with text
|
;; Nice line wrapping when working with text
|
||||||
(add-hook 'text-mode-hook 'visual-line-mode)
|
(add-hook 'text-mode-hook 'visual-line-mode)
|
||||||
|
|
||||||
|
;; mix format
|
||||||
|
(add-hook 'after-save-hook
|
||||||
|
'(lambda ()
|
||||||
|
(when (eq major-mode 'elixir-ts-mode)
|
||||||
|
(shell-command-to-string (format "mix format %s" (buffer-file-name))))))
|
||||||
|
|
||||||
;; Modes to highlight the current line with
|
;; Modes to highlight the current line with
|
||||||
(let ((hl-line-hooks '(text-mode-hook prog-mode-hook)))
|
(let ((hl-line-hooks '(text-mode-hook prog-mode-hook)))
|
||||||
(mapc (lambda (hook) (add-hook hook 'hl-line-mode)) hl-line-hooks))
|
(mapc (lambda (hook) (add-hook hook 'hl-line-mode)) hl-line-hooks))
|
||||||
|
@ -482,10 +488,16 @@ If the new path's directories does not exist, create them."
|
||||||
(typescript-mode . typescript-ts-mode)
|
(typescript-mode . typescript-ts-mode)
|
||||||
(json-mode . json-ts-mode)
|
(json-mode . json-ts-mode)
|
||||||
(css-mode . css-ts-mode)
|
(css-mode . css-ts-mode)
|
||||||
(python-mode . python-ts-mode)))
|
(python-mode . python-ts-mode)
|
||||||
|
(elixir-mode . elixir-ts-mode)))
|
||||||
|
(add-to-list 'auto-mode-alist
|
||||||
|
'("\\.ex\\'" . elixir-mode))
|
||||||
|
(add-to-list 'auto-mode-alist
|
||||||
|
'("\\.exs\\'" . elixir-mode))
|
||||||
|
|
||||||
:hook
|
:hook
|
||||||
;; Auto parenthesis matching
|
;; Auto parenthesis matching
|
||||||
((prog-mode . electric-pair-mode)))
|
(prog-mode . electric-pair-mode))
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;;;
|
;;;
|
||||||
|
@ -527,17 +539,19 @@ If the new path's directories does not exist, create them."
|
||||||
;; no :ensure t here because it's built-in
|
;; no :ensure t here because it's built-in
|
||||||
|
|
||||||
;; Configure hooks to automatically turn-on eglot for selected modes
|
;; Configure hooks to automatically turn-on eglot for selected modes
|
||||||
; :hook
|
:hook
|
||||||
; (((python-mode ruby-mode elixir-mode) . eglot))
|
; (((python-mode ruby-mode) . eglot))
|
||||||
|
((elixir-ts-mode . eglot-ensure))
|
||||||
|
|
||||||
:custom
|
:custom
|
||||||
(eglot-send-changes-idle-time 0.1)
|
;; let's try a higher idle time, elixir-ls is a bit finicky
|
||||||
|
(eglot-send-changes-idle-time 0.5)
|
||||||
|
|
||||||
:config
|
:config
|
||||||
(fset #'jsonrpc--log-event #'ignore) ; massive perf boost---don't log every event
|
(fset #'jsonrpc--log-event #'ignore) ; massive perf boost---don't log every event
|
||||||
;; Sometimes you need to tell Eglot where to find the language server
|
;; Sometimes you need to tell Eglot where to find the language server
|
||||||
; (add-to-list 'eglot-server-programs
|
(add-to-list 'eglot-server-programs
|
||||||
; '(haskell-mode . ("haskell-language-server-wrapper" "--lsp")))
|
'(elixir-ts-mode "${pkgs.elixir-ls}/bin/elixir-ls"))
|
||||||
)
|
)
|
||||||
|
|
||||||
; oorg
|
; oorg
|
||||||
|
@ -1030,10 +1044,6 @@ If the new path's directories does not exist, create them."
|
||||||
:config
|
:config
|
||||||
(direnv-mode))
|
(direnv-mode))
|
||||||
|
|
||||||
(use-package lsp-mode
|
|
||||||
:ensure t
|
|
||||||
:commands (lsp lsp-deferred))
|
|
||||||
|
|
||||||
; yay
|
; yay
|
||||||
(setq confirm-kill-processes nil)
|
(setq confirm-kill-processes nil)
|
||||||
(setq auto-save-interval 100)
|
(setq auto-save-interval 100)
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
"[html]" = { "editor.defaultFormatter" = "esbenp.prettier-vscode"; };
|
"[html]" = { "editor.defaultFormatter" = "esbenp.prettier-vscode"; };
|
||||||
"[java]" = { "editor.suggest.snippetsPreventQuickSuggestions" = false; };
|
"[java]" = { "editor.suggest.snippetsPreventQuickSuggestions" = false; };
|
||||||
"[javascript]" = {
|
"[javascript]" = {
|
||||||
"editor.defaultFormatter" = null;
|
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||||
"editor.formatOnSave" = true;
|
"editor.formatOnSave" = true;
|
||||||
};
|
};
|
||||||
"[javascriptreact]" = {
|
"[javascriptreact]" = {
|
||||||
|
|
Loading…
Reference in a new issue