diff --git a/files/.xinitrc b/files/.xinitrc index 8c4be09..67a403b 100755 --- a/files/.xinitrc +++ b/files/.xinitrc @@ -41,7 +41,7 @@ export _JAVA_AWT_WM_NONREPARENTING=1 if [ `hostname` == "nazarick" ];then xrandr --output DP-2 --mode 3440x1440 --rate 99.98 --primary xrandr --output DP-1 --off - feh --bg-scale $HOME/data/nextcloud/wallpaper/wallpaper219.png + feh --bg-fill $HOME/data/nextcloud/wallpaper/wallpaper219.png else feh --bg-scale $HOME/data/nextcloud/wallpaper/wallpaper169.png #asetroot $HOME/data/nextcloud/wallpaper/animated/current/ -t 100 & diff --git a/files/init.el b/files/init.el index 9270ab8..b15f881 100644 --- a/files/init.el +++ b/files/init.el @@ -17,6 +17,13 @@ (setq initial-major-mode 'fundamental-mode) ;; better startup speed (setq initial-scratch-message nil) ;; don't show me help at startup +;; smooth scrolling +(setq redisplay-dont-pause t + scroll-margin 1 + scroll-step 1 + scroll-conservatively 10000 + scroll-preserve-screen-position 1) + ;; Show matching parenthesis (show-paren-mode t) (setq show-paren-style 'paranthesis) @@ -52,8 +59,7 @@ (setq package-enable-at-startup nil) (setq package-archives '(("org" . "http://orgmode.org/elpa/") ("melpa" . "https://melpa.org/packages/") - ("elpa" . "http://elpa.gnu.org/packages/") - )) + ("elpa" . "http://elpa.gnu.org/packages/"))) (package-initialize) ;; Bootstrap use-package @@ -122,7 +128,7 @@ ;; NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA (use-package nyan-mode :ensure t - :config + :init (nyan-mode) (nyan-start-animation) (nyan-toggle-wavy-trail)) @@ -286,7 +292,8 @@ "gd" 'magit-diff "gl" 'magit-log "gc" 'magit-checkout - "gb" 'magit-branch)) + "gb" 'magit-branch + "gi" 'magit-gitignore-in-topdir)) ;; File bar (use-package treemacs @@ -316,7 +323,7 @@ :ensure t) (use-package treemacs-magit - :after(treemacs magit) + :after (treemacs magit) :ensure t) ;; Lsp @@ -510,7 +517,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("4a8d4375d90a7051115db94ed40e9abb2c0766e80e228ecad60e06b3b397acab" "a3bdcbd7c991abd07e48ad32f71e6219d55694056c0c15b4144f370175273d16" "e074be1c799b509f52870ee596a5977b519f6d269455b84ed998666cf6fc802a" "8f5a7a9a3c510ef9cbb88e600c0b4c53cdcdb502cfe3eb50040b7e13c6f4e78e" "fce3524887a0994f8b9b047aef9cc4cc017c5a93a5fb1f84d300391fba313743" default)) + '("5784d048e5a985627520beb8a101561b502a191b52fa401139f4dd20acb07607" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "4a8d4375d90a7051115db94ed40e9abb2c0766e80e228ecad60e06b3b397acab" "a3bdcbd7c991abd07e48ad32f71e6219d55694056c0c15b4144f370175273d16" "e074be1c799b509f52870ee596a5977b519f6d269455b84ed998666cf6fc802a" "8f5a7a9a3c510ef9cbb88e600c0b4c53cdcdb502cfe3eb50040b7e13c6f4e78e" "fce3524887a0994f8b9b047aef9cc4cc017c5a93a5fb1f84d300391fba313743" default)) '(package-selected-packages '(quelpa org-bullets ein fill-column-indicator lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package))) (custom-set-faces