From c1e5a0de997c8e08526cdf625ecbbe5c3300a497 Mon Sep 17 00:00:00 2001 From: JaeYoo-Im Date: Thu, 16 Sep 2021 01:35:02 +0900 Subject: [PATCH] =?UTF-8?q?mv=20directory,=20and=20some=20fix.=F0=9F=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/alacritty/alacritty.yml | 8 +++---- {.emacs.d.vanilla => .emacs.d}/desktop.org | 0 {.emacs.d.vanilla => .emacs.d}/emacs.org | 0 .../exwm/EXWM.desktop | 0 .../exwm/start-exwm.sh | 0 {.emacs.d.vanilla => .emacs.d}/init.el | 13 ----------- .../logos/black-hole.png | Bin .../logos/emacs-e.png | Bin .../snippets/text-mode/__license | 0 .../snippets/text-mode/__license-apache | 0 .../snippets/text-mode/__license-apache-bp | 0 .../snippets/text-mode/__license-bsd2 | 0 .../snippets/text-mode/__license-bsd3 | 0 .../snippets/text-mode/__license-gpl3 | 0 .../snippets/text-mode/__license-gpl3-bp | 0 .../snippets/text-mode/__license-lgpl3 | 0 .../snippets/text-mode/__license-mit | 0 .../snippets/text-mode/__license-mozilla | 0 .../snippets/text-mode/__license-mozilla-bp | 0 .../snippets/text-mode/__license-unlicense | 0 .gitignore | 7 ------ .xmonad/scripts/autostart.sh | 0 .xmonad/xmonad.hs | 8 +++---- .xmonad/xmonad.org | 22 +++++++++--------- scripts/init_script_arcolinux.sh | 2 +- 25 files changed, 20 insertions(+), 40 deletions(-) rename {.emacs.d.vanilla => .emacs.d}/desktop.org (100%) rename {.emacs.d.vanilla => .emacs.d}/emacs.org (100%) rename {.emacs.d.vanilla => .emacs.d}/exwm/EXWM.desktop (100%) rename {.emacs.d.vanilla => .emacs.d}/exwm/start-exwm.sh (100%) rename {.emacs.d.vanilla => .emacs.d}/init.el (56%) rename {.emacs.d.vanilla => .emacs.d}/logos/black-hole.png (100%) rename {.emacs.d.vanilla => .emacs.d}/logos/emacs-e.png (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-apache (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-apache-bp (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-bsd2 (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-bsd3 (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-gpl3 (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-gpl3-bp (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-lgpl3 (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-mit (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-mozilla (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-mozilla-bp (100%) rename {.emacs.d.vanilla => .emacs.d}/snippets/text-mode/__license-unlicense (100%) mode change 100644 => 100755 .xmonad/scripts/autostart.sh diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index b26aa2a..250cfb0 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -14,16 +14,16 @@ scrolling: history: 10000 font: normal: - family: Mononoki Nerd Font + family: Monospace style: Regular bold: - family: Mononoki Nerd Font + family: Monospace style: Bold italic: - family: Mononoki Nerd Font + family: Monospace style: Italic bold_italic: - family: Mononoki Nerd Font + family: Monospace style: Bold Italic # Point size size: 11.0 diff --git a/.emacs.d.vanilla/desktop.org b/.emacs.d/desktop.org similarity index 100% rename from .emacs.d.vanilla/desktop.org rename to .emacs.d/desktop.org diff --git a/.emacs.d.vanilla/emacs.org b/.emacs.d/emacs.org similarity index 100% rename from .emacs.d.vanilla/emacs.org rename to .emacs.d/emacs.org diff --git a/.emacs.d.vanilla/exwm/EXWM.desktop b/.emacs.d/exwm/EXWM.desktop similarity index 100% rename from .emacs.d.vanilla/exwm/EXWM.desktop rename to .emacs.d/exwm/EXWM.desktop diff --git a/.emacs.d.vanilla/exwm/start-exwm.sh b/.emacs.d/exwm/start-exwm.sh similarity index 100% rename from .emacs.d.vanilla/exwm/start-exwm.sh rename to .emacs.d/exwm/start-exwm.sh diff --git a/.emacs.d.vanilla/init.el b/.emacs.d/init.el similarity index 56% rename from .emacs.d.vanilla/init.el rename to .emacs.d/init.el index 67060fc..f985534 100644 --- a/.emacs.d.vanilla/init.el +++ b/.emacs.d/init.el @@ -19,16 +19,3 @@ (setq tab-width 4) ; or any other preferred value (defvaralias 'c-basic-offset 'tab-width) (defvaralias 'cperl-indent-level 'tab-width) -(custom-set-variables - ;; custom-set-variables 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. - '(org-agenda-files nil) - '(package-selected-packages '(no-littering doom-themes evil-numbers use-package))) -(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. - ) diff --git a/.emacs.d.vanilla/logos/black-hole.png b/.emacs.d/logos/black-hole.png similarity index 100% rename from .emacs.d.vanilla/logos/black-hole.png rename to .emacs.d/logos/black-hole.png diff --git a/.emacs.d.vanilla/logos/emacs-e.png b/.emacs.d/logos/emacs-e.png similarity index 100% rename from .emacs.d.vanilla/logos/emacs-e.png rename to .emacs.d/logos/emacs-e.png diff --git a/.emacs.d.vanilla/snippets/text-mode/__license b/.emacs.d/snippets/text-mode/__license similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license rename to .emacs.d/snippets/text-mode/__license diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-apache b/.emacs.d/snippets/text-mode/__license-apache similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-apache rename to .emacs.d/snippets/text-mode/__license-apache diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-apache-bp b/.emacs.d/snippets/text-mode/__license-apache-bp similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-apache-bp rename to .emacs.d/snippets/text-mode/__license-apache-bp diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-bsd2 b/.emacs.d/snippets/text-mode/__license-bsd2 similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-bsd2 rename to .emacs.d/snippets/text-mode/__license-bsd2 diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-bsd3 b/.emacs.d/snippets/text-mode/__license-bsd3 similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-bsd3 rename to .emacs.d/snippets/text-mode/__license-bsd3 diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-gpl3 b/.emacs.d/snippets/text-mode/__license-gpl3 similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-gpl3 rename to .emacs.d/snippets/text-mode/__license-gpl3 diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-gpl3-bp b/.emacs.d/snippets/text-mode/__license-gpl3-bp similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-gpl3-bp rename to .emacs.d/snippets/text-mode/__license-gpl3-bp diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-lgpl3 b/.emacs.d/snippets/text-mode/__license-lgpl3 similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-lgpl3 rename to .emacs.d/snippets/text-mode/__license-lgpl3 diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-mit b/.emacs.d/snippets/text-mode/__license-mit similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-mit rename to .emacs.d/snippets/text-mode/__license-mit diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-mozilla b/.emacs.d/snippets/text-mode/__license-mozilla similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-mozilla rename to .emacs.d/snippets/text-mode/__license-mozilla diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-mozilla-bp b/.emacs.d/snippets/text-mode/__license-mozilla-bp similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-mozilla-bp rename to .emacs.d/snippets/text-mode/__license-mozilla-bp diff --git a/.emacs.d.vanilla/snippets/text-mode/__license-unlicense b/.emacs.d/snippets/text-mode/__license-unlicense similarity index 100% rename from .emacs.d.vanilla/snippets/text-mode/__license-unlicense rename to .emacs.d/snippets/text-mode/__license-unlicense diff --git a/.gitignore b/.gitignore index decb450..56bde5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ .ssh/* !.ssh/config - -.emacs.d/* -!.emacs.d/desktop.org -!.emacs.d/emacs.org -!.emacs.d/init.el -!.emacs.d/exwm/ - diff --git a/.xmonad/scripts/autostart.sh b/.xmonad/scripts/autostart.sh old mode 100644 new mode 100755 diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 3dff9d9..d6a7aad 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -128,7 +128,7 @@ myStartupHook = do -- spawnOnce "~/.fehbg &" -- set last saved feh wallpaper -- spawnOnce "feh --randomize --bg-fill ~/wallpapers/*" -- feh set random wallpaper -- spawnOnce "nitrogen --restore &" -- if you prefer nitrogen to feh - setWMName "LG3D" + setWMName "LG3D" myColorizer :: Window -> Bool -> X (String, String) myColorizer = colorRangeFromClassName @@ -503,7 +503,7 @@ main = do -- xmproc0 <- spawnPipe "xmobar -x 0 $HOME/.config/xmobar/xmobarrc_desktop_qhd" -- xmproc1 <- spawnPipe "xmobar -x 1 $HOME/.config/xmobar/xmobarrc_desktop_fhd" xmproc0 <- spawnPipe "xmobar -x 2 $HOME/.config/xmobar/xmobarrc_labtop_fhd" - xmproc0 <- spawnPipe "polyb + -- xmproc0 <- spawnPipe "polyb -- the xmonad, ya know...what the WM is named after! xmonad $ ewmh def { manageHook = ( isFullscreen --> doFullFloat ) <+> myManageHook <+> manageDocks @@ -527,10 +527,10 @@ main = do , focusedBorderColor = myFocusColor , logHook = dynamicLogWithPP $ namedScratchpadFilterOutWorkspacePP $ xmobarPP -- the following variables beginning with 'pp' are settings for xmobar. - { ppOutput = \x -> hPutStrLn xmproc0 x -- xmobar on monitor 1 + { -- ppOutput = \x -> hPutStrLn xmproc0 x -- xmobar on monitor 1 -- >> hPutStrLn xmproc1 x -- xmobar on monitor 2 -- >> hPutStrLn xmproc2 x -- xmobar on monitor 3 - , ppCurrent = xmobarColor "#FFFFFF" "" . wrap "●" "" -- Current workspace + ppCurrent = xmobarColor "#FFFFFF" "" . wrap "●" "" -- Current workspace , ppVisible = xmobarColor "#c0a79a" "" . wrap "♼" "" . clickable -- Visible but not current workspace , ppHidden = xmobarColor "#c0a79a" "" . wrap "○" "" . clickable -- Hidden workspaces , ppHiddenNoWindows = xmobarColor "#c792ea" "" . \s -> "" -- Hidden workspaces (no windows) diff --git a/.xmonad/xmonad.org b/.xmonad/xmonad.org index 3ce395e..c3d9252 100644 --- a/.xmonad/xmonad.org +++ b/.xmonad/xmonad.org @@ -129,15 +129,15 @@ --spawnOnce "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 &" --spawnOnce "/usr/bin/emacs --daemon &" -- spawnOnce "/usr/bin/emacs --daemon &" -- emacs daemon for the emacsclient - -- spawnOnce "kak -d -s mysession &" -- kakoune daemon for better performance - -- spawnOnce "urxvtd -q -o -f &" -- urxvt daemon for better performance + -- spawnOnce "kak -d -s mysession &" -- kakoune daemon for better performance + -- spawnOnce "urxvtd -q -o -f &" -- urxvt daemon for better performance - --spawnOnce "xargs xwallpaper --stretch < ~/.xwallpaper" -- set last saved with xwallpaper - -- spawnOnce "/bin/ls ~/wallpapers | shuf -n 1 | xargs xwallpaper --stretch" -- set random xwallpaper - -- spawnOnce "~/.fehbg &" -- set last saved feh wallpaper - -- spawnOnce "feh --randomize --bg-fill ~/wallpapers/*" -- feh set random wallpaper - -- spawnOnce "nitrogen --restore &" -- if you prefer nitrogen to feh - setWMName "LG3D" + --spawnOnce "xargs xwallpaper --stretch < ~/.xwallpaper" -- set last saved with xwallpaper + -- spawnOnce "/bin/ls ~/wallpapers | shuf -n 1 | xargs xwallpaper --stretch" -- set random xwallpaper + -- spawnOnce "~/.fehbg &" -- set last saved feh wallpaper + -- spawnOnce "feh --randomize --bg-fill ~/wallpapers/*" -- feh set random wallpaper + -- spawnOnce "nitrogen --restore &" -- if you prefer nitrogen to feh + setWMName "LG3D" #+end_src ** Layout @@ -525,16 +525,16 @@ -- Launching three instances of xmobar on their monitors. -- xmproc0 <- spawnPipe "xmobar -x 0 $HOME/.config/xmobar/xmobarrc_desktop_qhd" -- xmproc1 <- spawnPipe "xmobar -x 1 $HOME/.config/xmobar/xmobarrc_desktop_fhd" - xmproc0 <- spawnPipe "xmobar -x 2 $HOME/.config/xmobar/xmobarrc_labtop_fhd" + -- xmproc0 <- spawnPipe "xmobar -x 2 $HOME/.config/xmobar/xmobarrc_labtop_fhd" -- the xmonad, ya know...what the WM is named after! xmonad $ ewmh def - { manageHook = ( isFullscreen --> doFullFloat ) <+> myManageHook <+> manageDocks + { -- manageHook = ( isFullscreen --> doFullFloat ) <+> myManageHook <+> manageDocks -- Run xmonad commands from command line with "xmonadctl command". Commands include: -- shrink, expand, next-layout, default-layout, restart-wm, xterm, kill, refresh, run, -- focus-up, focus-down, swap-up, swap-down, swap-master, sink, quit-wm. You can run -- "xmonadctl 0" to generate full list of commands written to ~/.xsession-errors. -- To compile xmonadctl: ghc -dynamic xmonadctl.hs - , handleEventHook = serverModeEventHookCmd + handleEventHook = serverModeEventHookCmd <+> serverModeEventHook <+> serverModeEventHookF "XMONAD_PRINT" (io . putStrLn) <+> docksEventHook diff --git a/scripts/init_script_arcolinux.sh b/scripts/init_script_arcolinux.sh index a721890..bf85d53 100755 --- a/scripts/init_script_arcolinux.sh +++ b/scripts/init_script_arcolinux.sh @@ -33,7 +33,7 @@ TMUX_PLUGIN_MANAGER_PATH=~/.config/tmux/plugins/tpm ~/.tmux/plugins/tpm/bin/upda #./install.sh # font -paru -S ttf-fira-code ttf-nanum nerd-fonts-mononoki --noconfirm +paru -S ttf-fira-code ttf-nanum nerd-fonts-mononoki ttf-monaco ttf-d2coding --noconfirm # hangul paru -S fcitx-hangul fcitx-configtool --noconfirm