From 80f60407654ccac18d8dc82458a8c01fdf589ac5 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Thu, 14 Nov 2024 17:04:54 -0500 Subject: [PATCH] update Signed-off-by: Michael Thomson --- hosts/dell/home.nix | 1 - hosts/desktop/home.nix | 1 - hosts/macbook/configuration.nix | 7 +- hosts/macbook/home.nix | 21 +- modules/home-manager/emacs/default.nix | 16 -- .../home-manager/emacs/emacs.d/early-init.el | 3 - modules/home-manager/emacs/emacs.d/init.el | 225 ------------------ modules/home-manager/irssi/default.nix | 19 -- modules/home-manager/neovim/default.nix | 1 - modules/home-manager/nixvim/default.nix | 29 +++ 10 files changed, 45 insertions(+), 278 deletions(-) delete mode 100644 modules/home-manager/emacs/default.nix delete mode 100644 modules/home-manager/emacs/emacs.d/early-init.el delete mode 100644 modules/home-manager/emacs/emacs.d/init.el delete mode 100644 modules/home-manager/irssi/default.nix diff --git a/hosts/dell/home.nix b/hosts/dell/home.nix index 4f50f11..f680931 100644 --- a/hosts/dell/home.nix +++ b/hosts/dell/home.nix @@ -11,7 +11,6 @@ ../../modules/home-manager/tmux ../../modules/home-manager/taskwarrior ../../modules/home-manager/zoxide - ../../modules/home-manager/irssi ]; home.username = "mthomson"; home.homeDirectory = "/home/mthomson"; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index a90014c..bd7d1b6 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -11,7 +11,6 @@ ../../modules/home-manager/tmux ../../modules/home-manager/taskwarrior ../../modules/home-manager/zoxide - ../../modules/home-manager/irssi ../../modules/home-manager/syncthing ../../modules/home-manager/email ../../modules/home-manager/password-store diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix index a7137b9..ab260f8 100644 --- a/hosts/macbook/configuration.nix +++ b/hosts/macbook/configuration.nix @@ -32,15 +32,10 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; environment.systemPackages = with pkgs; [ - hello man-pages man-pages-posix ]; - environment.variables = { - EDITOR = "nvim"; - }; - services = { skhd = { enable = true; @@ -59,7 +54,7 @@ }; }; - programs.zsh.enable = true; + # programs.zsh.enable = true; system.stateVersion = 5; diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 7998045..225bc23 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -4,13 +4,11 @@ imports = [ ../../modules/home-manager/git ../../modules/home-manager/nixvim - ../../modules/home-manager/emacs ../../modules/home-manager/wezterm ../../modules/home-manager/kitty ../../modules/home-manager/zsh ../../modules/home-manager/tmux ../../modules/home-manager/zoxide - ../../modules/home-manager/irssi ../../modules/home-manager/email ../../modules/home-manager/password-store ../../modules/home-manager/taskwarrior @@ -32,6 +30,18 @@ java = { enable = true; }; + zk = { + enable = true; + settings = { + notebook = { + dir = "~/zk"; + }; + }; + }; + }; + + home.sessionVariables = { + ZK_NOTEBOOK_DIR = "\${HOME}/zk"; }; home.packages = with pkgs; [ @@ -42,7 +52,6 @@ cowsay lazygit k9s - tintin nb w3m kubectl @@ -53,13 +62,13 @@ wireguard-tools kompose inetutils - devenv _1password-cli calcurse glow gcc - luajit - qemu + nchat + go + emanote ]; programs.home-manager.enable = true; diff --git a/modules/home-manager/emacs/default.nix b/modules/home-manager/emacs/default.nix deleted file mode 100644 index 8606e78..0000000 --- a/modules/home-manager/emacs/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, config, ... }: - -{ - home.packages = with pkgs; [ - emacs - fzf - ripgrep - emacs-lsp-booster - (nerdfonts.override { fonts = [ "Iosevka" ]; }) - ]; - - home.file.".emacs.d" = { - source = ./emacs.d; - recursive = true; - }; -} diff --git a/modules/home-manager/emacs/emacs.d/early-init.el b/modules/home-manager/emacs/emacs.d/early-init.el deleted file mode 100644 index 38d8302..0000000 --- a/modules/home-manager/emacs/emacs.d/early-init.el +++ /dev/null @@ -1,3 +0,0 @@ -(setq package-enable-at-startup nil) -(setenv "LSP_USE_PLISTS" "true") - diff --git a/modules/home-manager/emacs/emacs.d/init.el b/modules/home-manager/emacs/emacs.d/init.el deleted file mode 100644 index 3419bdf..0000000 --- a/modules/home-manager/emacs/emacs.d/init.el +++ /dev/null @@ -1,225 +0,0 @@ -(defvar bootstrap-version) -(let ((bootstrap-file - (expand-file-name - "straight/repos/straight.el/bootstrap.el" - (or (bound-and-true-p straight-base-dir) - user-emacs-directory))) - (bootstrap-version 7)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage)) -(straight-use-package 'use-package) -(setq straight-use-package-by-default t) - -;; Turn off unwanted GUI elements. -(menu-bar-mode -1) -(scroll-bar-mode -1) -(tool-bar-mode -1) -(tooltip-mode -1) - -;; Set the default font. -;; Append a size -NN to the font name. -(add-to-list 'default-frame-alist - '(font . "Iosevka Nerd Font-16")) - -;; garbage collect when not in focus -(if (boundp 'after-focus-change-function) - (add-function :after after-focus-change-function - (lambda () (unless (frame-focus-state) - (garbage-collect)))) - (add-hook 'after-focus-change-function - 'garbage-collect)) - -;; set name and email -(setq user-full-name "Michael Thomson") -(setq user-mail-address "michael@michaelthomson.dev") - -;; display columna nd line numbers on all buffers -(column-number-mode 1) -(global-display-line-numbers-mode 1) - -;; paren closing and tab fix -(electric-pair-mode 1) -(electric-indent-mode -1) -(setq-default tab-width 2) -(setq-default indent-tabs-mode nil) -(setq-default indent-line-function 'insert-tab) - -;; save history of mini buffer commands and opened files -(savehist-mode 1) -(recentf-mode 1) - -;; disable lock file creation and send backups to a different directory -(setq backup-directory-alist '(("." . "~/.saves"))) -(setq backup-by-copying t) -(setq version-control t) -(setq delete-old-versions t) -(setq create-lockfiles nil) - -;; scroll wheel improvments -(setq mouse-wheel-progressive-speed nil) -(setq scroll-conservatively 101) - -;; y or n for prompts -(setq use-short-answers t) -(setq use-dialog-box nil) - -;; disable startup screen and messages buffer -(setq inhibit-startup-message t) -(setq message-log-max nil) -(kill-buffer "*Messages*") - -;; prog mode truncate lines and highlight lines -(add-hook 'prog-mode-hook - (lambda () (toggle-truncate-lines 1))) -(add-hook 'prog-mode-hook 'hl-line-mode) - -;; theme -(use-package catppuccin-theme - :config - (load-theme 'catppuccin :no-confirm) - (setq catppuccin-flavor 'frappe) ;; or 'latte, 'macchiato, or 'mocha - (catppuccin-reload)) - - -;; evil -(use-package evil - :init - (setq evil-want-keybinding nil) - :config - (setq evil-want-keybinding nil - evil-auto-indent nil - evil-want-C-u-scroll t - evil-shift-width 2 - evil-undo-system 'undo-redo - evil-vsplit-window-right t) - (evil-mode t)) - -(use-package evil-collection - :after evil - :config - (evil-collection-init)) - -;; vertico -(use-package vertico - :init - (vertico-mode)) - -(use-package savehist - :init - (savehist-mode)) - -(use-package marginalia - :after vertico - :init - (marginalia-mode)) - -(use-package nerd-icons-completion - :after marginalia - :config - (nerd-icons-completion-mode) - (add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup)) - -(use-package orderless - :custom - (completion-styles '(orderless basic)) - (completion-category-defaults nil) - (completion-category-overrides '((file (styles partial-completion))))) - -(use-package consult - :bind (;; A recursive grep - ("M-s M-g" . consult-grep) - ;; Search for files names recursively - ("M-s M-f" . consult-find) - ;; Search through the outline (headings) of the file - ("M-s M-o" . consult-outline) - ;; Search the current buffer - ("M-s M-l" . consult-line) - ;; Switch to another buffer, or bookmarked file, or recently - ;; opened file. - ("M-s M-b" . consult-buffer))) - -;; icons -(use-package all-the-icons - :if (display-graphic-p)) - -;;;; Code Completion -(use-package corfu - :custom - (corfu-cycle t) ;; Enable cycling for `corfu-next/previous' - (corfu-auto t) ;; Enable auto completion - (corfu-separator ?\s) ;; Orderless field separator - (corfu-auto-delay 0) ;; TOO SMALL - NOT RECOMMENDED - (corfu-auto-prefix 1) - :init - (global-corfu-mode)) - -(use-package flycheck - :config - (add-hook 'after-init-hook #'global-flycheck-mode)) - - -;; treesitter -(use-package treesit-auto - :custom - (treesit-auto-install 'prompt) - :config - (treesit-auto-add-to-auto-mode-alist 'all) - (global-treesit-auto-mode)) - -(use-package lsp-mode - :init - (setq lsp-keymap-prefix "C-c l") - (setq lsp-use-plists t) - :hook ((tsx-ts-mode . lsp) - (typescript-ts-mode . lsp) - (js-ts-mode . lsp) - (go-ts-mode . lsp) - (vue-mode . lsp)) - :commands lsp) - - -(use-package lsp-ui :commands lsp-ui-mode) - -(setq read-process-output-max (* 10 1024 1024)) ;; 10mb -(setq gc-cons-threshold 200000000) - -;; emacs-lsp-booster -(defun lsp-booster--advice-json-parse (old-fn &rest args) - "Try to parse bytecode instead of json." - (or - (when (equal (following-char) ?#) - (let ((bytecode (read (current-buffer)))) - (when (byte-code-function-p bytecode) - (funcall bytecode)))) - (apply old-fn args))) -(advice-add (if (progn (require 'json) - (fboundp 'json-parse-buffer)) - 'json-parse-buffer - 'json-read) - :around - #'lsp-booster--advice-json-parse) - -(defun lsp-booster--advice-final-command (old-fn cmd &optional test?) - "Prepend emacs-lsp-booster command to lsp CMD." - (let ((orig-result (funcall old-fn cmd test?))) - (if (and (not test?) ;; for check lsp-server-present? - (not (file-remote-p default-directory)) ;; see lsp-resolve-final-command, it would add extra shell wrapper - lsp-use-plists - (not (functionp 'json-rpc-connection)) ;; native json-rpc - (executable-find "emacs-lsp-booster")) - (progn - (when-let ((command-from-exec-path (executable-find (car orig-result)))) ;; resolve command from exec-path (in case not found in $PATH) - (setcar orig-result command-from-exec-path)) - (message "Using emacs-lsp-booster for %s!" orig-result) - (cons "emacs-lsp-booster" orig-result)) - orig-result))) -(advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command) - -;; languages -(use-package vue-mode) diff --git a/modules/home-manager/irssi/default.nix b/modules/home-manager/irssi/default.nix deleted file mode 100644 index 1701380..0000000 --- a/modules/home-manager/irssi/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, config, ... }: - -{ - programs = { - irssi = { - enable = true; - networks = { - liberachat = { - nick = "DrDeww"; - server = { - address = "irc.libera.chat"; - port = 6697; - autoConnect = false; - }; - }; - }; - }; - }; -} diff --git a/modules/home-manager/neovim/default.nix b/modules/home-manager/neovim/default.nix index 6c5dcac..7164e00 100644 --- a/modules/home-manager/neovim/default.nix +++ b/modules/home-manager/neovim/default.nix @@ -8,7 +8,6 @@ luajit lua-language-server nil - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ]; programs.neovim = { diff --git a/modules/home-manager/nixvim/default.nix b/modules/home-manager/nixvim/default.nix index 3f497c2..373e32f 100644 --- a/modules/home-manager/nixvim/default.nix +++ b/modules/home-manager/nixvim/default.nix @@ -43,6 +43,7 @@ cursorline = true; scrolloff = 10; hlsearch = true; + foldlevel = 99; }; keymaps = [ @@ -66,6 +67,21 @@ key = "u"; action = "UndotreeToggle"; } + { + mode = "n"; + key = "zf"; + action = "ZkNotes"; + } + { + mode = "n"; + key = "zt"; + action = "ZkTags"; + } + { + mode = "n"; + key = "zn"; + action = "ZkNew"; + } ]; plugins = { @@ -75,6 +91,7 @@ }; treesitter = { enable = true; + folding = true; settings = { highlight = { enable = true; @@ -112,6 +129,15 @@ pick = {}; }; }; + zk = { + enable = true; + settings = { + picker = "minipick"; + }; + }; + render-markdown = { + enable = true; + }; friendly-snippets = { enable = true; }; @@ -197,6 +223,9 @@ cssls = { enable = true; }; + stylelint_lsp = { + enable = true; + }; volar = { enable = true; tslsIntegration = true;