From ab8cdcd03986119890ffcda25125b2fabda71b6f Mon Sep 17 00:00:00 2001 From: nya Date: Fri, 23 Apr 2021 12:15:19 -0500 Subject: [PATCH 1/3] move emacs files to XDG_CONFIG_HOME --- .config/.emacs | 35 +++++++++++++++++++ .emacs => .config/emacs/init.el | 15 ++++---- .../emacs}/themes/nyan-theme.el | 0 3 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 .config/.emacs rename .emacs => .config/emacs/init.el (59%) rename {.emacs.d => .config/emacs}/themes/nyan-theme.el (100%) diff --git a/.config/.emacs b/.config/.emacs new file mode 100644 index 0000000..864db3d --- /dev/null +++ b/.config/.emacs @@ -0,0 +1,35 @@ +(require 'sudo-edit) +(require 'xterm-color) +(require 'package) +(add-to-list 'package-archives + '("melpa" . "https://melpa.org/packages/") t) +(add-to-list 'package-archives + '("org" . "https://orgmode.org/elpa/") t) +(package-initialize) +(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. + '(custom-enabled-themes '(nyan)) + '(custom-file "~/.config/.emacs") + '(custom-safe-themes + '("f3d88904f7c4a25cd6d0fad6cf1f5da9045a83a056f97540127fc7f8c26f8caf" default)) + '(custom-theme-directory "~/.emacs.d/themes") + '(fringe-mode 0 nil (fringe)) + '(gnus-init-file "~/config/.gnus.el") + '(initial-scratch-message nil) + '(package-selected-packages '(mingus sudo-edit xterm-color vterm org multi-vterm)) + '(scroll-bar-mode 'left) + '(tab-bar-mode t) + '(use-file-dialog nil)) +(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 (:family "lucy tewi" :foundry "lucy" :slant normal :weight normal :height 83 :width normal)))) + '(fringe ((t nil))) + '(tab-bar ((t (:inherit variable-pitch :background "grey85" :foreground "black" :height 1.15 :foundry "lucy" :family "lucy tewi")))) + '(tab-bar-tab ((t (:inherit tab-bar :box (:line-width 1 :style released-button))))) + '(tab-bar-tab-inactive ((t (:inherit tab-bar-tab :background "grey75"))))) diff --git a/.emacs b/.config/emacs/init.el similarity index 59% rename from .emacs rename to .config/emacs/init.el index 8f03e41..d461dbf 100644 --- a/.emacs +++ b/.config/emacs/init.el @@ -1,5 +1,3 @@ -(require 'sudo-edit) -(require 'xterm-color) (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) @@ -10,12 +8,13 @@ '(custom-enabled-themes '(nyan)) '(custom-safe-themes '("f3d88904f7c4a25cd6d0fad6cf1f5da9045a83a056f97540127fc7f8c26f8caf" default)) - '(custom-theme-directory "~/.emacs.d/themes") - '(fringe-mode 0 nil (fringe)) - '(initial-scratch-message nil) - '(package-selected-packages '(sudo-edit xterm-color vterm org multi-vterm)) - '(scroll-bar-mode 'left) + '(custom-theme-directory "~/.config/emacs/themes") + '(package-selected-packages '(ampc multi-vterm sudo-edit vterm org)) + '(tab-bar-mode t) + '(tab-bar-show t) '(use-file-dialog nil)) (custom-set-faces '(default ((t (:family "lucy tewi" :foundry "lucy" :slant normal :weight normal :height 83 :width normal)))) - '(fringe ((t nil)))) + '(fringe ((t nil))) + '(tab-bar-tab ((t (:inherit tab-bar :box (:line-width 1 :style released-button))))) + '(tab-bar-tab-inactive ((t (:inherit tab-bar-tab :background "grey75"))))) diff --git a/.emacs.d/themes/nyan-theme.el b/.config/emacs/themes/nyan-theme.el similarity index 100% rename from .emacs.d/themes/nyan-theme.el rename to .config/emacs/themes/nyan-theme.el From ea949f42b17cdde92ddaeb1292d5e81b505d7673 Mon Sep 17 00:00:00 2001 From: nya Date: Fri, 23 Apr 2021 12:19:37 -0500 Subject: [PATCH 2/3] add xdg-dirs-update file --- .config/user-dirs.dirs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .config/user-dirs.dirs diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs new file mode 100644 index 0000000..906609f --- /dev/null +++ b/.config/user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run. +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="$HOME/desk" +XDG_DOWNLOAD_DIR="$HOME/dls" +XDG_TEMPLATES_DIR="$HOME/temp" +XDG_PUBLICSHARE_DIR="$HOME/pub" +XDG_DOCUMENTS_DIR="$HOME/docs" +XDG_MUSIC_DIR="$HOME/music" +XDG_PICTURES_DIR="$HOME/pics" +XDG_VIDEOS_DIR="$HOME/vids" From 87714b7968036cdc516b77b3be8fd9efd4c168e9 Mon Sep 17 00:00:00 2001 From: nya Date: Fri, 23 Apr 2021 12:25:41 -0500 Subject: [PATCH 3/3] remove leftover file --- .config/.emacs | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .config/.emacs diff --git a/.config/.emacs b/.config/.emacs deleted file mode 100644 index 864db3d..0000000 --- a/.config/.emacs +++ /dev/null @@ -1,35 +0,0 @@ -(require 'sudo-edit) -(require 'xterm-color) -(require 'package) -(add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/") t) -(add-to-list 'package-archives - '("org" . "https://orgmode.org/elpa/") t) -(package-initialize) -(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. - '(custom-enabled-themes '(nyan)) - '(custom-file "~/.config/.emacs") - '(custom-safe-themes - '("f3d88904f7c4a25cd6d0fad6cf1f5da9045a83a056f97540127fc7f8c26f8caf" default)) - '(custom-theme-directory "~/.emacs.d/themes") - '(fringe-mode 0 nil (fringe)) - '(gnus-init-file "~/config/.gnus.el") - '(initial-scratch-message nil) - '(package-selected-packages '(mingus sudo-edit xterm-color vterm org multi-vterm)) - '(scroll-bar-mode 'left) - '(tab-bar-mode t) - '(use-file-dialog nil)) -(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 (:family "lucy tewi" :foundry "lucy" :slant normal :weight normal :height 83 :width normal)))) - '(fringe ((t nil))) - '(tab-bar ((t (:inherit variable-pitch :background "grey85" :foreground "black" :height 1.15 :foundry "lucy" :family "lucy tewi")))) - '(tab-bar-tab ((t (:inherit tab-bar :box (:line-width 1 :style released-button))))) - '(tab-bar-tab-inactive ((t (:inherit tab-bar-tab :background "grey75")))))