fontconfig, patches, tabs

home-config/alacritty/alacritty.yml

@@ -12,7 +12,7 @@ window:
 # Set font
 font:
     normal:
-        family: FiraCode Nerd Font Mono
+        family: monospace # FiraCode Nerd Font Mono
         style: Regular
     bold:
         style: Bold

home-config/home-configuration.scm

@@ -14,6 +14,7 @@
              (gnu home services shells)
              (gnu home services desktop)
              (gnu home services gnupg)
+             (gnu home services fontutils)
              (gnu home services)
              (home-services pipewire)
              (home-packages shells)
@@ -101,6 +102,8 @@
 
 
                                                     "font-google-noto-sans-cjk" ;; fonts
+                                                    "font-fira-mono"
+                                                    "font-dejavu"
 
 
                                                     "alacritty"             ;; gui applicatiosn
@@ -167,6 +170,35 @@
                     (".scripts" ,(local-file "scripts" #:recursive? #t))
                     (".gitconfig" ,(local-file "git/gitconfig"))))
 
+         (simple-service 'additional-fonts-service 
+                  home-fontconfig-service-type
+                  (list "~/.local/share/fonts"
+                        "~/.nix-profile/share/fonts"
+                        "~/.nix-profile/share/fonts"
+                        '(alias
+                           (family "serif")
+                           (prefer
+                             (family "Twemoji")
+                             (family "Font Awesome 6 Pro Regular")
+                             (family "Times New Roman")
+                             (family "DejaVu Serif")))
+                        '(alias
+                           (family "sans-serif")
+                           (prefer
+                             (family "Twemoji")
+                             (family "Font Awesome 6 Pro Regular")
+                             (family "Cantarell")
+                             (family "Noto Sans")
+                             (family "DejaVu Sans")))
+                        '(alias
+                           (family "monospace")
+                           (prefer
+                             (family "FiraMono Nerd Font")
+                             (family "Fira Mono")
+                             (family "Font Awesome Pro Regular")
+                             (family "Twemoji")
+                             (family "DejaVu Sans Mono")))))
+
          (service home-pipewire-service-type)
          (service home-dbus-service-type)
          (service home-gpg-agent-service-type

home-config/nix-home-manager/home.nix

@@ -26,9 +26,11 @@
     pcem
     cider
     gzdoom
+    yarn
     unityhub
     yuzu-early-access
     sonar-scanner-cli
+      tailscale
     #steam
 
     # Gstreamer
@@ -59,6 +61,10 @@
     lua52Packages.dkjson
     lua52Packages.luaposix
     lua-language-server
+
+    # Fonts
+    cantarell-fonts
+    twemoji-color-font
   ];
 
   # Let Home Manager install and manage itself.

home-config/nvim/lua/plugin.lua

@@ -34,5 +34,6 @@ Plug('folke/trouble.nvim')
 Plug('kylechui/nvim-surround')
 Plug('akinsho/toggleterm.nvim', {tag = '*'})
 Plug('goolord/alpha-nvim')
+Plug('Darazaki/indent-o-matic')
 
 vim.call('plug#end')

home-config/nvim/lua/theme.lua

@@ -40,6 +40,12 @@ require('lualine').setup {
 	},
 }
 
+require('indent-o-matic').setup {
+    max_lines = 2048,
+    standard_widths = { 2, 4, 8 },
+    skip_multiline = true,
+}
+
 vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
 vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
 vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })

home-config/nvim/lua/vimopt.lua

@@ -2,6 +2,7 @@ local set = vim.opt
 set.tabstop = 4
 set.softtabstop = 4
 set.shiftwidth = 4
+--set.noexpandtab = true
 set.mouse = "a"
 set.clipboard = "unnamedplus"
 set.hlsearch = true

home-config/sway/scripts.d/project.sh

@@ -9,7 +9,7 @@ get_mode() {
 get_name() {
     swaymsg -t get_outputs -r | jq -r ".[$1].name"
 }
-sg
+
 get_width() {
     get_mode "$1" | jq ".width"
 }
@@ -71,7 +71,7 @@ get_id() {
 }
 
 PRIMARY=$(get_id "eDP-1")
-EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1")
+EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1" || get_id "HDMI-A-1")
 
 PRIMARY_SCALE=1.5
 EXTERNAL_SCALE=1

modules/home-config/base-system.scm

@@ -52,11 +52,11 @@
          (kernel linux)
          (firmware (list linux-firmware intel-microcode sof-firmware))
          (locale "en_US.utf8")
-		 (locale-definitions (cons* (locale-definition
+         (locale-definitions (cons* (locale-definition
-									  (name "en_US.utf8") (source "en_US"))
+                                      (name "en_US.utf8") (source "en_US"))
-									(locale-definition
+                                    (locale-definition
-									  (name "ja_JP.utf8") (source "ja_JP"))
+                                      (name "ja_JP.utf8") (source "ja_JP"))
-									%default-locale-definitions))
+                                    %default-locale-definitions))
          (timezone "America/New_York")
          (keyboard-layout (keyboard-layout "us"))
          (host-name "ThisWillChange") 
@@ -87,10 +87,10 @@
                                                              "opendoas"
                                                              "chrony"
                                                              "gnupg"
-															 "flatpak"
+                                                                                           "flatpak"
-															 "man-db"
+                                                                                           "man-db"
-															 "man-pages"
+                                                                                           "man-pages"
-															 "docker"
+                                                                                           "docker"
 
 
                                                              "alsa-utils"               ;; sound and bluetooth
@@ -107,11 +107,14 @@
                                                              "vulkan-headers"
                                                              "spirv-tools"
                                                              "spirv-headers"
+                                                                                           "shaderc"
                                                              "sdl2"
+                                                                                           "glm"
                                                              "openal"
                                                              "freealut"
                                                              "xf86-video-qxl"
                                                              "v4l2loopback-linux-module"
+                                                             "fuse@2"
 
 
                                                              "xdg-desktop-portal"       ;; graphics
@@ -162,7 +165,10 @@
                               (fast-connectable? #t)))
                (service pam-limits-service-type)
                (service fprintd-service-type)
-			   (service docker-service-type)
+               (service docker-service-type)
+               (service special-files-service-type
+                  `(("/lib/ld-linux-x86-64.so.2"
+                      ,(file-append (canonical-package glibc) "/lib/ld-linux-x86-64.so.2"))))
                (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
 
            ;; This is the default list of services we