diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 250cfb0..5f0f1e2 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -14,48 +14,51 @@ scrolling: history: 10000 font: normal: - family: Monospace + family: UbuntuMono style: Regular bold: - family: Monospace + family: UbuntuMono style: Bold italic: - family: Monospace + family: UbuntuMono style: Italic bold_italic: - family: Monospace + family: UbuntuMono style: Bold Italic # Point size - size: 11.0 + size: 12.0 offset: x: 0 y: 1 draw_bold_text_with_bright_colors: true colors: + # Default colors primary: - background: '0x282c34' - foreground: '0xbbc2cf' - selection: - text: '0xbbc2cf' + background: '0x292d3e' + foreground: '0xd0d0d0' + + # Normal colors normal: - black: '0x1c1f24' - red: '0xff6c6b' - green: '0x98be65' - yellow: '0xda8548' - blue: '0x51afef' - magenta: '0xc678dd' - cyan: '0x5699af' - white: '0x202328' + black: '0x292d3e' + red: '0xf07178' + green: '0xc3e88d' + yellow: '0xffcb6b' + blue: '0x82aaff' + magenta: '0xc792ea' + cyan: '0x89ddff' + white: '0xd0d0d0' + + # Bright colors bright: - black: '0x5b6268' - red: '0xda8548' - green: '0x4db5bd' - yellow: '0xecbe7b' - blue: '0x3071db' # This is 2257a0 in Doom Emacs but I lightened it. - magenta: '0xa9a1e1' - cyan: '0x46d9ff' - white: '0xdfdfdf' -background_opacity: 0.9 + black: '0x434758' + red: '0xff8b92' + green: '0xddffa7' + yellow: '0xffe585' + blue: '0x9cc4ff' + magenta: '0xe1acff' + cyan: '0xa3f7ff' + white: '0xffffff' +background_opacity: 0.75 key_bindings: # (Windows, Linux, and BSD only) - { key: V, mods: Control|Shift, action: Paste } diff --git a/.config/fish/config.fish b/.config/fish/config.fish new file mode 100644 index 0000000..c89dc18 --- /dev/null +++ b/.config/fish/config.fish @@ -0,0 +1,20 @@ +if status is-interactive + # Commands to run in interactive sessions can go here +end +set fish_color_normal brcyan +set fish_color_autosuggestion '#7d7d7d' +set fish_color_command brcyan +set fish_color_error '#ff6c6b' +set fish_color_param brcyan + + +set EDITOR "emacsclient -t -a ''" + +alias vi=nvim +alias emacs="emacsclient -t" +alias paruunlock="sudo rm /var/lib/pacman/db.lck" +alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg" +alias ytv-best="youtube-dl -f bestvideo+bestaudio " + +figlet -w 100 "JaeUs-Device" +starship init fish | source diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables new file mode 100644 index 0000000..4dbe202 --- /dev/null +++ b/.config/fish/fish_variables @@ -0,0 +1,30 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_initialized:3100 +SETUVAR fish_color_autosuggestion:\x237d7d7d +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:brcyan +SETUVAR fish_color_comment:990000 +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:009900 +SETUVAR fish_color_error:\x23ff6c6b +SETUVAR fish_color_escape:00a6b2 +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:brcyan +SETUVAR fish_color_operator:00a6b2 +SETUVAR fish_color_param:brcyan +SETUVAR fish_color_quote:999900 +SETUVAR fish_color_redirection:00afff +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:\x1d +SETUVAR fish_pager_color_description:B3A06D\x1eyellow +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/.config/nu/config.toml b/.config/nu/config.toml new file mode 100644 index 0000000..668e7b9 --- /dev/null +++ b/.config/nu/config.toml @@ -0,0 +1,64 @@ +complete_from_path = true +ctrlc_exit = false +disable_table_indexes = false +filesize_format = "B" +filesize_metric = true +nonzero_exit_errors = true +path = ["/sbin", "/bin", "/usr/bin", "/usr/local/bin", "/usr/local/sbin", "/usr/bin/site_perl", "/usr/bin/vendor_perl", "/usr/bin/core_perl", "/var/lib/snapd/snap/bin"] +pivot_mode = "auto" +plugin_dirs = ["D:\\Src\\GitHub\\nu-plugin-lib\\samples\\Nu.Plugin.Len\\bin\\Debug\\netcoreapp3.1"] +prompt = "build-string (ansi gb) (pwd) (ansi reset) '(' (ansi cb) (do -i { git rev-parse --abbrev-ref HEAD } | str trim ) (ansi reset) ')' (char newline) (ansi yb) (date format '%m/%d/%Y %I:%M:%S%.3f %p') (ansi reset) '> ' " +rm_always_trash = true +skip_welcome_message = false +startup = ["figlet -w 100 'JaeUs-Device'"] +table_mode = "other" + +[color_config] +header_align = "l" +header_bold = true +header_color = "c" +index_color = "rd" +leading_trailing_space_bg = "white" +primitive_binary = "cyan" +primitive_boolean = "green" +primitive_columnpath = "cyan" +primitive_date = "ru" +primitive_decimal = "red" +primitive_duration = "blue" +primitive_filesize = "ur" +primitive_int = "green" +primitive_line = "yellow" +primitive_path = "yellow" +primitive_pattern = "white" +primitive_range = "purple" +primitive_string = "pb" +separator_color = "purple" + +[line_editor] +auto_add_history = true +bell_style = "audible" +color_mode = "enabled" +completion_prompt_limit = 100 +completion_type = "circular" +edit_mode = "emacs" +history_duplicates = "ignoreconsecutive" +history_ignore_space = false +keyseq_timeout_ms = 500 +max_history_size = 100000 +tab_stop = 4 + +[textview] +colored_output = true +grid = false +header = true +line_numbers = true +pager = "less" +paging_mode = "QuitIfOneScreen" +snip = true +tab_width = 4 +term_width = "default" +theme = "TwoDark" +true_color = true +use_italics = true +vcs_modification_markers = true +wrapping_mode = "NoWrapping" diff --git a/.config/starship.toml b/.config/starship.toml new file mode 100644 index 0000000..3b400c8 --- /dev/null +++ b/.config/starship.toml @@ -0,0 +1,21 @@ +# ~/.config/starship.toml +# Don't print a new line at the start of the prompt +add_newline = false + +# Make prompt a single line instead of two lines +[line_break] +disabled = true + +# Replace the "❯" symbol in the prompt with "➜" +# [character] # The name of the module we are configuring is "character" +# success_symbol = "[➜](bold green)" # The "success_symbol" is set to "➜" with color "bold green" + +# Use custom format +# format = """ +# [┌───────────────────>](bold green) +# [│](bold green)$directory$rust$package +# [└─>](bold green) """ + +# Disable the package module, hiding it from the prompt completely +[package] +disabled = true diff --git a/.emacs.d/emacs.org b/.emacs.d/emacs.org index f16254e..99564aa 100644 --- a/.emacs.d/emacs.org +++ b/.emacs.d/emacs.org @@ -20,9 +20,9 @@ (setenv "LANG" "en_US.UTF-8") (setenv "LC_ALL" "en_US.UTF-8") ;; theme var - (defvar gvar/default-font-size 120) - (defvar gvar/default-variable-font-size 120) - (defvar gvar/frame-transparency '(95 . 95)) + (defvar gvar/default-font-size 110) + (defvar gvar/default-variable-font-size 110) + (defvar gvar/frame-transparency '(75 . 75)) ;;dir (setq user-emacs-directory "~/.cache/emacs") ;; encoding @@ -245,8 +245,8 @@ https://nathantypanski.com/blog/2014-08-03-a-vim-like-emacs-config.html (setq doom_themes-enable-bold t doom-themes-enablbe-italic t) :config - (load-theme 'doom-material t) - ;;(load-theme 'doom-palenight t) + ;;(load-theme 'doom-material t) + (load-theme 'doom-palenight t) ;;(load-theme 'doom-gruvbox t) ;; Enable flashing mode-line on errors (doom-themes-visual-bell-config) @@ -304,19 +304,45 @@ https://nathantypanski.com/blog/2014-08-03-a-vim-like-emacs-config.html (dashboard-setup-startup-hook) (dashboard-modify-heading-icons '((recents . "file-text") (bookmarks . "book")))) + (setq initial-buffer-choice (lambda () (get-buffer-create "*dashboard*"))) #+end_src * Fonts | 12345678 | | |----------+---| | 일이삼사 | | #+begin_src emacs-lisp + ;; NanumGothicCoding + ;;(add-to-list 'default-frame-alist `(font . "NanumGothicCoding")) + ;;(set-face-attribute 'default nil :font "NanumGothicCoding" :height gvar/default-font-size) + ;;(set-face-attribute 'fixed-pitch nil :font "NanumGothicCoding" :height gvar/default-font-size) + ;;(set-face-attribute 'variable-pitch nil :font "NanumGothicCoding" :height gvar/default-variable-font-size :weight 'regular) + ;;(set-fontset-font t 'hangul (font-spec :family "NanumGothicCoding" :height gvar/default-font-size)) + + ;; D2Coding + ;;(add-to-list 'default-frame-alist `(font . "D2Coding")) + ;;(set-face-attribute 'default nil :font "D2Coding" :height gvar/default-font-size) + ;;(set-face-attribute 'fixed-pitch nil :font "D2Coding" :height gvar/default-font-size) + ;;(set-face-attribute 'variable-pitch nil :font "D2Coding" :height gvar/default-variable-font-size :weight 'regular) + ;;(set-fontset-font t 'hangul (font-spec :family "D2Coding" :height gvar/default-font-size)) + + ;; Fira Code Retina(English) / D2Coding(Hangul) - Fixed pitch only + (add-to-list 'default-frame-alist `(font . "Fira Code Retina")) (set-face-attribute 'default nil :font "Fira Code Retina" :height gvar/default-font-size) (set-face-attribute 'fixed-pitch nil :font "Fira Code Retina" :height gvar/default-font-size) (set-face-attribute 'variable-pitch nil :font "Fira Code Retina" :height gvar/default-variable-font-size :weight 'regular) (set-fontset-font t 'hangul (font-spec :family "D2Coding" :height gvar/default-font-size)) (setq face-font-rescale-alist - '(("D2Coding" . 1.3))) - (setq-default line-spacing 2) + '(("D2Coding" . 1.25))) + + ;; Dejavu Sans Mono(English) / D2Coding(Hangul) - Fixed pitch only + ;;(add-to-list 'default-frame-alist `(font . "Dejavu Sans Mono")) + ;;(set-face-attribute 'default nil :font "Dejavu Sans Mono" :height gvar/default-font-size) + ;;(set-face-attribute 'fixed-pitch nil :font "Dejavu Sans Mono" :height gvar/default-font-size) + ;;(set-face-attribute 'variable-pitch nil :font "Dejavu Sans Mono" :height gvar/default-variable-font-size :weight 'regular) + ;;(set-fontset-font t 'hangul (font-spec :family "D2Coding" :height gvar/default-font-size)) + ;;(setq face-font-rescale-alist + ;; '(("D2Coding" . 1.25))) + ;;(setq-default line-spacing 2) ;;(global-prettify-symbols-mode +1) #+end_src * Whitespace @@ -451,21 +477,21 @@ https://nathantypanski.com/blog/2014-08-03-a-vim-like-emacs-config.html + ORG mode =#+= Candidates https://emacs.stackexchange.com/a/30691 - #+begin_src emacs-lisp - (defun org-keyword-backend (command &optional arg &rest ignored) - (interactive (list 'interactive)) - (cl-case command - (interactive (company-begin-backend 'org-keyword-backend)) - (prefix (and (eq major-mode 'org-mode) - (cons (company-grab-line "^#\\+\\(\\w*\\)" 1) - t))) - (candidates (mapcar #'upcase - (cl-remove-if-not - (lambda (c) (string-prefix-p arg c)) - (pcomplete-completions)))) - (ignore-case t) - (duplicates t))) - #+end_src +#+begin_src emacs-lisp + (defun org-keyword-backend (command &optional arg &rest ignored) + (interactive (list 'interactive)) + (cl-case command + (interactive (company-begin-backend 'org-keyword-backend)) + (prefix (and (eq major-mode 'org-mode) + (cons (company-grab-line "^#\\+\\(\\w*\\)" 1) + t))) + (candidates (mapcar #'upcase + (cl-remove-if-not + (lambda (c) (string-prefix-p arg c)) + (pcomplete-completions)))) + (ignore-case t) + (duplicates t))) +#+end_src ** Consult #+begin_src emacs-lisp (defun dw/get-project-root () @@ -717,7 +743,7 @@ https://emacs.stackexchange.com/a/30691 #+begin_src emacs-lisp (defun efs/org-mode-setup () (org-indent-mode) - (variable-pitch-mode 1) + ;(variable-pitch-mode 1) (visual-line-mode 1)) (use-package org @@ -1232,6 +1258,10 @@ using =svlangserver= #+begin_src emacs-lisp (use-package cmake-mode) #+end_src +** YAML +#+begin_src emacs-lisp +(use-package yaml-mode) +#+end_src * ETC ** Youtube diff --git a/.xmonad/scripts/autostart.sh b/.xmonad/scripts/autostart.sh index 1c78f86..a6334e4 100755 --- a/.xmonad/scripts/autostart.sh +++ b/.xmonad/scripts/autostart.sh @@ -30,4 +30,6 @@ picom -b --config $HOME/.xmonad/scripts/picom.conf & /usr/lib/xfce4/notifyd/xfce4-notifyd & seadrive-gui & -trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 0 --transparent true --alpha 0 --tint 0x282c34 --height 24 & +trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 0 --transparent true --alpha 0 --tint 0x282c34 --height 16 & + +emacs --daemon & diff --git a/scripts/init_script_arcolinux.sh b/scripts/init_script_arcolinux.sh index bf85d53..0804a1e 100755 --- a/scripts/init_script_arcolinux.sh +++ b/scripts/init_script_arcolinux.sh @@ -1,13 +1,29 @@ #!/bin/sh +paru -S stow alacritty trayer --noconfirm -sudo pacman -Syu --noconfirm -paru -S stow zsh-autosuggestions-git alacritty trayer --noconfirm -/usr/share/oh-my-zsh/tools/install.sh +# config file handling +rm ~/.config/nu/config.toml rm ~/.zshrc ~/.bashrc ~/.xmonad/xmonad.hs rm -rf ~/.config/alacritty ~/.xmonad/scripts cd ~/.dotfiles stow . +sudo pacman -Syu --noconfirm + +#ZSH +#paru -S zsh-autosuggestions-git --noconfirm +#/usr/share/oh-my-zsh/tools/install.sh + +# NUSHELL +#paru -S nushell +#nu ~/scripts/init_script_nushell.nu +#echo "Changing Shell to nushell" +#chsh -s /bin/nu # change shell + +# FISH +paru -S fish starship +chsh -s /bin/fish + # neovim paru -S neovim --noconfirm sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ diff --git a/scripts/init_script_nushell.nu b/scripts/init_script_nushell.nu new file mode 100644 index 0000000..0bfefd4 --- /dev/null +++ b/scripts/init_script_nushell.nu @@ -0,0 +1 @@ +config set env $nu.env