diff --git a/.config/spacemacs/.spacemacs b/.config/spacemacs/.spacemacs index af0ea4e0..1ec56fb6 100644 --- a/.config/spacemacs/.spacemacs +++ b/.config/spacemacs/.spacemacs @@ -79,7 +79,9 @@ This function should only modify configuration layer settings." latex ;; oh baby its time to go even beyond pdf ;; refusing to pay adobe is morally right svelte ;; frontend-for-hipsters - (vue :variables vue-backend 'lsp) ;; vite vite vite vue + (vue :variables + vue-backend 'lsp + vue-lsp-client 'vls) (yaml :variables yaml-enable-lsp t) ;; evil clearly fomatted toml ;; what if we tried yet another std @@ -666,6 +668,7 @@ before packages are loaded." ;; M-x nerd-icons-install-fonts to fix doom-emacs status line (add-to-list 'exec-path "/etc/profiles/per-user/henri.vandersleyen/bin") ;; --- misc problems --- + (setq-default spacemacs-yank-indent-threshold 0) ;; disables auto indent on pasting (setq-default word-wrap t) (spacemacs/set-leader-keys "obs" 'scratch-buffer) ;; --- pomm --- @@ -698,6 +701,9 @@ before packages are loaded." 'org-babel-load-languages '((typescript . t))) ;; Enable TypeScript support + ;; --- hl-todo --- + (with-eval-after-load 'hl-todo + (add-to-list 'hl-todo-keyword-faces '("WARN" . "#FFA500"))) ;; --- org-general --- (setq user-mail-address "henri-vandersleyen@protonmail.com") (add-hook 'org-mode-hook @@ -725,8 +731,8 @@ before packages are loaded." '((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d!)") (sequence "BACKLOG(b)" "PLAN(p)" "READY(r)" "ACTIVE(a)" "REVIEW(v)" "WAIT(w@/!)" "HOLD(h)" "|" "COMPLETED(c)" "CANC(k@)"))) ;; --- org-journal --- - (setq org-journal-dir "/home/henri/Documents/zettelkasten/org/journal") - (setq org-directory "/home/henri/Documents/zettelkasten/org") + (setq org-journal-dir "~/Documents/zettelkasten/org/journal") + (setq org-directory "~/Documents/zettelkasten/org") (setq org-default-notes-file (concat org-directory )) ;; "/notes.org" (setq find-file-visit-truename t) ;; --- org-agenda --- @@ -740,7 +746,6 @@ before packages are loaded." (add-hook 'python-mode-hook #'lsp) (add-hook 'typescript-mode-hook #'lsp) (add-hook 'js-mode-hook #'lsp) - (add-hook 'vue-mode-hook #'lsp) (add-hook 'json-mode-hook #'lsp) ;; prevents refactor move (setq lsp-auto-execute-action nil) @@ -778,18 +783,12 @@ This function is called at the very end of Spacemacs initialization." ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(helm-source-names-using-follow nil) - '(org-agenda-files - '("/home/henri/Documents/zettelkasten/org-roam/20231228151941-3d_printing.org" "/home/henri/Documents/zettelkasten/org-roam/20231228153323-chinese.org" "/home/henri/Documents/zettelkasten/org-roam/20231228160947-chinese_radicals.org" "/home/henri/Documents/zettelkasten/org-roam/20231228161027-chinese_basic_patterns.org" "/home/henri/Documents/zettelkasten/org-roam/20231228161212-chinese_sentences.org" "/home/henri/Documents/zettelkasten/org-roam/20231228161242-chinese_often_forgotten_words.org" "/home/henri/Documents/zettelkasten/org-roam/20231228162309-chinese_class_notes.org" "/home/henri/Documents/zettelkasten/org-roam/20240101164825-chinese_words_group.org" "/home/henri/Documents/zettelkasten/org-roam/20240109111240-programming.org" "/home/henri/Documents/zettelkasten/org-roam/20240117183030-comtemporary_chinese_vol_3.org" "/home/henri/Documents/zettelkasten/org-roam/20240201095349-openwrt.org" "/home/henri/Documents/zettelkasten/org-roam/20240201132007-rpi_k3s_cluster.org" "/home/henri/Documents/zettelkasten/org-roam/20240328185905-db_mariadb.org" "/home/henri/Documents/zettelkasten/org-roam/20240409213406-mandarin_corner_drinking_culture.org" "/home/henri/Documents/zettelkasten/org-roam/20240415080027-programming_go.org" "/home/henri/Documents/zettelkasten/org-roam/20240419141132-programming_bash.org" "/home/henri/Documents/zettelkasten/org-roam/20240423204241-mandarin_corner_white_skin.org" "/home/henri/Documents/zettelkasten/org-roam/20240423204705-mandarin_corner_walk_around_a_fishing_village.org" "/home/henri/Documents/zettelkasten/org-roam/20240423204946-mandarin_corner_lying_flat.org" "/home/henri/Documents/zettelkasten/org-roam/20240424144809-programming_github_actions_workflows.org" "/home/henri/Documents/zettelkasten/org-roam/20240425140202-programming_docker.org" "/home/henri/Documents/zettelkasten/org-roam/20240427172817-programming_nextjs.org" "/home/henri/Documents/zettelkasten/org-roam/20240429195948-mandarin_corner_work_cultural_aspects.org" "/home/henri/Documents/zettelkasten/org-roam/20240513203801-mandarin_corner_chinese_men_so_feminine.org" "/home/henri/Documents/zettelkasten/org-roam/20240624213227-hsk_4_part_1.org" "/home/henri/Documents/zettelkasten/org-roam/20240702185623-programming_sops.org" "/home/henri/Documents/zettelkasten/org-roam/20240722213733-chinese_summer_2024_review.org" "/home/henri/Documents/zettelkasten/org-roam/20240723210041-mandarin_corner_leftover_men.org" "/home/henri/Documents/zettelkasten/org-roam/20240731212533-mandarin_corner_why_girls_mei_you_jie_hun.org" "/home/henri/Documents/zettelkasten/org-roam/20240827191742-emacs.org" "/home/henri/Documents/zettelkasten/org-roam/20240828204250-knowlege_base.org" "/home/henri/Documents/zettelkasten/org-roam/20240830214805-zsa_moonlander.org" "/home/henri/Documents/zettelkasten/org-roam/20240901150838-programming_nix.org" "/home/henri/Documents/zettelkasten/org-roam/20240905210105-chinese_class_wrap_up_and_learn.org" "/home/henri/Documents/zettelkasten/org-roam/20240924205652-cert_ckad.org" "/home/henri/Documents/zettelkasten/org-roam/20240924213459-mastery.org" "/home/henri/Documents/zettelkasten/org-roam/20240930100436-maintenance_home.org" "/home/henri/Documents/zettelkasten/org-roam/20241002120519-work_house_operto.org")) '(package-selected-packages - '(nix-ts-mode company-php ac-php-core xcscope company-phpactor drupal-mode geben php-auto-yasnippets php-extras php-mode phpactor composer php-runtime phpunit ob-typescript nginx-mode pdf-view-restore pdf-tools company-auctex company-math company-reftex evil-tex auctex lsp-latex consult math-symbol-lists omnisharp csharp-mode auto-complete sops sqlup-mode sql-indent copilot ace-pinyin chinese-conv fcitx find-by-pinyin-dired pinyinlib pangu-spacing pyim xr pyim-basedict flycheck-kotlin kotlin-mode groovy-imports groovy-mode lsp-java maven-test-mode mvn keychain-environment bundler chruby minitest rake rbenv robe inf-ruby rspec-mode rubocop rubocopfmt ruby-hash-syntax ruby-refactor ruby-test-mode ruby-tools rvm seeing-is-believing xkcd shrink-path nerd-icons spaceline-all-the-icons memoize ibuffer-projectile helm-spotify-plus multi spotify erc-hl-nicks erc-image erc-social-graph erc-view-log erc-yt company-nixos-options helm-nixos-options nix-mode nixos-options company-tabnine js-react-redux-yasnippets company-statistics color-identifiers-mode rainbow-identifiers rainbow-mode company-web web-completion-data helm-css-scss impatient-mode pug-mode sass-mode haml-mode scss-mode slim-mode tagedit web-mode toggle-term ligature unicode-fonts ucs-utils font-utils persistent-soft pcache dap-mode lsp-docker bui lsp-tailwindcss zonokai-emacs zenburn-theme zen-and-art-theme yasnippet-snippets yapfify yaml-mode xterm-color ws-butler writeroom-mode winum white-sand-theme which-key web-beautify volatile-highlights vim-powerline vi-tilde-fringe uuidgen unfill undo-tree underwater-theme ujelly-theme typescript-mode twilight-theme twilight-bright-theme twilight-anti-bright-theme treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil treemacs-all-the-icons toxi-theme toml-mode toc-org texfrag terminal-here term-cursor tao-theme tangotango-theme tango-plus-theme tango-2-theme symon symbol-overlay sunny-day-theme sublime-themes subatomic256-theme subatomic-theme string-inflection string-edit-at-point sqlite3 sphinx-doc spacemacs-whitespace-cleanup spacemacs-purpose-popwin spaceline spacegray-theme space-doc soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smeargle shell-pop seti-theme rjsx-mode reverse-theme restart-emacs rebecca-theme rainbow-delimiters railscasts-theme quickrun pytest pylookup pyenv-mode pydoc py-isort purple-haze-theme professional-theme prettier-js popwin poetry planet-theme pippel pipenv pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme pcre2el password-generator paradox overseer orgit-forge organic-green-theme org-superstar org-roam-ui org-rich-yank org-projectile org-present org-pomodoro org-mime org-download org-contrib org-cliplink open-junk-file omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme npm-mode nose nodejs-repl noctilux-theme naquadah-theme nameless mwim mustang-theme multi-vterm multi-term multi-line monokai-theme monochrome-theme molokai-theme moe-theme modus-themes minimal-theme material-theme markdown-toc majapahit-themes madhat2r-theme macrostep lush-theme lsp-ui lsp-treemacs lsp-pyright lsp-origami lorem-ipsum livid-mode live-py-mode link-hint light-soap-theme kubernetes-evil kaolin-themes json-reformat json-navigator json-mode js2-refactor js-doc jbeans-theme jazz-theme ir-black-theme inspector inkpot-theme info+ indent-guide importmagic hybrid-mode hungry-delete htmlize holy-mode hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt heroku-theme hemisu-theme helm-xref helm-themes helm-swoop helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-org helm-mode-manager helm-make helm-lsp helm-ls-git helm-git-grep helm-descbinds helm-company helm-comint helm-c-yasnippet helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio godoctor go-tag go-rename go-impl go-guru go-gen-test go-fill-struct go-eldoc gnuplot gitignore-templates git-timemachine git-modes git-messenger git-link gh-md gandalf-theme flyspell-popup flyspell-correct-helm flycheck-pos-tip flycheck-package flycheck-golangci-lint flycheck-elsa flx-ido flatui-theme flatland-theme farmhouse-themes fancy-battery eziam-themes eyebrowse expand-region exotica-theme exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-evilified-state evil-escape evil-easymotion evil-collection evil-cleverparens evil-args evil-anzu eval-sexp-fu espresso-theme eshell-z eshell-prompt-extras esh-help emr emojify emoji-cheat-sheet-plus emmet-mode elisp-slime-nav elisp-def editorconfig eat dumb-jump drag-stuff dracula-theme dotenv-mode doom-themes doom-modeline dockerfile-mode docker django-theme dired-quick-sort diminish diff-hl devdocs define-word darktooth-theme darkokai-theme darkmine-theme dakrone-theme cython-mode cyberpunk-theme company-terraform company-go company-emoji company-anaconda column-enforce-mode color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized code-cells clues-theme clean-aindent-mode chocolate-theme cherry-blossom-theme centered-cursor-mode catppuccin-theme busybee-theme bubbleberry-theme browse-at-remote blacken birds-of-paradise-plus-theme badwolf-theme auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme add-node-modules-path ace-link ace-jump-helm-line))) + '(fic-mode company-auctex company-math company-reftex evil-tex auctex lsp-latex consult lsp-tailwindcss math-symbol-lists pomm toml-mode docker aio dockerfile-mode ob-typescript web-mode nix-ts-mode blacken code-cells company-anaconda anaconda-mode cython-mode dap-mode lsp-docker bui helm-pydoc importmagic epc ctable concurrent live-py-mode lsp-pyright pip-requirements pipenv load-env-vars pippel poetry py-isort pydoc pyenv-mode pythonic pylookup pytest pyvenv sphinx-doc yapfify company-shell fish-mode flycheck-bashate insert-shebang shfmt reformatter exec-path-from-shell yaml-mode doom-modeline shrink-path nerd-icons treemacs-all-the-icons add-node-modules-path auto-dictionary auto-yasnippet browse-at-remote catppuccin-theme code-review emojify deferred a color-identifiers-mode company-nixos-options diff-hl doom-themes eat esh-help eshell-prompt-extras eshell-z evil-org flycheck-pos-tip pos-tip flyspell-correct-helm flyspell-correct flyspell-popup git-link git-messenger git-modes git-timemachine gitignore-templates gnuplot helm-c-yasnippet helm-company helm-git-grep helm-ls-git helm-lsp helm-nixos-options helm-org-rifle htmlize js-doc js2-refactor multiple-cursors json-mode json-navigator json-reformat json-snatcher ligature livid-mode lsp-origami origami lsp-treemacs lsp-ui lsp-mode multi-term multi-vterm xref nix-mode nixos-options nodejs-repl npm-mode nyan-mode org-cliplink org-contrib org-download org-mime org-pomodoro alert log4e gntp org-present org-projectile org-project-capture org-category-capture org-rich-yank org-roam-ui websocket org-roam orgit-forge orgit forge yaml ghub closql emacsql treepy org prettier-js rainbow-identifiers rainbow-mode shell-pop skewer-mode js2-mode simple-httpd smeargle sops sqlite3 terminal-here treemacs-magit magit with-editor transient magit-section typescript-mode unicode-fonts ucs-utils font-utils persistent-soft pcache vterm web-beautify xkcd yasnippet-snippets yasnippet company-emoji company emoji-cheat-sheet-plus gh-md markdown-toc markdown-mode valign vmd-mode ws-butler writeroom-mode winum which-key vundo volatile-highlights vim-powerline vi-tilde-fringe uuidgen undo-fu-session undo-fu treemacs-projectile treemacs-persp treemacs-icons-dired treemacs-evil toc-org term-cursor symon symbol-overlay string-inflection string-edit-at-point spacemacs-whitespace-cleanup spacemacs-purpose-popwin spaceline space-doc restart-emacs request rainbow-delimiters quickrun popwin pcre2el password-generator paradox overseer org-superstar open-junk-file nameless multi-line macrostep lorem-ipsum link-hint inspector info+ indent-guide hybrid-mode hungry-delete holy-mode hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt helm-xref helm-themes helm-swoop helm-purpose helm-projectile helm-org helm-mode-manager helm-make helm-descbinds helm-comint helm-ag google-translate golden-ratio flycheck-package flycheck-elsa flx-ido fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-evilified-state evil-escape evil-easymotion evil-collection evil-cleverparens evil-args evil-anzu eval-sexp-fu emr elisp-slime-nav elisp-demos elisp-def editorconfig dumb-jump drag-stuff dotenv-mode disable-mouse dired-quick-sort diminish devdocs define-word column-enforce-mode clean-aindent-mode centered-cursor-mode auto-highlight-symbol auto-compile all-the-icons aggressive-indent ace-link ace-jump-helm-line))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(default ((t (:background nil)))) - '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil)))) - '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))) '(treemacs-hl-line-face ((t (:background "#e64553"))))) ) diff --git a/nix-darwin/flake.lock b/nix-darwin/flake.lock index 8e462f63..1188efb0 100644 --- a/nix-darwin/flake.lock +++ b/nix-darwin/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1737636397, - "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", + "lastModified": 1741282631, + "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7fe006981fae53e931f513026fc754e322f13145", + "rev": "81498562d0f53e613d30368bb5b076784fa86f80", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737579274, - "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", + "lastModified": 1741521711, + "narHash": "sha256-uV+olxh2H8GrB676m8lHpDujYVJ1K5rie6Y0GEFSMhI=", "owner": "catppuccin", "repo": "nix", - "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", + "rev": "62424ccd65e280f3739754e0f30b85c901f6bcd9", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1738033138, - "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", + "lastModified": 1741229100, + "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", + "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", "type": "github" }, "original": { @@ -71,27 +71,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "firefox-addons": { "inputs": { "flake-utils": "flake-utils", @@ -101,11 +80,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1738037010, - "narHash": "sha256-aJYv3EmI/fnvwd1L0xaaKxUf0R3QbDZ9EzCP2ijZLj8=", + "lastModified": 1741581065, + "narHash": "sha256-XSvtiOujwD30SkuJMlzgDqosmfh5AmT25ViAobXvBCw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "bddd81ca4dfa5ec11aef63e5d53b34b1a7c0e124", + "rev": "fce197617d7d5a3f632f5b0a98043b726ccfe6be", "type": "gitlab" }, "original": { @@ -131,36 +110,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -169,11 +118,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -215,32 +164,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -263,28 +186,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -292,32 +193,11 @@ ] }, "locked": { - "lastModified": 1737968762, - "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737968762, - "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", + "lastModified": 1741613526, + "narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", + "rev": "3593ee59a44974b8518829a5239b2f77222e3c81", "type": "github" }, "original": { @@ -333,11 +213,11 @@ ] }, "locked": { - "lastModified": 1737949234, - "narHash": "sha256-rkOIzVI0ND7775hWR+N4RxnI31ajYrsqkXVStB+Qf+8=", + "lastModified": 1741496583, + "narHash": "sha256-cpeVMgLDkcgPKGCpvETYkozSrHvy4GQ/8NmDhn8GbZA=", "owner": "StevenBlack", "repo": "hosts", - "rev": "a0af3d5cb1b0fb88c8e6f2037331758f8fcb6109", + "rev": "511c57b8548d51924d92dca37e1bc9a191a11e35", "type": "github" }, "original": { @@ -362,11 +242,11 @@ ] }, "locked": { - "lastModified": 1737634937, - "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -391,11 +271,11 @@ ] }, "locked": { - "lastModified": 1737985436, - "narHash": "sha256-zx8FdI4zr2GhNyD1YGAqa2ymodAObTSAdwuWwVucewo=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "23783b96036f5506fdaf8b2250a1ef849d57f0d3", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -422,11 +302,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738107811, - "narHash": "sha256-+57jB0fv53OmAQ8QpK3eiRXfypBfKJtfdepRusNX+DM=", + "lastModified": 1741628446, + "narHash": "sha256-fTZk3uEnkR39JWFRgrstYjAOoi/OqWEDtNB3bmzVcRQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3d1dd6b5c7b90e513e86c1ad27c6c01a5c69e4f8", + "rev": "e4af4b5e2e3566a5fa95505b0d0ef5e5c9e174b8", "type": "github" }, "original": { @@ -447,11 +327,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -515,11 +395,11 @@ ] }, "locked": { - "lastModified": 1737981711, - "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -544,11 +424,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -591,11 +471,11 @@ ] }, "locked": { - "lastModified": 1737978343, - "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", + "lastModified": 1741123584, + "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", + "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", "type": "github" }, "original": { @@ -616,11 +496,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -657,34 +537,13 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738033138, - "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -696,11 +555,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -712,24 +571,18 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1738106190, - "narHash": "sha256-woDlUpfK4n1znQfGREKDLMVOQ4JZo7L6YY/sTPZGw0g=", + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "eeafe2a7153197982ccd6ad6678192bca1df446e", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "type": "github" }, "original": { @@ -748,11 +601,11 @@ ] }, "locked": { - "lastModified": 1737924095, - "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -771,11 +624,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -808,11 +661,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1733265112, - "narHash": "sha256-FdO+2X7TeIAW73hiyFKZbCjlAskb4xMmYYPX97mo9RE=", + "lastModified": 1740132177, + "narHash": "sha256-gNc20APKMefFdH5RONBuHhOps14aiMdgIT0I6RaSN64=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "89dc9e347ce8da26766ad421b0899536f9f87639", + "rev": "568067f35a85932192bd43ddf64fc05eff850f9f", "type": "github" }, "original": { @@ -828,11 +681,11 @@ ] }, "locked": { - "lastModified": 1737411508, - "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -843,18 +696,17 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], "systems": "systems_5" }, "locked": { - "lastModified": 1738099675, - "narHash": "sha256-q1oixDeEvoKm8t7Fr6vEGnv4sb8vRXCa6rF6YWIbGmk=", + "lastModified": 1741493656, + "narHash": "sha256-1M2mf5pZTlhZXkSI8wKs9GfNb1hllND58zQUYSAe8EA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2f0cc0c110c25804cd2f6c167ab66f567941452c", + "rev": "a06e502c884307c33dbdf2017fd50ab3592ad868", "type": "github" }, "original": { @@ -938,27 +790,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_4" diff --git a/nix-darwin/home-modules/programs/arc_browser.nix b/nix-darwin/home-modules/programs/arc_browser.nix new file mode 100644 index 00000000..1841f43a --- /dev/null +++ b/nix-darwin/home-modules/programs/arc_browser.nix @@ -0,0 +1,22 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + options = { + arc-browser.enable = lib.mkOption { + type = lib.types.bool; + description = "Enables the arc-browser"; + default = false; + }; + }; + + config = lib.mkIf config.arc-browser.enable { + # Merge the packages conditionally + home.packages = with pkgs; [ + arc-browser + ]; + }; +} diff --git a/nix-darwin/home-modules/programs/default.nix b/nix-darwin/home-modules/programs/default.nix index 14c2cbdb..34f2cdb3 100644 --- a/nix-darwin/home-modules/programs/default.nix +++ b/nix-darwin/home-modules/programs/default.nix @@ -2,6 +2,7 @@ { imports = [ ./alacritty.nix + ./arc_browser.nix ./bat.nix ./brave.nix ./btop.nix diff --git a/nix-darwin/home-modules/programs/kitty.nix b/nix-darwin/home-modules/programs/kitty.nix index b850ce81..44b3dee8 100644 --- a/nix-darwin/home-modules/programs/kitty.nix +++ b/nix-darwin/home-modules/programs/kitty.nix @@ -22,7 +22,12 @@ }; }; programs = { + kitty = { + package = pkgs.kitty.overrideAttrs (oldAttrs: { + # https://github.com/NixOS/nixpkgs/issues/388020 + doInstallCheck = false; + }); enable = true; shellIntegration.enableFishIntegration = true; shellIntegration.enableZshIntegration = true; diff --git a/nix-darwin/users/henri.vandersleyen/configuration.nix b/nix-darwin/users/henri.vandersleyen/configuration.nix index fb45eecb..fc021de0 100644 --- a/nix-darwin/users/henri.vandersleyen/configuration.nix +++ b/nix-darwin/users/henri.vandersleyen/configuration.nix @@ -11,6 +11,7 @@ ]; nix = { + enable = true; settings.experimental-features = "nix-command flakes"; # Optimize storage and automatic scheduled GC running # If you want to run GC manually, use commands: @@ -23,8 +24,6 @@ # interval = "weekly"; options = "--delete-older-than 14d"; }; - configureBuildUsers = true; - useDaemon = true; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # for nix.nix }; @@ -34,7 +33,6 @@ config.allowUnsupportedSystem = true; }; - services.nix-daemon.enable = true; # system.configurationRevision = self.rev or self.dirtyRev or null; system.stateVersion = 5; @@ -67,12 +65,12 @@ casks = [ "rectangle" "iterm2" - "dive" "postman" - "aws-sam-cli" # "nikitabobko/tap/aerospace" # not vetted on work laptop ]; brews = [ + "dive" + "aws-sam-cli" # "koekeishiya/formulae/yabai" # "koekeishiya/formulae/skhd" ]; diff --git a/nix-darwin/users/henri.vandersleyen/home.nix b/nix-darwin/users/henri.vandersleyen/home.nix index d157542a..3586f4ef 100644 --- a/nix-darwin/users/henri.vandersleyen/home.nix +++ b/nix-darwin/users/henri.vandersleyen/home.nix @@ -4,7 +4,6 @@ { config, username, - pkgs, ... }: @@ -12,6 +11,7 @@ imports = [ # programs + ../../home-modules/programs/arc_browser.nix ../../home-modules/programs/nnn.nix ../../home-modules/programs/kitty.nix ../../home-modules/programs/starship.nix @@ -30,6 +30,7 @@ ../../home-modules/programs/devops.nix ../../home-modules/programs/spotify.nix ../../home-modules/programs/nh.nix + ../../home-modules/programs/bat.nix # languages ../../home-modules/languages/nix.nix @@ -60,6 +61,7 @@ jsts.lsp.enable = true; # programs + arc-browser.enable = true; fish.enable = true; zsh.enable = true; nh.flakeLocation = "/Users/${username}/Documents/dotFiles/nix-darwin";