Changeset 7b427be in dotfiles


Ignore:
Timestamp:
May 18, 2020, 4:58:06 PM (4 years ago)
Author:
Mikhail Kirillov <w96k@…>
Branches:
master
Children:
93219db
Parents:
caef369
git-author:
Mikhail Kirillov <w96k@…> (04/18/20 19:36:10)
git-committer:
Mikhail Kirillov <w96k@…> (05/18/20 16:58:06)
Message:

Add taisei-project package

Files:
2 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • X/.Xdefaults

    rcaef369 r7b427be  
    1 URxvt.termName: rxvt
     1URxvt.termName: rxvt-256color
    22
    33!TomorrowNightEighties
    … …  
    3838*.color15:      #393939
    3939
     40! Xterm
     41XTerm.vt100*faceName: Fira Code
     42XTerm*faceSize: 9
     43XTerm*renderFont: true
     44
    4045! URxvt
    41 URxvt.font: xft:terminus
     46URxvt.font: xft: Fira Mono:style=Regular:size=10.5
     47URxvt.boldFont: xft:Fira Mono:style=Bold:size=10.5
     48URxvt.italicFont: xft:Fira Mono:style=Light:size=10.5
     49URxvt.letterSpace: -1
    4250URxvt.scrollBar: false
     51URxvt.urlLauncher: icecat
    4352URxvt.underlineURLs:  True
    4453URxvt.cursorBlink: True
    45 Urxvt.cursorUnderline: True
     54nUrxvt.cursorUnderline: True
    4655Urxvt.visualBell: True
    4756Urxvt.fading: 50
    4857Urxvt.fadeColor: #ff0000
    4958
     59! Emacs
     60Emacs.fontBackend: xft
     61Emacs.font: Fira Code:size=14
     62
     63! Font Settings
    5064Xft.autohint: 0
    5165Xft.lcdfilter: lcddefault
    52 Xft.hintstyle: hintslight
    53 Xft.hinting: 0
     66Xft.hintstyle: hintfull
     67Xft.hinting: 1
    5468Xft.antialias: 1
    5569Xft.rgba: rgb
    56 
    5770! Change cursor
    5871Xcursor.theme: Adwaita

  • emacs/.emacs

    rcaef369 r7b427be  
    4747
    4848(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)))))
    56 (custom-set-variables
    57  ;; custom-set-variables was added by Custom.
    58  ;; If you edit it by hand, you could mess it up, so be careful.
    59  ;; Your init file should contain only one such instance.
    60  ;; If there is more than one, they won't work right.
    61  '(package-selected-packages
    62    (quote
    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

    rcaef369 r7b427be  
    1717#+END_SRC
    1818* Внешний вид
    19 ** Назначение шрифта
     19** Назначение шрифта и лигатур
    2020А также отступа между строк
    2121#+BEGIN_SRC emacs-lisp
    2222  ;;; 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")
     23  ;;(set-frame-font "terminus 12" nil t)
     24  (add-to-list 'default-frame-alist '(font . "Fira Code-10.5"))
     25  (set-frame-font "Fira Code-10.5" nil t)
    2526  (setq-default line-spacing 0)
    26 #+END_SRC
    27 
     27
     28(use-package fira-code-mode
     29  :ensure
     30  :config (global-fira-code-mode))
     31
     32(global-prettify-symbols-mode)
     33#+END_SRC
    2834** Назначение темы
    2935Вы ее в видите в блоках кода
    … …  
    3844** Отображение номера строк
    3945#+BEGIN_SRC emacs-lisp 
    40 ;;; Display numbers
    41 (use-package display-line-numbers
    42   :init
    43   (setq display-line-numbers-type 'relative)
    44   (global-display-line-numbers-mode))
     46  ;;; Отображение номера строки ненужно из-за наличия avy-jump
     47  ;; (use-package display-line-numbers
     48  ;;   :init
     49  ;;   (setq display-line-numbers-type 'relative)
     50  ;;   (global-display-line-numbers-mode))
    4551#+END_SRC
    4652** Мод-лайн
    4753#+BEGIN_SRC emacs-lisp
    48   (use-package mood-line
    49     :ensure t
    50     :config
    51     (setq mood-line-show-encoding-information t)
    52     (mood-line-mode))
     54(custom-set-faces
     55 '(mode-line ((t (:background "#2d2d2d" :foreground "#cccccc" :box (:line-width 1 :color "#2d2d2d" :style released-button) :weight bold :height 1.0 :family "Fira Code")))))
    5356#+END_SRC
    5457** Подсвечивать текущую строку
    … …  
    5861  (global-hl-line-mode))
    5962#+END_SRC
     63** Эмодзи (для telega.el)
     64#+BEGIN_SRC emacs-lisp
     65(use-package emojify
     66  :config
     67  (global-emojify-mode)
     68  (global-emojify-mode-line-mode))
     69#+END_SRC
    6070* Редактирование кода в общем
    6171** Линтер Flymake [built-in]
    6272#+BEGIN_SRC emacs-lisp
    63     ;;; Live-checking text
    64   ;; (use-package flymake
    65   ;;   :config (flymake-mode))
    66 #+END_SRC
    67 
     73      ;;; Live-checking text
     74    ;; (use-package flymake
     75    ;; :config (flymake-mode))
     76
     77  (global-flycheck-mode)
     78#+END_SRC
    6879** Дерево отмен
    6980#+BEGIN_SRC emacs-lisp
    … …  
    8091  :ensure t
    8192  :config (global-aggressive-indent-mode))
     93#+END_SRC
     94** SSH
     95#+BEGIN_SRC emacs-lisp
     96(use-package ssh-agency)
    8297#+END_SRC
    8398** Система контроля версий
    … …  
    144159** Прыжки
    145160#+BEGIN_SRC emacs-lisp
    146 (use-package ace-jump-mode
     161(use-package avy
    147162  :config
    148   (define-key global-map (kbd "C-c s") 'ace-jump-mode))
     163  (define-key global-map (kbd "C-c s") 'avy-goto-char)
     164  (define-key global-map (kbd "C-c l") 'avy-goto-line))
    149165#+END_SRC
    150166** Поиск (ivy + swiper + councel)
    … …  
    184200      (ivy-mode 1))
    185201#+END_SRC
    186 
    187202** Автодополнение
    188203#+BEGIN_SRC emacs-lisp
    … …  
    199214  :hook ((prog-mode . company-mode))
    200215  :bind (:map company-active-map
    201               ("C-n" . company-select-next)
    202               ("C-p" . company-select-previous)))
     216              ("C-n" . company-select-next)
     217              ("C-p" . company-select-previous)))
    203218
    204219(use-package company-quickhelp
    … …  
    212227  :diminish
    213228  :bind (("s-p" . projectile-command-map)
    214         ("C-c p" . projectile-command-map))
     229        ("C-c p" . projectile-command-map))
    215230  :config
    216231  (projectile-global-mode))
    … …  
    221236(use-package dumb-jump
    222237  :bind (("M-g o" . dumb-jump-go-other-window)
    223         ("M-g j" . dumb-jump-go)
    224         ("M-g i" . dumb-jump-go-prompt)
    225         ("M-g x" . dumb-jump-go-prefer-external)
    226         ("M-g z" . dumb-jump-go-prefer-external-other-window)))
     238        ("M-g j" . dumb-jump-go)
     239        ("M-g i" . dumb-jump-go-prompt)
     240        ("M-g x" . dumb-jump-go-prefer-external)
     241        ("M-g z" . dumb-jump-go-prefer-external-other-window)))
    227242#+END_SRC
    228243
    … …  
    257272(use-package yasnippet
    258273  :diminish
     274  :defer
    259275  :config (yas-global-mode 1))
    260276
    261277(use-package yasnippet-snippets
    262278  :ensure t
     279  :defer
    263280  :diminish
    264281  :after yasnippet)
    … …  
    294311#+END_SRC
    295312** Показывать пробелы
    296 #+BEGIN_SRC emacs-lisp
    297   ;; (use-package whitespace-mode
    298   ;;   :config
    299   ;; (progn
    300   ;;  ;; Make whitespace-mode with very basic background coloring for whitespaces.
    301   ;;   ;; http://ergoemacs.org/emacs/whitespace-mode.html
    302   ;;   (setq whitespace-style (quote (face spaces tabs newline space-mark tab-mark newline-mark )))
    303 
    304   ;;   ;; Make whitespace-mode and whitespace-newline-mode use “¶” for end of line char and “▷” for tab.
    305   ;;   (setq whitespace-display-mappings
    306   ;;         ;; all numbers are unicode codepoint in decimal. e.g. (insert-char 182 1)
    307   ;;         '(
    308   ;;           (space-mark 32 [183] [46]) ; SPACE 32 「 」, 183 MIDDLE DOT 「·」, 46 FULL STOP 「.」
    309   ;;           (newline-mark 10 [182 10]) ; LINE FEED,
    310   ;;           (tab-mark 9 [9655 9] [92 9]) ; tab
    311   ;;           )))
    312   ;;   (global-whitespace-mode))
     313   Не работает
     314#+BEGIN_SRC emacs-lisp
     315(use-package whitespace
     316  :config
     317  (progn
     318  (setq whitespace-style (quote (face indentation indentation::space indentation::tab)))
     319  (setq whitespace-space 'underline)
     320    (setq whitespace-display-mappings
     321          '((space-mark 32 [183] [46])
     322            (tab-mark 9 [9655 9] [92 9])
     323            )))
     324    (global-whitespace-mode))
    313325#+END_SRC
    314326* Языки программирования
    … …  
    326338(use-package paredit)
    327339#+END_SRC
    328 *** Библиотеки
    329 **** Работа со строками
    330 #+BEGIN_SRC emacs-lisp
    331 ;;; Emacs Lisp string manipulation
    332 (use-package s)
    333 #+END_SRC
    334340*** Автокомлпит Scheme
    335341#+BEGIN_SRC emacs-lisp
    … …  
    339345*** REPL Scheme
    340346#+BEGIN_SRC emacs-lisp
    341 (use-package geiser
    342   :config
    343   (defun geiser-guile--version (binary)
    344   "3.0.2"))
     347(use-package geiser)
    345348#+END_SRC
    346349** Python
    … …  
    410413  (setq-default js2-basic-offset 2)
    411414  (add-hook 'js2-mode-hook
    412             (lambda ()
    413               (define-key js-mode-map (kbd "C-x C-e") 'nodejs-repl-send-last-expression)
    414               (define-key js-mode-map (kbd "C-c C-j") 'nodejs-repl-send-line)
    415               (define-key js-mode-map (kbd "C-c C-r") 'nodejs-repl-send-region)
    416               (define-key js-mode-map (kbd "C-c C-l") 'nodejs-repl-load-file)
    417               (define-key js-mode-map (kbd "C-c C-z") 'nodejs-repl-switch-to-repl))))
     415            (lambda ()
     416              (define-key js-mode-map (kbd "C-x C-e") 'nodejs-repl-send-last-expression)
     417              (define-key js-mode-map (kbd "C-c C-j") 'nodejs-repl-send-line)
     418              (define-key js-mode-map (kbd "C-c C-r") 'nodejs-repl-send-region)
     419              (define-key js-mode-map (kbd "C-c C-l") 'nodejs-repl-load-file)
     420              (define-key js-mode-map (kbd "C-c C-z") 'nodejs-repl-switch-to-repl))))
    418421#+END_SRC
    419422*** Node.js REPL
    … …  
    462465  (progn
    463466    (setq parinfer-extensions
    464           '(defaults       ; should be included.
    465             pretty-parens  ; different paren styles for different modes.
    466             lispy          ; If you use Lispy. With this extension, you should install Lispy and do not enable lispy-mode directly.
    467             paredit        ; Introduce some paredit commands.
    468             smart-tab      ; C-b & C-f jump positions and smart shift with tab & S-tab.
    469             smart-yank))   ; Yank behavior depend on mode.
     467          '(defaults       ; should be included.
     468            pretty-parens  ; different paren styles for different modes.
     469            lispy          ; If you use Lispy. With this extension, you should install Lispy and do not enable lispy-mode directly.
     470            paredit        ; Introduce some paredit commands.
     471            smart-tab      ; C-b & C-f jump positions and smart shift with tab & S-tab.
     472            smart-yank))   ; Yank behavior depend on mode.
    470473    (add-hook 'clojure-mode-hook #'parinfer-mode)
    471474    (add-hook 'emacs-lisp-mode-hook #'parinfer-mode)
    … …  
    509512       (interactive)
    510513       (comint-send-string
    511         (inferior-lisp-proc)
    512         (format "(lume.hotswap \"%s\")\n"
    513                 (substring (file-name-nondirectory (buffer-file-name)) 0 -4))))))
     514        (inferior-lisp-proc)
     515        (format "(lume.hotswap \"%s\")\n"
     516                (substring (file-name-nondirectory (buffer-file-name)) 0 -4))))))
    514517#+END_SRC
    515518* Языки декларирования
    … …  
    537540  :config
    538541  (setq org-todo-keywords
    539         (quote ((sequence "TODO(t)" "MIGRATE(m)" "|" "DONE(d)")
    540                 (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)" "PHONE" "MEETING"))))
     542        (quote ((sequence "TODO(t)" "MIGRATE(m)" "|" "DONE(d)")
     543                (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)" "PHONE" "MEETING"))))
    541544  (setq org-todo-keyword-faces
    542         (quote (("TODO" :foreground "red" :weight bold)
    543                 ("NEXT" :foreground "blue" :weight bold)
    544                 ("DONE" :foreground "forest green" :weight bold)
    545                 ("WAITING" :foreground "orange" :weight bold)
    546                 ("HOLD" :foreground "magenta" :weight bold)
    547                 ("CANCELLED" :foreground "forest green" :weight bold)
    548                 ("MEETING" :foreground "forest cyan" :weight bold)
    549                 ("PHONE" :foreground "blue" :weight bold)))))
     545        (quote (("TODO" :foreground "red" :weight bold)
     546                ("NEXT" :foreground "blue" :weight bold)
     547                ("DONE" :foreground "forest green" :weight bold)
     548                ("WAITING" :foreground "orange" :weight bold)
     549                ("HOLD" :foreground "magenta" :weight bold)
     550                ("CANCELLED" :foreground "forest green" :weight bold)
     551                ("MEETING" :foreground "forest cyan" :weight bold)
     552                ("PHONE" :foreground "blue" :weight bold)))))
    550553#+END_SRC
    551554*** Пункты списка для org-mode
    … …  
    560563;;; Org-mode Setup
    561564(setq org-agenda-files (list
    562                         "~/Documents/life.org"))
     565                        "~/Documents/life.org"))
    563566#+END_SRC
    564567*** Техника pomodoro
    … …  
    593596  (autoload 'lilypond-mode "lilypond-mode")
    594597  (setq auto-mode-alist
    595         (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
     598        (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
    596599  (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock))))
    597600
    … …  
    702705*** Плавный скролл
    703706#+BEGIN_SRC emacs-lisp
    704 ;; Smooth scrolling
    705 (setq redisplay-dont-pause nil
    706   scroll-margin 10
    707   scroll-step 1
    708   scroll-conservatively 10000
    709   scroll-preserve-screen-position 100)
     707  ;; Smooth scrolling
     708  ;; (setq redisplay-dont-pause nil
     709  ;;   scroll-margin 10
     710  ;;   scroll-step 1
     711  ;;   scroll-conservatively 10000
     712  ;;   scroll-preserve-screen-position 100)
    710713#+END_SRC
    711714** Which-key
    … …  
    724727*** Guix
    725728#+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"))
     729;;  (use-package guix-autoloads)
    731730
    732731  (use-package edit-indirect)
    … …  
    779778#+BEGIN_SRC emacs-lisp
    780779  ;;; PDF Tools
    781   ;; (use-package pdf-tools
    782   ;;   :if window-system
    783   ;;   :config (pdf-tools-install))
    784 #+END_SRC
    785 ** Экспорт в HTML
    786 #+BEGIN_SRC emacs-lisp
    787 ;;; Export to html
    788 (use-package htmlize)
     780  (use-package pdf-tools
     781    :if window-system
     782    :config (pdf-tools-install))
    789783#+END_SRC
    790784** Управление финансами

  • guix/.bash_profile

    rcaef369 r7b427be  
    1 # Add npm to PATH
    2 export PATH="~/.nodejs/bin/:$PATH"
     1export PATH=~/.config/guix/current:$PATH
    32
    4 # Add .bin to PATH
    5 export PATH="~/.bin/:$PATH"
    6 
    7 export PATH="~/.local/bin/:$PATH"
    8 export PATH="~/usr/local/bin/:$PATH"
    9 
    10 # Add ruby gems to PATH
    11 export PATH=$PATH:/home/w96k/.gem/
    12 export PATH=$PATH:/home/w96k/.gem/ruby/2.5.0/bin/
    13 
    14 # Not used in waylad
    15 #setxkbmap -layout us,ru -option grp:win_space_toggle -option 'ctrl:swapcaps'
    16 
    17 #sh export GDK_CORE_DEVICE_EVENTS=1
    18 
    19 export ALTERNATE_EDITOR=""
    20 export EDITOR="emacsclient -t"                  # $EDITOR opens in terminal
    21 export VISUAL="emacsclient -c -a emacs" # $VISUAL opens in GUI mode
    22 
    23 export 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"
    28 
    29 streaming() {
    30     INRES="1280x720" # input resolution
    31     OUTRES="1280x720" # output resolution
    32     FPS="10" # target FPS
    33     GOP="20" # i-frame interval, should be double of FPS,
    34     GOPMIN="10" # min i-frame interval, should be equal to fps,
    35     THREADS="2" # max 6
    36     CBR="1000k" # constant bitrate (should be between 1000k - 3000k)
    37     QUALITY="ultrafast"  # one of the many FFMPEG preset
    38     AUDIO_RATE="44100"
    39     STREAM_KEY="$1" # use the terminal command Streaming streamkeyhere to stream your video to twitch or justin
    40     SERVER="live-sjc" # twitch server in California, see http://bashtech.net/twitch/ingest.php to change
    41 
    42     ffmpeg -f x11grab -s "$INRES" -r "$FPS" -i :0.0 -f flv -ac 2 -ar $AUDIO_RATE \
    43            -vcodec libx264 -g $GOP -keyint_min $GOPMIN -b:v $CBR -minrate $CBR -maxrate $CBR -pix_fmt yuv420p\
    44            -s $OUTRES -preset $QUALITY -tune film -acodec libmp3lame -threads $THREADS -strict normal \
    45            -bufsize $CBR "rtmp://$SERVER.twitch.tv/app/$STREAM_KEY"
    46 }
    47 
    48 [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
    49     . /usr/share/bash-completion/bash_completion
    50 
    51 
    52 # Colored ls
    53 export LS_OPTIONS='--color=auto'
    54 eval "`dircolors`"
    55 alias ls='ls $LS_OPTIONS'
    56 
    57 alias python='python3'
    58 
    59 # Autocomplete bash
    60 complete -cf sudo
    61 set -o history
    62 set -o notify
    63 shopt -q -s cdspell
    64 shopt -s autocd
    65 
    66 # Wayland vars
    67 export XDG_SESSION_TYPE=wayland
    68 export SDL_VIDEODRIVER=wayland
    69 export _JAVA_AWT_WM_NONREPARENTING=1
    70 export MOZ_ENABLE_WAYLAND=1
    71 
    72 if test -z "${XDG_RUNTIME_DIR}";
    73 then
    74     export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
    75     if ! test -d "${XDG_RUNTIME_DIR}"; then
    76         mkdir "${XDG_RUNTIME_DIR}"
    77         chmod 0700 "${XDG_RUNTIME_DIR}"
    78     fi
    79 fi
    80 
    81 # Bash completion (You need to have bash-completion package installed)
    82 if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
    83 
    84     # Check for recent enough version of bash.
    85     if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
    86            [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
    87         [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
    88             . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
    89         if shopt -q progcomp && [ -r /gnu/store/9i5d4dsxip5mfrrda0z2mypjg77ypm27-bash-completion-2.8/share/bash-completion/bash_completion ]; then
    90             # Source completion code.
    91             . /gnu/store/9i5d4dsxip5mfrrda0z2mypjg77ypm27-bash-completion-2.8/share/bash-completion/bash_completion
    92         fi
    93     fi
    94 fi
    95 
    96 
    97 #if [ "$(tty)" = "/dev/tty1" ]; then
    98     #herd start &&
    99 #    exec sway
    100 #fi
    101    
    102 if [ -f .bashrc ]
    103 then
    104     . .bashrc
    105 fi
     3# Honor per-interactive-shell startup file
     4if [ -f ~/.bashrc ]; then . ~/.bashrc; fi

  • guix/.bashrc

    rcaef369 r7b427be  
    2020source /etc/bashrc
    2121
    22 function color_prompt {
    23     local __user_and_host="\[\033[01;35m\]\u"
    24     local __cur_location="\[\033[01;34m\]\w"
    25     local __git_branch_color="\[\033[01;36m\]"
    26     #local __git_branch="\`ruby -e \"print (%x{git branch 2> /dev/null}.grep(/^\*/).first || '').gsub(/^\* (.+)$/, '(\1) ')\"\`"
    27     local __git_branch='`git branch 2> /dev/null | grep -e ^* | sed -E  s/^\\\\\*\ \(.+\)$/\(\\\\\1\)\ /`'
    28     local __prompt_tail="\[\033[30m\]$"
    29     local __last_color="\[\033[00m\]"
    30     local __guix_env="\[\033[01;32m\][env]"
    31     if [ -n "$GUIX_ENVIRONMENT" ]
    32     then
    33         export PS1="$__user_and_host $__cur_location $__git_branch_color$__git_branch$__guix_env $__prompt_tail$__last_color "
    34     else
    35         export PS1="$__user_and_host $__cur_location $__git_branch_color$__git_branch$__prompt_tail$__last_color "
    36     fi
    37 }
    38 
    39 color_prompt
    40 
    41 
    42 set colored-stats on
    43 
    4422# Adjust the prompt depending on whether we're in 'guix environment'.
     23if [ -n "$GUIX_ENVIRONMENT" ]
     24then
     25    PS1='\u@\h \w [env]\$ '
     26else
     27    PS1='\u \w\$ '
     28fi
     29alias ls='ls -p --color=auto'
     30alias ll='ls -l'
     31alias grep='grep --color=auto'

  • guix/.config/fontconfig/fonts.conf

    rcaef369 r7b427be  
    22<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
    33<fontconfig>
     4  <match>
     5    <test name="family"><string>sans-serif</string></test>
     6    <edit name="family" mode="prepend" binding="strong">
     7      <string>Google Noto</string>
     8    </edit>
     9  </match>
     10  <match>
     11    <test name="family"><string>serif</string></test>
     12    <edit name="family" mode="prepend" binding="strong">
     13      <string>Google Noto</string>
     14    </edit>
     15  </match>
     16  <match>
     17    <test name="family"><string>monospace</string></test>
     18    <edit name="family" mode="prepend" binding="strong">
     19      <string>Fira Code</string>
     20    </edit>
     21  </match>
    422
    5   <match>
    6         <test name="family"><string>sans-serif</string></test>
    7         <edit name="family" mode="prepend" binding="strong">
    8                 <string>Terminus</string>
    9         </edit>
    10         <edit name="family" mode="append" binding="strong">
    11                 <string>Terminus</string>
    12 
    13         </edit>
    14 </match>
    15 <match>
    16         <test name="family"><string>serif</string></test>
    17         <edit name="family" mode="prepend" binding="strong">
    18                 <string>Terminus</string>
    19         </edit>
    20 </match>
    21 <match>
    22         <test name="family"><string>monospace</string></test>
    23         <edit name="family" mode="prepend" binding="strong">
    24                 <string>Terminus</string>
    25         </edit>
    26 </match>
    27 
    28 <match target="font">
     23  <match target="font">
    2924    <edit name="antialias" mode="assign">
    3025      <bool>true</bool>
    3126    </edit>
    32   </match>
    33     <match target="font">
    3427    <edit name="hinting" mode="assign">
    3528      <bool>true</bool>
    3629    </edit>
     30    <edit mode="assign" name="embeddedbitmap">
     31      <bool>true</bool>
     32    </edit>
     33    <edit mode="assign" name="hintstyle">
     34      <const>hintfull</const>
     35    </edit>
     36    <edit mode="assign" name="lcdfilter">
     37      <const>lcddefault</const>
     38    </edit>
     39    <edit mode="assign" name="rgba">
     40      <const>rgb</const>
     41    </edit>
    3742  </match>
    38 
    3943</fontconfig>

  • guix/.config/guix/channels.scm

    rcaef369 r7b427be  
    11(cons*
    2 
    32 (channel
    43  (name 'w96k)
    5   (url "https://git.sr.ht/~w96k/dotfiles"))
    6 
    7  (channel
    8   (name 'doujinhub)
    9   (url "https://git.sr.ht/~w96k/doujinhub"))
    10 
    11  (channel
    12   (name 'cl-guix)
    13   (url "https://gitlab.com/hu.moonstone/cl-guix.git")
     4  (url "https://git.sr.ht/~w96k/dotfiles")
    145  (branch "master"))
    15 
    166 ;; (channel
    17  ;;  (name 'nonguix)
    18  ;;  (url "https://gitlab.com/nonguix/nonguix"))
    19 
    20  ;; (channel
    21  ;;  (name 'Brett)
    22  ;;  (url "https://git.sr.ht/~brettgilio/cfg"))
    23  
     7 ;;  (name 'guix-home-manager)
     8 ;;  (url "https://framagit.org/tyreunom/guix-home-manager")
     9 ;;  (branch "master"))
    2410 %default-channels)

  • guix/.zprofile

    rcaef369 r7b427be  
    1 export GUIX_PROFILE="$HOME/.guix-profile"
    2 source "$HOME/.guix-profile/etc/profile"
    3 
    4 # Wayland vars
    5 export XDG_SESSION_TYPE=wayland
    6 export SDL_VIDEODRIVER=wayland
    7 export _JAVA_AWT_WM_NONREPARENTING=1
    8 export MOZ_ENABLE_WAYLAND=1
    9 
    10 if test -z "${XDG_RUNTIME_DIR}";
    11 then
    12     export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
    13     if ! test -d "${XDG_RUNTIME_DIR}"; then
    14         mkdir "${XDG_RUNTIME_DIR}"
    15         chmod 0700 "${XDG_RUNTIME_DIR}"
    16     fi
    17 fi
    18 
    19 streaming() {
    20     INRES="1280x720" # input resolution
    21     OUTRES="1280x720" # output resolution
    22     FPS="10" # target FPS
    23     GOP="20" # i-frame interval, should be double of FPS,
    24     GOPMIN="10" # min i-frame interval, should be equal to fps,
    25     THREADS="2" # max 6
    26     CBR="1000k" # constant bitrate (should be between 1000k - 3000k)
    27     QUALITY="ultrafast"  # one of the many FFMPEG preset
    28     AUDIO_RATE="44100"
    29     STREAM_KEY="$1" # use the terminal command Streaming streamkeyhere to stream your video to twitch or justin
    30     SERVER="live-sjc" # twitch server in California, see http://bashtech.net/twitch/ingest.php to change
    31 
    32     ffmpeg -f x11grab -s "$INRES" -r "$FPS" -i :0.0 -f flv -ac 2 -ar $AUDIO_RATE \
    33            -vcodec libx264 -g $GOP -keyint_min $GOPMIN -b:v $CBR -minrate $CBR -maxrate $CBR -pix_fmt yuv420p\
    34            -s $OUTRES -preset $QUALITY -tune film -acodec libmp3lame -threads $THREADS -strict normal \
    35            -bufsize $CBR "rtmp://$SERVER.twitch.tv/app/$STREAM_KEY"
    36 }
    37 
    38 GUIX_PROFILE="/home/w96k/.config/guix/current"
    39 . "$GUIX_PROFILE/etc/profile"
    40 
    41 
    42 export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
    43 
    44 # Add npm to PATH
    45 export PATH="$PATH:$HOME/.nodejs/bin/"
    46 
    47 # Add .bin to PATH
    48 export PATH="~$PATH:/.bin/"
    49 
    50 export PATH="$PATH:$HOME/.local/bin/"
    51 export PATH="$PATH:$HOME/usr/local/bin/"
    52 
    53 # Add ruby gems to PATH
    54 export PATH=$PATH:/home/w96k/.gem/
    55 export PATH=$PATH:/home/w96k/.gem/ruby/2.5.0/bin/
    56 
    57 export PATH=$HOME/.config/guix/current/bin:$PATH
    58 
    59 #sh export GDK_CORE_DEVICE_EVENTS=1
    60 
    61 export ALTERNATE_EDITOR=""
    62 export EDITOR="emacsclient -t"                  # $EDITOR opens in terminal
    63 export 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
    69 export LS_OPTIONS='--color=auto'
    70 eval "`dircolors`"
    71 alias ls='ls $LS_OPTIONS'
    72 
    73 alias python='python3'
    74 
    75 if [ -f .zshrc ]
    76 then
    77     . ~/.zshrc
    78 fi
    79 
    80 
    81 if [ "$(tty)" = "/dev/tty1" ]; then
    82     tor &
    83     exec sway
    84 fi
     1# Honor system-wide environment variables
     2source /etc/profile

  • guix/fresh.scm

    rcaef369 r7b427be  
    22;; by the graphical installer.
    33
    4 (use-modules (gnu))
    5 (use-service-modules desktop networking ssh xorg)
     4(use-modules (gnu)
     5             (srfi srfi-1))
     6
     7;;(use-modules (non-gnu packages lua-fennel))
     8(use-service-modules
     9 desktop
     10 networking
     11 ssh
     12 xorg
     13 sound
     14 dbus
     15 nix)
     16(use-package-modules wm lisp bash fonts)
    617
    718(operating-system
    … …  
    2637 (packages
    2738  (append
    28    (list (specification->package "ratpoison")
    29          (specification->package "xterm")
    30          (specification->package "nss-certs"))
     39   (map specification->package
     40        '("ratpoison"
     41          "xterm"
     42          "stumpwm"
     43          "nix"
     44          "nss-certs"
     45          "glibc-utf8-locales"
     46          "font-dejavu"
     47          "font-terminus"
     48          "font-fira-code"
     49          "font-fira-mono"))
     50   (list sbcl stumpwm `(,stumpwm "lib"))
    3151   %base-packages))
    32  (services
    33   (append
    34    (list (service xfce-desktop-service-type)
    35          (service openssh-service-type)
    36          (service tor-service-type)
    37          (set-xorg-configuration
    38           (xorg-configuration
    39            (keyboard-layout keyboard-layout))))
    40    %desktop-services))
     52
     53 (services (cons*
     54            (service openssh-service-type)
     55            (service tor-service-type)
     56
     57               ;;Wacom tablet support
     58            (service inputattach-service-type
     59                     (inputattach-configuration
     60                      (device "/dev/ttyS4")
     61                      (device-type "wacom")))
     62
     63            (extra-special-file "/bin/bash"
     64                                (file-append bash "/bin/bash"))
     65
     66            (service nix-service-type)
     67            (set-xorg-configuration
     68              (xorg-configuration
     69                (keyboard-layout keyboard-layout)))
     70            %desktop-services))
     71
    4172 (bootloader
    4273  (bootloader-configuration
    … …  
    4475   (target "/dev/sda")
    4576   (keyboard-layout keyboard-layout)))
    46  (mapped-devices
    47   (list (mapped-device
    48          (source
    49           (uuid "84d2acc1-048c-4bae-b776-1f888c364a66"))
    50          (target "cryptroot")
    51          (type luks-device-mapping))))
     77 (swap-devices (list "/dev/sda1"))
    5278 (file-systems
    53   (cons* (file-system
    54           (mount-point "/")
    55           (device "/dev/mapper/cryptroot")
    56           (type "ext4")
    57           (dependencies mapped-devices))
    58          %base-file-systems)))
     79    (cons* (file-system
     80             (mount-point "/")
     81             (device
     82               (uuid "c184f446-df67-4103-b28e-465ac8776f10"
     83                     'ext4))
     84             (type "ext4"))
     85           (file-system
     86             (mount-point "/media/hdd/")
     87             (device
     88               (uuid "71cb0818-baf3-4f7f-8bc2-7e2b0cca3488"
     89                     'ext4))
     90             (type "ext4"))
     91           
     92           %base-file-systems)))

  • wm/.stumpwmrc

    rcaef369 r7b427be  
    11(in-package :stumpwm)
    2 (load "~/quicklisp/setup.lisp")
     2;;(load "~/quicklisp/setup.lisp")
    33
    44(setq *startup-message* "Welcome to your lovely LISP-machine")
    55
    6 ;; Shepherd (with emacs daemon)
    7 (run-shell-command "shepherd")
    8 
    96(set-prefix-key (kbd "C-t"))
    107
    11 (set-module-dir "~/stumpwm/contrib")
    12 ;;(ql:quickload :clx-truetype)
     8(set-module-dir "~/.stumpwm.d/modules")
     9
     10(load-module :ttf-fonts)
     11(setf xft:*font-dirs* '("/run/current-system/profile/share/fonts/"))
     12(setf clx-truetype:+font-cache-filename+ (concat (getenv "HOME") "/.fonts/font-cache.sexp"))
     13(xft:cache-fonts)
     14(set-font (make-instance 'xft:font :family "Fira Code" :subfamily "Bold" :size 10.5))
    1315
    1416(load-module "battery-portable")
    … …  
    1921(load-module "shell-command-history")
    2022(load-module "app-menu")
     23(load-module "swm-gaps")
    2124;;(load-module "screenshot")
    22 ;;(load-module "ttf-fonts")
    2325
    2426;;(clx-truetype:cache-fonts)
    … …  
    2729
    2830(setf *mode-line-pad-x* 8
    29       *mode-line-pad-y* 2
     31      *mode-line-pad-y* 0
    3032      *mode-line-timeout* 1
    3133      *mouse-focus-policy* :click
    … …  
    3436      *normal-border-width* 0
    3537      *mode-line-border-width* 1
    36       *transient-border-width* 0
     38      *transient-border-width* 1
    3739      *mode-line-position* :top
    3840      *time-modeline-string* "%d.%m.%y %k:%M"
    … …  
    5961                                 ))
    6062
    61 
    62 ;; launch Web browser
    63 ;; (defcommand next () ()
    64 ;;   "Start Next or switch to it, if it is already running."
    65 ;;   (run-or-raise "next" '(:class "Next")))
    66 ;; (define-key *root-map* (kbd "B") "next")
     63(set-normal-gravity :top)
     64(set-win-bg-color "#2d2d2d")
    6765
    6866(defcommand icecat () ()
    69   "Start Next or switch to it, if it is already running."
    70   (run-or-raise "icecat" '(:class "IceCat")))
    71 (define-key *root-map* (kbd "B") "icecat")
     67            "Start Next or switch to it, if it is already running."
     68            (run-or-raise "icecat" '(:class "IceCat")))
     69(define-key *root-map* (kbd "b") "icecat")
    7270
    7371;; launch terminal
    … …  
    8280;; Change emacs to emacsclient
    8381(defcommand emacsclient () ()
    84   "Start Urxvt or switch to it, if it is already running."
    8582  (run-or-raise "emacsclient -c -a emaces" '(:class "Emacs")))
    86 (define-key *root-map* (kbd "e") "emacsclient -c -a emaces")
     83(defcommand emacs () ()
     84  (run-or-raise "emacs" '(:class "Emacs")))
     85  (define-key *root-map* (kbd "e") "emacs")
    8786
    8887;; Volume Management
    … …  
    9291  (define-key *top-map* (kbd "XF86AudioMute") "amixer -q sset Master toggle"))
    9392
     93;; Printscreen
     94(defcommand printscreen () ()
     95            (message "Print screen region")
     96            (run-shell-command "xfce4-screenshooter"))
     97           
     98(define-key *top-map* (kbd "SunPrint_Screen") "printscreen")
     99
    94100;; Mode-line
    95101(enable-mode-line (current-screen) (current-head) t)
    96102
    97 
    98103;; Gaps
    99 (load-module "swm-gaps")
    100 (setf swm-gaps:*inner-gaps-size* 8)
    101 (setf swm-gaps:*outer-gaps-size* 4)
    102 ;;(swm-gaps:toggle-gaps)
    103 
    104 ;; Golden Ratio
    105 ;;(load-module "swm-golden-ratio")
    106 ;;(swm-golden-ratio:toggle-golden-ratio)
     104;; (setf swm-gaps:*inner-gaps-size* 0)
     105;; (setf swm-gaps:*outer-gaps-size* 2)
     106;; (swm-gaps:toggle-gaps)
    107107
    108108(setf (getenv "GDK_CORE_DEVICE_EVENTS") "1")
    … …  
    122122
    123123;; Clipboard history
    124 (define-key *root-map* (kbd "C-y") "show-clipboard-history")
    125 (clipboard-history:start-clipboard-manager)
     124;; (define-key *root-map* (kbd "C-y") "show-clipboard-history")
     125;; (clipboard-history:start-clipboard-manager)
    126126
    127127;; Shell history
    128 (setf shell-command-history:*shell-command-history-file*
    129       "/home/w96k/.cache/stumpwm/shell-command-history")
     128;; (setf shell-command-history:*shell-command-history-file*
     129;;       "/home/w96k/.cache/stumpwm/shell-command-history")
    130130
    131131;; Menu
    132 (setq app-menu:*app-menu*
    133       '(("Midnight Commander" "mc ~")
    134         ("Telegram" "telegram-desktop")
    135         ("Icecat" icecat)
    136         ("Next" next)
    137         ("Terminal" urxvt)
    138         ("Deluge" "deluge")))
     132;; (setq app-menu:*app-menu*
     133;;       '(("Midnight Commander" "mc ~")
     134;;         ("Telegram" "telegram-desktop")
     135;;         ("Icecat" icecat)
     136;;         ("Next" next)
     137;;         ("Terminal" urxvt)
     138;;         ("Deluge" "deluge")))
    139139
    140 (define-key *root-map* (kbd "q") "show-menu")
     140;; (define-key *root-map* (kbd "q") "show-menu")
    141141
    142 ;; Show / Hide mode-line
    143 (define-key *root-map* (kbd "M") "mode-line")
     142;; ;; Show / Hide mode-line
     143;; (define-key *root-map* (kbd "M") "mode-line")
    144144
    145145
Note: See TracChangeset for help on using the changeset viewer.