From e881d7c7f518cbe745c5174a114bc627950d07ba Mon Sep 17 00:00:00 2001 From: ALittlePatate Date: Thu, 2 Nov 2023 15:32:38 +0100 Subject: [PATCH] fixed emacs config, added picom to i3 --- .emacs | 43 +++++++++++++++++++++++++++++++++++++++++-- .emacs_lsp | 22 ++++++++++++++++++++++ .zshrc | 4 ++++ i3/config | 2 ++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/.emacs b/.emacs index 5da3485..fbf7a41 100755 --- a/.emacs +++ b/.emacs @@ -23,7 +23,6 @@ (show-paren-mode 1) (electric-pair-mode 1) (global-display-line-numbers-mode 1) -(global-font-lock-mode 0) (setq display-line-numbers-type 'relative) (set-face-attribute 'default nil :height 200) (global-set-key (kbd "") 'keyboard-escape-quit) @@ -31,7 +30,24 @@ (unless (package-installed-p 'gruvbox-theme) (package-install 'gruvbox-theme)) -(load-theme 'gruvbox-dark-soft t) + (load-theme 'gruvbox-dark-soft t) + +(setq-default display-fill-column-indicator-column 79) ; 80 column indicator - Emacs columns are 0-based... +(global-display-fill-column-indicator-mode 1) + +(setq neo-theme (if (display-graphic-p) 'icons)) + +;; emacs gdb +(fmakunbound 'gdb) +(fmakunbound 'gdb-enable-debug) + +(unless (package-installed-p 'gdb-mi) + (package-install 'gdb-mi)) + +(use-package gdb-mi + :init + (fmakunbound 'gdb) + (fmakunbound 'gdb-enable-debug)) ;; neotree (unless (package-installed-p 'neotree) @@ -57,6 +73,16 @@ (require 'evil) (evil-mode 1) +(defun my-untabify-all-lines () + "Select all lines in the buffer and run 'untabify' on them." + (interactive) + (save-excursion + (goto-char (point-min)) + (push-mark (point-max) t t) + (untabify (region-beginning) (region-end)))) + +(global-set-key (kbd "C-c C-x") 'my-untabify-all-lines) + ;; ;; Epitech configuration ;; @@ -64,3 +90,16 @@ (load "site-start.d/epitech-init.el") (setq-default indent-tabs-mode nil) +(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. + '(package-selected-packages + '(company simpleclip rust-mode org-cliplink neotree magit gruber-darker-theme go-mode evil dash-functional all-the-icons))) +(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_lsp b/.emacs_lsp index 14023f1..9ecc098 100755 --- a/.emacs_lsp +++ b/.emacs_lsp @@ -32,6 +32,9 @@ (load-theme 'gruvbox-dark-soft t) +(setq-default display-fill-column-indicator-column 79) ; 80 column indicator - Emacs columns are 0-based... +(global-display-fill-column-indicator-mode 1) + (unless (package-installed-p 'lsp-mode) (package-install 'lsp-mode)) @@ -42,6 +45,15 @@ (c-mode . lsp)) :commands lsp) +(require 'lsp-mode) +(lsp-register-client + (make-lsp-client :new-connection (lsp-stdio-connection '("/home/maxime/Downloads/ecsls/venv/bin/ecsls_run")) + :major-modes '(c-mode c++-mode makefile-mode) + :server-id 'ecsls)) + +(add-hook 'c-mode-hook 'lsp) +(add-hook 'c++-mode-hook 'lsp) +(add-hook 'makefile-mode-hook 'lsp) ;; company (unless (package-installed-p 'company) @@ -96,6 +108,16 @@ (require 'evil) (evil-mode 1) +(defun my-untabify-all-lines () + "Select all lines in the buffer and run 'untabify' on them." + (interactive) + (save-excursion + (goto-char (point-min)) + (push-mark (point-max) t t) + (untabify (region-beginning) (region-end)))) + +(global-set-key (kbd "C-c C-x") 'my-untabify-all-lines) + ;; ;; Epitech configuration ;; diff --git a/.zshrc b/.zshrc index e60acfb..be01153 100644 --- a/.zshrc +++ b/.zshrc @@ -4,6 +4,7 @@ # Path to your oh-my-zsh installation. export ZSH="$HOME/.oh-my-zsh" +export PATH=$HOME/my_scripts:$PATH # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -116,3 +117,6 @@ alias ls='eza' alias lt='eza --tree' neofetch + +# Created by `pipx` on 2023-11-02 13:38:50 +export PATH="$PATH:/home/maxime/.local/bin" diff --git a/i3/config b/i3/config index b457dd8..454323b 100755 --- a/i3/config +++ b/i3/config @@ -15,6 +15,8 @@ exec xinput set-prop "Elan Touchpad" "libinput Tapping Enabled" 1 exec_always feh --bg-scale ~/dotfiles/bg.png exec --no-startup-id dunst +exec --no-startup-id picom -D 0 + # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. # font pango:monospace 8