diff --git a/.Xresources b/.Xresources index e130034..0e8579f 100644 --- a/.Xresources +++ b/.Xresources @@ -1,6 +1,5 @@ !!! Scaling, fonts !!! -! Xft.dpi: 136 -Xft.dpi: 166 +Xft.dpi: 210 !Xft.autohint: 1 Xft.autohint: 0 Xft.lcdfilter: lcddefault @@ -28,8 +27,8 @@ Xft.rgba: rgb #define S_base2 #eee8d5 #define S_base3 #fdf6e3 -*background: S_base03 -*foreground: S_base0 +!*background: S_base03 +!*foreground: S_base0 !*fading: 40 !*fadeColor: S_base03 *cursorColor: S_base1 diff --git a/.config/i3/config b/.config/i3/config index fcec233..fca64f0 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,10 +1,3 @@ -# This file has been auto-generated by i3-config-wizard(1). -# 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 http://i3wm.org/docs/userguide.html for a complete reference! @@ -12,7 +5,7 @@ set $mod Mod4 # DPI scaling -exec xrandr --dpi 166 +exec xrandr --dpi 210 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. @@ -56,18 +49,18 @@ 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+colon move right +bindsym $mod+shift+j move left +bindsym $mod+shift+k move down +bindsym $mod+shift+l move up +bindsym $mod+shift+colon move right # Also with slovenian layout -bindsym $mod+Shift+ccaron move right +bindsym $mod+shift+ccaron 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 +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 @@ -84,16 +77,16 @@ bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split # toggle tiling / floating -bindsym $mod+Shift+space floating toggle +bindsym $mod+shift+f floating toggle # change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle +bindsym $mod+shift+space focus mode_toggle # focus the parent container -bindsym $mod+Shift+a focus parent +bindsym $mod+shift+a focus parent # focus the child container -#bindsym $mod+d focus child +#bindsym $mod+shift+c focus child # name workspaces set $w0 0: @@ -119,6 +112,8 @@ bindsym $mod+8 workspace $w8 bindsym $mod+9 workspace $w9 bindsym $mod+0 workspace $w0 +# back and forth between workspaces +bindsym Mod1+Tab workspace back_and_forth # move focused container to workspace bindsym $mod+Shift+1 move container to workspace $w1 @@ -142,10 +137,12 @@ bindsym Mod1+Shift+j move workspace to output left assign [class="Thunderbird"] $w3 assign [class="Slack"] $w4 assign [class="Riot"] $w4 +assign [class="Revolt"] $w4 assign [class="Lollypop"] $w7 # Program startup exec thunderbird & +exec revolt & # reload the configuration file bindsym $mod+Shift+c reload @@ -184,11 +181,11 @@ bindsym $mod+r mode "resize" # External monitor set $restart_compton (killall compton && compton -b) || compton -b -bindsym $mod+p exec xrandr --output HDMI-1 --auto --right-of eDP-1 && $set_bg && $restart_compton -bindsym $mod+Shift+p exec xrandr --output HDMI-1 --off && $restart_compton +bindsym $mod+p exec xrandr --output HDMI1 --auto --right-of eDP1 && $set_bg && $restart_compton +bindsym $mod+Shift+p exec xrandr --output HDMI1 --off && $restart_compton # Lock screen -bindsym $mod+shift+b exec i3lock-next +bindsym $mod+shift+b exec i3lock-fancy # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) @@ -207,7 +204,7 @@ bar { #font pango:Iosevka Medium 10 font pango: Iosevka Medium 8 strip_workspace_numbers yes - height 34 + height 46 tray_padding 2 } @@ -223,14 +220,12 @@ client.background #222222 ####################### # Touchpad tap to click -exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapping Enabled" 1 -exec --no-startup-id xinput set-prop "Elan Touchpad" "libinput Tapping Enabled" 1 +exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "libinput Tapping Enabled" 1 # Touchpad natural scrolling -exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natural Scrolling Enabled" 1 -exec --no-startup-id xinput set-prop "Elan Touchpad" "libinput Natural Scrolling Enabled" 1 +exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "libinput Natural Scrolling Enabled" 1 # Cursor acceleration -exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Accel Speed" 0.456 +exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "libinput Accel Speed" 0.456 # Autolock #exec --no-startup-id xautolock -time 10 -locker 'i3lock-next' & @@ -242,7 +237,7 @@ exec --no-startup-id compton --unredir-if-possible -b exec redshift-gtk & # Background -set $set_bg feh --bg-fill ~/Pictures/wlp.jpg +set $set_bg feh --bg-fill ~/Slike/Wallpapers/neka_trava.jpg exec --no-startup-id $set_bg & # Network manager applet @@ -251,6 +246,12 @@ exec nm-applet & # Keyboard layout, caps lock as compose key #exec_always --no-startup-id "setxkbmap -layout us,si -option grp:lctrl_lwin_toggle -option compose:caps" exec_always --no-startup-id "setxkbmap -layout us,si -option grp:win_space_toggle -option compose:caps" +#exec_always --no-startup-id "setxkbmap -layout us,si -option compose:caps" +#exec_always --no-startup-id "setxkbmap -layout us,si -option compose:caps" + +# Change layout +bindym $mod+space exec "i3-keyboard-layout cycle us si" +#i3-keyboard-layout cycle us si # gaps between windows gaps inner 7 @@ -273,8 +274,8 @@ bindsym Mod1+shift+w exec chromium --force-device-scale-factor=1 # Increase volume set $vol_sig_cmd pkill -RTMIN+10 i3blocks -set $vol_down_cmd pamixer -d 5 -set $vol_up_cmd pamixer -i 5 +set $vol_down_cmd pulsemixer --change-volume -5 +set $vol_up_cmd pulsemixer --change-volume +5 bindsym $mod+shift+d exec "$vol_up_cmd && $vol_sig_cmd" bindsym XF86AudioRaiseVolume exec "$vol_up_cmd && $vol_sig_cmd" # Decrease volume @@ -285,12 +286,12 @@ bindsym XF86AudioLowerVolume exec "$vol_down_cmd && $vol_sig_cmd" bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd" # start a terminal -#bindsym $mod+Return exec i3-sensible-terminal -bindsym $mod+Return exec "termite -t konz0l" +bindsym $mod+Return exec i3-sensible-terminal +#bindsym $mod+Return exec "termite -t konz0l" # kill focused window -bindsym $mod+Shift+q kill -bindsym $mod+Ctrl+q exec --no-startup-id "xterm -e xkill" +bindsym $mod+shift+q kill +bindsym $mod+ctrl+q exec --no-startup-id "xterm -e xkill" # start dmenu (a program launcher) #bindsym $mod+d exec dmenu_run @@ -304,18 +305,24 @@ bindsym XF86MonBrightnessUp exec "xbacklight -inc 8.333 -time 222 -steps 5 && $b bindsym XF86MonBrightnessDown exec "xbacklight -dec 8.333 -time 222 -steps 5 && $brt_sig_cmd" # File manager -bindsym Mod1+Shift+q exec nautilus +bindsym Mod1+shift+q exec nautilus # Emacs! bindsym $mod+a exec emacs # Radio študent -bindsym Mod1+Shift+r exec vlc /home/g1smo/Music/radiostudent.m3u -bindsym Mod1+Shift+z exec playerctl play-pause -bindsym Mod1+Shift+y exec playerctl play-pause +bindsym Mod1+shift+r exec vlc /home/g1smo/Glasba/radiostudent.m3u +bindsym Mod1+shift+z exec playerctl play-pause +bindsym Mod1+shift+y exec playerctl play-pause # Skrinšot bindsym 0xff61 exec gnome-screenshot -i # Keyring related exec --no-startup-id /usr/share/gnome-settings-daemon + +# Pulseaudio zagon +exec --no-startup-id /usr/bin/pulseaudio -D + +# Polybar +#exec_always --no-startup-id ~/.config/polybar/launch.sh diff --git a/.config/sway/config b/.config/sway/config index d6aa689..f25133e 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -20,9 +20,10 @@ set $menu "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local #set $menu j4-dmenu-desktop #set $menu compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec -#output eDP-1 resolution 2440x1440 scale 2 -output eDP-1 resolution 1920x1080 scale 1 -output "*" background ~/Pictures/wlp.jpg fill +#output eDP-1 resolution 2560x1440 scale 2 +output eDP-1 resolution 2560x1440 scale 2 +#output eDP-1 resolution 1920x1080 scale 1 +output "*" background ~/Slike/Wallpapers/neka_trava.jpg fill # start a terminal bindsym $mod+Return exec $term diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..ebae271 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,12 @@ +[alias] + prd = pull --rebase + co = checkout + +[user] + name = Jurij Podgoršek + email = podgorsek.jurij@gmail.com +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 index e0ab91e..e69de29 100644 --- a/.gtkrc-2.0 +++ b/.gtkrc-2.0 @@ -1,25 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=0 -gtk-theme-name=Arc-Darker -gtk-fallback-icon-theme=Numix -gtk-icon-theme-name=Numix-Square -gtk-font-name=Lato 8 -gtk-auto-mnemonics=1 -gtk-visible-focus=automatic -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull -gtk-xft-rgba=rgb -gtk-cursor-theme-name=Adwaita -gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle="hintfull" -gtk-xft-rgba="rgb" -gtk-modules="gail:atk-bridge" diff --git a/.i3blocks.conf b/.i3blocks.conf index 1b8e6f7..b4f341a 100644 --- a/.i3blocks.conf +++ b/.i3blocks.conf @@ -25,14 +25,15 @@ # The top properties below are applied to every block, but can be overridden. # Each block command defaults to the script name to avoid boilerplate. command=/usr/lib/i3blocks/$BLOCK_NAME -separator_block_width=15 -#[mediaplayer] +[mediaplayer] #label=♪ -#label= +label= #instance=Lollypop -#interval=5 -#signal=10 +command="/home/g1smo/Sredstva/i3blocks-contrib/mediaplayer/mediaplayer" +#instance=mpd +interval=5 +signal=10 #[monitors] #label= @@ -42,16 +43,14 @@ separator_block_width=15 [brightness] label= color=#F8FF05 -command=echo -n "$label $(xbacklight -get)%" +command=echo -n "$label $(xbacklight -get | sed -e 's/\.[0-9]\+//')%" interval=once signal=5 [volume-pulseaudio] -#command=/home/g1smo/Sredstva/i3blocks-contrib/volume-pulseaudio/volume-pulseaudio -S -F "${SYMB}${VOL}%" -command=LONG_FORMAR="${VOL}" /home/g1smo/Sredstva/i3blocks-contrib/volume-pulseaudio/volume-pulseaudio -S +command=/home/g1smo/Sredstva/i3blocks-contrib/volume-pulseaudio/volume-pulseaudio -S -F "\${SYMB}\${VOL}%" #label= #SUBSCRIBE=1 -#LONG_FORMAT="$SYMB$VOL%" interval=persist [memory] @@ -72,12 +71,25 @@ interval=10 # The directory defaults to $HOME if the instance is not specified. # The script may be called with a optional argument to set the alert # (defaults to 10 for 10%). -[disk] -#label=HOME +[disk-root] label= color=#AAAAAA command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk -#instance=/mnt/data +instance=/ +interval=30 + +[disk-home] +label= +color=#AAAAAA +command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk +instance=/home +interval=30 + +[disk-var] +label= +color=#AAAAAA +command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk +instance=/var interval=30 [iface] @@ -116,7 +128,8 @@ command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_us color=#FA0009 interval=1 align=right -min_width= 99.0% +min_width= 99.0% +#command=/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage | sed -r 's/^([0-9])\./\ \1\./' [load_average] #label= @@ -155,7 +168,7 @@ separator=false #command=date '+%Y-%m-%d %H:%M:%S' label= color=#ffffff -command=echo -n "$label ";date '+%H:%M' +command=echo -n "$label";date '+%H:%M' interval=5 [shutdown] diff --git a/.local/rofi/config b/.local/rofi/config index 39a14a9..fb70535 100644 --- a/.local/rofi/config +++ b/.local/rofi/config @@ -3,5 +3,5 @@ rofi.color-urgent: #002d303b, #cc6666, #e52d303b, #a54242, #f9f9f9 rofi.color-active: #002d303b, #b5bd68, #e42d303b, #8c9440, #f9f9f9 rofi.color-window: #f22d303b, #7c8389, #1d1f21 rofi.separator-style: solid -rofi.font: terminus 13 +rofi.font: terminus 18 diff --git a/.spacemacs b/.spacemacs index 7524ff3..ba0cd15 100644 --- a/.spacemacs +++ b/.spacemacs @@ -67,6 +67,8 @@ This function should only modify configuration layer settings." sql nginx coffeescript + racket + go ;; Disable flychecker (syntax-checking :variables syntax-checking-enable-by-default nil) @@ -102,7 +104,8 @@ This function should only modify configuration layer settings." haskell-mode tidal htmlize - fireplace) + fireplace + arduino-mode) ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() @@ -252,7 +255,7 @@ It should only modify the values of Spacemacs settings." ;; Default font, or prioritized list of fonts. `powerline-scale' allows to ;; quickly tweak the mode-line size to make separators look not too crappy. dotspacemacs-default-font '("Iosevka Medium" - :size 19 + :size 24 :weight bold :width normal :powerline-scale 1.1) @@ -593,6 +596,9 @@ before packages are loaded." ;; Agenda fajli (setq org-agenda-files (file-expand-wildcards "~/Documents/*.org")) + + ;; Mishka + (set-mouse-color "GhostWhite") ) (defun dotspacemacs/emacs-custom-settings () @@ -607,7 +613,7 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (zenburn-theme yasnippet-snippets wgrep web-mode tidal tao-theme sql-indent solarized-theme ruby-hash-syntax rspec-mode rjsx-mode request pyvenv phpcbf orgit org-projectile org-download org-brain live-py-mode ivy-hydra hl-todo highlight-indentation guix bui gruvbox-theme google-translate git-timemachine geiser eyebrowse evil-visual-mark-mode evil-surround evil-nerd-commenter evil-matchit evil-magit evil-goggles editorconfig dumb-jump doom-modeline eldoc-eval docker json-mode tablist diff-hl define-word cython-mode counsel-projectile cider-eval-sexp-fu eval-sexp-fu cider clojure-mode browse-at-remote auto-yasnippet auto-compile aggressive-indent ace-window ace-link anaconda-mode ac-php-core company counsel swiper smartparens flycheck projectile helm helm-core window-purpose imenu-list ivy avy magit magit-popup git-commit markdown-mode restclient php-mode f inf-ruby simple-httpd spaceline powerline dash async evil goto-chg org-plus-contrib hydra yapfify yaml-mode xcscope ws-butler writeroom-mode with-editor winum which-key web-beautify vue-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package undo-tree treepy toc-org tagedit symon suscolors-theme string-inflection spaceline-all-the-icons smex smeargle slim-mode shrink-path sesman seeing-is-believing scss-mode sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor rubocop robe restart-emacs rbenv rake rainbow-delimiters queue pytest pyenv-mode py-isort pug-mode prettier-js popwin pippel pipenv pip-requirements phpunit php-extras php-auto-yasnippets persp-mode password-generator paradox packed overseer org-present org-pomodoro org-mime org-category-capture org-bullets open-junk-file ob-restclient ob-http ob-coffeescript nginx-mode neotree nameless move-text minitest markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum livid-mode link-hint json-snatcher json-reformat json-navigator js2-refactor js-doc ivy-yasnippet ivy-xref ivy-purpose indent-guide importmagic impatient-mode hungry-delete highlight-parentheses highlight-numbers helm-make haskell-mode graphql golden-ratio gnuplot gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md fuzzy font-lock+ flycheck-pos-tip flx-ido floobits fireplace fill-column-indicator fancy-battery extempore-mode expand-region evil-visualstar evil-unimpaired evil-tutor evil-org evil-numbers evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav drupal-mode dotenv-mode dockerfile-mode docker-tramp diminish dakrone-light-theme counsel-css company-web company-tern company-statistics company-restclient company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clean-aindent-mode chruby centered-cursor-mode bundler autothemer auto-highlight-symbol all-the-icons-dired ac-ispell)))) + (helm-gtags helm helm-core godoctor go-tag go-rename go-impl go-guru go-gen-test go-fill-struct go-eldoc ggtags flycheck-gometalinter flycheck-golangci-lint counsel-gtags company-go go-mode swiper zenburn-theme yapfify yaml-mode ws-butler winum which-key wgrep web-mode web-beautify vue-mode ssass-mode vue-html-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tidal tao-theme tagedit suscolors-theme sql-indent spaceline powerline solarized-theme smex smeargle slim-mode scss-mode sass-mode rvm rudel ruby-tools ruby-test-mode rubocop rspec-mode robe rjsx-mode restart-emacs request rbenv rake rainbow-delimiters pyvenv pytest pyenv-mode py-isort pug-mode popwin pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el paradox orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-plus-contrib org-mime org-download org-bullets open-junk-file ob-restclient ob-http nginx-mode neotree move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint js2-refactor js-doc ivy-hydra indent-guide hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make haskell-mode haml-mode guix gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md fuzzy flycheck-pos-tip flx-ido floobits fireplace fill-column-indicator fancy-battery eyebrowse extempore-mode expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode dockerfile-mode docker diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile company-web company-tern company-statistics company-restclient company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby bundler bind-key auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -615,3 +621,17 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. ) ) +(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 + (quote + (swiper zenburn-theme yapfify yaml-mode ws-butler winum which-key wgrep web-mode web-beautify vue-mode ssass-mode vue-html-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tidal tao-theme tagedit suscolors-theme sql-indent spaceline powerline solarized-theme smex smeargle slim-mode scss-mode sass-mode rvm rudel ruby-tools ruby-test-mode rubocop rspec-mode robe rjsx-mode restart-emacs request rbenv rake rainbow-delimiters pyvenv pytest pyenv-mode py-isort pug-mode popwin pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el paradox orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-plus-contrib org-mime org-download org-bullets open-junk-file ob-restclient ob-http nginx-mode neotree move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint js2-refactor js-doc ivy-hydra indent-guide hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make haskell-mode haml-mode guix gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md fuzzy flycheck-pos-tip flx-ido floobits fireplace fill-column-indicator fancy-battery eyebrowse extempore-mode expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode dockerfile-mode docker diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile company-web company-tern company-statistics company-restclient company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby bundler bind-key auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell)))) +(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/.zshrc b/.zshrc index c21b1c2..5089056 100644 --- a/.zshrc +++ b/.zshrc @@ -108,7 +108,10 @@ export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools # Chrome scaling -export CHROMIUM_FLAGS="--force-device-scale-factor=2" +export CHROMIUM_FLAGS="--force-device-scale-factor=1.66" + +# Flatpak +export XDG_DATA_DIRS="/home/g1smo/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:$XDG_DATA_DIRS" # Guix! export GUIX_PROFILE="$HOME/.guix-profile" @@ -118,7 +121,7 @@ export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile" export GUIX_PACKAGE_PATH="$HOME/Projects/guix-packages" export GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" #export PATH="/home/g1smo/.config/guix/current/bin${PATH:+:}$PATH" -export PATH="/home/g1smo/.guix-profile/bin${PATH:+:}$PATH" +export PATH="$GUIX_PROFILE/bin${PATH:+:}$PATH" #export SSL_CERT_DIR="$GUIX_PROFILE/etc/ssl/certs" #export SSL_CERT_FILE="$SSL_CERT_DIR/ca-certificates.crt" #export GIT_SSL_CAINFO="$SSL_CERT_FILE" diff --git a/povezi.sh b/povezi.sh index 540c25b..56f8a0f 100755 --- a/povezi.sh +++ b/povezi.sh @@ -1,20 +1,21 @@ #!/bin/sh DIR=`pwd` +echo "DIR: $DIR" ln -s $DIR/.zshrc ~/.zshrc ln -s $DIR/.config/gtk-3.0 ~/.config/gtk-3.0 -mkdir $DIR/.config/i3 +mkdir ~/.config/i3 ln -s $DIR/.config/i3/config ~/.config/i3/config -mkdir $DIR/.config/sway +mkdir ~/.config/sway ln -s $DIR/.config/sway/config ~/.config/sway/config -mkdir $DIR/.config/termite +mkdir ~/.config/termite ln -s $DIR/.config/termite/config ~/.config/termite/config -ln -s $DIR/.config/compton ~/.config/compton +ln -s $DIR/.config/compton.conf ~/.config/compton.conf ln -s $DIR/.config/redshift ~/.config/redshift @@ -22,6 +23,7 @@ ln -s $DIR/.gtkrc-2.0 ~/.gtkrc-2.0 ln -s $DIR/.i3blocks.conf ~/.i3blocks.conf +mkdir ~/.local/rofi ln -s $DIR/.local/rofi/config ~/.local/rofi/config ln -s $DIR/.spacemacs ~/.spacemacs @@ -31,3 +33,5 @@ ln -s $DIR/.vimrc ~/.vimrc ln -s $DIR/.Xresources ~/.Xresources ln -s $DIR/.zlogin ~/.zlogin + +ln -s $DIR/.gitconfig ~/.gitconfig