diff --git a/bootstrap/win/Registry.ps1 b/bootstrap/win/Registry.ps1 index 93f0909..a170680 100644 --- a/bootstrap/win/Registry.ps1 +++ b/bootstrap/win/Registry.ps1 @@ -4,3 +4,8 @@ REG ADD "HKEY_CURRENT_USER\Control Panel\Accessibility\StickyKeys" /v "Flags" /t # Disable Hyper+Keys to open Office apps REG ADD HKCU\Software\Classes\ms-officeapp\Shell\Open\Command /t REG_SZ /d rundll32 + +# Disable DOS 8.3 file name creation +sudo fsutil 8dot3name set 1 +# Delete all known DOS 8.3 file name +fsutil 8dot3name strip /s /v C:\ diff --git a/platforms/wsl/systemd/symlink-wayland-socket.service b/platforms/wsl/systemd/symlink-wayland-socket.service new file mode 100644 index 0000000..272461e --- /dev/null +++ b/platforms/wsl/systemd/symlink-wayland-socket.service @@ -0,0 +1,13 @@ +# https://github.com/microsoft/WSL/issues/11261 +# Cannot use GUI apps/tools as Wayland socket doesn't exist in `XDG_RUNTIME_DIR` + +[Unit] +Description=Symlink Wayland socket to XDG_RUNTIME_DIR + +[Service] +Type=oneshot +ExecStart=/usr/bin/ln -s /mnt/wslg/runtime-dir/wayland-0 $XDG_RUNTIME_DIR +ExecStart=/usr/bin/ln -s /mnt/wslg/runtime-dir/wayland-0.lock $XDG_RUNTIME_DIR + +[Install] +WantedBy=default.target diff --git a/tools/doom/config.el b/tools/doom/config.el index 26e85f9..a266d41 100644 --- a/tools/doom/config.el +++ b/tools/doom/config.el @@ -55,7 +55,7 @@ ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers t) -(setq display-line-numbers-type 'relative) +(setq display-line-numbers-type 'visual) @@ -93,6 +93,18 @@ ;; they are implemented. (add-to-list 'load-path (expand-file-name "lisp" doom-user-dir)) +(setq doom-local-dir (expand-file-name "emacs" (getenv "XDG_DATA_HOME"))) +(setq doom-data-dir (expand-file-name "etc" doom-local-dir)) + +(after! recentf + (setq recentf-max-saved-items 200) + (add-to-list 'recentf-exclude "\\.revive$") + (add-to-list 'recentf-exclude "\\.windows$") + (add-to-list 'recentf-exclude "\\.#.+$") + (add-to-list 'recentf-exclude "^/tmp/") + (add-to-list 'recentf-exclude "COMMIT_EDITMSG\\'") +)[1][2] + (after! wakatime-mode @@ -119,11 +131,13 @@ ) -(use-package! rime - :config - (setq default-input-method "rime") - (add-hook! (org-mode markdown-mode) (activate-input-method default-input-method)) - ) +(if (not (eq system-type 'windows-nt)) + (use-package! rime + :config + (setq default-input-method "rime") + (add-hook! (org-mode markdown-mode) (activate-input-method default-input-method)) + (setq rime-user-data-dir (expand-file-name "emacs-rime" (getenv "XDG_CONFIG_HOME"))) + )) (load! "calendar.el") diff --git a/tools/doom/lisp/org-pomodoro-music-controller.el b/tools/doom/lisp/org-pomodoro-music-controller.el index 932b1d4..236643d 100644 --- a/tools/doom/lisp/org-pomodoro-music-controller.el +++ b/tools/doom/lisp/org-pomodoro-music-controller.el @@ -8,11 +8,18 @@ (require 'org-pomodoro) ;; Variables -(defcustom org-pomodoro-music-player-command "playerctl" + +(defcustom org-pomodoro-music-player-command + (cond + ((eq system-type 'windows-nt) "clmcontrol") + ((eq system-type 'darwin) "nowplaying-cli") + ((eq system-type 'gnu/linux) "playerctl") + (t "playerctl")) "Command to control the music player." :type 'string :group 'org-pomodoro) + (defcustom org-pomodoro-music-player-args nil "Arguments to pass to the music player command." :type '(repeat string) diff --git a/tools/doom/org.el b/tools/doom/org.el index a367d52..56b0bbd 100644 --- a/tools/doom/org.el +++ b/tools/doom/org.el @@ -1,4 +1,4 @@ -;; If you use `org' and don't want your org files in the default location below, +;; If use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! (setq org-directory "~/OrgFiles/") ;; (setq org-roam-directory "~/OrgFiles/roam/") @@ -29,6 +29,14 @@ (setq org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d@/!)" "CANCELLED(c@)") )) + (setq org-todo-keyword-faces + '(("TODO" . (:foreground "red" :weight bold :background "yellow")) + ("NEXT" . (:foreground "blue" :weight bold :background "lightgray")) + ("WAIT" . (:foreground "orange" :weight bold)) + ("DONE" . (:foreground "grey" :weight bold :italic t)) + ("CANCELLED" . (:foreground "grey" :weight bold)) + )) + ;; Keymaps (map! :map org-mode-map :desc "Bold with ZWS" "C-c b" (lambda () (interactive) (my/insert-emphasis-with-zws ?*)) @@ -196,7 +204,7 @@ ;;; org-babel -(if (bound-and-true-p ISMAC) +(if (not (eq system-type 'gnu/linux)) (setq org-babel-C-compiler "clang")) diff --git a/tools/fish/config.fish b/tools/fish/config.fish index a919122..db1fb7f 100644 --- a/tools/fish/config.fish +++ b/tools/fish/config.fish @@ -21,3 +21,17 @@ set --export PATH $BUN_INSTALL/bin $PATH fish_add_path "$HOME/.moon/bin" + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +if test -f /home/js0ny/.local/anaconda3/bin/conda + eval /home/js0ny/.local/anaconda3/bin/conda "shell.fish" "hook" $argv | source +else + if test -f "/home/js0ny/.local/anaconda3/etc/fish/conf.d/conda.fish" + . "/home/js0ny/.local/anaconda3/etc/fish/conf.d/conda.fish" + else + set -x PATH "/home/js0ny/.local/anaconda3/bin" $PATH + end +end +# <<< conda initialize <<< + diff --git a/tools/nvim/lua/plugins/fileutils.lua b/tools/nvim/lua/plugins/fileutils.lua index 3cac56d..39bca40 100644 --- a/tools/nvim/lua/plugins/fileutils.lua +++ b/tools/nvim/lua/plugins/fileutils.lua @@ -45,4 +45,7 @@ return { -- { "gg", "LazyGit", desc = "LazyGit" }, -- }, -- }, + { + "NeogitOrg/neogit" + } } diff --git a/tools/zed/settings.json b/tools/zed/settings.json index 448535d..16f799c 100644 --- a/tools/zed/settings.json +++ b/tools/zed/settings.json @@ -23,8 +23,8 @@ "ui_font_size": 16, "buffer_font_size": null, "theme": { - "mode": "dark", - "light": "Catppuccin Latte", + "mode": "system", + "light": "Rosé Pine Dawn", "dark": "Catppuccin Mocha" }, "relative_line_numbers": true,