Update mostly only fonts

5 files changed, 126 insertions, 60 deletions

diff --git a/X/.Xdefaults b/X/.Xdefaults
index a705688..f36204b 100644
--- a/X/.Xdefaults
+++ b/X/.Xdefaults
@@ -46,7 +46,11 @@ xterm*termName: xterm-256color
 !xterm*loginShell: true
 xterm*locale: true
 xterm*vt100.locale: true
-xterm*font: x:-adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1
+! xterm*font: x:-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
+! xterm*font: x:-misc-fixed-bold-r-normal--15-*-75-75-c-90-iso10646-1
+xterm*font: x:-adobe-courier-bold-r-normal--14-*-75-75-m-90-iso10646-1
+xterm*boldMode: false
+! xterm*font: x:-adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1
 ! xterm*boldFont: x:-adobe-courier-medium-r-bold--14-140-75-75-m-90-iso8859-1
 xterm*vt100.allowBoldFonts: True
 xterm*renderFont: True
@@ -61,14 +65,21 @@ xterm*scaleHeight: 0
 xterm*highlightSelection: True
 xterm.pointerColor: red
 
-*font: x:-adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1
+! *font: x:-adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1
+! *font: x:-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
+*font: -adobe-courier-bold-r-normal--14-*-75-75-m-90-iso10646-1
+*boldFont: x:-adobe-courier-bold-r-normal--14-*-75-75-m-90-iso10646-1
+*boldMode: false
 
 emacs.toolBar: 0
 emacs.FontBackend: x,xft
 emacs.geometry:=80x49+270+0
 ! emacs.font: Unifont-12
-emacs.font: -adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1
-emacs.boldFont: x:-adobe-courier-medium-r-bold--14-140-75-75-m-90-iso8859-1
+! emacs.font: -adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1
+! emacs.font: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
+emacs.font: -adobe-courier-bold-r-normal--14-*-75-75-m-90-iso10646-1
+emacs.boldFont: -adobe-courier-bold-o-normal--14-*-75-75-m-90-iso10646-1
+! emacs.boldFont: x:-adobe-courier-medium-r-bold--14-140-75-75-m-90-iso8859-1
 emacs.menuBar: 0
 emacs.verticalScrollBars: off
 emacs.cursorColor: red
diff --git a/emacs/.emacs.d/.emacs-config.org b/emacs/.emacs.d/.emacs-config.org
index b6e007a..817f974 100644
--- a/emacs/.emacs.d/.emacs-config.org
+++ b/emacs/.emacs.d/.emacs-config.org
@@ -27,7 +27,7 @@ Only needed when I need to install a package from Melpa and not GNU Guix
   (require 'package)
 
   (setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
-		     ("melpa" . "http://melpa.org/packages/")))
+  		     ("melpa" . "http://melpa.org/packages/")))
 
   (when (< emacs-major-version 27)
     (package-initialize))
@@ -81,8 +81,8 @@ Only needed when I need to install a package from Melpa and not GNU Guix
 ** Configuration
 #+BEGIN_SRC emacs-lisp :tangle init.el
   (setq config-dotfiles-path "/home/w96k/projects/dotfiles/emacs/.emacs.d/"
-	config-path "~/.emacs.d/"
-	config-name ".emacs-config.org")
+  	config-path "~/.emacs.d/"
+  	config-name ".emacs-config.org")
 
   (defun config-visit ()
     (interactive)
@@ -482,8 +482,7 @@ Sudo-edit
 или байт-код при помощи пакета RMSbolt.
 #+begin_src emacs-lisp :tangle init.el
   (use-package rmsbolt
-    :defer t
-    :hook (prog-mode . rmsbolt-mode))
+    :defer t)
 #+end_src
 
 ** Быстрый запуск программы
