Changeset 9989e84 in dotfiles


Ignore:
Timestamp:
Apr 13, 2020, 7:41:10 PM (5 years ago)
Author:
Mikhail Kirillov <w96k@…>
Branches:
master
Children:
6f739ce
Parents:
6918e4c
Message:

Update everything

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • cvs/.gitconfig

    r6918e4c r9989e84  
    33[user]
    44        name = Mikhail Kirillov
    5         email = w96k@member.fsf.org
     5        email = w96k@posteo.net
    66[gpg]
    77        program = gpg2

  • emacs/.emacs

    r6918e4c r9989e84  
    3131  (package-install 'use-package))
    3232
    33 ;; (eval-when-compile
    34 ;;   (require 'use-package))
    35 
    36 (require 'use-package)
     33(eval-when-compile
     34  (require 'use-package))
    3735
    3836(use-package use-package-ensure-system-package
    … …  
    4240  :config
    4341  (when (memq window-system '(mac ns x))
    44     (exec-path-from-shell-copy-env "PATH")
    45     (exec-path-from-shell-copy-env "PYTHONPATH")
     42    (exec-path-from-shell-copy-env "GUILE_LOAD_PATH")
    4643    (exec-path-from-shell-initialize)))
    4744
    … …  
    5047
    5148(org-babel-load-file "~/.emacs-config.org")
     49
     50(custom-set-faces
     51 ;; custom-set-faces was added by Custom.
     52 ;; If you edit it by hand, you could mess it up, so be careful.
     53 ;; Your init file should contain only one such instance.
     54 ;; If there is more than one, they won't work right.
     55 '(highlight-indentation-face ((t (:inherit git-gutter+-unchanged)))))
    5256(custom-set-variables
    5357 ;; custom-set-variables was added by Custom.
    … …  
    5761 '(package-selected-packages
    5862   (quote
    59     (keycast org-mime flycheck-lilypond flymd epresent org-journal intero vue-mode js2-mode jinja2-mode elpy mwim yasnippet-snippets column-enforce-mode pos-tip swiper ivy browse-kill-ring git-gutter+ magit-gitflow magit aggressive-indent mood-line color-theme-sanityinc-tomorrow auto-package-update use-package))))
    60 (custom-set-faces
    61  ;; custom-set-faces was added by Custom.
    62  ;; If you edit it by hand, you could mess it up, so be careful.
    63  ;; Your init file should contain only one such instance.
    64  ;; If there is more than one, they won't work right.
    65  '(highlight-indentation-face ((t (:inherit git-gutter+-unchanged)))))
     63    (emojify zzz-to-char yasnippet-snippets vue-mode use-package-ensure-system-package pos-tip org-mime org-journal mwim mood-line magit-gitflow keycast js2-mode jinja2-mode intero git-gutter+ flymd flycheck-lilypond fennel-mode epresent elpy counsel column-enforce-mode color-theme-sanityinc-tomorrow browse-kill-ring auto-package-update aggressive-indent))))

  • emacs/.emacs-config.org

    r6918e4c r9989e84  
    2020А также отступа между строк
    2121#+BEGIN_SRC emacs-lisp
    22 ;;; Set font
    23 (add-to-list 'default-frame-alist '(font . "terminus-10"))
    24 (set-face-attribute 'default nil :font "-*-terminus-medium-r-*-*-*-125-75-75-*-*-iso8859-15")
    25 (setq-default line-spacing 0)
     22  ;;; Set font
     23  ;; (add-to-list 'default-frame-alist '(font . "terminus-10"))
     24  ;; (set-face-attribute 'default nil :font "-xos4-Terminus-normal-normal-normal-*-16-*-*-*-c-80-iso10646-1")
     25  (setq-default line-spacing 0)
    2626#+END_SRC
    2727
    … …  
    2929Вы ее в видите в блоках кода
    3030#+BEGIN_SRC emacs-lisp
    31 ;;; Load a theme
    32 ;;; https://emacsthemes.com/themes/sanityinc-tomorrow-themes.html
    33 (use-package color-theme-sanityinc-tomorrow
    34   :ensure
    35   :config (load-theme 'sanityinc-tomorrow-eighties t))
     31  ;;; Load a theme
     32  ;;; https://emacsthemes.com/themes/sanityinc-tomorrow-themes.html
     33  (use-package color-theme-sanityinc-tomorrow
     34    :ensure
     35    :config (load-theme 'sanityinc-tomorrow-eighties t))
    3636#+END_SRC
    3737
    … …  
    340340#+BEGIN_SRC emacs-lisp
    341341(use-package geiser
    342   :after yasnippet)
     342  :config
     343  (defun geiser-guile--version (binary)
     344  "3.0.2"))
    343345#+END_SRC
    344346** Python
    … …  
    490492  ((cljr-add-keybindings-with-prefix "C-c C-m")))
    491493#+END_SRC
     494** Common Lisp
     495*** REPL
     496#+BEGIN_SRC emacs-lisp
     497(use-package slime
     498  :config
     499
     500  (setq slime-contribs '(slime-fancy slime-repl slime-banner)))
     501#+END_SRC
     502** Fennel
     503#+BEGIN_SRC emacs-lisp
     504(use-package fennel-mode
     505  :ensure
     506  :config
     507(define-key fennel-mode-map (kbd "C-c C-k")
     508     (defun pnh-fennel-hotswap ()
     509       (interactive)
     510       (comint-send-string
     511        (inferior-lisp-proc)
     512        (format "(lume.hotswap \"%s\")\n"
     513                (substring (file-name-nondirectory (buffer-file-name)) 0 -4))))))
     514#+END_SRC
    492515* Языки декларирования
    493516** SQL
    … …  
    680703#+BEGIN_SRC emacs-lisp
    681704;; Smooth scrolling
    682 (setq redisplay-dont-pause t
     705(setq redisplay-dont-pause nil
    683706  scroll-margin 10
    684707  scroll-step 1
    … …  
    699722#+END_SRC
    700723** Системные пакеты
     724*** Guix
     725#+BEGIN_SRC emacs-lisp
     726  (use-package guix-autoloads
     727  :after geiser
     728  :config
     729  (setq guix-repl-use-latest t)
     730  (setq guix-guile-program "guile"))
     731
     732  (use-package edit-indirect)
     733  (use-package build-farm)
     734  (use-package dash)
     735  (use-package bui)
     736
     737#+END_SRC
    701738*** Docker
    702739#+BEGIN_SRC emacs-lisp

  • guix-channel/non-gnu/packages/lua-fennel.scm

    r6918e4c r9989e84  
    3838              (source (assoc-ref %build-inputs "source")))
    3939
    40           (mkdir out)
    41           (mkdir (string-append out "/bin"))
    42           (call-with-output-file (string-append out "/bin/fennel")
     40          (mkdir (string-append source "/bin"))
     41          (call-with-output-file (string-append source "/bin/fennel")
    4342            (lambda (port)
    4443              (display "#!/bin/sh\n../fennel" port)))
    45           (invoke (string-append coreutils "/bin/chmod") "+x" (string-append out "/bin/fennel"))
     44          ;;(invoke (string-append coreutils "/bin/chmod") "+x" (string-append out "/bin/fennel"))
    4645          ;;(invoke (string-append make "/bin/make") "-C" out)
     46          (mkdir out)
    4747          (copy-recursively source out)))))
    4848   (synopsis "Lua Lisp Language.")

  • guix/.bash_profile

    r6918e4c r9989e84  
    2121export VISUAL="emacsclient -c -a emacs" # $VISUAL opens in GUI mode
    2222
    23 export GUIX_PROFILE="/home/w96k/.guix-profile"
    24      . "$GUIX_PROFILE/etc/profile"
     23export GUIX_PROFILE="$HOME/.guix-profile"
     24. "$GUIX_PROFILE/etc/profile"
     25
     26#source "$HOME/.guix-profile/etc/profile"
     27#source "$HOME/.config/guix/current/etc/profile"
    2528
    2629streaming() {
    … …  
    9295
    9396
    94 if [ "$(tty)" = "/dev/tty1" ]; then
     97#if [ "$(tty)" = "/dev/tty1" ]; then
    9598    #herd start &&
    96     exec sway
    97 fi
     99#    exec sway
     100#fi
    98101   
    99102if [ -f .bashrc ]

  • guix/.config/guix/channels.scm

    r6918e4c r9989e84  
    1414  (branch "master"))
    1515
    16  (channel
    17   (name 'nonguix)
    18   (url "https://gitlab.com/nonguix/nonguix"))
     16 ;; (channel
     17 ;; (name 'nonguix)
     18 ;; (url "https://gitlab.com/nonguix/nonguix"))
    1919
    2020 ;; (channel

  • guix/.config/i3blocks/config

    r6918e4c r9989e84  
    11# Optimized for 1280x800 resolution
    22# on thinkpad x200t
    3 
    4 [title]
    5 full_text=<placeholder for pressed keybind>
    6 align=center
    7 min_width=600
    83
    94[cpu]

  • guix/.config/nixpkgs/config.nix

    r6918e4c r9989e84  
    11{
    22  allowUnfree = true;
    3 
    4   boot.kernel.sysctl."vm.overcommit_memory" = "1";
    53}

  • guix/.config/rofi/config.rasi

    r6918e4c r9989e84  
    7070/*      display-combi: ;*/
    7171/*      display-keys: ;*/
    72 /*      kb-primary-paste: "Control+V,Shift+Insert";*/
     72        kb-primary-paste: "Control+V,Shift+Insert,Control+y";
    7373/*      kb-secondary-paste: "Control+v,Insert";*/
    7474/*      kb-clear-line: "Control+w";*/

  • guix/.config/sway/config

    r6918e4c r9989e84  
    1515set $right l
    1616
    17 set $term urxvt
     17set $term wterm
    1818
    1919bindsym $mod+d exec --no-startup-id "rofi -show drun -run-shell-command '{terminal} -e \\" {cmd}; read -n 1 -s\\"'"
    … …  
    221221         # Launch emacs
    222222         e exec emacsclient; workspace "Editor"; mode default;
    223          shift+e exec emacs; workspace "Editor"; mode default;
     223         
     224         shift+e exec "if ps auxf | grep -c emacs > 1; then swaymsg '[class=Emacs] focus'; else swaymsg exec 'emacs'; fi; swaymsg 'mode default'";
    224225         
    225226         # Launch terminal
    … …  
    279280bindsym --to-code $StumpMod mode "stumpwm"
    280281
    281 mode "stumpwm-control" {
    282 
    283 }
     282bindsym --to-code $mod+n exec --no-startup-id "rofi -show window"
    284283
    285284bindsym $mod+g mode "default"

  • guix/.zprofile

    r6918e4c r9989e84  
    3636}
    3737
     38GUIX_PROFILE="/home/w96k/.config/guix/current"
     39. "$GUIX_PROFILE/etc/profile"
     40
     41
     42export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
     43
     44# Add npm to PATH
     45export PATH="$PATH:$HOME/.nodejs/bin/"
     46
     47# Add .bin to PATH
     48export PATH="~$PATH:/.bin/"
     49
     50export PATH="$PATH:$HOME/.local/bin/"
     51export PATH="$PATH:$HOME/usr/local/bin/"
     52
     53# Add ruby gems to PATH
     54export PATH=$PATH:/home/w96k/.gem/
     55export PATH=$PATH:/home/w96k/.gem/ruby/2.5.0/bin/
     56
     57export PATH=$HOME/.config/guix/current/bin:$PATH
     58
     59#sh export GDK_CORE_DEVICE_EVENTS=1
     60
     61export ALTERNATE_EDITOR=""
     62export EDITOR="emacsclient -t"                  # $EDITOR opens in terminal
     63export VISUAL="emacsclient -c -a emacs" # $VISUAL opens in GUI mode
     64
     65#[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
     66    #    . /usr/share/bash-completion/bash_completion
     67
     68# Colored ls
     69export LS_OPTIONS='--color=auto'
     70eval "`dircolors`"
     71alias ls='ls $LS_OPTIONS'
     72
     73alias python='python3'
     74
     75if [ -f .zshrc ]
     76then
     77    . ~/.zshrc
     78fi
     79
     80
    3881if [ "$(tty)" = "/dev/tty1" ]; then
    3982    tor &
    4083    exec sway
    4184fi
    42 
    43 if [ -f .zshrc ]
    44 then
    45     . .zshrc
    46 fi

  • guix/.zshenv

    r6918e4c r9989e84  
    1 # Add guix path
    2 export GUIX_PROFILE="$HOME/.guix-profile" ; \
    3 source "$HOME/.guix-profile/etc/profile"
    4 
    5 export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
    6 
    7 # Add npm to PATH
    8 export PATH="$PATH:~/.nodejs/bin/"
    9 
    10 # Add .bin to PATH
    11 export PATH="~$PATH:/.bin/"
    12 
    13 export PATH="$PATH:~/.local/bin/"
    14 export PATH="$PATH:~/usr/local/bin/"
    15 
    16 # Add ruby gems to PATH
    17 export PATH=$PATH:/home/w96k/.gem/
    18 export PATH=$PATH:/home/w96k/.gem/ruby/2.5.0/bin/
    19 
    20 #sh export GDK_CORE_DEVICE_EVENTS=1
    21 
    22 export ALTERNATE_EDITOR=""
    23 export EDITOR="emacsclient -t"                  # $EDITOR opens in terminal
    24 export VISUAL="emacsclient -c -a emacs" # $VISUAL opens in GUI mode
    25 
    26 #[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
    27 #    . /usr/share/bash-completion/bash_completion
    28 
    29 # Colored ls
    30 export LS_OPTIONS='--color=auto'
    31 eval "`dircolors`"
    32 alias ls='ls $LS_OPTIONS'
    33 
    34 alias python='python3'

  • guix/.zshrc

    r6918e4c r9989e84  
    1313compinit
    1414_comp_options+=(globdots)               # Include hidden files.
     15
     16#source /run/current-system/profile/etc/profile.d/nix.sh

  • guix/config.scm

    r6918e4c r9989e84  
    77;; https://w96k.ru
    88
    9 (use-modules (gnu) (gnu system nss)             
     9(use-modules (gnu) (gnu system nss)
     10             (guix build emacs-utils)
    1011             (srfi srfi-1))
    1112
    … …  
    4647   ;;       (libvirt-configuration
    4748   ;;        (unix-sock-group "libvirt")))
    48    ;;x11-socket-directory-service
    4949
    5050   (service nix-service-type)
    … …  
    5757   
    5858   ;;(postgresql-service #:extension-packages (list postgis))
    59    (service docker-service-type)
     59   ;;(service docker-service-type)
    6060   (service alsa-service-type)
    6161   
    6262   (service tor-service-type)
    6363
    64    (service cleanup-service-type #t)
     64   ;;(service cleanup-service-type #t)
    6565   ;; Fix unavailable /usr/bin/env
    6666   ;; It's needed by many shell scripts
    6767   (extra-special-file "/usr/bin/env"
    6868                       (file-append coreutils "/bin/env"))
    69    (extra-special-file "/bin/bash"
    70                        (file-append bash "/bin/bash"))
    7169   (extra-special-file "/bin/zsh"
    7270                       (file-append zsh "/bin/zsh"))
    … …  
    7472                       (file-append python "/bin/python"))
    7573   
    76    (service rottlog-service-type)
     74   ;;(service rottlog-service-type)
    7775   ;;%powertop-service
    7876
    … …  
    8280   (service dbus-root-service-type)
    8381   polkit-wheel-service
    84    fontconfig-file-system-service
     82   ;;fontconfig-file-system-service
    8583   (service elogind-service-type)
    86    (simple-service 'network-manager-applet
    87                    profile-service-type
    88                    (list network-manager-applet))
    89    %base-services))
     84   ;; (simple-service 'network-manager-applet
     85   ;;              profile-service-type
     86   ;;              (list network-manager-applet))
     87
     88   (modify-services %base-services
     89                    (guix-service-type config =>
     90                                       (guix-configuration (inherit config)
     91                                                           (substitute-urls '("http://ci.guix.gnu.org"
     92                                                                              "https://berlin.guixsd.org")))))))
    9093
    9194;; Remove gdm (gdm is default in guix)
    … …  
    210213
    211214                     "intremap=off"     ; Fix for failed to map dmar2
     215
     216                     "logo.nologo"
     217                     "loglevel=4"
    212218                     
    213219                     ;;"intel_iommu=on"
    … …  
    229235               (supplementary-groups '("wheel" "netdev"
    230236                                       "audio" "video"
    231                                        "kvm" "docker"
     237                                       "kvm" ;;"docker"
    232238                                       ))
    233                (shell (file-append zsh "/bin/zsh"))
     239               ;;(shell (file-append zsh "/bin/zsh"))
    234240               (home-directory "/home/w96k"))
    235241              %base-user-accounts))
    … …  
    237243  (append
    238244   %emacs
     245   %base-packages
    239246   (map specification->package
    240247        '(
    241           "bash"
    242           "bash-completion"
     248          ;; "bash"
     249          ;; "bash-completion"
    243250          "zsh"
    244251          "zsh-autosuggestions"
    … …  
    254261          "gcc-toolchain"
    255262          "make"
    256           "glibc"
    257263          "stow"
    258264          "icecat"
    … …  
    295301          "bundler"
    296302          "sbcl"
    297           "docker"
    298           "docker-cli"
     303          ;;"docker"
     304          ;;"docker-cli"
    299305          "nix"
    300306          "postgresql"
    … …  
    323329          "adwaita-icon-theme"
    324330          ;;"font-awesome"
    325           "dbus"
    326331          "p7zip"
    327332          "glibc-utf8-locales"
    328           "gvfs"))
    329    %base-packages))
     333          ;;"gvfs"
     334          ))))
    330335
    331336 (services  %my-services)

  • guix/server.scm

    r6918e4c r9989e84  
    7474   (postgresql-service #:extension-packages (list postgis))
    7575   (service openssh-service-type)
    76 ;;   (service dhcpd-service-type
    77 ;;      (dhcpd-configuration
    78 ;;              (interfaces '("enp0s25"))))
     76   ;;   (service dhcpd-service-type
     77   ;;   (dhcpd-configuration
     78   ;;           (interfaces '("enp0s25"))))
    7979
    80 ;;   (service dhcp-client-service-type)
    81    (service zabbix-server-service-type)
     80   ;;   (service dhcp-client-service-type)
     81   ;;(service zabbix-server-service-type)
    8282   %base-services))
    8383

  • wm/.stumpwmrc

    r6918e4c r9989e84  
    1010
    1111(set-module-dir "~/stumpwm/contrib")
    12 (ql:quickload :clx-truetype)
     12;;(ql:quickload :clx-truetype)
    1313
    1414(load-module "battery-portable")
    … …  
    2222;;(load-module "ttf-fonts")
    2323
    24 (clx-truetype:cache-fonts)
     24;;(clx-truetype:cache-fonts)
    2525
    2626(print *time-modeline-string*)
Note: See TracChangeset for help on using the changeset viewer.