diff options
| m--------- | private | 0 | ||||
| -rw-r--r-- | system/linde.nix | 6 | ||||
| -rw-r--r-- | system/settings/colmena-auto-upgrade.nix | 2 | ||||
| -rw-r--r-- | user/emacs/init.el | 8 | ||||
| -rw-r--r-- | user/marvin.nix | 2 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 2 | ||||
| -rw-r--r-- | user/settings/user-interface.nix | 35 | ||||
| -rw-r--r-- | user/settings/workstation.nix | 44 |
8 files changed, 65 insertions, 34 deletions
diff --git a/private b/private -Subproject 7b106e27d58e46bed2a4f627f1321592a0bedb2 +Subproject 414f928498da42a4a8998186618bb0285e13099 diff --git a/system/linde.nix b/system/linde.nix index ed45d774..7fd8337a 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -883,7 +883,7 @@ in services.searchix = { enable = true; environment = { - GOMEMLIMIT = "2000MiB"; + GOMEMLIMIT = "1000MiB"; }; settings = { web = @@ -955,6 +955,10 @@ in }; }; }; + systemd.services.searchix.serviceConfig = { + MemoryHigh = "750M"; + MemoryMax = "1G"; + }; programs.git = { enable = true; diff --git a/system/settings/colmena-auto-upgrade.nix b/system/settings/colmena-auto-upgrade.nix index b9b84e88..43789285 100644 --- a/system/settings/colmena-auto-upgrade.nix +++ b/system/settings/colmena-auto-upgrade.nix @@ -227,7 +227,7 @@ in ${lib.optionalString cfg.git.enable '' ${git} fetch --prune - ${git} checkout ${cfg.git.branch} + ${git} reset --hard ${cfg.git.branch} '' } diff --git a/user/emacs/init.el b/user/emacs/init.el index aa44144f..e95600e0 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -32,6 +32,7 @@ (load-file user-init-file)) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) +(run-with-idle-timer 300 nil #'package-refresh-contents) (setq use-package-enable-imenu-support t) (require 'use-package) @@ -910,12 +911,6 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve (use-package astro-ts-mode :mode (("\\.astro\\'" . astro-ts-mode))) -(define-derived-mode dnscontrol-mode typescript-ts-mode "DNSControl" - "Major mode for editing configuration of DNSControl." - (if (featurep 'apheleia) - (setq-local apheleia-formatter 'dnscontrol))) -(add-to-list 'auto-mode-alist '("dnsconfig.js\\'" . dnscontrol-mode)) - (autoload 'ansi-color-apply-on-region "ansi-color") (defun colourise-compilation-buffer () (ansi-color-apply-on-region compilation-filter-start (point-max))) @@ -1359,7 +1354,6 @@ paths for the same project." '("shfmt")) (setq apheleia-formatters (append apheleia-formatters '((nixpkgs-fmt "nixpkgs-fmt") - (dnscontrol "dnscontrol" "fmt") (golines "golines") (taplo "taplo" "format" "-") (prettier-gotmpl diff --git a/user/marvin.nix b/user/marvin.nix index d064626b..acd0ece1 100644 --- a/user/marvin.nix +++ b/user/marvin.nix @@ -13,12 +13,14 @@ ./settings/nixpkgs.nix ./settings/ssh.nix ./settings/tabnine.nix + ./settings/aider.nix ./settings/workstation.nix ./settings/user-interface.nix ./settings/nix.nix ../private ../private/ssh.nix ../private/tabnine.nix + ../private/llm.nix ]; home.username = "alan"; diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 703e012a..2fd77c1e 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -24,7 +24,7 @@ in "*.el diff=elisp" ]; programs.git.extraConfig."diff.elisp" = { - xfuncname = "^(((;;;+ )|\\(|([ \t]+\\(((cl-|el-patch-)?def(un|var|macro|method|custom)|gb/))).*)$"; + xfuncname = "^\\([^[:space:]]+[[:space:]]+([^()[:space:]]+)"; }; services.emacs = lib.mkIf stdenv.isLinux { diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix index a7dde811..9b413ee7 100644 --- a/user/settings/user-interface.nix +++ b/user/settings/user-interface.nix @@ -1,5 +1,5 @@ -{ config -, pkgs +{ pkgs +, lib , ... }: let @@ -24,23 +24,20 @@ in ]; }; }; - home.packages = with pkgs; - [ - inter - ] ++ (with pkgs.nerd-fonts; [ - blex-mono - jetbrains-mono - recursive-mono - symbols-only - ]) - ++ lib.optionals (!stdenv.isDarwin) (with pkgs; [ - (discord.override { withOpenASAR = true; }) + home.packages = (with pkgs.nerd-fonts; [ + blex-mono + jetbrains-mono + recursive-mono + symbols-only + ]) + ++ lib.optionals (!stdenv.isDarwin) (with pkgs; [ + (discord.override { withOpenASAR = true; }) - zeal - falkon - beeper - kdePackages.neochat - kdePackages.kleopatra - ]); + zeal + falkon + beeper + kdePackages.neochat + kdePackages.kleopatra + ]); services.emacs.startWithUserSession = "graphical"; } diff --git a/user/settings/workstation.nix b/user/settings/workstation.nix index 44a6e6b4..8a3c5dfd 100644 --- a/user/settings/workstation.nix +++ b/user/settings/workstation.nix @@ -33,6 +33,45 @@ difftastic = { enable = true; }; + attributes = [ + # `mergiraf languages --gitattributes` + "*.java merge=mergiraf" + "*.kt merge=mergiraf" + "*.rs merge=mergiraf" + "*.go merge=mergiraf" + "*.js merge=mergiraf" + "*.jsx merge=mergiraf" + "*.mjs merge=mergiraf" + "*.json merge=mergiraf" + "*.yml merge=mergiraf" + "*.yaml merge=mergiraf" + "*.toml merge=mergiraf" + "*.html merge=mergiraf" + "*.htm merge=mergiraf" + "*.xhtml merge=mergiraf" + "*.xml merge=mergiraf" + "*.c merge=mergiraf" + "*.h merge=mergiraf" + "*.cc merge=mergiraf" + "*.cpp merge=mergiraf" + "*.hpp merge=mergiraf" + "*.cs merge=mergiraf" + "*.dart merge=mergiraf" + "*.dts merge=mergiraf" + "*.scala merge=mergiraf" + "*.sbt merge=mergiraf" + "*.ts merge=mergiraf" + "*.tsx merge=mergiraf" + "*.py merge=mergiraf" + "*.php merge=mergiraf" + "*.phtml merge=mergiraf" + "*.sol merge=mergiraf" + "*.lua merge=mergiraf" + "*.rb merge=mergiraf" + "*.nix merge=mergiraf" + "*.sv merge=mergiraf" + "*.svh merge=mergiraf" + ]; extraConfig = { "merge.mergiraf" = { name = "mergiraf"; @@ -61,9 +100,4 @@ }; }; }; - xdg.configFile."git/attributes" = { - source = (pkgs.runCommandLocal "mergiraf-gitattributes" { } '' - ${pkgs.mergiraf}/bin/mergiraf languages --gitattributes >> $out - ''); - }; } |