@@ -1223,3 +1222,30 @@ The main way to interact with SQL is using org-mode
   (global-set-key [remap dabbrev-expand] 'hippie-expand)
 #+end_src
 
+** Window Divider
+#+begin_src emacs-lisp :tangle init.el
+  (window-divider-mode t)
+#+end_src
+
+** Use specific font for major modes
+#+begin_src emacs-lisp :tangle init.el
+  (buffer-face-mode t)
+
+  (defun set-normal-font ()
+    "Set normal weight font in current buffer"
+    (interactive)
+    (buffer-face-mode 1)
+    (setq buffer-face-mode-face '(:weight normal))
+    (buffer-face-mode))
+
+  ;; Use monospaced font faces in current buffer
+  (defun set-bold-font ()
+    "Sets a bold font in current buffer"
+    (interactive)
+    (buffer-face-mode 1)
+    (setq buffer-face-mode-face '(:weight bold))
+    (buffer-face-mode))
+
+  (add-hook 'dired-mode-hook 'set-normal-font)
+  (add-hook 'org-mode-hook 'set-normal-font)
+#+end_src
diff --git a/guix/.dotfiles/.bashrc b/guix/.dotfiles/.bashrc
index 3a09a90..1c5c069 100644
--- a/guix/.dotfiles/.bashrc
+++ b/guix/.dotfiles/.bashrc
@@ -1,2 +1,5 @@
 export GUIX_PACKAGE_PATH=$HOME/.guix-packages
 export GUIX_EXTRA_PROFILES=$HOME/.guix-extra-profiles
+
+export PS1="\e[0;34m\u@\e[0;35m\h \e[0;30m\w\${GUIX_ENVIRONMENT:+ [env]}$ "
+
diff --git a/guix/.dotfiles/home-configuration.scm b/guix/.dotfiles/home-configuration.scm
index 67446da..b7e53f6 100644
--- a/guix/.dotfiles/home-configuration.scm
+++ b/guix/.dotfiles/home-configuration.scm
@@ -19,12 +19,18 @@
 
 (define wkz-home (home-environment
 		  (packages (specifications->packages (list
-						       "guix"
+							"mg"
 						       "ratpoison"
+							"xterm"
+							"screen"
 						       "xdot"
 						       "graphviz"
 						       "sed"
-						       "darktable"
+						       ;;"darktable"
+
+						       "global"
+						       "emacs-ggtags"
+						       "emacs-semantic-refactor"
                                             "openssh"
                                             "docker-compose"
                                             "emacs-company"
@@ -32,7 +38,10 @@
                                             "emacs-s"
 					    "emacs-xterm-color"
                                             "emacs-lsp-mode"
+					    
 					    "emacs-helm"
+					    "emacs-helm-gtags"
+					    
 					    "emacs-magit"
 					    "emacs-git-timemachine"
 					    "emacs-browse-kill-ring"
@@ -41,6 +50,11 @@
 					    "emacs-highlight"
 					    "emacs-mastodon"
 					    "emacs-org-roam"
+					    "emacs-undo-tree"
+					    "emacs-expand-region"
+
+					    "emacs-nyxt"
+					    "nyxt"
 
 					    "guile"
 					    "guile-readline"
@@ -49,15 +63,20 @@
 					    "emacs-geiser-guile"
 					    
 					    ;;"emacs-telega"
+					    ;;"emacs-telega-contrib"
 					    "emacs-guix"
 					    "emacs-simple-httpd"
 					    "emacs-osm"
+					    "translate-shell"
                                             "wget"
                                             "bitcoin-core"
+					    "monero"
+					    "monero-gui"
                                             "xrandr"
                                             "unzip"
                                             "zip"
                                             "mpv"
+					    "ffmpeg"
                                             "emacs-rmsbolt"
                                             "git"
                                             ;; "wkz-emacs"
@@ -69,10 +88,10 @@
                                             "make"
                                             "emacs-simple-httpd"
                                             "emacs-guix"
-                                            "gimp"
+                                            ;;"gimp"
                                             "imagemagick"
                                             "stow"
-                                            "icecat"
+                                            ;;"icecat"
                                             "smartmontools"
                                             "lshw"
                                             "hwinfo"
@@ -87,16 +106,21 @@
                                             "alsa-utils"
                                             "grep"
 					    "xlockmore"
-					    "bitcoin-core"
 					    "x11-ssh-askpass"
 					    "pinentry-emacs"
-					    "texlive"
+					    ;;"texlive"
 					    "fetchmail"
 					    "gnupg"
 					    "xhost"
 
 					    "universal-ctags"
+					    
 					    "c-intro-and-ref"
+					    "sicp"
+
+					    "font-xfree86-type1"
+					    "xlsfonts"
+					    "font-alias"
 					    ;; "wkz-php"
 					    ;; "wkz-python"
 					    ;; "wkz-ruby"
@@ -124,12 +148,12 @@
                    ;;                      "bash_profile")))
 		   ))
 
-    (service home-redshift-service-type
-	     (home-redshift-configuration
-	      (location-provider 'manual)
-	      (latitude 41.71)
-	      (longitude 44.82)
-	      ))
+;;    (service home-redshift-service-type
+;;	     (home-redshift-configuration
+;;	      (location-provider 'manual)
+;;	      (latitude 41.71)
+;;	      (longitude 44.82)
+;;	      ))
 
     ;; (service home-x11-display-service-type)
 	 (service home-gpg-agent-service-type
@@ -138,9 +162,9 @@
            (file-append pinentry-emacs "/bin/pinentry-emacs"))
           (ssh-support? #t)))
 
-	 (service home-unclutter-service-type
-		  (home-unclutter-configuration
-		   (idle-timeout 1)))
+;;	 (service home-unclutter-service-type
+;;		  (home-unclutter-configuration
+;;		   (idle-timeout 1)))
 
 	 (service home-openssh-service-type
 		  (home-openssh-configuration
diff --git a/guix/config-desktop.scm b/guix/config-desktop.scm
index 32ac2cc..c731650 100644
--- a/guix/config-desktop.scm
+++ b/guix/config-desktop.scm
@@ -6,7 +6,7 @@
 	     (nongnu system linux-initrd)
              (gnu home services shells))
 
-(use-service-modules guix cups desktop networking ssh xorg docker nix admin vnc lightdm syncthing virtualization databases)
+(use-service-modules guix cups desktop networking ssh xorg docker nix admin vnc lightdm syncthing virtualization databases linux)
 (use-package-modules gnome xdisorg vnc databases)
 
 (load "/home/w96k/projects/dotfiles/guix/.dotfiles/home-configuration.scm")
@@ -33,12 +33,6 @@
                 (group "users")
                 (home-directory "/home/w96k")
                 (supplementary-groups '("wheel" "netdev" "audio" "video" "docker")))
-	       (user-account
-                (name "wkz")
-                (comment "wkz")
-                (group "users")
-                (home-directory "/home/wkz")
-                (supplementary-groups '("wheel" "netdev" "audio" "video" "docker")))
                %base-user-accounts))
 
  ;; (packages %base-packages)
@@ -47,9 +41,7 @@
    (map
     specification->package
     '(
-      "ratpoison"
-      "xterm"
-      "screen"
+
       ))
    %base-packages))
 
@@ -60,6 +52,11 @@
 	   (service guix-home-service-type `(("w96k" ,wkz-home) ("wkz" ,wkz-home)))
 	   (service block-facebook-hosts-service-type)
 
+	   (service zram-device-service-type
+                            (zram-device-configuration
+                              (compression-algorithm 'zlib)
+                              (priority 100)))
+
 	   (service tor-service-type)
 	   (service openssh-service-type)
 	   (service containerd-service-type)
@@ -69,13 +66,12 @@
            ;;    (disk-size (* 5000 (expt 2 20))) ;5G
            ;;    (memory-size 1024)))
 	   
-	   (service nix-service-type (nix-configuration
-				      (extra-options '("--extra-experimental-features nix-command"))))
+	   ;; (service nix-service-type)
 
-	   (service xvnc-service-type (xvnc-configuration
-                                       (display-number 10)
-                                       (localhost? #f)
-                                       (geometry "1280x800")))
+	   ;; (service xvnc-service-type (xvnc-configuration
+           ;;                             (display-number 10)
+           ;;                             (localhost? #f)
+           ;;                             (geometry "1280x800")))
 
 	   (service syncthing-service-type
 		    (syncthing-configuration
@@ -108,10 +104,14 @@
 			   (delete network-manager-service-type)
 			   (delete usb-modeswitch-service-type)
 			   (delete geoclue-service-type)
+			   ;;(delete elogind-service-type)
+			   (delete colord-service-type)
 			   
 			   
 			   (guix-service-type config => (guix-configuration
 							 (inherit config)
+							                                  ;; Rely on btrfs compression.
+							 (log-compression 'none)
 							 (extra-options '("--max-jobs=10"))
 							 (substitute-urls
 							  (append (list "https://substitutes.nonguix.org")
@@ -130,26 +130,28 @@
 			   
 			   (delete gdm-service-type))))
 
+  (mapped-devices (list (mapped-device
+                          (source (uuid
+                                   "03db8d78-051b-4a11-a7e5-b62ae0f530d4"))
+                          (target "cryptroot")
+                          (type luks-device-mapping))))
+
+  ;; The list of file systems that get "mounted".  The unique
+  ;; file system identifiers there ("UUIDs") can be obtained
+  ;; by running 'blkid' in a terminal.
+  (file-systems (cons* (file-system
+                         (mount-point "/")
+                         (device "/dev/mapper/cryptroot")
+                         (type "btrfs")
+			 (options "compress=zlib:6,autodefrag")
+                         (dependencies mapped-devices))
+                       (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid "6ECD-551F"
+                                       'fat32))
+                         (type "vfat")) %base-file-systems))
+ 
  (bootloader (bootloader-configuration
               (bootloader grub-efi-bootloader)
               (targets (list "/boot/efi"))
-              (keyboard-layout keyboard-layout)))
- (mapped-devices (list (mapped-device
-                        (source (uuid
-                                 "6cfe9eed-8cdd-43da-9b9f-cec6f8ec538b"))
-                        (target "cryptroot")
-                        (type luks-device-mapping))))
-
- (file-systems (cons* (file-system
-                       (mount-point "/boot/efi")
-                       (device (uuid "17C5-3E35"
-                                     'fat32))
-                       (type "vfat"))
-                      (file-system
-                       (mount-point "/")
-                       (device "/dev/mapper/cryptroot")
-                       (type "ext4")
-		       (options "discard")
-		       (skip-check-if-clean? #f)
-		       (repair #t)
-                       (dependencies mapped-devices)) %base-file-systems)))
+              (keyboard-layout keyboard-layout))))