From fb41333e345fc689c5ee33ba141ff8c2ca267150 Mon Sep 17 00:00:00 2001 From: ALittlePatate Date: Thu, 26 Oct 2023 16:35:51 +0200 Subject: [PATCH] update .emacs, gruvbox theme, using kitty --- .Xresources | 90 ++++++++++++++++------------------------ .emacs | 56 +------------------------ .emacs_bak => .emacs_lsp | 56 ++++++++++++++++++++++++- MANIFEST.linux | 2 + dunstrc | 43 +++++++++++++++++++ i3/config | 52 +++++++++++++++++++---- kitty.conf | 56 +++++++++++++++++++++++++ 7 files changed, 238 insertions(+), 117 deletions(-) rename .emacs_bak => .emacs_lsp (50%) create mode 100644 dunstrc create mode 100644 kitty.conf diff --git a/.Xresources b/.Xresources index ab8dce6..d2ba55f 100755 --- a/.Xresources +++ b/.Xresources @@ -3,61 +3,43 @@ Xft.antialias: 1 Xft.hinting: 1 Xft.hintstyle: hintmedium -URxvt.termName: rxvt -URxvt*depth: 32 -URxvt.transparent: false -URxvt.font: xft:mono:size=22 -URxvt.scrollBar: false -URxvt.iconFile: .rexim/icons/terminal-icon.png -URxvt*lineSpace: -1 -URxvt*letterSpace: -1 +*termName: rxvt +*depth: 32 +*transparent: false +*font: xft:mono:size=22 +*scrollBar: false +*iconFile: .rexim/icons/terminal-icon.png +*lineSpace: -1 +*letterSpace: -1 -! Gruber-Darker -URxvt*foreground: #e4e4ef -URxvt*background: #181818 -URxvt*color0: #2E3436 -URxvt*color1: #a40000 -URxvt*color2: #4E9A06 -URxvt*color3: #C4A000 -URxvt*color4: #3465A4 -URxvt*color5: #75507B -URxvt*color6: #ce5c00 -URxvt*color7: #babdb9 -URxvt*color8: #555753 -URxvt*color9: #EF2929 -URxvt*color10: #8AE234 -URxvt*color11: #FCE94F -URxvt*color12: #729FCF -URxvt*color13: #AD7FA8 -URxvt*color14: #fcaf3e -URxvt*color15: #EEEEEC - -! ! Zenburn -! URxvt*background: #3f3f3f -! URxvt*foreground: #dcdccc -! URxvt*cursorColor: #aaaaaa -! ! URxvt*colorUL: #366060 -! ! URxvt*underlineColor: #dfaf8f -! URxvt*color0: #3f3f3f -! URxvt*color1: #cc9393 -! URxvt*color2: #7f9f7f -! URxvt*color3: #d0bf8f -! URxvt*color4: #6ca0a3 -! URxvt*color5: #dc8cc3 -! URxvt*color6: #93e0e3 -! URxvt*color7: #dcdccc -! URxvt*color8: #989890 -! URxvt*color9: #dca3a3 -! URxvt*color10: #bfebbf -! URxvt*color11: #f0dfaf -! URxvt*color12: #8cd0d3 -! URxvt*color13: #dc8cc3 -! URxvt*color14: #93e0e3 -! URxvt*color15: #ffffff - -! Adwaita -! URxvt*background: #EDEDED -! URxvt*foreground: #2E3436 +! hard contrast: *background: #1d2021 +*background: #282828 +! soft contrast: *background: #32302f +*foreground: #ebdbb2 +! Black + DarkGrey +*color0: #282828 +*color8: #928374 +! DarkRed + Red +*color1: #cc241d +*color9: #fb4934 +! DarkGreen + Green +*color2: #98971a +*color10: #b8bb26 +! DarkYellow + Yellow +*color3: #d79921 +*color11: #fabd2f +! DarkBlue + Blue +*color4: #458588 +*color12: #83a598 +! DarkMagenta + Magenta +*color5: #b16286 +*color13: #d3869b +! DarkCyan + Cyan +*color6: #689d6a +*color14: #8ec07c +! LightGrey + White +*color7: #a89984 +*color15: #ebdbb2 URxvt.perl-ext-common: resize-font,matcher URxvt.url-launcher: /usr/bin/xdg-open diff --git a/.emacs b/.emacs index 14023f1..5da3485 100755 --- a/.emacs +++ b/.emacs @@ -23,6 +23,7 @@ (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) @@ -30,47 +31,7 @@ (unless (package-installed-p 'gruvbox-theme) (package-install 'gruvbox-theme)) - (load-theme 'gruvbox-dark-soft t) - -(unless (package-installed-p 'lsp-mode) - (package-install 'lsp-mode)) - -(use-package lsp-mode - :init - :config - :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) - (c-mode . lsp)) - :commands lsp) - - -;; company -(unless (package-installed-p 'company) - (package-install 'company)) - -(use-package company - :after lsp-mode - :hook (prog-mode . company-mode) - :bind (:map company-active-map - ("" . company-complete-selection)) - (:map lsp-mode-map - ("" . company-indent-or-complete-common)) - :custom - (company-minimum-prefix-length 1) - (company-idle-delay 0.0)) - -(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)) +(load-theme 'gruvbox-dark-soft t) ;; neotree (unless (package-installed-p 'neotree) @@ -103,16 +64,3 @@ (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_bak b/.emacs_lsp similarity index 50% rename from .emacs_bak rename to .emacs_lsp index 5da3485..14023f1 100755 --- a/.emacs_bak +++ b/.emacs_lsp @@ -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,47 @@ (unless (package-installed-p 'gruvbox-theme) (package-install 'gruvbox-theme)) -(load-theme 'gruvbox-dark-soft t) + (load-theme 'gruvbox-dark-soft t) + +(unless (package-installed-p 'lsp-mode) + (package-install 'lsp-mode)) + +(use-package lsp-mode + :init + :config + :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) + (c-mode . lsp)) + :commands lsp) + + +;; company +(unless (package-installed-p 'company) + (package-install 'company)) + +(use-package company + :after lsp-mode + :hook (prog-mode . company-mode) + :bind (:map company-active-map + ("" . company-complete-selection)) + (:map lsp-mode-map + ("" . company-indent-or-complete-common)) + :custom + (company-minimum-prefix-length 1) + (company-idle-delay 0.0)) + +(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) @@ -64,3 +103,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/MANIFEST.linux b/MANIFEST.linux index fc5460d..f33a508 100755 --- a/MANIFEST.linux +++ b/MANIFEST.linux @@ -1,6 +1,8 @@ .Xresources|symlink| .tmux.conf|symlink| .vimrc|symlink| +dunstrc|symlink|.config/dunst +kitty.conf|symlink|.config/kitty i3|symlink|.config .screenlayout|symlink| .ghci|symlink| diff --git a/dunstrc b/dunstrc new file mode 100644 index 0000000..7244547 --- /dev/null +++ b/dunstrc @@ -0,0 +1,43 @@ +[global] + font = "Lato 9" + markup = yes + format = "%s\n%b" + sort = yes + indicate_hidden = yes + alignment = center + show_age_threshold = 60 + word_wrap = yes + ignore_newline = no + transparency = 1 + idle_threshold = 120 + monitor = 0 + follow = keyboard + sticky_history = yes + line_height = 0 + separator_height = 2 + padding = 8 + horizontal_padding = 8 + icon_position = left + icon_path = /usr/share/icons/Arc/status/16/:/usr/share/icons/Arc/devices/16/ + max_icon_size = 64 + separator_color = "#585858" + frame_width = 1 + frame_color = "#282828" + +[urgency_low] + background = "#383838" + foreground = "#ebdbb2" + timeout = 5 + +[urgency_normal] + background = "#383838" + foreground = "#ebdbb2" + timeout = 20 + +[urgency_critical] + background = "#383838" + foreground = "#ebdbb2" + timeout = 0 + +[spotify] + appname = *Spotify* \ No newline at end of file diff --git a/i3/config b/i3/config index 018b83d..d856bfc 100755 --- a/i3/config +++ b/i3/config @@ -13,6 +13,7 @@ set $mod Mod4 exec xinput set-prop "Elan Touchpad" "libinput Tapping Enabled" 1 exec_always feh --bg-scale ~/dotfiles/bg.png +exec --no-startup-id dunst # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. @@ -35,7 +36,8 @@ font pango:Iosevka 9 floating_modifier $mod # start a terminal -bindsym $mod+Return exec i3-sensible-terminal +exec xrdb ~/dotfiles/.Xresources +bindsym $mod+Return exec kitty # Pulse Audio controls #alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink @@ -168,12 +170,6 @@ mode "resize" { bindsym $mod+r mode "resize" -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - status_command i3status -} - bindsym Mod1+F1 exec "~/bin/hhkb-i3" bindsym $mod+Shift+h exec "~/.screenlayout/home-setup.sh" bindsym $mod+Shift+p exec "~/.screenlayout/portable-setup.sh" @@ -187,3 +183,45 @@ focus_follows_mouse no hide_edge_borders both +####### +#THEME# +####### + +# set primary gruvbox colorscheme colors +set $bg #282828 +set $red #cc241d +set $green #98971a +set $yellow #ffffff +set $white #ffffff +set $blue #458588 +set $purple #b16286 +set $aqua #689d68 +set $gray #a89984 +set $darkgray #1d2021 + +#start of bar section +bar { + status_command i3status + colors { + # bar background color + background $bg + # text color used for blocks that do not have a color specified. + statusline $yellow + # workspaces section + # border backgr. text + focused_workspace $aqua $aqua $darkgray + inactive_workspace $darkgray $darkgray $yellow + active_workspace $darkgray $darkgray $yellow + urgent_workspace $red $red $bg + } +} +#end of bar section + +#start of window title bars & borders section + +# green gruvbox +# class border|backgr|text|indicator|child_border +client.focused_inactive $darkgray $darkgray $yellow $purple $darkgray +client.urgent $red $red $white $red $red +client.focused $aqua $aqua $darkgray $purple $darkgray +client.unfocused $darkgray $darkgray $gray $aqua $darkgray \ No newline at end of file diff --git a/kitty.conf b/kitty.conf new file mode 100644 index 0000000..36f94ce --- /dev/null +++ b/kitty.conf @@ -0,0 +1,56 @@ +# Based on https://github.com/morhetz/gruvbox by morhetz +# Adapted to kitty by wdomitrz + +font_size 22.0 +cursor #928374 +cursor_text_color background + +url_color #83a598 + +visual_bell_color #8ec07c +bell_border_color #8ec07c + +active_border_color #d3869b +inactive_border_color #665c54 + +foreground #ebdbb2 +background #282828 +selection_foreground #928374 +selection_background #ebdbb2 + +active_tab_foreground #fbf1c7 +active_tab_background #665c54 +inactive_tab_foreground #a89984 +inactive_tab_background #3c3836 + +# black (bg3/bg4) +color0 #665c54 +color8 #7c6f64 + +# red +color1 #cc241d +color9 #fb4934 + +#: green +color2 #98971a +color10 #b8bb26 + +# yellow +color3 #d79921 +color11 #fabd2f + +# blue +color4 #458588 +color12 #83a598 + +# purple +color5 #b16286 +color13 #d3869b + +# aqua +color6 #689d6a +color14 #8ec07c + +# white (fg4/fg3) +color7 #a89984 +color15 #bdae93 \ No newline at end of file