Changeset c53d99e in dotfiles

Timestamp:

Jul 3, 2022, 8:18:15 PM (2 years ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

dc74d32

Parents:

b6142c1

git-author:

Mikhail Kirillov <w96k@…> (06/22/22 09:57:17)

git-committer:

Mikhail Kirillov <w96k@…> (07/03/22 20:18:15)

Message:

Update dotfiles

Files:

• cvs/.gitconfig (modified) (1 diff)
• guix/.guix-packages/emacs.scm (modified) (5 diffs)
• guix/config.scm (modified) (8 diffs)
• guix/user.scm (modified) (2 diffs)
• php/.psysh/rc.php (added)
• python/.pythonrc (modified) (1 diff)
• wm/.ratpoisonrc (modified) (1 diff)

cvs/.gitconfig

@@ -13 +13 @@
         smtpUser = w96k@riseup.net
         smtpServerPort = 587
+[init]
+        defaultBranch = master
+[http]
+        sslVerify = true

guix/.guix-packages/emacs.scm

@@ -9 +9 @@
   #:use-module (guix memoization)
   #:use-module (guix build-system emacs)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (gnu packages)
   #:use-module (gnu packages imagemagick)
@@ -24 +25 @@
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match))
+
+(define-public emacs
+  (package
+    (name "emacs")
+    (version "28.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/emacs/emacs-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98"))
+              (patches (search-patches "emacs-exec-path.patch"
+                                       "emacs-fix-scheme-indent-function.patch"
+                                       "emacs-source-date-epoch.patch"))
+              (modules '((guix build utils)))
+              (snippet
+               '(with-directory-excursion "lisp"
+                  ;; Delete the bundled byte-compiled elisp files and generated
+                  ;; autoloads.
+                  (for-each delete-file
+                            (append (find-files "." "\\.elc$")
+                                    (find-files "." "loaddefs\\.el$")
+                                    (find-files "eshell" "^esh-groups\\.el$")))
+
+                  ;; Make sure Tramp looks for binaries in the right places on
+                  ;; remote Guix System machines, where 'getconf PATH' returns
+                  ;; something bogus.
+                  (substitute* "net/tramp-sh.el"
+                    ;; Patch the line after "(defcustom tramp-remote-path".
+                    (("\\(tramp-default-remote-path")
+                     (format #f "(tramp-default-remote-path ~s ~s ~s ~s "
+                             "~/.guix-profile/bin" "~/.guix-profile/sbin"
+                             "/run/current-system/profile/bin"
+                             "/run/current-system/profile/sbin")))
+
+                  ;; Make sure Man looks for C header files in the right
+                  ;; places.
+                  (substitute* "man.el"
+                    (("\"/usr/local/include\"" line)
+                     (string-join
+                      (list line
+                            "\"~/.guix-profile/include\""
+                            "\"/var/guix/profiles/system/profile/include\"")
+                      " ")))
+                  #t))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:tests? #f                      ; no check target
+       #:configure-flags (list "--with-modules"
+                               "--with-cairo"
+                               "--disable-build-details")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-program-file-names
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* '("src/callproc.c"
+                            "lisp/term.el"
+                            "lisp/htmlfontify.el"
+                            "lisp/textmodes/artist.el"
+                            "lisp/progmodes/sh-script.el")
+               (("\"/bin/sh\"")
+                (format #f "~s" (which "sh"))))
+             (substitute* "lisp/doc-view.el"
+               (("\"(gs|dvipdf|ps2pdf)\"" all what)
+                (let ((ghostscript (assoc-ref inputs "ghostscript")))
+                  (if ghostscript
+                      (string-append "\"" ghostscript "/bin/" what "\"")
+                      all)))
+               (("\"(pdftotext)\"" all what)
+                (let ((poppler (assoc-ref inputs "poppler")))
+                  (if poppler
+                      (string-append "\"" poppler "/bin/" what "\"")
+                      all))))
+             ;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real"
+             ;; respectively when looking for GVFS processes.
+             (substitute* "lisp/net/tramp-gvfs.el"
+               (("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process)
+                (format #f "(or ~a (tramp-compat-process-running-p ~s))"
+                        all (string-append "." process "-real"))))
+             #t))
+         (add-before 'configure 'fix-/bin/pwd
+           (lambda _
+             ;; Use `pwd', not `/bin/pwd'.
+             (substitute* (find-files "." "^Makefile\\.in$")
+               (("/bin/pwd")
+                "pwd"))
+             #t))
+         (add-after 'install 'install-site-start
+           ;; Use 'guix-emacs' in "site-start.el", which is used autoload the
+           ;; Elisp packages found in EMACSLOADPATH.
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out      (assoc-ref outputs "out"))
+                    (lisp-dir (string-append out "/share/emacs/site-lisp"))
+                    (emacs    (string-append out "/bin/emacs")))
+
+               ;; This is duplicated from emacs-utils to prevent coupling.
+               (define* (emacs-byte-compile-directory dir)
+                 (let ((expr `(progn
+                               (setq byte-compile-debug t)
+                               (byte-recompile-directory
+                                (file-name-as-directory ,dir) 0 1))))
+                   (invoke emacs "--quick" "--batch"
+                           (format #f "--eval=~s" expr))))
+
+               (copy-file (assoc-ref inputs "guix-emacs.el")
+                          (string-append lisp-dir "/guix-emacs.el"))
+               (with-output-to-file (string-append lisp-dir "/site-start.el")
+                 (lambda ()
+                   (display
+                    (string-append
+                     "(when (require 'guix-emacs nil t)\n"
+                     "  (guix-emacs-autoload-packages)\n"
+                     "  (advice-add 'package-load-all-descriptors"
+                     " :after #'guix-emacs-load-package-descriptors))"))))
+               ;; Remove the extraneous subdirs.el file, as it causes Emacs to
+               ;; add recursively all the the sub-directories of a profile's
+               ;; share/emacs/site-lisp union when added to EMACSLOADPATH,
+               ;; which leads to conflicts.
+               (delete-file (string-append lisp-dir "/subdirs.el"))
+               ;; Byte compile the site-start files.
+               (emacs-byte-compile-directory lisp-dir))
+             #t))
+         (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
+           ;; restore the dump file that Emacs installs somewhere in
+           ;; libexec/ to its original state
+           (lambda* (#:key outputs target #:allow-other-keys)
+             (let* ((libexec (string-append (assoc-ref outputs "out")
+                                            "/libexec"))
+                    ;; each of these ought to only match a single file,
+                    ;; but even if not (find-files) sorts by string<,
+                    ;; so the Nth element in one maps to the Nth element of
+                    ;; the other
+                    (pdmp (find-files libexec "\\.pdmp$"))
+                    (pdmp-real (find-files libexec "\\.pdmp-real$")))
+               (for-each rename-file pdmp-real pdmp))))
+         (add-after 'glib-or-gtk-wrap 'strip-double-wrap
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped
+             ;; twice.  This also fixes a minor issue, where WMs would not be
+             ;; able to track emacs back to emacs.desktop.
+             (with-directory-excursion (assoc-ref outputs "out")
+               (copy-file
+                (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
+                "bin/emacs")
+               #t)))
+         (add-after 'strip-double-wrap 'wrap-emacs-paths
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (lisp-dirs (find-files (string-append out "/share/emacs")
+                                           "^lisp$"
+                                           #:directories? #t)))
+               (for-each
+                (lambda (prog)
+                  (wrap-program prog
+                    ;; emacs-next and variants rely on uname being in PATH for
+                    ;; Tramp.  Tramp paths can't be hardcoded, because they
+                    ;; need to be portable.
+                    `("PATH" suffix
+                      ,(map (lambda (in) (string-append in "/bin"))
+                            (list (assoc-ref inputs "gzip")
+                                  (assoc-ref inputs "coreutils"))))
+                    `("EMACSLOADPATH" suffix ,lisp-dirs)))
+                (find-files (string-append out "/bin")
+                            ;; Matches versioned and unversioned emacs binaries.
+                            ;; We don't patch emacsclient, because it takes its
+                            ;; environment variables from emacs.
+                            ;; Likewise, we don't need to patch helper binaries
+                            ;; like etags, ctags or ebrowse.
+                            "^emacs(-[0-9]+(\\.[0-9]+)*)?$"))))))))
+    (inputs
+     `(("gnutls" ,gnutls)
+       ("ncurses" ,ncurses)
+
+       ;; Required for "core" functionality, such as dired and compression.
+       ("coreutils" ,coreutils)
+       ("gzip" ,gzip)
+
+       ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
+       ;; only via insecure channels.  This is not needed for (modern) IMAP.
+       ("mailutils" ,mailutils)
+
+       ;; TODO: Add the optional dependencies.
+       ("gpm" ,gpm)
+       ("libx11" ,libx11)
+       ("gtk+" ,gtk+)
+       ("cairo" ,cairo)
+       ("pango" ,pango)
+       ("harfbuzz" ,harfbuzz)
+       ("libxft" ,libxft)
+       ("libtiff" ,libtiff)
+       ("giflib" ,giflib)
+       ("libjpeg" ,libjpeg-turbo)
+       ("acl" ,acl)
+       ("jansson" ,jansson)
+       ("gmp" ,gmp)
+       ("ghostscript" ,ghostscript)
+       ("poppler" ,poppler)
+
+       ;; When looking for libpng `configure' links with `-lpng -lz', so we
+       ;; must also provide zlib as an input.
+       ("libpng" ,libpng)
+       ("zlib" ,zlib)
+       ("librsvg" ,@(if (target-x86-64?)
+                         (list librsvg-bootstrap)
+                         (list librsvg-2.40)))
+       ("libxpm" ,libxpm)
+       ("libxml2" ,libxml2)
+       ("libice" ,libice)
+       ("libsm" ,libsm)
+       ("alsa-lib" ,alsa-lib)
+       ("dbus" ,dbus)
+
+       ;; multilingualization support
+       ("libotf" ,libotf)
+       ("m17n-lib" ,m17n-lib)))
+    (native-inputs
+     `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
+       ("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)))
+
+    (native-search-paths
+     (list (search-path-specification
+            (variable "EMACSLOADPATH")
+            (files '("share/emacs/site-lisp")))
+           (search-path-specification
+            (variable "INFOPATH")
+            (files '("share/info")))))
+
+    (home-page "https://www.gnu.org/software/emacs/")
+    (synopsis "The extensible, customizable, self-documenting text editor")
+    (description
+     "GNU Emacs is an extensible and highly customizable text editor.  It is
+based on an Emacs Lisp interpreter with extensions for text editing.  Emacs
+has been extended in essentially all areas of computing, giving rise to a
+vast array of packages supporting, e.g., email, IRC and XMPP messaging,
+spreadsheets, remote server editing, and much more.  Emacs includes extensive
+documentation on all aspects of the system, from basic editing to writing
+large Lisp programs.  It has full Unicode support for nearly all human
+languages.")
+    (license license:gpl3+)))
 
 (define-public libgccjit-for-gcc
@@ -71 +313 @@
   (libgccjit-for-gcc gcc-11))
 
-(define-public emacs-28
-  (package
-   (inherit emacs-next)
+(define-public emacs
+  (package
+   (inherit emacs)
    (name "emacs")
    (version "28.1")
@@ -119 +361 @@
   (let ((libgccjit (libgccjit-for-gcc gcc-11)))
     (package
-      (inherit emacs-28)
+      (inherit emacs)
       (name "emacs-with-native-compilation")
       (version "28.1")
@@ -309 +551 @@
 
 (define-public emacs-realgud-xdebug
-  (let ((commit "4e0886e6952d697c4ef19dc220bafa764c36d9ce")
-        (revision "0"))
-    (package
-     (name "emacs-realgud-xdebug")
-     (version (git-version "0.1" revision commit))
-     (source
-      (origin
-       (uri (git-reference
-             (url "https://github.com/realgud/realgud-xdebug")
-             (commit commit)))
-       (method git-fetch)
-       (sha256
-        (base32 "133smyrd4xryj9z9ggfg7zvp8s33991sa44ll8s2p2s9y30i6il2"))
-       (file-name (git-file-name name version))))
-     (build-system emacs-build-system)
-     (propagated-inputs
-      (list emacs-realgud emacs-load-relative))
-     (home-page "https://github.com/realgud/realgud-xdebug/")
-     (synopsis
-      "Modular front-end for interacting with external debuggers")
-     (description
-      "RealGUD is a modular, extensible GNU Emacs front-end for interacting
+  (package
+   (name "emacs-realgud-xdebug")
+   (version "0.1.0")
+   (source
+    (origin
+     (uri (git-reference
+           (url "https://github.com/realgud/realgud-xdebug")
+           (commit version)))
+     (method git-fetch)
+     (sha256
+      (base32 "0iyxm4yfjwpc322md8iz38xs1y6whqjgsbbs7vdjw1k5029q8nc0"))
+     (file-name (git-file-name name version))))
+   (build-system emacs-build-system)
+   (inputs
+    (list emacs-realgud))
+   (home-page "https://github.com/realgud/realgud-xdebug/")
+   (synopsis
+    "Modular front-end for interacting with external debuggers")
+   (description
+    "RealGUD is a modular, extensible GNU Emacs front-end for interacting
 with external debuggers.  It integrates various debuggers such as gdb, pdb,
 ipdb, jdb, lldb, bashdb, zshdb, etc. and allows visually steping through code in the
 sources.  Unlike GUD, it also supports running multiple debug sessions in
 parallel.")
-     (license license:gpl3+))))
+   (license license:gpl3+)))
 
 (define-public emacs-xcscope

guix/config.scm

@@ -5 +5 @@
 (use-service-modules
  desktop
+ databases
  networking
  ssh
@@ -39 +40 @@
    'cpupower activation-service-type
    #~(zero? (system* #$(file-append cpupower "/bin/cpupower")
-                     "frequency-set"
-                     "--governor"
-                     "schedutil"))))
+                     "frequency-set" "--governor" "schedutil"))))
 
 (define %x86-energy-perf-policy-service
@@ -47 +46 @@
    'x86-energy-perf-policy-service activation-service-type
    #~(zero? (system* #$(file-append x86-energy-perf-policy "/bin/x86_energy_perf_policy")
-                     "--turbo-enable"
-                     "0"
-                     "--hwp-desired"
-                     "16"))))
+                     "--turbo-enable" "0"
+                     "--hwp-desired" "16"))))
 
 (define %thinkfan-service
@@ -164 +161 @@
       "mesa-utils"
       "ratpoison"
+      "wmname"
       "fvwm"
       "cagebreak" ;; ratpoison for wayland that works very poorly
@@ -250 +248 @@
                            ,drm-kms-config)))
 
-   (service openvpn-client-service-type
-            (openvpn-client-configuration
-             (persist-tun? #t)
-             (remote
-              (list
-               (openvpn-remote-configuration
-                (name "nyc.vpn.riseup.net")
-                (port 1196))))))
+   ;; (service openvpn-client-service-type
+   ;;       (openvpn-client-configuration
+   ;;        (persist-tun? #t)
+   ;;        (remote
+   ;;         (list
+   ;;          (openvpn-remote-configuration
+   ;;           (name "nyc.vpn.riseup.net")
+   ;;           (port 1196))))))
    
    (service special-files-service-type
@@ -269 +267 @@
                              "/lib/ld-linux-x86-64.so.2"))))
 
-   ;; (service nix-service-type)
+   (service nix-service-type
+            (nix-configuration
+             (extra-config '("trusted-users = root w96k"))))
+
+   (service postgresql-service-type)
 
    %cpupower-service
@@ -303 +305 @@
                       (inherit config)
                       (substitute-urls
-                       (append (list "https://4zwzi66wwdaalbhgnix55ea3ab4pvvw66ll2ow53kjub6se4q2bclcyd.onion"
+                       (append (list "http://ci.guix.trop.in"
+                                     ;; "https://4zwzi66wwdaalbhgnix55ea3ab4pvvw66ll2ow53kjub6se4q2bclcyd.onion"
                                      "https://bordeaux.guix.gnu.org"
                                      "https://substitutes.nonguix.org")
@@ -324 +327 @@
  )"))
                                %default-authorized-guix-keys))
-                       (http-proxy "http://localhost:9250"))))))
+                      ;; (http-proxy "http://localhost:9250")
+                      )))))
 
  (bootloader

guix/user.scm

@@ -11 +11 @@
 
 (packages->manifest
-  (list (specification->package "emacs-flycheck")
+ (list
+  (transform1 (specification->package "emacs"))
+  (specification->package "emacs-flycheck")
         (specification->package "emacs-pdf-tools")
         (specification->package "emacs-debbugs")
@@ -38 +40 @@
         (specification->package "emacs-all-the-icons")
         (specification->package "erlang")
-        (transform1 (specification->package "emacs"))
         (specification->package "gcc-toolchain")
         (specification->package "kicad")

python/.pythonrc

@@ -1 +1 @@
 # -*- mode: python -*-
-import atexit
-import rlcompleter
-import code
-import os
-import readline
+# import atexit
+# import rlcompleter
+# import code
+# import os
+# import readline
 
-readline.parse_and_bind('tab:complete')
-readline.parse_and_bind('bind ^I rl_complete')
-
-class HistoryConsole(code.InteractiveConsole):
-    def __init__(self, locals=None, filename="<console>",
-                 histfile=os.path.expanduser("~/.console-history")):
-        code.InteractiveConsole.__init__(self, locals, filename)
-        self.init_history(histfile)
-
-    def init_history(self, histfile):
-        readline.parse_and_bind("tab: complete")
-        if hasattr(readline, "read_history_file"):
-            try:
-                readline.read_history_file(histfile)
-            except FileNotFoundError:
-                pass
-            atexit.register(self.save_history, histfile)
-
-    def save_history(self, histfile):
-        readline.set_history_length(1000)
-        readline.write_history_file(histfile)
-
-        
+# readline.parse_and_bind('tab:complete')
+# readline.parse_and_bind('bind ^I rl_complete')

wm/.ratpoisonrc

@@ -20 +20 @@
 alias emacs exec ratpoison -c "select emacs" || exec emacs
 alias xterm exec ratpoison -c "select xterm" || exec xterm
-alias firefox exec ratpoison -c "select firefox" || exec x11docker -c --pulseaudio  --alsa -I --share $HOME/Downloads -- --tmpfs /dev/shm -- jess/firefox
+alias firefox exec ratpoison -c "select firefox" || exec flatpak run org.mozilla.firefox
 
 # Run or raise Emacs