Changeset cc8263e in dotfiles

Timestamp:

Sep 1, 2020, 5:33:00 PM (4 years ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

f7fb9ae

Parents:

b7234fa

git-author:

Mikhail Kirillov <w96k@…> (08/07/20 14:33:08)

git-committer:

Mikhail Kirillov <w96k@…> (09/01/20 17:33:00)

Message:

Update guix config

Files:

• README (modified) (1 diff)
• emacs/.emacs (modified) (1 diff)
• emacs/.emacs-config.org (modified) (7 diffs)
• guix/.bash_profile (modified) (1 diff)
• guix/.bashrc (modified) (2 diffs)
• guix/.config/nyxt/init.lisp (added)
• guix/.zshenv (modified) (1 diff)
• guix/config.scm (modified) (4 diffs)
• wm/.stumpwmrc (modified) (1 diff)

README

@@ -11 +11 @@
 
 ** Emacs
-[[emacs.png]]
+   [[emacs.png]]
 
 *** My setup

emacs/.emacs

@@ -57 +57 @@
   :config
   (when (memq window-system '(mac ns x))
-    (exec-path-from-shell-copy-env "GUILE_LOAD_PATH")
+    (exec-path-from-shell-copy-env "PYTHONPATH")
     (exec-path-from-shell-initialize)))
 

emacs/.emacs-config.org

@@ -65 +65 @@
    #+END_SRC
 
-* Редактирование кода в общем
+* Редактирование кода в общемsss
 ** Файловый менеджер
    #+BEGIN_SRC emacs-lisp
@@ -314 +314 @@
         (use-package lsp-mode
          :hook  (scala-mode . lsp)
-                (python-mode . lsp)
+                ;;(python-mode . lsp)
                 (lsp-mode . lsp-enable-which-key-integration)
                 (lsp-mode . lsp-lens-mode)
@@ -322 +322 @@
            :config (push 'company-lsp company-backends))
 
-        ;;(use-package lsp-metals)
+        (use-package lsp-metals :ensure)
 
         (use-package lsp-ui)
@@ -371 +371 @@
 *** Elpy
     #+BEGIN_SRC emacs-lisp
-  ;; (use-package elpy
-  ;;   :ensure t
-  ;;   :init
-  ;;   (elpy-enable)
-  ;;   :config
-  ;;   (setq elpy-rpc-python-command "python3"
-  ;;    python-shell-interpreter "python3"
-  ;;    ;;python-shell-interpreter "ipython" elpy-modules
-  ;;    elpy-rpc-virtualenv-path 'current
-  ;;    pyvenv-mode-line-indicator t )
-  ;;   :bind
-  ;;   ("C-c p" . elpy-autopep8-fix-code)
-  ;;   ("C-c b" . elpy-black-fix-code))
+      (use-package elpy
+        :hook ((elpy-mode . flycheck-mode)
+           (elpy-mode . (lambda ()
+                          (set (make-local-variable 'company-backends)
+                               '((elpy-company-backend :with company-yasnippet))))))
+        :init
+        (elpy-enable)
+        :config
+        (setq elpy-rpc-python-command "python3"
+              python-shell-interpreter "python3"
+              ;;python-shell-interpreter "ipython" elpy-modules
+              elpy-rpc-virtualenv-path 'current
+              elpy-modules (delq 'elpy-module-flymake elpy-modules)
+              pyvenv-mode-line-indicator t )
+        (add-hook 'elpy-mode-hook 'flycheck-mode)
+        :bind
+        (:map elpy-mode-map
+        ("C-c p" . elpy-autopep8-fix-code)
+        ("C-c b" . elpy-black-fix-code)
+        ("C-M-n" . elpy-nav-forward-block)
+        ("C-M-p" . elpy-nav-backward-block)))
     #+END_SRC
 *** Anaconda
@@ -412 +420 @@
   :config (setq pydoc-command "python3 -m pydoc"))
     #+END_SRC
+
 ** Javascript
 *** Основной мод
@@ -759 +768 @@
   :hook (emacs-lisp-mode-hook . outshine-mode))
     #+END_SRC
+*** nobreak символы
+    #+BEGIN_SRC emacs-lisp
+      (setq nobreak-char-display nil)
+    #+END_SRC
+** Guix
+   #+BEGIN_SRC emacs-lisp
+     (use-package guix
+       :config
+       (add-hook 'after-init-hook 'global-guix-prettify-mode))
+   #+END_SRC
 ** Полный экран
    #+BEGIN_SRC emacs-lisp
@@ -872 +891 @@
 ** Обнаруживать просадки
    #+BEGIN_SRC emacs-lisp
-     ;; (use-package explain-pause-mode
-     ;;   :quelpa (explain-pause-mode :fetcher github :repo "lastquestion/explain-pause-mode")
-     ;;   :diminish
-     ;;   :config (setq explain-pause-blocking-too-long-ms 200)
-     ;;           (explain-pause-mode))
-   #+END_SRC
+     (use-package explain-pause-mode
+       :quelpa (explain-pause-mode :fetcher github :repo "lastquestion/explain-pause-mode")
+       :diminish
+       :config (setq explain-pause-blocking-too-long-ms 200)
+                       (explain-pause-mode))
+   #+END_SRC

guix/.bash_profile

@@ -1 @@
-export PATH=$PATH:~/.bin
+export PATH=$PATH:~/.bin:~/.local/bin
+
+alias python=python3
+
+# THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
+export SDKMAN_DIR="/home/w96k/.sdkman"
+[[ -s "/home/w96k/.sdkman/bin/sdkman-init.sh" ]] && source "/home/w96k/.sdkman/bin/sdkman-init.sh"
+
+# Python Env
+export PATH="/home/w96k/.pyenv/bin:$PATH"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
 
 # Honor per-interactive-shell startup file
 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
+if [ -e /home/w96k/.nix-profile/etc/profile.d/nix.sh ]; then . /home/w96k/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

guix/.bashrc

@@ -23 +23 @@
 if [ -n "$GUIX_ENVIRONMENT" ]
 then
-    export PS1="\w [env] \$"
+    export PS1="\w [env]\$ "
 else
     export PS1="\[$(tput bold; tput setaf 3;)\]\w \$ \[$(tput sgr0)\]"
@@ -33 +33 @@
 # Welcome message
 printf "Welcome to bash shell\n\n"
-
-alias python=python3
-
-# THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="/home/w96k/.sdkman"
-[[ -s "/home/w96k/.sdkman/bin/sdkman-init.sh" ]] && source "/home/w96k/.sdkman/bin/sdkman-init.sh"

guix/.zshenv

@@ +1 @@
+if [ -e /home/w96k/.nix-profile/etc/profile.d/nix.sh ]; then . /home/w96k/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

guix/config.scm

@@ -7 +7 @@
  ssh
  xorg
+ virtualization
  nix)
 
@@ -21 +22 @@
      "caps:ctrl_modifier"
      )))
- (kernel linux-libre)
+ (kernel linux-libre-5.8)
  (kernel-arguments
   '("processor.max_cstate=1"  ; Disable power savings
@@ -46 +47 @@
     (home-directory "/home/w96k")
     (supplementary-groups
-     '("wheel" "netdev" "audio" "video" "nixbld")))
+     '("wheel" "netdev" "audio" "video")))
    %base-user-accounts))
  (packages
@@ -63 +64 @@
       "font-fira-mono"
       "sbcl"
-      "nix"
       "stumpwm"))
    (list `(,stumpwm "lib"))

wm/.stumpwmrc

@@ -64 +64 @@
 
 (defcommand icecat () ()
+            (run-or-raise "icecat" '(:class "IceCat")))
+
+(defcommand nyxt () ()
             "Start Next or switch to it, if it is already running."
-            (run-or-raise "icecat" '(:class "IceCat")))
-(define-key *root-map* (kbd "b") "icecat")
+            (run-or-raise "nyxt" '(:class "nyxt")))
+            
+(define-key *root-map* (kbd "b") "nyxt")
 
 ;; launch terminal