From 5efc3f77ebc158b0fc49f4341c0f950003924e1b Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:18:48 +0000 Subject: [PATCH] hold on im getting somewhere' --- bin/symlink-configuration-to-home.sh | 8 +++++++ config/emacs/emacs.org | 33 +++++++++------------------- config/emacs/init.el | 18 ++------------- 3 files changed, 20 insertions(+), 39 deletions(-) create mode 100644 bin/symlink-configuration-to-home.sh diff --git a/bin/symlink-configuration-to-home.sh b/bin/symlink-configuration-to-home.sh new file mode 100644 index 00000000..e70a42a3 --- /dev/null +++ b/bin/symlink-configuration-to-home.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# run this after login + +cp -r /etc/nixos ~/nixos +sudo rm -rf /etc/nixos +sudo ln -sf ~/nixos /etc/nixos +echo 'done' diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index 8fc883a0..443ec439 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -177,15 +177,16 @@ M-x org-bable-tangle #+end_src ** General Leader Key #+begin_src emacs-lisp -(use-package general - :config - (general-create-definer sakomacs/leader-keys - :keymaps `(normal insert visual emacs) - :prefix "SPC" - :global-prefix "C-SPC") - (sakomacs/leader-keys - "t" `(:ignore t :which-key "toggles") - "tt" `(counsel-load-theme :which-key "choose theme"))) + (use-package general + :config + (general-create-definer sakomacs/leader-keys + :keymaps `(normal insert visual emacs) + :prefix "SPC" + :global-prefix "C-SPC") + (sakomacs/leader-keys + "t" `(:ignore t :which-key "toggles") + "tt" `(counsel-load-theme :which-key "choose theme") + "ee" `(treemacs))) #+end_src ** Evil Mode (vim) #+begin_src emacs-lisp @@ -436,7 +437,6 @@ M-x org-bable-tangle (:map global-map ("M-0" . treemacs-select-window) ("C-x t 1" . treemacs-delete-other-windows) - ("SPC e" . treemacs) ("C-x t d" . treemacs-select-directory) ("C-x t B" . treemacs-bookmark) ("C-x t C-t" . treemacs-find-file) @@ -450,23 +450,10 @@ M-x org-bable-tangle :after (treemacs projectile) :ensure t) -(use-package treemacs-icons-dired - :hook (dired-mode . treemacs-icons-dired-enable-once) - :ensure t) - (use-package treemacs-magit :after (treemacs magit) :ensure t) -(use-package treemacs-persp ;;treemacs-perspective if you use perspective.el vs. persp-mode - :after (treemacs persp-mode) ;;or perspective vs. persp-mode - :ensure t - :config (treemacs-set-scope-type 'Perspectives)) - -(use-package treemacs-tab-bar ;;treemacs-tab-bar if you use tab-bar-mode - :after (treemacs) - :ensure t - :config (treemacs-set-scope-type 'Tabs)) #+end_src ** Dev Packages *** Magit (git in emacs) diff --git a/config/emacs/init.el b/config/emacs/init.el index d684448a..88dbc3a8 100644 --- a/config/emacs/init.el +++ b/config/emacs/init.el @@ -140,7 +140,8 @@ :global-prefix "C-SPC") (sakomacs/leader-keys "t" `(:ignore t :which-key "toggles") - "tt" `(counsel-load-theme :which-key "choose theme"))) + "tt" `(counsel-load-theme :which-key "choose theme") + "ee" `(treemacs))) (use-package evil :init @@ -381,7 +382,6 @@ (:map global-map ("M-0" . treemacs-select-window) ("C-x t 1" . treemacs-delete-other-windows) - ("SPC e" . treemacs) ("C-x t d" . treemacs-select-directory) ("C-x t B" . treemacs-bookmark) ("C-x t C-t" . treemacs-find-file) @@ -395,24 +395,10 @@ :after (treemacs projectile) :ensure t) -(use-package treemacs-icons-dired - :hook (dired-mode . treemacs-icons-dired-enable-once) - :ensure t) - (use-package treemacs-magit :after (treemacs magit) :ensure t) -(use-package treemacs-persp ;;treemacs-perspective if you use perspective.el vs. persp-mode - :after (treemacs persp-mode) ;;or perspective vs. persp-mode - :ensure t - :config (treemacs-set-scope-type 'Perspectives)) - -(use-package treemacs-tab-bar ;;treemacs-tab-bar if you use tab-bar-mode - :after (treemacs) - :ensure t - :config (treemacs-set-scope-type 'Tabs)) - (use-package magit :custom (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))