commit d3b847215036990cf51afadb2458ea0ed3bcabd7
parent f5f544cfcc837bf797398fe3d23518895077e485
Author: Ryan Jeffrey <pwishie@gmail.com>
Date: Wed, 6 Nov 2019 23:08:15 -0800
Merge branch 'master' of https://github.com/Ma11ock/dotfiles
Diffstat:
5 files changed, 299 insertions(+), 60 deletions(-)
diff --git a/.config/i3/config b/.config/i3/config
@@ -0,0 +1,187 @@
+
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+
+set $mod Mod4
+gaps inner 15
+gaps outer 15
+
+# Thinkpad multimedia keys
+
+bindsym $mod+Return exec xterm
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+bindsym $mod+e exec emacsclient -c .zshrc
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+font pango:DejaVu Sans:style=regular
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+# bindsym $mod+Return exec xterm
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# for window, order sometimes matters
+for_window [class="^.*"] border pixel 1
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+p layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+ # These bindings trigger as soon as you enter the resize mode
+
+ # Pressing left will shrink the window’s width.
+ # Pressing right will grow the window’s width.
+ # Pressing up will shrink the window’s height.
+ # Pressing down will grow the window’s height.
+ bindsym j resize shrink width 10 px or 10 ppt
+ bindsym k resize grow height 10 px or 10 ppt
+ bindsym l resize shrink height 10 px or 10 ppt
+ bindsym semicolon resize grow width 10 px or 10 ppt
+
+ # same bindings, but for the arrow keys
+ bindsym Left resize shrink width 10 px or 10 ppt
+ bindsym Down resize grow height 10 px or 10 ppt
+ bindsym Up resize shrink height 10 px or 10 ppt
+ bindsym Right resize grow width 10 px or 10 ppt
+
+ # back to normal: Enter or Escape or $mod+r
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+ bindsym $mod+r mode "default"
+}
+
+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
+}
+
+exec --no-startup-id compton -b
+
+exec --no-startup-id feh --bg-scale /home/ryan/Pictures/Gnu_wallpaper.png
diff --git a/.config/i3status/config b/.config/i3status/config
@@ -0,0 +1,76 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+ colors = true
+ interval = 5
+ color_good = "#1793d0"
+}
+
+#order += "ipv6"
+order += "volume master"
+order += "wireless _first_"
+order += "ethernet _first_"
+order += "battery all"
+order += "disk /"
+#order += "load"
+order += "cpu_usage"
+order += "memory"
+order += "cpu_temperature 0"
+order += "tztime local"
+
+wireless _first_ {
+ format_up = "Wifi: (%quality at %essid) %ip"
+ format_down = "Wifi: down"
+}
+
+ethernet _first_ {
+ format_up = "Eth: %ip (%speed)"
+ format_down = "Eth: down"
+}
+
+battery all {
+ integer_battery_capacity = true
+ last_full_capacity = true
+ format_down = "No battery"
+ format = "Bat: %percentage %remaining"
+}
+
+disk "/" {
+ format = "/ %avail"
+}
+
+cpu_usage {
+ format = "CPU: %usage"
+}
+
+load {
+ format = "%1min \%"
+}
+
+volume master {
+ format = "♪ %volume"
+ format_muted = "♪ muted (%volume)"
+ device = "pulse"
+}
+
+memory {
+ format = "Used: %used | Free: %available"
+ threshold_degraded = "1G"
+ format_degraded = "MEMORY < %available"
+}
+
+
+cpu_temperature 0 {
+ format = "%degrees °C"
+ path = "/sys/class/thermal/thermal_zone0/temp"
+}
+
+tztime local {
+ format = "%I:%M %p"
+}
diff --git a/.econfig.org b/.econfig.org
@@ -7,23 +7,26 @@
** init
#+BEGIN_SRC emacs-lisp
+(server-start)
+
(eval-when-compile
(require 'use-package))
(defalias 'yes-or-no-p 'y-or-n-p)
+ (set-frame-parameter (selected-frame) 'alpha '(90 . 50))
+ (add-to-list 'default-frame-alist '(alpha . (90 . 50)))
+
#+END_SRC
** font and theme
#+BEGIN_SRC emacs-lisp
(add-to-list 'default-frame-alist
- '(font . "DejaVu Sans Mono:antialias=true:size=16:style=Regular"))
+ '(font . "Droid Sans Mono:antialias=true:size=16:style=Regular"))
(add-to-list 'load-path "~/.emacs.d/themes/")
-(if (display-graphic-p)
- (load-theme 'aanila t)
- (load-theme 'manoj-dark t))
+(load-theme 'manoj-dark2 t)
#+END_SRC
** Ivy-mode
@@ -105,9 +108,13 @@
"~/.emacs.d/joestar/"
:config
(joestar-mode t))
+
(dolist (hook '(prog-mode-hook text-mode-hook help-mode-hook dired-mode-hook))
(add-hook hook #'joestar-mode))
+(global-set-key (kbd "S-<right>") 'joe-nbuf)
+(global-set-key (kbd "S-<left>") 'joe-pbuf)
+
#+END_SRC
** org
#+BEGIN_SRC emacs-lisp
@@ -162,6 +169,7 @@
#+END_SRC
** C/C++
*** style and font-lock
+
#+BEGIN_SRC emacs-lisp
(setq c-default-style "linux"
@@ -171,64 +179,28 @@
(modern-c++-font-lock-global-mode t)
#+END_SRC
-*** rtags
+*** autocomplete and yasnippet
#+BEGIN_SRC emacs-lisp
-(add-to-list 'load-path "/home/ryan/CSProjects/rtags")
+(defun my:ac-c-headers-init ()
+ (require 'auto-complete-c-headers)
+ (add-to-list 'ac-sources 'ac-source-c-headers)
+ (add-to-list 'achead:include-directories '"/usr/include/c++/9.2.0"))
-(use-package rtags
- :init
- (set-variable 'rtags-path "/usr/local/bin/")
- :config
- (progn
- (unless (rtags-executable-find "rc") (error "Binary rc is not installed!"))
- (unless (rtags-executable-find "rdm") (error "Binary rdm is not installed!"))
- (define-key c-mode-base-map (kbd "M-.") 'rtags-find-symbol-at-point)
- (define-key c-mode-base-map (kbd "M-,") 'rtags-find-references-at-point)
- (define-key c-mode-base-map (kbd "M-?") 'rtags-display-summary)
- (rtags-enable-standard-keybindings)
+(add-hook 'c++-mode-hook 'my:ac-c-headers-init)
+(add-hook 'c-mode-hook 'my:ac-c-headers-init)
- (setq rtags-use-ivy t)
- ;; Shutdown rdm when leaving emacs.
- (add-hook 'kill-emacs-hook 'rtags-quit-rdm)
- ))
+(add-hook 'c++-mode-hook
+ (lambda () (setq flycheck-clang-language-standard "c++17")))
-;; TODO: Has no coloring! How can I get coloring?
-(use-package ivy-rtags
- :config
- (progn
- (setq rtags-display-result-backend 'ivy)
- ))
+(Require 'yasnippet)
+(yas-reload-all)
+(add-hook 'prog-mode-hook #'yas-minor-mode)
-;; Use rtags for auto-completion.
-(use-package company-rtags
- :config
- (progn
- (setq rtags-autostart-diagnostics t)
- (rtags-diagnostics)
- (setq rtags-completions-enabled t)
- (push 'company-rtags company-backends)
- ))
-
-;; Live code checking.
-(use-package flycheck-rtags
- :config
- (progn
- ;; ensure that we use only rtags checking
- ;; https://github.com/Andersbakken/rtags#optional-1
- (defun setup-flycheck-rtags ()
- (flycheck-select-checker 'rtags)
- (setq-local flycheck-highlighting-mode nil) ;; RTags creates more accurate overlays.
- (setq-local flycheck-check-syntax-automatically nil)
- (rtags-set-periodic-reparse-timeout 2.0) ;; Run flycheck 2 seconds after being idle.
- )
- (add-hook 'c-mode-hook #'setup-flycheck-rtags)
- (add-hook 'c++-mode-hook #'setup-flycheck-rtags)
- ))
-
#+END_SRC
+
** lisp
#+BEGIN_SRC emacs-lisp
@@ -242,6 +214,9 @@
(setq geiser-active-implementations '(guile))
+
+(add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
+
#+END_SRC
** Misc
diff --git a/.emacs b/.emacs
@@ -18,16 +18,16 @@
;; If there is more than one, they won't work right.
'(LaTeX-command "lualatex")
'(company-c-headers-path-system
- (quote
- ("/usr/include/" "/usr/local/include/" "/usr/include/c++/8.3.0/")))
+ '("/usr/include/" "/usr/local/include/" "/usr/include/c++/9.2.0/"))
'(package-selected-packages
- (quote
- (rainbow-delimiters flycheck go-mode impatient-mode xah-css-mode psgml emmet-mode web-mode auctex-latexmk company-auctex pdf-view-restore fic-mode seti-theme vimrc-mode use-package-hydra use-package-ensure-system-package use-package-el-get use-package-chords telephone-line ssh spacemacs-theme soothe-theme smooth-scrolling smooth-scroll slime scroll-restore robe req-package rebox2 rainbow-mode racer projectile pretty-mode php-mode pdf-tools org-mime org-babel-eval-in-repl night-owl-theme neotree multi-term modern-cpp-font-lock magit linum-relative klere-theme ivy-rtags iedit hydra hungry-delete hlinum highlight-indentation highlight-indent-guides helm grandshell-theme ggtags geiser flycheck-rust flycheck-perl6 fish-mode evil elfeed-org cyberpunk-theme counsel company-rtags company-irony-c-headers company-c-headers cmake-mode cmake-ide clojure-mode-extra-font-locking cider chess cargo auto-complete-clang auto-complete-c-headers auctex ample-theme)))
+ '(yasnippet-snippets yasnippet rainbow-delimiters flycheck go-mode impatient-mode xah-css-mode psgml emmet-mode web-mode auctex-latexmk company-auctex pdf-view-restore fic-mode seti-theme vimrc-mode use-package-hydra use-package-ensure-system-package use-package-el-get use-package-chords telephone-line ssh spacemacs-theme soothe-theme smooth-scrolling smooth-scroll slime scroll-restore robe req-package rebox2 rainbow-mode racer projectile pretty-mode php-mode pdf-tools org-mime org-babel-eval-in-repl night-owl-theme neotree multi-term modern-cpp-font-lock magit linum-relative klere-theme ivy-rtags iedit hydra hungry-delete hlinum highlight-indentation highlight-indent-guides helm grandshell-theme ggtags geiser flycheck-rust flycheck-perl6 fish-mode evil elfeed-org cyberpunk-theme counsel company-rtags company-irony-c-headers company-c-headers cmake-mode cmake-ide clojure-mode-extra-font-locking cider chess cargo auto-complete-clang auto-complete-c-headers auctex ample-theme))
'(pdf-view-continuous nil)
'(safe-local-variable-values
- (quote
- ((projectile-project-run-cmd . "mkdir -p build; cd build; cmake ..; make run")
- (projectile-project-compilation-cmd . "mkdir -p build; cd build; cmake ..; make")))))
+ '((achead:include-directories "./head/")
+ (add-to-list 'flycheck-clang-include-path '"./head/")
+ (add-to-list 'achead:include-directories '"./head/")
+ (projectile-project-run-cmd . "mkdir -p build; cd build; cmake ..; make run")
+ (projectile-project-compilation-cmd . "mkdir -p build; cd build; cmake ..; make"))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/dir-locals.el b/dir-locals.el
@@ -0,0 +1 @@
+((c++-mode . ((flycheck-clang-include-path . ("/home/ryan/src/misc-sdl-projects/arkanoid/head/")))))
