Changeset fcd469c in dotfiles


Ignore:
Timestamp:
Oct 21, 2020, 5:48:05 PM (4 years ago)
Author:
Mikhail Kirillov <w96k@…>
Branches:
master
Children:
9edc3e2
Parents:
1cd0b1d
git-author:
Mikhail Kirillov <w96k@…> (10/21/20 13:25:33)
git-committer:
Mikhail Kirillov <w96k@…> (10/21/20 17:48:05)
Message:

Minor updates

Files:
3 added
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • X/.Xdefaults

    r1cd0b1d rfcd469c  
    1 URxvt.termName: rxvt-257color
     1URxvt.termName: rxvt-256color
    22
    33!TomorrowNightEighties + bg/fg night
     
    3939
    4040! Xterm
    41 XTerm.vt100*faceName: Fira Mono
    42 xterm.vt100.blink: True
    43 XTerm*faceSize: 11.5
     41XTerm*faceName: Fira Mono
     42XTerm*faceSize: 11
    4443XTerm*renderFont: True
    4544XTerm*eightBitInput: False
     45XTerm*selectToClipboard: True
     46XTerm*cursorBlink: True
     47XTerm*visualBell: True
     48XTerm*ScrollKey: True
    4649
    4750! URxvt
  • emacs/.emacs.d/.emacs-config.org

    r1cd0b1d rfcd469c  
    1212       :config
    1313       (dashboard-setup-startup-hook)
    14        ;;(setq dashboard-center-content t)
    1514       (setq dashboard-startup-banner nil)
    1615       (setq dashboard-set-heading-icons t)
    17        (setq dashboard-set-file-icons t)
     16       (setq dashboard-set-file-icons nil)
    1817       (setq dashboard-items '((recents  . 2)           
    1918                               (projects . 10)
     
    2928;;(set-frame-font "Terminus-10" nil t)
    3029
    31      (set-language-environment "UTF-8")
     30(set-language-environment "UTF-8")
    3231     (set-default-coding-systems 'utf-8)
    3332     (setq-default line-spacing 0)
     
    3534     (set-face-attribute 'default nil
    3635                         :family "Fira Mono"
    37                          :height 110
     36                         :height 105
    3837                         :weight 'regular
    3938                         :width 'normal)
     
    145144       :hook (dired-mode .  dired-hide-dotfiles-mode))
    146145
    147 (require 'dired)
     146     (require 'dired)
    148147(setq dired-async-mode t)
    149148
     
    151150
    152151;; Show files in kilobytes
    153 (setq dired-listing-switches "-alh")
    154 
    155 (defun xah-dired-sort ()
    156   "Sort dired dir listing in different ways.
     152     (setq dired-listing-switches "-alh")
     153
     154     (defun xah-dired-sort ()
     155       "Sort dired dir listing in different ways.
    157156     Prompt for a choice.
    158157     URL `http://ergoemacs.org/emacs/dired_sort.html'
    159158     Version 2018-12-23"
    160   (interactive)
    161   (let ($sort-by $arg)
    162     (setq $sort-by (ido-completing-read "Sort by:" '( "date" "size" "name" )))
    163     (cond
    164      ((equal $sort-by "name") (setq $arg "-Al "))
    165      ((equal $sort-by "date") (setq $arg "-Al -t"))
    166      ((equal $sort-by "size") (setq $arg "-Al -S"))
    167      ;; ((equal $sort-by "dir") (setq $arg "-Al --group-directories-first"))
    168      (t (error "logic error 09535" )))
    169     (dired-sort-other $arg )))
     159       (interactive)
     160       (let ($sort-by $arg)
     161        (setq $sort-by (ido-completing-read "Sort by:" '( "date" "size" "name" )))
     162        (cond
     163          ((equal $sort-by "name") (setq $arg "-Al "))
     164          ((equal $sort-by "date") (setq $arg "-Al -t"))
     165          ((equal $sort-by "size") (setq $arg "-Al -S"))
     166          ;; ((equal $sort-by "dir") (setq $arg "-Al --group-directories-first"))
     167          (t (error "logic error 09535" )))
     168        (dired-sort-other $arg )))
    170169
    171170     (define-key dired-mode-map (kbd "s") 'xah-dired-sort)
     
    177176;;   :hook (prog-mode . flymake-mode))
    178177
    179      (use-package flycheck
    180        
    181        :bind (("C-c e" . flycheck-list-errors))
    182        :config
    183        (setq-default left-fringe-width 8 right-fringe-width 8
    184                      flycheck-indication-mode 'right-margin
    185                      left-margin-width 1 right-margin-width 0)
    186        (add-hook 'flycheck-mode-hook #'flycheck-set-indication-mode)
    187        (global-flycheck-mode))
     178(use-package flycheck
     179 
     180  :bind (("C-c e" . flycheck-list-errors))
     181  :config
     182  (setq-default left-fringe-width 8 right-fringe-width 8
     183                flycheck-indication-mode 'right-margin
     184                left-margin-width 1 right-margin-width 0)
     185  (add-hook 'flycheck-mode-hook #'flycheck-set-indication-mode)
     186  (global-flycheck-mode))
    188187   #+END_SRC
    189188** Дерево отмен
    190189   #+BEGIN_SRC emacs-lisp
    191190     ;;; Undo system
    192 (use-package undo-tree
    193   :diminish
    194   :config (global-undo-tree-mode))
     191     (use-package undo-tree
     192       :diminish
     193       :config (global-undo-tree-mode))
    195194   #+END_SRC
    196195   
     
    199198     (use-package treemacs
    200199       :ensure
     200       :config
     201       (setq treemacs-width 25)
    201202       :bind (("C-x C-d" . treemacs)))
    202203
    203 (use-package treemacs-projectile
    204   :ensure)
     204     (use-package treemacs-projectile
     205       :ensure)
    205206   #+END_SRC
    206207** Автоформатирование
     
    209210(use-package aggressive-indent
    210211  :ensure t
    211      :config (global-aggressive-indent-mode))
     212:config (global-aggressive-indent-mode))
    212213   #+END_SRC
    213214** SSH
    214215   #+BEGIN_SRC emacs-lisp
    215 (use-package ssh-agency
    216 :ensure)
     216     (use-package ssh-agency
     217       :ensure)
    217218   #+END_SRC
    218219** Система контроля версий
     
    220221
    221222   #+BEGIN_SRC emacs-lisp
    222          (use-package magit
    223            :bind (("C-x g" . magit-status)))
    224 
    225         (use-package magit-todos
    226           :hook (magit-mode . magit-todos))
    227 
     223     (use-package magit
     224       :bind (("C-x g" . magit-status)))
     225
     226
     227(use-package magit-gitflow
     228  :ensure
     229  :after magit
     230  :config (add-hook 'magit-mode-hook 'turn-on-magit-gitflow))
     231
     232     (use-package magit-todos
     233       :hook (magit-mode . magit-todos))
    228234   #+END_SRC
    229235*** Пометки о модифицированных строках
     
    234240    #+BEGIN_SRC emacs-lisp
    235241      ;;; Show added & removed git lines
    236       (use-package git-gutter+
    237         :ensure t
    238         :diminish
    239         :config
    240         (global-git-gutter+-mode)
    241         (setq git-gutter+-window-width 1)
    242         (set-face-background 'git-gutter+-added "#99cc99")
    243         (set-face-background 'git-gutter+-deleted "#f2777a")
    244         (set-face-background 'git-gutter+-modified "#ffcc66")
    245         (set-face-background 'git-gutter+-unchanged "#393939")
    246         (setq git-gutter+-added-sign " ")
    247         (setq git-gutter+-modified-sign " ")
    248         (setq git-gutter+-deleted-sign " ")
    249         (setq git-gutter+-unchanged-sign " ")
    250 
    251         (progn
    252           (define-key git-gutter+-mode-map (kbd "C-x n") 'git-gutter+-next-hunk)
    253           (define-key git-gutter+-mode-map (kbd "C-x p") 'git-gutter+-previous-hunk)
    254           (define-key git-gutter+-mode-map (kbd "C-x v =") 'git-gutter+-show-hunk)
    255           (define-key git-gutter+-mode-map (kbd "C-x r") 'git-gutter+-revert-hunks)
    256           (define-key git-gutter+-mode-map (kbd "C-x t") 'git-gutter+-stage-hunks)
    257           (define-key git-gutter+-mode-map (kbd "C-x c") 'git-gutter+-commit)
    258           (define-key git-gutter+-mode-map (kbd "C-x C") 'git-gutter+-stage-and-commit)
    259           (define-key git-gutter+-mode-map (kbd "C-x C-y") 'git-gutter+-stage-and-commit-whole-buffer)
    260           (define-key git-gutter+-mode-map (kbd "C-x U") 'git-gutter+-unstage-whole-buffer)))
     242(use-package git-gutter+
     243  :ensure t
     244  :diminish
     245  :config
     246  (global-git-gutter+-mode)
     247  (setq git-gutter+-window-width 1)
     248  (set-face-background 'git-gutter+-added "#99cc99")
     249  (set-face-background 'git-gutter+-deleted "#f2777a")
     250  (set-face-background 'git-gutter+-modified "#ffcc66")
     251  (set-face-background 'git-gutter+-unchanged "#393939")
     252  (setq git-gutter+-added-sign " ")
     253  (setq git-gutter+-modified-sign " ")
     254  (setq git-gutter+-deleted-sign " ")
     255  (setq git-gutter+-unchanged-sign " ")
     256
     257  (progn
     258    (define-key git-gutter+-mode-map (kbd "C-x n") 'git-gutter+-next-hunk)
     259    (define-key git-gutter+-mode-map (kbd "C-x p") 'git-gutter+-previous-hunk)
     260    (define-key git-gutter+-mode-map (kbd "C-x v =") 'git-gutter+-show-hunk)
     261    (define-key git-gutter+-mode-map (kbd "C-x r") 'git-gutter+-revert-hunks)
     262    (define-key git-gutter+-mode-map (kbd "C-x t") 'git-gutter+-stage-hunks)
     263    (define-key git-gutter+-mode-map (kbd "C-x c") 'git-gutter+-commit)
     264    (define-key git-gutter+-mode-map (kbd "C-x C") 'git-gutter+-stage-and-commit)
     265    (define-key git-gutter+-mode-map (kbd "C-x C-y") 'git-gutter+-stage-and-commit-whole-buffer)
     266    (define-key git-gutter+-mode-map (kbd "C-x U") 'git-gutter+-unstage-whole-buffer)))
    261267    #+END_SRC
    262268** Буфер обмена
    263269   #+BEGIN_SRC emacs-lisp
    264   (use-package browse-kill-ring
    265     :config (browse-kill-ring-default-keybindings))
     270     (use-package browse-kill-ring
     271       :config (browse-kill-ring-default-keybindings))
    266272   #+END_SRC
    267273** Прыжки
    268274   #+BEGIN_SRC emacs-lisp
    269 (use-package avy
    270   :config
    271   (define-key global-map (kbd "C-c s") 'avy-goto-char)
    272   (define-key global-map (kbd "C-c l") 'avy-goto-line))
    273 
    274 (use-package ace-jump-mode
    275   :config
    276   (global-set-key (kbd "M-o") 'ace-window))
     275     (use-package avy
     276       :config
     277       (define-key global-map (kbd "C-c s") 'avy-goto-char)
     278       (define-key global-map (kbd "C-c l") 'avy-goto-line))
     279
     280     (use-package ace-jump-mode
     281       :config
     282       (global-set-key (kbd "M-o") 'ace-window))
    277283   #+END_SRC
    278284** Сниппеты
     
    306312       :ensure t)
    307313
    308 (use-package company
     314     (use-package company
    309315  :diminish
    310   :custom
    311   (company-require-match nil)
    312   (company-minimum-prefix-length 1)
    313   (company-tooltip-align-annotation t)
    314   :config (global-company-mode)
    315   :bind (:map company-active-map
    316               ("C-n" . company-select-next)
    317               ("C-p" . company-select-previous)))
     316       :custom
     317       (company-require-match nil)
     318       (company-minimum-prefix-length 1)
     319       :config (global-company-mode)
     320       :bind (:map company-active-map
     321                   ("C-n" . company-select-next)
     322                   ("C-p" . company-select-previous)))
    318323
    319324(use-package company-quickhelp
     
    400405   #+END_SRC
    401406* Языки программирования
    402 ** LSP (автодополнение для языков) и DAP (дебаг)
    403    #+BEGIN_SRC emacs-lisp
    404         ;; (use-package lsp-mode
    405      ;;     :hook  (scala-mode . lsp)
    406      ;;            ;;(python-mode . lsp)
    407      ;;            (lsp-mode . lsp-enable-which-key-integration)
    408      ;;            (lsp-mode . lsp-lens-mode)
    409      ;;     :config (setq lsp-prefer-flymake nil))
    410 
    411      ;;     (use-package company-lsp
    412      ;;       :config (push 'company-lsp company-backends))
    413 
    414      ;;    (use-package lsp-metals :ensure)
    415 
    416      ;;    (use-package lsp-ui)
    417 
    418      ;;    (use-package lsp-ivy)
    419 
    420      ;;    (use-package company-lsp)
    421 
    422      ;; (use-package posframe
    423      ;;   :ensure)
    424 
    425      ;; (use-package dap-mode
    426      ;;   :ensure
    427      ;;   :hook
    428      ;;   (lsp-mode . dap-mode)
    429      ;;   (lsp-mode . dap-ui-mode))
    430 
    431      ;; (use-package lsp-java
    432      ;;   :ensure
    433      ;;   :hook (java-mode . lsp-mode))
    434    #+END_SRC
    435407** LISP
    436408*** Разукрашивание скобок в лиспах
     
    770742      (setq nobreak-char-display nil)
    771743    #+END_SRC
     744** Русский язык
     745   #+BEGIN_SRC emacs-lisp
     746     (use-package reverse-im
     747       :ensure
     748       :custom
     749       (reverse-im-input-methods '("russian-computer"))
     750       :config
     751       (reverse-im-mode t))
     752   #+END_SRC
    772753** Guix
    773754   #+BEGIN_SRC emacs-lisp
     
    775756       :config
    776757       (add-hook 'after-init-hook 'global-guix-prettify-mode))
     758   #+END_SRC
     759** Direnv
     760   #+BEGIN_SRC emacs-lisp
     761     (use-package direnv
     762      :config
     763      (direnv-mode))
    777764   #+END_SRC
    778765** Which-key
  • emacs/.emacs.d/early-init.el

    r1cd0b1d rfcd469c  
    1 ;; Do not initialise the package manager.  This is done in `init.el'.
    2 ;;(setq package-enable-at-startup t)
    3 
    4 ;; Allow loading from the package cache.
    5 ;;(setq package-quickstart t)
    6 
    71;; Do not resize the frame at this early stage.
    82(setq frame-inhibit-implied-resize t)
     
    137(tool-bar-mode -1)
    148(tooltip-mode t)
    15 
    16 ;;(setq package--init-file-ensured t)
  • emacs/.emacs.d/init.el

    r1cd0b1d rfcd469c  
    2323;; Dont ask when following symlinks
    2424(setq vc-follow-symlinks t)
    25 
    26 ;; (when (not (package-installed-p 'quelpa))
    27 ;;   (with-temp-buffer
    28 ;;     (url-insert-file-contents "https://github.com/quelpa/quelpa/raw/master/quelpa.el")
    29 ;;     (eval-buffer)
    30 ;;     (quelpa-self-upgrade)))
    31 
    32 ;; (quelpa
    33 ;;  '(quelpa-use-package
    34 ;;    :fetcher git
    35 ;;    :url "https://github.com/quelpa/quelpa-use-package.git"))
    36 ;; (require 'quelpa-use-package)
    3725
    3826;; "Bootstrap" use-package
     
    7563(require 'ob-tangle)
    7664(org-babel-load-file "~/.emacs.d/.emacs-config.org")
    77 
    78 (provide 'init)
    79 ;;; init.el ends here
     65(put 'upcase-region 'disabled nil)
  • guix/.bash_profile

    r1cd0b1d rfcd469c  
    1 export PATH=$PATH:~/.bin:~/.local/bin:/bin
     1GUIX_PROFILE="/home/w96k/.guix-profile"
     2     . "$GUIX_PROFILE/etc/profile"
     3source $GUIX_PROFILE
     4source "$HOME/.config/guix/current/etc/profile"
    25
    3 # THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
    4 # export SDKMAN_DIR="/home/w96k/.sdkman"
    5 # [[ -s "/home/w96k/.sdkman/bin/sdkman-init.sh" ]] && source "/home/w96k/.sdkman/bin/sdkman-init.sh"
     6#export GUIX_PACKAGE_PATH=$HOME/projects/dotfiles/guix-channel/non-gnu/packages/
     7export GUIX_PACKAGE_PATH=$HOME/.guix-packages/
     8
     9export PATH=$HOME/.config/guix/current/bin:$PATH:$HOME/.bin:~/.local/bin:/bin:$HOME/.nix-profile/bin
     10
     11export CC=gcc
     12export LD_LIBRARY_PATH=$HOME/.guix-profile/lib/
    613
    714GUIX_EXTRA_PROFILES=$HOME/.guix-extra-profiles
  • guix/.bashrc

    r1cd0b1d rfcd469c  
    1717# fi
    1818
     19# bind 'set show-all-if-ambiguous on'
     20# bind 'TAB:menu-complete'
     21
    1922# Source the system-wide file.
    2023source /etc/bashrc
     
    2528    export PS1="\w [env]\$ "
    2629else
    27     export PS1="\[$(tput bold; tput setaf 4;)\]\w \$ \[$(tput sgr0)\]"
     30    export PS1="\[$(tput bold; tput setaf 3;)\]\w \$ \[$(tput sgr0)\]"
     31    # Direnv
     32    eval "$(direnv hook bash)"
    2833fi
    2934alias ls='ls -p --color=auto'
  • guix/.config/guix/channels.scm

    r1cd0b1d rfcd469c  
    1 (cons*
     1(list
     2 (channel
     3  (name 'w96k)
     4  (url "https://git.sr.ht/~w96k/dotfiles")
     5  (branch "master"))
    26 ;; (channel
    3  ;;  (name 'w96k)
    4  ;;  (url "https://git.sr.ht/~w96k/dotfiles")
     7 ;;  (name 'guix-gaming)
     8 ;;  (url "https://gitlab.com/guix-gaming-channels/games")
    59 ;;  (branch "master"))
    610 (channel
    7   (name 'emacs-native)
    8   (url "https://github.com/flatwhatson/guix-channel")
    9   (branch "master"))
    10 (channel
    11   (name 'guix-gaming)
    12   (url "https://gitlab.com/guix-gaming-channels/games")
    13   (branch "master"))
    14 
    15 
    16  %default-channels)
     11  (name 'guix)
     12  (url "https://git.savannah.gnu.org/git/guix.git")
     13  (branch "master")))
  • guix/config.scm

    r1cd0b1d rfcd469c  
    99 docker
    1010 virtualization
     11 dbus
    1112 nix)
    1213
    13 (use-package-modules wm lisp bash linux python)
     14(use-package-modules
     15 wm
     16 lisp
     17 bash
     18 linux
     19 python
     20 xdisorg)
    1421
    1522(operating-system
    16   (locale "ru_RU.utf8")
    17   (timezone "Europe/Moscow")
     23 (locale "ru_RU.utf8")
     24 (timezone "Europe/Moscow")
     25 (keyboard-layout
    1826  (keyboard-layout
    19    (keyboard-layout
    20     "us,ru"
    21     #:options
    22     '("grp:win_space_toggle"
    23       "caps:ctrl_modifier"
    24       )))
    25   (kernel linux-libre-5.8)
    26   (kernel-arguments
    27    '("processor.max_cstate=1"  ; Disable power savings
    28      "intel_idle.max_cstate=2" ; (cstate 3-4 provides
     27   "us,ru"
     28   #:options
     29   '("grp:win_space_toggle"
     30     "caps:ctrl_modifier")))
     31 (kernel linux-libre-5.8)
     32 (kernel-arguments
     33  '("consoleblank=0"
     34    "processor.max_cstate=1"  ; Disable power savings
     35    "intel_idle.max_cstate=0" ; (cstate 3-4 provides
    2936                                        ; high freq cpu noice)
    30      "consoleblank=0"
    31      ;;"ahci.mobile_lpm_policy=1"
    32      "KVM"
    33      ;;"i915.enable_guc=-1"
    34      ;;"i915.enable_dc=0" ; Disable cstate for gpu
     37   
     38    ;;"ahci.mobile_lpm_policy=1"
     39    "KVM"
     40    "i915.enable_dc=0" ; Disable cstate for gpu
     41    "i915.enable_psr=0"
     42    "i915.fastboot=1"
     43    "i915.enable_guc=2"
     44    "i915.modeset=1"
    3545
    36      "intremap=off"     ; Fix for failed to map dmar2
    37      
    38      "logo.nologo"
    39      "loglevel=4"))
    40   (initrd-modules (append '("i915") %base-initrd-modules))
    41   (host-name "libreboot-x200t")
    42   (users
    43    (cons*
    44     (user-account
    45      (name "w96k")
    46      (comment "Mikhail Kirillov")
    47      (group "users")
    48      (home-directory "/home/w96k")
    49      (supplementary-groups
    50       '("wheel" "netdev" "audio" "video")))
    51     %base-user-accounts))
    52   (packages
    53    (append
    54     (map
    55      specification->package
    56      '("ratpoison"
    57        "xterm"
    58        "stumpwm"
    59        "bash"
    60        "nss-certs"
    61        "glibc-utf8-locales"
    62        "font-dejavu"
    63        "font-terminus"
    64        "font-fira-code"
    65        "font-fira-mono"
    66        "sbcl"
    67        "git"
    68        "stow"
    69        "guile-ssh"
    70        "stumpwm"))
    71     (list `(,stumpwm "lib"))
    72     %base-packages))
     46    "intremap=off"     ; Fix for failed to map dmar2
     47    "modprobe.blacklist=pcspkr"
     48   
     49    "logo.nologo"
     50    "loglevel=4"))
     51 (initrd-modules (append '("i915") %base-initrd-modules))
     52 (host-name "libreboot-x200t")
     53 (users
     54  (cons*
     55   (user-account
     56    (name "w96k")
     57    (comment "Mikhail Kirillov")
     58    (group "users")
     59    (home-directory "/home/w96k")
     60    (supplementary-groups
     61     '("wheel" "netdev" "audio" "video")))
     62   %base-user-accounts))
     63 (packages
     64  (append
     65   (map
     66    specification->package
     67    '("ratpoison"
     68      "sway"
     69      "wterm"
     70      "xterm"
     71      "stumpwm"
     72      "bash"
     73      "nss-certs"
     74      "glibc-utf8-locales"
     75      "font-dejavu"
     76      "font-terminus"
     77      "font-fira-code"
     78      "font-fira-mono"
     79      "sbcl"
     80      "intel-vaapi-driver"
     81      "git"
     82      "stow"
     83      "xf86-video-intel"
     84      "mesa"
     85      "xorg-server"
     86      "network-manager"
     87      "guile-ssh"
     88      "emacs"
     89      "stumpwm"))
     90   (list `(,stumpwm "lib"))
     91   %base-packages))
    7392
    74   (services
    75    (cons*
    76     (service openssh-service-type)
    77     (service tor-service-type)
    78     (service docker-service-type)
     93 (services
     94  (cons*
    7995
    80     ;;Wacom tablet support
    81     (service inputattach-service-type
    82              (inputattach-configuration
    83               (device "/dev/ttyS4")
    84               (device-type "wacom")))
    85    
    86     (service special-files-service-type
    87              `(("/bin/bash"   ,(file-append bash "/bin/bash"))
    88                ("/bin/python" ,(file-append python "/bin/python3"))))
     96   ;; (service login-service-type
     97   ;;          (login-configuration
     98   ;;           (motd (plain-file "motd" "\
     99   ;; Welcome to GNU/Guix lisp machine\n\n"))))
     100   
    89101
    90     (service nix-service-type)
    91     (service slim-service-type
    92              (slim-configuration
     102   ;; (udisks-service)
     103   
     104   (service openssh-service-type)
     105   (service tor-service-type)
     106   (service docker-service-type)
     107
     108   ;;Wacom tablet support
     109   (service inputattach-service-type
     110            (inputattach-configuration
     111             (device "/dev/ttyS4")
     112             (device-type "wacom")))
     113   
     114   (service special-files-service-type
     115            `(("/bin/bash"   ,(file-append bash "/bin/bash"))
     116              ("/bin/python" ,(file-append python "/bin/python3"))))
     117
     118   (service nix-service-type)
     119
     120   (screen-locker-service xlockmore "xlock")
     121   (service slim-service-type
     122            (slim-configuration
     123             (xorg-configuration
    93124              (xorg-configuration
    94                (xorg-configuration
    95                 (keyboard-layout keyboard-layout)))))
    96     (remove (lambda (service)
    97               (eq? (service-kind service) gdm-service-type))
    98             %desktop-services)))
     125               (keyboard-layout keyboard-layout)))))
     126   (remove (lambda (service)
     127             (eq? (service-kind service) gdm-service-type))
     128           %desktop-services)))
    99129
    100   (bootloader
    101    (bootloader-configuration
    102     (bootloader grub-bootloader)
    103     (target "/dev/sda")
    104     (keyboard-layout keyboard-layout)))
    105   (swap-devices (list "/dev/sda1"))
    106   (file-systems
    107    (cons*
    108     (file-system
    109       (mount-point "/")
    110       (device
    111        (uuid "c184f446-df67-4103-b28e-465ac8776f10"
    112              'ext4))
    113       (type "ext4"))
    114     ;;(file-system
    115     ;;(mount-point "/media/hdd/")
    116     ;;(device
    117     ;;  (uuid "71cb0818-baf3-4f7f-8bc2-7e2b0cca3488"
    118     ;;   'ext4))
    119     ;; (type "ext4"))
    120    
    121     %base-file-systems)))
     130 (bootloader
     131  (bootloader-configuration
     132   (bootloader grub-bootloader)
     133   (target "/dev/sda")
     134   (keyboard-layout keyboard-layout)))
     135 (swap-devices (list "/dev/sda1"))
     136 (file-systems
     137  (cons*
     138   (file-system
     139    (mount-point "/")
     140    (device
     141     (uuid "c184f446-df67-4103-b28e-465ac8776f10"
     142           'ext4))
     143    (type "ext4"))
     144   ;;(file-system
     145   ;;(mount-point "/media/hdd/")
     146   ;;(device
     147   ;;  (uuid "71cb0818-baf3-4f7f-8bc2-7e2b0cca3488"
     148   ;;    'ext4))
     149   ;; (type "ext4"))
     150   
     151   %base-file-systems)))
     152
     153
  • guix/user.scm

    r1cd0b1d rfcd469c  
    11(specifications->manifest
    2  '("adb"
     2 '(
     3   ;; Programming languages
     4   ;;"julia"
     5   "chibi-scheme"
     6   "perl"
     7   "php"
     8   "python"
     9   "ruby"
     10   "rust"
     11   "sbcl"
     12   "go"
     13   "ghc@8.6.5"
     14   "ocaml"
     15   "ocaml4.07-utop"
     16   "opam"
     17   "polyml"
     18   "vala"
     19
     20   "geda-gaf"
     21   
     22   "adb"
    323   "adwaita-icon-theme"
    424   "alsa-utils"
    525   ;;"ardour"
    6    "audacity"
     26   ;;"audacity" ;; Long to compile
    727   "bash"
    828   "bashtop"
    929   "binutils"
    1030   "bzip2"
    11    "chibi-scheme"
     31
    1232   "clinfo"
    1333   "cloc"
     
    1636   "cpupower"
    1737   "curl"
     38   "direnv"
    1839   "djview"
    1940   "djvulibre"
    20    "dwarf-fortress"
     41   "mg"   ; Emacs-like
     42   "zile" ; text editor
    2143   ;; Emacs
    2244   "emacs"
    2345   ;;"emacs-native-comp"
     46   "emacs-julia-mode"
    2447   "emacs-ace-jump-mode"
     48   "emacs-all-the-icons"
    2549   "emacs-avy"
    2650   "emacs-bui"
     
    3660   "emacs-debbugs"
    3761   "emacs-diminish"
     62   "emacs-direnv"
    3863   "emacs-djvu"
    3964   "emacs-docker"
     
    6590   "emacs-mastodon"
    6691   "emacs-nodejs-repl"
     92   "emacs-nix-mode"
    6793   "emacs-org-bullets"
    6894   "emacs-org-pomodoro"
     
    77103   "emacs-rainbow-delimiters"
    78104   "emacs-restclient"
     105   "emacs-request"
    79106   "emacs-s"
    80107   "emacs-scheme-complete"     
     
    86113   ;;"emacs-sudo-edit"
    87114   "emacs-telega"
     115   "emacs-transmission"
    88116   ;;"emacs-treemacs"
    89117   ;;"emacs-treemacs-extra"
     
    107135   "emacs-polymode-org"
    108136   ;; Emacs ends here
    109    "vim-full"
     137   ;;"vim-full"
    110138   "evince"
    111139   "fastboot"
     
    121149   "gdb"
    122150   "gdbm"
    123    "ghc"
    124151   "gimp"
    125152   "git"
     
    134161   "gnome-themes-extra"
    135162   "htop"
     163   "pkg-config"
     164   "gobject-introspection"
    136165   "icecat"
    137166   "imagemagick"
     
    149178   "mpv"
    150179   "musescore"
     180   "denemo"
    151181   "ncurses-with-gpm"
    152182   "neofetch"
     
    155185   "node"
    156186   "nss-certs"
    157    "nyxt"
     187   ;;"nyxt"
    158188   "openjdk"
    159189   "openssh"
    160190   "openssl"
    161191   "parcimonie"
    162    "perl"
    163    "php"
    164192   "pinentry"
    165    "poppler"
    166193   "postgresql"
    167    "python"
    168    "python-ipython"
     194
     195   ;;"python-ipython"
    169196   "python-black"
    170197   "python-cython"
     
    183210   "readline"
    184211   "ristretto"
    185    "ruby"
    186    "rust"
    187    "rust"
    188    "sbcl"
    189212   "sbcl-clx"
    190213   "sbcl-clx-truetype"
     
    205228   "tk"
    206229   "translate-shell"
    207    "transmission"
     230   "transmission:gui"
    208231   "tree"
    209232   "smartmontools"
     
    215238   "wget"
    216239   "xboard"
     240   "xclip"
    217241   "xdg-utils"
    218242   "xfce4-screenshooter"
     
    225249   "fd"
    226250   "universal-ctags"
    227    "zsh"))
     251   "zsh"
     252
     253   "nix"
     254
     255   ;; Games
     256   ;;"dwarf-fortress"
     257   "dosbox"
     258   "chocolate-doom"
     259   "freedoom"
     260   "eduke32"
     261   "crawl-tiles"
     262   "minetest"
     263   "minetest-mineclone"
     264   ;;"cataclysm-dda:tiles" ;; Long to rebuild every time
     265   ))
  • shell/.inputrc

    r1cd0b1d rfcd469c  
     1# https://www.gnu.org/software/bash/manual/html_node/Readline-Init-File-Syntax.html
     2set show-all-if-ambiguous on
     3TAB:menu-complete
     4set blink-matching-paren on
     5set colored-completion-prefix on
     6set colored-stats on
     7set completion-display-width 1
     8set completion-ignore-case on
     9set completion-map-case 0
     10set enable-bracketed-paste on
     11set mark-symlinked-directories on
     12set menu-complete-display-prefix on
  • wm/.stumpwmrc

    r1cd0b1d rfcd469c  
    1212(setf clx-truetype:+font-cache-filename+ (concat (getenv "HOME") "/.fonts/font-cache.sexp"))
    1313(xft:cache-fonts)
    14 (set-font (make-instance 'xft:font :family "Fira Code" :subfamily "Bold" :size 10.5))
     14(set-font (make-instance 'xft:font :family "Fira Mono" :subfamily "Bold" :size 10.5))
    1515
    1616(load-module "battery-portable")
     
    2727(setf *mode-line-pad-x* 0
    2828      *mode-line-pad-y* 0
    29       *mode-line-timeout* 1
     29      *mode-line-timeout* 3
    3030      *mouse-focus-policy* :click
    3131      *window-border-style* :thin
    3232      *message-window-gravity* :center
    3333      *normal-border-width* 0
    34       *mode-line-border-width* 1
     34      *mode-line-border-width* 0
    3535      *transient-border-width* 1
    3636      *mode-line-position* :top
     
    8989  (define-key *top-map* (kbd "XF86AudioMute") "amixer -q sset Master toggle"))
    9090
     91(define-key *root-map* (kbd "I") "exec flatpak run com.jetbrains.PyCharm-Community")
     92
    9193;; Printscreen
    9294(defcommand printscreen () ()
     
    105107
    106108(setf (getenv "GDK_CORE_DEVICE_EVENTS") "1")
    107 
    108 (defun key-press-hook (key key-seq cmd)
    109     (let ((*message-window-gravity* :bottom))
    110       (message-no-timeout "Key sequence: ~A"
    111                (print-key-seq (reverse key-seq))))
    112     (when (stringp cmd)
    113         (sleep 0.1)))
    114 
    115 (defmacro replace-hook (hook fn)
    116   `(remove-hook ,hook ,fn)
    117   `(add-hook ,hook ,fn))
    118 
    119 (replace-hook *key-press-hook* 'key-press-hook)
    120109
    121110;; Clipboard history
Note: See TracChangeset for help on using the changeset viewer.