1
0
Fork 0
mirror of https://github.com/Horhik/dotfiles.git synced 2024-11-22 16:31:26 +00:00

some updates

This commit is contained in:
horhik 2021-06-11 13:39:49 +03:00
parent 59b0414d02
commit 3a07f4c92e
7 changed files with 337 additions and 269 deletions

View file

@ -0,0 +1 @@
#s(lsp-session ("/home/horhik/code/competitive") nil #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()))

View file

@ -804,7 +804,16 @@
(add-hook 'c-mode-hook 'irony-mode) (add-hook 'c-mode-hook 'irony-mode)
(add-hook 'objc-mode-hook 'irony-mode) (add-hook 'objc-mode-hook 'irony-mode)
(add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options) (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
(setq irony-additional-clang-options
(append '("-std=c++17") irony-additional-clang-options))
)
(add-to-list 'auto-mode-alist '("\\.cpp\\'" . cpp-hook))
(add-to-list 'auto-mode-alist '("\\.cxx\\'" . cpp-hook))
(add-to-list 'auto-mode-alist '("\\.c++\\'" . cpp-hook))
(add-to-list 'auto-mode-alist '("\\.C\\'" . cpp-hook))
(defun cpp-hook ()
(c++-mode 1)
(lsp-mode 1)
) )
#+end_src #+end_src
** Markdown ** Markdown
@ -819,8 +828,9 @@
** Nix ** Nix
#+begin_src emacs-lisp #+begin_src emacs-lisp
;; (use-package direnv ;; (use-package direnv
;; :config ;; :config
;; (direnv-mode)) ;; (direnv-mode))
;; (add-hook 'lsp-mode-hook #'direnv-update-environment) ;; (add-hook 'lsp-mode-hook #'direnv-update-environment)
(use-package nix-mode)
#+end_src #+end_src

View file

@ -45,7 +45,7 @@
'(jdee-db-spec-breakpoint-face-colors (cons "#0d1011" "#928374")) '(jdee-db-spec-breakpoint-face-colors (cons "#0d1011" "#928374"))
'(objed-cursor-color "#fb4934") '(objed-cursor-color "#fb4934")
'(package-selected-packages '(package-selected-packages
'(neotree treemacs-persp spaceline-all-the-icons all-the-icons-ivy-rich all-the-icons-ivy treemacs-the-icons dired-icon treemacs-magit treemacs-projectile nlinum linum-mode unicode-fonts ewal-doom-themes ivy-rich which-key counsel org-roam treemacs-evil treemacs-all-the-icons treemacs use-package general gruvbox-theme flycheck-rust cargo linum-relative ac-racer lusty-explorer doom-modeline doom-themes rainbow-delimiters evil-mc rustic lsp-mode avy)) '(ivy-posframe nix-mode neotree treemacs-persp spaceline-all-the-icons all-the-icons-ivy-rich all-the-icons-ivy treemacs-the-icons dired-icon treemacs-magit treemacs-projectile nlinum linum-mode unicode-fonts ewal-doom-themes ivy-rich which-key counsel org-roam treemacs-evil treemacs-all-the-icons treemacs use-package general gruvbox-theme flycheck-rust cargo linum-relative ac-racer lusty-explorer doom-modeline doom-themes rainbow-delimiters evil-mc rustic lsp-mode avy))
'(pdf-view-midnight-colors (cons "#ebdbb2" "#282828")) '(pdf-view-midnight-colors (cons "#ebdbb2" "#282828"))
'(rustic-ansi-faces '(rustic-ansi-faces
["#282828" "#fb4934" "#b8bb26" "#fabd2f" "#83a598" "#cc241d" "#8ec07c" "#ebdbb2"]) ["#282828" "#fb4934" "#b8bb26" "#fabd2f" "#83a598" "#cc241d" "#8ec07c" "#ebdbb2"])

View file

@ -18,7 +18,6 @@ set -g status-justify centre
# set -g @plugin 'git@bitbucket.com:user/plugin' # set -g @plugin 'git@bitbucket.com:user/plugin'
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.config/tmux/plugins/tpm/tpm'
# Activity monitoring # Activity monitoring
@ -47,3 +46,9 @@ bind -r K resize-pane -U
bind -r J resize-pane -D bind -r J resize-pane -D
bind -r H resize-pane -L bind -r H resize-pane -L
bind -r L resize-pane -R bind -r L resize-pane -R
if "test ! -d ~/.tmux/plugins/tpm" \
"run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm'"
run '~/.tmux/plugins/tpm/tpm'

View file

@ -124,7 +124,8 @@
wpa_supplicant python3 xkblayout-state acpi yaru-theme wpa_supplicant python3 xkblayout-state acpi yaru-theme
pipewire pulsemixer nerdfonts pipewire pulsemixer nerdfonts
feh compton ninja meson cmake feh compton ninja meson cmake
anki clang_12 zathura redshift rustup neofetch tree anki clang_12 llvmPackages_12.libcxxabi
zathura redshift rustup neofetch tree
killall audacity thefuck killall audacity thefuck
polkit etcher gsettings-qt appimage-run pamixer unzip qjackctl gnome3.nautilus bluez pkgconfig pavucontrol bpytop polkit etcher gsettings-qt appimage-run pamixer unzip qjackctl gnome3.nautilus bluez pkgconfig pavucontrol bpytop
#nur.repos.reedrw.picom-next-ibhagwan #nur.repos.reedrw.picom-next-ibhagwan

View file

@ -73,6 +73,7 @@
home-manager.users.horhik = { home-manager.users.horhik = {
imports = [ imports = [
./modules/picom.nix ./modules/picom.nix
./modules/tmux.nix
]; ];
}; };
}) })

50
nix/modules/tmux.nix Normal file
View file

@ -0,0 +1,50 @@
{config, pkgs, ...}:
programs.tmux = {
enable = true;
clock24 = true;
extraPackages = tmuxPlugins : [tmux-gruvbox.gruvbox ];
extraTmuxConf = ''
set -g @plugin 'egel/tmux-gruvbox'
set -g @tmux-gruvbox 'dark' # or 'light'
# List of plugins
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
set -g mouse on
set -g history-limit 500000
setw -g monitor-activity on
set -g visual-activity on
set -g status-justify centre
#run '~/.config/tmux/plugins/tpm/tpm'
# Activity monitoring
set-option -g prefix C-space
setw -g monitor-activity on
set -g visual-activity on
# Vi copypaste mode
set-window-option -g mode-keys vi
bind-key -T copy-mode-vi v send-keys -X begin-selection
bind-key -T copy-mode-vi y send-keys -X copy-selection
# enable by r + v
bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
# word seperators for automatic word selection
setw -g word-separators ' '
# hjkl pane traversal
bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
bind l select-pane -R
# HJKL resize pane
bind -r K resize-pane -U
bind -r J resize-pane -D
bind -r H resize-pane -L
bind -r L resize-pane -R
'';
}