update channels, minor fixes

README.md

@@ -1,29 +1,14 @@
-# Guix Installation
+### dotfiles
 
-## Installing Guix
+my personal dot-files
 
-### Instructions
+i usse GNU/Guix btw
 
-- Create USB with Guix installation image
+### instaliation
-- Boot and create partitions using graphical installer
+
-- Bail out right before installation begins, go to terminal
+if you wish to install my guix system
-    - Mount cow-store using herd start cow-store /mnt
+
-    - Download latest version of configuration using `curl -o main.tar.gz --insecure --follow https://g.tylerm.dev/tylerm/dotfiles/archive/main.tar.gz` and unpack using tar
+- get a bootable systemcrafters guix iso
-    - Authorize nonguix channel using `curl -o signkey.pub https://substitutes.nonguix.org/signing-key.pub and guix archive --authorize < signkey.pub`
+- boot into it
-    - Modify/add system config for system and initialize using `guix time-machine -C channels.scm -- system -L modules/ --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org https://substitutes.nonguix.org' init system.scm /mnt`
+- clone this repo `curl -o main.tar.gz --insecure --follow https://g.freya.cat/freya/dotfiles/archive/main.tar.gz`
-    - When installed, proceed
+- cd into guix-strap and run `./guix-setup`
-- Reboot into system, assign root and tylerm user a password
-- Setup system completely
-    - Clone guix-config to proper location
-    - Reconfigure system
-        - `sudo -E guix time-machine -C channels.scm -- system -L modules reconfigure system.scm` <---- may not be needed
-        - `guix pull`
-        - `hash guix`
-        - `sudo guix system -L modules reconfigure system.scm`
-    - Configure GUIX Home
-        - Install Nix Home Manager
-        - May need to sudo herd restart nix-daemon or reconfigure system to get nix working???
-        - `nix-channel --update`
-        - `nix-shell '<home-manager>' -A install`
-        - `home-manager switch`
-- Everything should now be set up and ready to use :)

channels.scm

@@ -3,7 +3,7 @@
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "c4886c0cb608e1b36969f195eb2f7ea25a37ac89")
+          "201f90f34f90242bb74baa5ca44bda6131b3a035")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -11,10 +11,10 @@
               "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
       (channel
         (name 'nonguix)
-        (url "https://gitlab.com/nonguix/nonguix")
+        (url "https://gitlab.com/nonguix/nonguix.git")
         (branch "master")
         (commit
-          "61279f68f2b617ab868a094db856188602fc880b")
+          "25bcda2b9107b948a1c858e41aba1b7f95b76228")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"

guix-strap/guix-crypt

@@ -13,6 +13,9 @@ EVENT "Setting up disk encryption with luks"
 if [[ $DISK == "/dev/sd"* ]]; then
     CRYPT_PARTITION="$DISK""2"
     EFI_PARTITION="$DISK""1"
+elif [[ $DISK == "/dev/vd"* ]]; then
+    CRYPT_PARTITION="$DISK""2"
+    EFI_PARTITION="$DISK""1"
 elif [[ $DISK == "/dev/nvme"* ]]; then
     CRYPT_PARTITION="$DISK""p2"
     EFI_PARTITION="$DISK""p1"
@@ -43,24 +46,30 @@ $PASSWORD
 $PASSWORD_CONFIRM
 EOF
 
-EVENT "Opening cryptroot"
+EVENT "Opening root"
 
-cryptsetup open "$CRYPT_PARTITION" cryptroot <<EOF
+cryptsetup open "$CRYPT_PARTITION" root <<EOF
 $PASSWORD
 EOF
 
-EVENT "Setting up cryptroot btrfs"
+EVENT "Setting up root btrfs"
 
-mkfs.btrfs "/dev/mapper/cryptroot"
+mkfs.btrfs "/dev/mapper/root"
 
-EVENT "Mounting cryptroot"
+EVENT "Mounting root"
 
-mount /dev/mapper/cryptroot /mnt
+mkdir -p /mnt
+mount /dev/mapper/root /mnt
 
 EVENT "Setting up EFI vfat"
 
 mkfs.vfat "-F32" "$EFI_PARTITION"
 
+EVENT "Mounting EFI"
+
+mkdir -p /mnt/boot/efi
+mount $EFI_PARTITION /mnt/boot/efi
+
 EVENT "Successfully setup efi vfat and luks"
 
 echo "CRYPT_PARTITION=\"$CRYPT_PARTITION\"" >> ./guix-env

guix-strap/guix-install

@@ -3,20 +3,16 @@
 source ./guix-env
 source ./guix-log
 
-EVENT "Mounting /gnu/store to destination disk..."
+EVENT "Pulling guix channels"
-herd start cow-store /mnt
+guix pull -C ../channels.scm
-
-EVENT "Installing non-guix signing keys for substitutes..."
-curl -o /tmp/sign-key.pub https://substitutes.nonguix.org/signing-key.pub
-guix archive --authorize < /tmp/sign-key.pub
 
 EVENT "Installing GNU Guix"
 guix time-machine -C ../channels.scm -- system -L ../modules --substitute-urls='https://substitutes.nonguix.org https://bordeaux.guix.gnu.org https://ci.guix.gnu.org' init ../$HOSTNAME.scm /mnt
 
 EVENT "Installing User Environment"
 
-USER=tylerm
+USER=freya
-guix shell git -- git clone https://g.tylerm.dev/tylerm/dotfiles /mnt/home/$USER/.config/guix
+guix shell git -- git clone https://g.freya.cat/freya/dotfiles /mnt/home/$USER/.config/guix
 cp ../$HOSTNAME.scm /mnt/home/$USER/.config/guix/$HOSTNAME.scm
 cp ./guix-setup-user /mnt/home/$USER/.zprofile
 

guix-strap/guix-password

@@ -43,7 +43,7 @@ cat << EOF | chroot /mnt
 passwd
 $ROOT_PASSWORD
 $ROOT_PASSWORD
-passwd tylerm
+passwd freya
 $USER_PASSWORD
 $USER_PASSWORD
 EOF

guix-strap/guix-prepare

@@ -0,0 +1,11 @@
+#!/run/current-system/profile/bin/bash
+
+source ./guix-env
+source ./guix-log
+
+EVENT "Mounting /gnu/store to destination disk..."
+herd start cow-store /mnt
+
+EVENT "Installing non-guix signing keys for substitutes..."
+curl -o /tmp/sign-key.pub https://substitutes.nonguix.org/signing-key.pub
+guix archive --authorize < /tmp/sign-key.pub

guix-strap/guix-setup

@@ -1,7 +1,7 @@
 #!/run/current-system/profile/bin/bash
 
 echo "#!/run/current-system/profile/bin/bash" > ./guix-env
-echo "" > ./guix-env 
+echo "" > ./guix-env
 
 welcome() {
     cat<<"EOF"
@@ -32,12 +32,21 @@ EOF
     read -r  ANSWER
 }
 
+cleanup() {
+    herd stop cow-store
+    umount /mnt/boot/efi
+    umount /mnt
+    umount /tmp
+    cryptsetup close root
+}
+
 welcome
 ./guix-partition
 ./guix-crypt
 ./guix-configure
+./guix-prepare
 ./guix-install
-./guix-password
+cleanup
 
 echo "GNU Guix has been installed, you can now reboot..."
 exit 0

guix-strap/system.scm

@@ -8,12 +8,12 @@
     (mapped-devices (list (mapped-device
                 (source (uuid
                       "SED_CRYPT_UUID"))
-                (target "cryptroot")
+                (target "root")
                 (type luks-device-mapping))))
-  
+
     (file-systems (cons* (file-system
                             (mount-point "/")
-                            (device "/dev/mapper/cryptroot")
+                            (device "/dev/mapper/root")
                             (type "btrfs")
                             (dependencies mapped-devices))
                          (file-system

home-config/alacritty/alacritty.yml

@@ -4,15 +4,15 @@ import:
 
 # Window settings
 window:
-  opacity: .85
+  opacity: 0.85
   padding:
-    x: 5
+    x: 10
-    y: 5
+    y: 10
 
 # Set font
 font:
     normal:
-        family: FiraCode Nerd Font Mono
+        family: monospace # FiraCode Nerd Font Mono
         style: Regular
     bold:
         style: Bold

home-config/git/gitconfig

@@ -1,7 +1,7 @@
 [user]
 	signingkey = 4F6BC11CEBB2F24214B90FAC9FF6937B829E565A
-	email = tylerm@tylerm.dev
+	email = freya@freyacat.org
-	name = Tyler Murphy
+	name = Freya Murphy
 [commit]
 	gpgsign = true
 [init]

home-config/home-configuration.scm

@@ -14,9 +14,11 @@
              (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)
+             (home-packages freedesktop)
              (home-packages mozillia)
              (home-packages vim)
              (home-packages gnome-xyz)
@@ -28,69 +30,109 @@
 (home-environment
   ;; Below is the list of packages that will show up in your
   ;; Home profile, unser ~/.guix-home/profile.
-  (packages (append (specifications->packages (list "xdg-utils"
+  (packages (append (specifications->packages (list "unzip"                 ;; cli command packages
-                                                    "mako"
+                                                    "p7zip"                 ;; pacakges usefull in the terminal
-                                                    "vscodium"
-                                                    "libnotify"
-                                                    "i3-autotiling"
-                                                    "wofi"
-                                                    "qrencode"
-                                                    "sassc"
-                                                    "binutils"
-                                                    "clang-toolchain"
-                                                    "racket"
-                                                    "libreoffice"
-                                                    "gnupg"
-                                                    "pavucontrol"
-                                                    "bind:utils"
-                                                    "syncthing"
-                                                    "imv"
-                                                    "unzip"
-                                                    "p7zip"
                                                     "curl"
                                                     "htop"
                                                     "curl"
+                                                    "mpv"
+                                                    "qrencode"
+                                                    "tree"
+                                                    "rlwrap"
+                                                    "netcat"
+                                                    "jq"
+                                                    "pfetch"
+                                                    "grim"
+                                                    "slurp"
+                                                    "bind:utils"
+                                                    "zsh"
+
+
+                                                    "nasm"                  ;; devlopment packages
+                                                    ;;"rust"                  ;; packages usefull for coding and devlopment
+                                                    "gcc-toolchain"
+                                                    "clang-toolchain"
+                                                    "racket"
+                                                    "python"
+                                                    "node"
+                                                    "make"
+                                                    "pkg-config"
+
+
+                                                    "pandoc"                ;; tex
+                                                    "texlive-bin"
+                                                    "texlive-scheme-basic"
+                                                    "texlive-txfonts"
+                                                    "texlive-amsfonts"
+                                                    "texlive-lm"
+                                                    "texlive-lm-math"
+                                                    "texlive-iftex"
+                                                    "texlive-unicode-math"
+                                                    "texlive-fontspec"
+                                                    "texlive-xcolor"
+                                                    "texlive-geometry"
+                                                    "texlive-hyperref"
+                                                    "texlive-parskip"
+                                                    "texlive-etoolbox"
+
+
+                                                    "ripgrep"               ;; lunar vim packages
+                                                    "tree-sitter-cli"       ;; vimmmmmmm
+                                                    "python-pynvim"
+                                                    "fd"
+    
+                                                    
+                                                    "retroarch"             ;; gayming
+                                                    "steam"                 ;; gayyyyymeeeesss :3
+
+
+                                                    "swayfx"                ;; window manager packages
+                                                    "swaybg"                ;; time to swayyyyyy
+                                                    "swayidle"
+                                                    "wl-clipboard"
+                                                    "libnotify"
+                                                    "xdg-utils"
+                                                    "brightnessctl"
+                                                    "i3-autotiling"
+
+
+                                                    "gnome-themes-extra"    ;; themes
+                                                    "adwaita-icon-theme"    ;; gtk stuff idk
+                                                    "hicolor-icon-theme"
+
+
+                                                    "font-google-noto-sans-cjk" ;; fonts
+                                                    "font-fira-mono"
+                                                    "font-dejavu"
+
+
+                                                    "alacritty"             ;; gui applicatiosn
+                                                    "wlogout"               ;; applications that gui :0
+                                                    "waybar"
+                                                    "mako"
+                                                    "wofi"
+                                                    "libreoffice"
+                                                    "imv"
                                                     "zathura"
                                                     "zathura-pdf-mupdf"
                                                     "gimp"
                                                     "weechat"
-                                                    "mpv"
-                                                    "git"
-                                                    "pinentry"
-                                                    "ungoogled-chromium"
                                                     "element-desktop"
                                                     "nm-tray"
-                                                    "pfetch"
+                                                    "pavucontrol"
-                                                    "acpi"
+                                                    "obs"
-                                                    "brightnessctl"
+                                                    "octave"
-                                                    "neofetch"
+                                                    "syncthing"
-                                                    "python"
+                                                    "filezilla"
-                                                    "make"
+                                                    "pinentry"
-                                                    "tree"
+                                                    "ungoogled-chromium"))
-                                                    "rlwrap"
+            (list neovim-new                ;; custom made packages
-                                                    "netcat"
+                  easyeffects               ;; thanks guix for not having them or doing them wrong >:(
-                                                    "ripgrep"
-                                                    "fd"
-                                                    "nasm"
-                                                    "wine-staging"
-                                                    "winetricks"
-                                                    "steam"
-                                                    "node"
-                                                    "ncurses"
-                                                    "jq"
-                                                    "rust"
-                                                    "gcc-toolchain"
-                                                    "openssl"
-                                                    "pkg-config"
-                                                    "tree-sitter-cli"
-                                                    "python-pynvim"))
-
-            (list neovim-new 
-                  easyeffects 
                   firefox-wayland-new 
                   lavanda-gtk-theme 
                   zsh-autosuggestions
                   freya-ca-certs
+                  wl-mirror
                   vim-plug)))
 
   ;; Below is the list of Home services.  To search for available
@@ -102,11 +144,10 @@
                    (zprofile (list (local-file "zsh/zprofile")))))
 
          (service home-xdg-configuration-files-service-type
-                  `(("nvim/init.vim" ,(local-file "nvim/init.vim"))
+                  `(("nvim" ,(local-file "nvim" #:recursive? #t))
                     ("sway" ,(local-file "sway" #:recursive? #t))
                     ("waybar" ,(local-file "waybar" #:recursive? #t))
                     ("alacritty" ,(local-file "alacritty" #:recursive? #t))
-                    ("lvim" ,(local-file "lvim" #:recursive? #t))
                     ("mako" ,(local-file "mako" #:recursive? #t))
                     ("gtk-3.0" ,(local-file "gtk/gtk-3.0" #:recursive? #t))
                     ("gtk-4.0" ,(local-file "gtk/gtk-4.0" #:recursive? #t))
@@ -126,8 +167,38 @@
                     (".local/share/icons" ,(local-file "icons" #:recursive? #t))
                     (".gtkrc-2.0" ,(local-file "gtk/gtkrc-2.0"))
                     (".nix-channels" ,(local-file "nix-channels"))
+                    (".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/lvim/config.lua

@@ -1,51 +0,0 @@
--- Vim Options
-local set = vim.opt -- set options
-set.tabstop = 4
-set.softtabstop = 4
-set.shiftwidth = 4
-set.mouse = "a"
-set.clipboard = "unnamedplus"
-set.hlsearch = true
-set.autoindent = true
-set.ttyfast = true
-
-lvim.plugins = {
-    { "catppuccin/nvim", name = "catppuccin" }
-}
-
--- Lvim Options
-lvim.log.level = "warn"
-lvim.format_on_save.enabled = false
-lvim.colorscheme = "catppuccin"
-
--- Keybinds
-lvim.leader = "space"
-lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
-
--- Builtin Shit IDK
-lvim.builtin.alpha.active = true
-lvim.builtin.alpha.mode = "dashboard"
-lvim.builtin.lualine.style = "default"
-lvim.builtin.terminal.active = true
-lvim.builtin.nvimtree.setup.view.side = "left"
-lvim.builtin.nvimtree.setup.renderer.icons.show.git = false
-
--- LSP Stuff
-lvim.builtin.treesitter.ensure_installed = {
-  "bash",
-  "c",
-  "javascript",
-  "json",
-  "lua",
-  "python",
-  "typescript",
-  "tsx",
-  "css",
-  "rust",
-  "java",
-  "yaml",
-}
-
--- Idk why were ignoring haskell but it was here by default so whatever
-lvim.builtin.treesitter.ignore_install = { "haskell" }
-lvim.builtin.treesitter.highlight.enable = true

home-config/lvim/lazy-lock.json

@@ -1,45 +0,0 @@
-{
-  "Comment.nvim": { "branch": "master", "commit": "38d3b7eb553872d8866f14a0dd4fe84126068fce" },
-  "LuaSnip": { "branch": "master", "commit": "e77fa9ad0b1f4fc6cddf54e51047e17e90c7d7ed" },
-  "alpha-nvim": { "branch": "main", "commit": "87c204040e3f5d4c1c95067b35905d8f8a2f2545" },
-  "bigfile.nvim": { "branch": "main", "commit": "c1bad34ce742b4f360b67ca23c873fef998240fc" },
-  "bufferline.nvim": { "branch": "main", "commit": "a4bd44523316928a7c4a5c09a3407d02c30b6027" },
-  "catppuccin": { "branch": "main", "commit": "3ffd2f511f3dc6c01258923d7170ccaf1445634b" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "friendly-snippets": { "branch": "main", "commit": "631f79e346b0b3203d2ce3eae619ca8d612e5463" },
-  "gitsigns.nvim": { "branch": "main", "commit": "e5edefd9976039f5352e0c900f35206770b33a2d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
-  "lazy.nvim": { "branch": "main", "commit": "d6a782c7002682f4a01b79fc3918c4584ad6e8fb" },
-  "lir.nvim": { "branch": "master", "commit": "1aa871f20637eccc4e1e26b0fbcf9aafc9b6caf7" },
-  "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
-  "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "7276ffffcf51a8304b5fd4b81293be4ee010ec47" },
-  "mason.nvim": { "branch": "main", "commit": "057ac5ca159c83e302a55bd839a96ff1ea2396db" },
-  "neodev.nvim": { "branch": "main", "commit": "0043cf91c18aeac8db5765eb86c6078e17ac9325" },
-  "nlsp-settings.nvim": { "branch": "main", "commit": "32aa12da328258f2dccb15d327c26a8d21d9f4bd" },
-  "null-ls.nvim": { "branch": "main", "commit": "33b853a3933eed3137cd055aac4e539e69832ad0" },
-  "nvim-autopairs": { "branch": "master", "commit": "7566a86f44bb72ba2b1a609f528a27d93241502d" },
-  "nvim-cmp": { "branch": "main", "commit": "11102d3db12c7f8b35265ad0e17a21511e5b1e68" },
-  "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" },
-  "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "427378a03ffc1e1bc023275583a49b1993e524d0" },
-  "nvim-navic": { "branch": "master", "commit": "83dc174da915f9dbc9b51169e9b62a2e0d42b527" },
-  "nvim-tree.lua": { "branch": "master", "commit": "bb375fb20327c49920c41d2b51c1ce2f4fe7deb3" },
-  "nvim-treesitter": { "branch": "master", "commit": "2ce3c9080cfe4a39c7907e672edafd2a95244a7c" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
-  "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" },
-  "onedarker.nvim": { "branch": "freeze", "commit": "b00dd2189f264c5aeb4cf04c59439655ecd573ec" },
-  "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
-  "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "schemastore.nvim": { "branch": "main", "commit": "0b396f538f195c249f021a48c3d8988f0d3f86f7" },
-  "structlog.nvim": { "branch": "main", "commit": "45b26a2b1036bb93c0e83f4225e85ab3cee8f476" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "9de317bdea2bc393074651179c4fc7f93e9b2d56" },
-  "toggleterm.nvim": { "branch": "main", "commit": "68fdf851c2b7901a7065ff129b77d3483419ddce" },
-  "tokyonight.nvim": { "branch": "main", "commit": "c5df636ce62a8aab7565f35da143cfd672526302" },
-  "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
-  "which-key.nvim": { "branch": "main", "commit": "4acffc92953a90a790603bfdab7c92319ab167b1" }
-}

home-config/nix-channels

@@ -1,3 +1,4 @@
 https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
 https://nixos.org/channels/nixpkgs-unstable nixpkgs
+https://github.com/guibou/nixGL/archive/main.tar.gz nixgl
 

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

@@ -3,8 +3,8 @@
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
-  home.username = "tylerm";
+  home.username = "freya";
-  home.homeDirectory = "/home/tylerm";
+  home.homeDirectory = "/home/freya";
   home.stateVersion = "22.11"; # Please read the comment before changing.
 
   # This value will set some environment variables to allow home-manager to
@@ -20,13 +20,32 @@
     yt-dlp
     starship
     discord
-    thunderbirdPackages.thunderbird-115
+    thunderbird
     slack
     cryptomator
     pcem
     cider
+    gzdoom
+    yarn
+    unityhub
+    yuzu-early-access
+    sonar-scanner-cli
+      tailscale
     #steam
 
+    # Gstreamer
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-libav
+    gst_all_1.gst-vaapi
+
+    # Wine
+    wineWowPackages.stable
+    winetricks
+
     # Rust
     rustup
     gcc-unwrapped
@@ -41,6 +60,11 @@
     lua
     lua52Packages.dkjson
     lua52Packages.luaposix
+    lua-language-server
+
+    # Fonts
+    cantarell-fonts
+    twemoji-color-font
   ];
 
   # Let Home Manager install and manage itself.

home-config/nvim/init.lua

@@ -0,0 +1,7 @@
+require('plugin')
+require('theme')
+require('vimopt')
+require('tree')
+require('keybinds')
+require('treesitter')
+require('lsp')

home-config/nvim/init.vim

@@ -1,36 +0,0 @@
-call plug#begin()
-
-Plug 'itchyny/lightline.vim'
-
-Plug 'folke/tokyonight.nvim', { 'branch': 'main' }
-
-call plug#end()
-
-syntax on
-filetype plugin indent on
-
-colorscheme tokyonight-moon
-let g:lightline = {'colorscheme': 'tokyonight'}
-
-set mouse=v
-set mouse=a
-set clipboard=unnamedplus
-set autoindent
-set hlsearch
-set tabstop=4
-set shiftwidth=0
-set expandtab
-set number
-set cc=80
-set encoding=utf-8
-set nofoldenable
-set laststatus=2
-set noshowmode
-set modeline
-set mouse=a
-set ttyfast
-set colorcolumn=0
-
-hi Normal guibg=NONE ctermbg=NONE
-hi LineNr term=bold cterm=bold ctermfg=2 guifg=White guibg=NONE
-

home-config/nvim/lua/keybinds.lua

@@ -0,0 +1,22 @@
+local opts = { noremap = true, silent = true }
+local keymap = vim.keymap.set
+local builtin = require('telescope.builtin')
+local Terminal  = require('toggleterm.terminal').Terminal
+local term_float = Terminal:new({ direction = 'float', hidden = 'true' })
+
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+
+keymap('', '<leader>', '<Nop>', opts)
+keymap('n', '<leader>e', vim.cmd.NvimTreeToggle)
+keymap('n', '<leader>m', vim.cmd.Mason)
+keymap('n', '<leader>h', vim.cmd.noh)
+keymap('n', '<leader>p', vim.cmd.PlugUpdate)
+keymap('n', '<leader>ff', builtin.find_files, {})
+keymap('n', '<leader>fg', builtin.live_grep, {})
+keymap('n', '<leader>fb', builtin.buffers, {})
+keymap('n', '<leader>fh', builtin.help_tags, {})
+keymap('n', '<leader>u', vim.cmd.UndotreeToggle)
+keymap('n', '<leader>gs', vim.cmd.Git)
+keymap('n', '<leader>t', function() require('trouble').toggle() end)
+keymap('', '<A-s>', function() term_float:toggle() end)

home-config/nvim/lua/lsp.lua

@@ -0,0 +1,77 @@
+local lsp = require('lsp-zero')
+
+lsp.preset('recommended')
+
+require('mason').setup({})
+require('mason-lspconfig').setup({
+	ensure_installed = {
+		'tsserver',
+		'eslint',
+		'rust_analyzer',
+		'clangd',
+		'html',
+		'cssls',
+		'pyright',
+		'vimls',
+		'yamlls',
+		'jdtls',
+		'bashls',
+		'lua_ls'
+	},
+	handlers = {
+		lsp.default_setup,
+	},
+})
+
+local cmp = require('cmp')
+
+local cmp_select = {behavior = cmp.SelectBehavior.Select}
+local cmp_mappings = cmp.mapping.preset.insert({
+  ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
+  ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
+  ['<CR>'] = cmp.mapping.confirm({ select = true }),
+  ["<C-Space>"] = cmp.mapping.complete(),
+})
+
+cmp_mappings['<Tab>'] = nil
+cmp_mappings['<S-Tab>'] = nil
+
+cmp.setup({
+	mapping = cmp_mappings
+})
+
+lsp.set_preferences({
+    suggest_lsp_servers = false,
+    sign_icons = {
+        error = 'E',
+        warn = 'W',
+        hint = 'H',
+        info = 'I'
+    }
+})
+
+lsp.on_attach(function(client, bufnr)
+	local opts = {buffer = bufnr, remap = false}
+	local keymap = vim.keymap.set
+
+	keymap("n", "gd", function() vim.lsp.buf.definition() end, opts)
+  	keymap("n", "K", function() vim.lsp.buf.hover() end, opts)
+  	keymap("n", "<leader>ls", function() vim.lsp.buf.workspace_symbol() end, opts)
+  	keymap("n", "<leader>lf", function() vim.diagnostic.open_float() end, opts)
+  	keymap("n", "[d", function() vim.diagnostic.goto_next() end, opts)
+  	keymap("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
+  	keymap("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts)
+  	keymap("n", "<leader>lr", function() vim.lsp.buf.references() end, opts)
+  	keymap("n", "<leader>ln", function() vim.lsp.buf.rename() end, opts)
+  	keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+end)
+
+lsp.setup()
+
+vim.diagnostic.config({
+    virtual_text = true
+})
+
+require("neodev").setup()
+require("nvim-surround").setup()
+require("toggleterm").setup()

home-config/nvim/lua/menu.lua

@@ -0,0 +1,261 @@
+local path_ok, plenary_path = pcall(require, "plenary.path")
+if not path_ok then
+    return
+end
+
+local dashboard = require("alpha.themes.dashboard")
+local cdir = vim.fn.getcwd()
+local if_nil = vim.F.if_nil
+
+local nvim_web_devicons = {
+    enabled = true,
+    highlight = true,
+}
+
+local function get_extension(fn)
+    local match = fn:match("^.+(%..+)$")
+    local ext = ""
+    if match ~= nil then
+        ext = match:sub(2)
+    end
+    return ext
+end
+
+local function icon(fn)
+    local nwd = require("nvim-web-devicons")
+    local ext = get_extension(fn)
+    return nwd.get_icon(fn, ext, { default = true })
+end
+
+local function file_button(fn, sc, short_fn,autocd)
+    short_fn = short_fn or fn
+    local ico_txt
+    local fb_hl = {}
+
+    if nvim_web_devicons.enabled then
+        local ico, hl = icon(fn)
+        local hl_option_type = type(nvim_web_devicons.highlight)
+        if hl_option_type == "boolean" then
+            if hl and nvim_web_devicons.highlight then
+                table.insert(fb_hl, { hl, 0, #ico })
+            end
+        end
+        if hl_option_type == "string" then
+            table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico })
+        end
+        ico_txt = ico .. "  "
+    else
+        ico_txt = ""
+    end
+    local cd_cmd = (autocd and " | cd %:p:h" or "")
+    local file_button_el = dashboard.button(sc, ico_txt .. short_fn, "<cmd>e " .. vim.fn.fnameescape(fn) .. cd_cmd .." <CR>")
+    local fn_start = short_fn:match(".*[/\\]")
+    if fn_start ~= nil then
+        table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt })
+    end
+    file_button_el.opts.hl = fb_hl
+    return file_button_el
+end
+
+local default_mru_ignore = { "gitcommit" }
+
+local mru_opts = {
+    ignore = function(path, ext)
+        return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext))
+    end,
+    autocd = false
+}
+
+--- @param start number
+--- @param cwd string? optional
+--- @param items_number number? optional number of items to generate, default = 10
+local function mru(start, cwd, items_number, opts)
+    opts = opts or mru_opts
+    items_number = if_nil(items_number, 10)
+
+    local oldfiles = {}
+    for _, v in pairs(vim.v.oldfiles) do
+        if #oldfiles == items_number then
+            break
+        end
+        local cwd_cond
+        if not cwd then
+            cwd_cond = true
+        else
+            cwd_cond = vim.startswith(v, cwd)
+        end
+        local ignore = (opts.ignore and opts.ignore(v, get_extension(v))) or false
+        if (vim.fn.filereadable(v) == 1) and cwd_cond and not ignore then
+            oldfiles[#oldfiles + 1] = v
+        end
+    end
+    local target_width = 35
+
+    local tbl = {}
+    for i, fn in ipairs(oldfiles) do
+        local short_fn
+        if cwd then
+            short_fn = vim.fn.fnamemodify(fn, ":.")
+        else
+            short_fn = vim.fn.fnamemodify(fn, ":~")
+        end
+
+        if #short_fn > target_width then
+            short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 })
+            if #short_fn > target_width then
+                short_fn = plenary_path.new(short_fn):shorten(1, { -1 })
+            end
+        end
+
+        local shortcut = tostring(i + start - 1)
+
+        local file_button_el = file_button(fn, shortcut, short_fn,opts.autocd)
+        tbl[i] = file_button_el
+    end
+    return {
+        type = "group",
+        val = tbl,
+        opts = {},
+    }
+end
+
+local cats = {
+	{
+		[[	,-.       _,---._ __  / \]],
+		[[ /  )    .-'       `./ /   \]],
+		[[(  (   ,'            `/    /|]],
+		[[ \  `-"             \'\   / |]],
+		[[  `.              ,  \ \ /  |]],
+		[[   /`.          ,'-`----Y   |]],
+		[[  (            ;        |   ']],
+		[[  |  ,-.    ,-'         |  /]],
+		[[  |  | (   |        hjw | /]],
+		[[  )  |  \  `.___________|/]],
+		[[  `--'   `--']],
+	},
+	{
+		[[		 _]],
+		[[       \`*-.     ]],
+		[[        )  _`-.     ]],
+		[[       .  : `. .       ]],
+		[[       : _   '  \         ]],
+		[[       ; *` _.   `*-._       ]],
+		[[       `-.-'          `-.       ]],
+		[[         ;       `       `.     ]],
+		[[         :.       .        \    ]],
+		[[         . \  .   :   .-'   .   ]],
+		[[         '  `+.;  ;  '      :   ]],
+		[[         :  '  |    ;       ;-. ]],
+		[[         ; '   : :`-:     _.`* ;]],
+		[[[bug] .*' /  .*' ; .*`- +'  `*' ]],
+		[[      `*-*   `*-*  `*-*']],
+  },
+  {
+		[[                   .-o=o-.]],
+		[[               ,  /=o=o=o=\ .--.]],
+		[[              _|\|=o=O=o=O=|    \]],
+		[[          __.'  a`\=o=o=o=(`\   /]],
+		[[          '.   a 4/`|.-""'`\ \ ;'`)   .---.]],
+		[[            \   .'  /   .--'  |_.'   / .-._)]],
+		[[             `)  _.'   /     /`-.__.' /]],
+		[[          jgs `'-.____;     /'-.___.-']],
+		[[                       `"""`]],
+  },
+  {
+		[[      (`.]],
+		[[        ) )]],
+ 		[[       ( (]],
+ 		[[        \ \]],
+ 		[[         \ \]],
+ 		[[       .-'  `-.]],
+ 		[[      /        `.]],
+ 		[[     (      )    `-._ ,    _]],
+ 		[[      )   ,'         (.\--'(]],
+ 		[[      \  (         ) /      \]],
+ 		[[       \  \_(     / (   <0 (0]],
+ 		[[        \_)))\   (   `._ ::Y)__]],
+ 		[[         '''  \   `-._.'`---^_)))]],
+ 		[[               `-._ )))       ```]],
+ 		[[                    ```           hjw]],
+  }
+}
+
+math.randomseed(os.time())
+local header = {
+    type = "text",
+	val = cats[math.random(1, #cats)],
+    opts = {
+        position = "center",
+        hl = "Type",
+    },
+}
+
+local section_mru = {
+    type = "group",
+    val = {
+        {
+            type = "text",
+            val = "Recent files",
+            opts = {
+                hl = "SpecialComment",
+                shrink_margin = false,
+                position = "center",
+            },
+        },
+        { type = "padding", val = 1 },
+        {
+            type = "group",
+            val = function()
+                return { mru(0, cdir) }
+            end,
+            opts = { shrink_margin = false },
+        },
+    },
+}
+
+local buttons = {
+    type = "group",
+    val = {
+        { type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } },
+        { type = "padding", val = 1 },
+        dashboard.button("e", "  New file", "<cmd>ene<CR>"),
+        dashboard.button("SPC f f", "󰈞  Find file"),
+        dashboard.button("SPC f g", "󰊄  Live grep"),
+        dashboard.button("SPC p", "  Update plugins", "<cmd>PlugUpdate<CR>"),
+        dashboard.button("c", "  Configuration", "<cmd>cd ~/.config/nvim/ <CR>"),
+        dashboard.button("q", "󰅚  Quit", "<cmd>qa<CR>"),
+    },
+    position = "center",
+}
+
+local config = {
+    layout = {
+        { type = "padding", val = 2 },
+        header,
+        { type = "padding", val = 2 },
+        section_mru,
+        { type = "padding", val = 2 },
+        buttons,
+    },
+    opts = {
+        margin = 5,
+        setup = function()
+            vim.api.nvim_create_autocmd('DirChanged', {
+                pattern = '*',
+                group = "alpha_temp",
+                callback = function () require('alpha').redraw() end,
+            })
+        end,
+    },
+}
+
+return {
+    header = header,
+    buttons = buttons,
+    mru = mru,
+    config = config,
+    -- theme specific config
+    mru_opts = mru_opts,
+    leader = dashboard.leader,
+    nvim_web_devicons = nvim_web_devicons,
+}

home-config/nvim/lua/plugin.lua

@@ -0,0 +1,39 @@
+local Plug = vim.fn['plug#']
+
+vim.call('plug#begin')
+
+Plug('nvim-tree/nvim-web-devicons')
+Plug('nvim-tree/nvim-tree.lua')
+Plug('nvim-lualine/lualine.nvim')
+Plug('ryanoasis/vim-devicons')
+Plug('SirVer/ultisnips')
+Plug('honza/vim-snippets')
+Plug('preservim/nerdcommenter')
+Plug('neoclide/coc.nvim', { branch = 'release' })
+Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' })
+Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
+Plug('nvim-lua/plenary.nvim')
+Plug('mbbill/undotree')
+Plug('catppuccin/nvim', { as = 'catppuccin' })
+Plug('tpope/vim-fugitive')
+Plug('neovim/nvim-lspconfig')
+Plug('hrsh7th/nvim-cmp')
+Plug('hrsh7th/cmp-nvim-lsp')
+Plug('L3MON4D3/LuaSnip')
+Plug('williamboman/mason.nvim')
+Plug('williamboman/mason-lspconfig.nvim')
+Plug('VonHeikemen/lsp-zero.nvim', { branch = 'v3.x' })
+Plug('akinsho/bufferline.nvim', { tag = '*' })
+Plug('folke/neodev.nvim')
+Plug('RRethy/vim-illuminate')
+Plug('SmiteshP/nvim-navic')
+Plug('utilyre/barbecue.nvim')
+Plug('j-hui/fidget.nvim', { tag = 'legacy' })
+Plug('rcarriga/nvim-notify')
+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

@@ -0,0 +1,64 @@
+local catppuccin = require('catppuccin')
+
+catppuccin.setup({
+	transparent_background = true,
+	integrations = {
+		cmp = true,
+		nvimtree = true,
+		treesitter = true,
+		illuminate = {
+			enabled = true,
+			lsp = false
+		},
+		barbecue = {
+		    dim_dirname = true, -- directory name is dimmed by default
+		    bold_basename = true,
+		    dim_context = false,
+		    alt_background = false,
+		},
+		coc_nvim = true,
+		fidget = true,
+		markdown = true,
+		notify = true,
+		lsp_trouble = true,
+	},
+})
+
+local colorscheme = "catppuccin"
+local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
+vim.o.background = "dark" -- or "light" for light mode
+if not ok then
+    vim.notify("colorscheme " .. colorscheme .. " not found!")
+    return
+end
+
+require('lualine').setup {
+	options = { 
+		theme = colorscheme,
+		icons_enabled = true,
+		globalstatus = true,
+	},
+}
+
+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" })
+
+vim.opt.termguicolors = true
+require("bufferline").setup{}
+require("barbecue").setup()
+require("barbecue.ui").toggle(true)
+require("fidget").setup {
+    window = {
+        blend = 0,
+    },
+}
+
+local theme = require('menu')
+require('alpha').setup(theme.config)

home-config/nvim/lua/tree.lua

@@ -0,0 +1,120 @@
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+local function on_attach(bufnr)
+	local api = require("nvim-tree.api")
+
+	local function opts(desc)
+		return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
+	end
+
+	local function edit_or_open()
+		local node = api.tree.get_node_under_cursor()
+
+		if node.nodes ~= nil then
+			-- expand or collapse folder
+			api.node.open.edit()
+		else
+			-- open file
+			api.node.open.edit()
+			-- Close the tree if file was opened
+			api.tree.close()
+		end
+	end
+
+	api.config.mappings.default_on_attach(bufnr)
+	vim.keymap.set("n", "<CR>", edit_or_open, opts("Open"))
+end
+
+require("nvim-tree").setup({
+    sort_by = "case_sensitive",
+    view = {
+		adaptive_size = false,
+        centralize_selection = true,
+        width = 30,
+        side = "left",
+        preserve_window_proportions = false,
+        number = false,
+        relativenumber = false,
+        signcolumn = "yes",
+        float = {
+			enable = false,
+			quit_on_focus_loss = true,
+			open_win_config = {
+				relative = "editor",
+				border = "rounded",
+				width = 30,
+				height = 30,
+				row = 1,
+				col = 1,
+			},
+        },
+    },
+    renderer = {
+        group_empty = true,
+    },
+	actions = {
+		use_system_clipboard = true,
+		change_dir = {
+			enable = true,
+            global = false,
+			restrict_above_cwd = false,
+        },
+        expand_all = {
+			max_folder_discovery = 300,
+			exclude = {},
+        },
+        file_popup = {
+			open_win_config = {
+				col = 1,
+				row = 1,
+				relative = "cursor",
+				border = "shadow",
+				style = "minimal",
+			},
+        },
+		open_file = {
+			window_picker = {
+				enable = false,
+				picker = "default",
+				chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
+				exclude = {
+					filetype = { "notify", "lazy", "qf", "diff", "fugitive", "fugitiveblame" },
+					buftype = { "nofile", "terminal", "help" },
+				},
+			}
+		},
+		remove_file = {
+			close_window = true,
+        },
+
+	},
+	tab = {
+        sync = {
+			open = false,
+			close = false,
+			ignore = {},
+        },
+    },
+	git = {
+        enable = true,
+        ignore = false,
+        show_on_dirs = true,
+        show_on_open_dirs = true,
+        timeout = 200,
+    },
+	filters = {
+        dotfiles = false,
+        git_clean = false,
+        no_buffer = false,
+        custom = { "node_modules", "\\.cache" },
+        exclude = {},
+    },
+	update_cwd = true,
+	respect_buf_cwd = true,
+	update_focused_file = {
+		enable = true,
+		update_cwd = true
+	},
+	on_attach = on_attach
+})

home-config/nvim/lua/treesitter.lua

@@ -0,0 +1,30 @@
+local lsps = {
+	"c",
+	"lua",
+	"rust",
+	"typescript",
+	"javascript",
+	"python",
+	"vim",
+	"vimdoc",
+	"query"
+};
+
+require('nvim-treesitter.configs').setup {
+  ensure_installed = lsps,
+  sync_install = false,
+  auto_install = true,
+  ignore_install = { "javascript" },
+  highlight = {
+    enable = true,
+    disable = { "c", "rust" },
+    disable = function(lang, buf)
+        local max_filesize = 100 * 1024 -- 100 KB
+        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
+        if ok and stats and stats.size > max_filesize then
+            return true
+        end
+    end,
+    additional_vim_regex_highlighting = false,
+  },
+}

home-config/nvim/lua/vimopt.lua

@@ -0,0 +1,14 @@
+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
+set.autoindent = true
+set.ttyfast = true
+set.number = true
+set.relativenumber = true
+set.rnu = true
+set.swapfile = false

home-config/scripts/chem.js

@@ -0,0 +1,118 @@
+let H	=  1.008;
+let He	=  4.002;
+let Li	=  6.94;
+let Be	=  9.012;
+let B	=  10.81;
+let C	=  12.011;
+let N	=  14.007;
+let O	=  15.999;
+let F	=  18.998;
+let Ne	=  20.180;
+let Na	=  22.990;
+let Mg	=  24.305;
+let Al	=  26.982;
+let Si	=  28.085;
+let P	=  30.974;
+let S	=  32.06;
+let Cl	=  35.45;
+let Ar	=  39.95;
+let K	=  39.098;
+let Ca	=  40.078;
+let Sc	=  44.956;
+let Ti	=  47.867;
+let V	=  50.942;
+let Cr	=  51.996;
+let Mn	=  54.938;
+let Fe	=  55.845;
+let Co	=  58.933;
+let Ni	=  58.693;
+let Cu	=  63.546;
+let Zn	=  65.38;
+let Ga	=  69.723;
+let Ge	=  72.630;
+let As	=  74.922;
+let Se	=  78.971;
+let Br	=  79.904;
+let Kr	=  83.798;
+let Rb	=  85.468;
+let Sr	=  87.62;
+let Y	=  88.906;
+let Zr	=  91.224;
+let Nb	=  92.906;
+let Mo	=  95.95;
+let Tc	=  98;
+let Ru	=  101.07;
+let Rh	=  102.91;
+let Pd	=  106.42;
+let Ag	=  107.87;
+let Cd	=  112.41;
+let In	=  114.82;
+let Sn	=  118.71;
+let Sb	=  121.76;
+let Te	=  127.60;
+let I	=  126.90;
+let Xe	=  131.29;
+let Cs	=  132.91;
+let Ba	=  137.33;
+let La	=  138.91;
+let Ce	=  140.12;
+let Pr	=  140.91;
+let Nd	=  144.24;
+let Pm	=  145.00;
+let Sm	=  150.36;
+let Eu	=  151.96;
+let Gd	=  157.25;
+let Tb	=  158.93;
+let Dy	=  162.50;
+let Ho	=  164.93;
+let Er	=  167.26;
+let Tm	=  168.93;
+let Yb	=  173.05;
+let Lu	=  174.97;
+let Hf	=  178.49;
+let Ta	=  180.95;
+let W	=  183.84;
+let Re	=  75;
+let Os	=  190.23;
+let Ir	=  192.22;
+let Pt	=  195.08;
+let Au	=  107.87;
+let Hg	=  200.59;
+let Tl	=  204.38;
+let Pb	=  207.2;
+let Bi	=  208.98;
+let Po	=  209;
+let At	=  210;
+let Rn	=  222;
+let Fr	=  223;
+let Ra	=  226;
+let Ac	=  227;
+let Th	=  232.04;
+let Pa	=  231.04;
+let U	=  238.03;
+let Np	=  237;
+let Pu	=  244;
+let Am	=  243;
+let Cm	=  247;
+let Bk	=  247;
+let Cf	=  251;
+let Es	=  252;
+let Fm	=  257;
+let Md	=  258;
+let No	=  259;
+let Lr	=  266;
+let Rf	=  267;
+let Db	=  268;
+let Sg	=  269;
+let Bh	=  270;
+let Hs	=  277;
+let Mt	=  278;
+let Ds	=  281;
+let Rg	=  282;
+let Cn	=  285;
+let Nh	=  286;
+let Fl	=  289;
+let Mc	=  290;
+let Lv	=  293;
+let Ts	=  294;
+let Og	=  294;

home-config/ssh/config

@@ -1,17 +1,21 @@
 Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
 
-Host icarus
+host garchomp
-    HostName icarus.tylerm.dev
+    hostname garchomp.freya.cat
-    User tylerm
+    user freya
 
-Host tardis
+host jolteon
-    HostName tardis.tylerm.dev
+    hostname jolteon.freya.cat
-    User tylerm
+    user freya
+
+Host yveltal
+    HostName yveltal.freya.cat
+    User freya
     Port 1111
 
 Host stationery
     HostName stationery.faith
-    User tylerm
+    User freya
 
 Host queeg
     Hostname queeg.cs.rit.edu
@@ -24,8 +28,8 @@ Host nitron
 Host github.com
     Hostname github.com
     User tam2214
-    IdentityFile /home/tylerm/.ssh/id_rit
+    IdentityFile /home/freya/.ssh/id_rit
 
-#Host *
+Host *
-#    KexAlgorithms -sntrup761x25519-sha512@openssh.com
+    KexAlgorithms -sntrup761x25519-sha512@openssh.com
 

home-config/sway/config

@@ -22,8 +22,8 @@ set $radius 0
 set $shadows on
 set $shadow_blur 15
 set $blur enable
-set $blur_radius 4
+set $blur_radius 10
-set $blur_passes 2
+set $blur_passes 3
 
 # Set browser
 set $browser firefox

home-config/sway/config.d/keybinds

@@ -36,10 +36,6 @@ bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bindsym F3 exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindsym F2 exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym F1 exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym F4 exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
 # Brightness keybinds
 bindsym XF86MonBrightnessDown exec brightnessctl set 5%-

home-config/sway/config.d/workspaces

@@ -21,7 +21,6 @@ bindsym $mod+6 workspace number 6
 bindsym $mod+7 workspace number 7
 bindsym $mod+8 workspace number 8
 bindsym $mod+9 workspace number 9
-bindsym $mod+0 workspace number 10
 
 # Move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace number 1
@@ -33,7 +32,6 @@ bindsym $mod+Shift+6 move container to workspace number 6
 bindsym $mod+Shift+7 move container to workspace number 7
 bindsym $mod+Shift+8 move container to workspace number 8
 bindsym $mod+Shift+9 move container to workspace number 9
-bindsym $mod+Shift+0 move container to workspace number 10
 
 # Layout stuff:
 

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

@@ -7,12 +7,12 @@ mako &
 
 nm-applet --indicator &
 
-GTK_THEME= waybar &
-
 autotiling &
 
 /usr/bin/gnome-keyring-daemon --foreground &
 
+GTK_THEME="Adwaita-dark" waybar &
+
 discord --enable-features=UseOzonePlatform --ozone-platform=wayland &
 element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland &
 #thunderbird &

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

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+PID=$$
+
 get_mode() {
     swaymsg -t get_outputs -r | jq ".[$1].modes[0]"
 }
@@ -60,18 +62,16 @@ get_id() {
             echo "$i"
             exit 0
         elif [ "$NAME" == "null" ]; then
+            notify-send -u critical -t 3000 "Sway" "Failed to get display"
+            kill $PID
             exit 1
         fi
         ((i=i+1))
     done
 }
 
-die() {
-    notify-send -u critical -t 3000 "Sway" "Failed to get display"
-}
-
 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

home-config/waybar/config

@@ -1,5 +1,6 @@
 {
     "height": 24,
+    "position": "top",
     "spacing": 4,
     "modules-left": [
         "sway/workspaces",

home-config/waybar/style.css

@@ -32,6 +32,8 @@ button {
 }
 
 #workspaces button {
+    margin: 1px 0px;
+    padding: 0px 5px;
     color: #c7c6c3;
     background-color: rgba(0, 0, 0, 0);
 }

home-config/zsh/zprofile

@@ -36,18 +36,23 @@ $HOME/.guix-home/on-first-login
 # Setup Nix Environment
 export NIX_PROFILE=$HOME/.nix-profile
 export XDG_DATA_DIRS=$XDG_DATA_DIRS:$NIX_PROFILE/share
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share
 export PATH=$PATH:$NIX_PROFILE/bin
 export LIBRARY_PATH=$LIBRARY_PATH:$NIX_PROFILE/lib
 
 # Setup User Environment
 export LOCAL_PROFILE=$HOME/.local
 export XDG_DATA_DIRS=$XDG_DATA_DIRS:$LOCAL_PROFILE/share
-export PATH=$PATH:$LOCAL_PROFILE/bin
+export PATH=$LOCAL_PROFILE/bin:$PATH
 
 # Setup Compilers
 export CC=$(which gcc)
 export LD=$(which gcc)
 
+# Docker
+export DOCKER_CONFIG=$HOME/.docker
+
 # Setup certs
 export SSL_CERT_FILE=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt
 export SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs

home-config/zsh/zshrc

@@ -35,6 +35,8 @@ alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
 alias ls="ls --color=auto"
 alias su="doas -s"
 
+alias ptable="node -i -e '$(< $HOME/.scripts/chem.js)'"
+
 # Have manpages use colors
 man() {
 	env \

kaworu.scm

@@ -8,12 +8,12 @@
   (mapped-devices (list (mapped-device
                           (source (uuid
                                    "89257280-202b-4565-b832-89f160d5e4e2"))
-                          (target "cryptroot")
+                          (target "root")
                           (type luks-device-mapping))))
 
   (file-systems (cons* (file-system
                          (mount-point "/")
-                         (device "/dev/mapper/cryptroot")
+                         (device "/dev/mapper/root")
                          (type "btrfs")
                          (dependencies mapped-devices))
                        (file-system

modules/home-config/base-system.scm

@@ -1,6 +1,7 @@
 (define-module (home-config base-system)
            #:use-module (gnu)
            #:use-module (gnu system setuid)
+           #:use-module (gnu system locale)
            #:use-module (gnu packages)
            #:use-module (gnu packages admin)
            #:use-module (gnu packages avahi)
@@ -23,11 +24,10 @@
            #:use-module (gnu services ssh)
            #:use-module (gnu services nix)
            #:use-module (gnu services sound)
-           #:use-module (gnu services docker)
            #:use-module (gnu services avahi)
+           #:use-module (gnu services docker)
            #:use-module (gnu services spice)
            #:use-module (gnu services virtualization)
-           #:use-module (home-services ntp)
            #:use-module (home-packages wm)
            #:use-module (home-packages certs)
            #:use-module (home-packages virtualization))
@@ -52,77 +52,82 @@
          (kernel linux)
          (firmware (list linux-firmware intel-microcode sof-firmware))
          (locale "en_US.utf8")
+         (locale-definitions (cons* (locale-definition
+                                      (name "en_US.utf8") (source "en_US"))
+                                    (locale-definition
+                                      (name "ja_JP.utf8") (source "ja_JP"))
+                                    %default-locale-definitions))
          (timezone "America/New_York")
          (keyboard-layout (keyboard-layout "us"))
          (host-name "ThisWillChange") 
 
          ;; The list of user accounts ('root' is implicit).
          (users (cons* (user-account
-                (name "tylerm")
+                (name "freya")
-                (comment "Tyler Murphy")
+                (comment "freya")
                 (group "users")
-                (home-directory "/home/tylerm")
+                (home-directory "/home/freya")
                 (shell (file-append zsh "/bin/zsh"))
-                (supplementary-groups '("wheel" "audio" "lp" "docker" "plugdev" "libvirt" "kvm" "netdev"  "video" "tty")))
+                (supplementary-groups '("docker" "wheel" "audio" "lp" "plugdev" "libvirt" "kvm" "netdev"  "video" "tty")))
                   %base-user-accounts))
 
-         (packages (append (map specification->package (list "swayfx"
+         (packages (append (map specification->package (list "sof-firmware"             ;; core system
-                                                             "swaybg"
+                                                             "intel-microcode"          ;; kernel utils,drivers, firmware, etc.
-                                                             "wlogout"
-                                                             "sof-firmware"
-                                                             "intel-microcode"
-                                                             "alsa-utils"
-                                                             "chrony"
-                                                             "swayidle"
-                                                             "dconf"
-                                                             "alacritty"
-                                                             "gnome-themes-extra"
-                                                             "adwaita-icon-theme"
-                                                             "hicolor-icon-theme"
-                                                             "git"
-                                                             "nss-certs"
-                                                             "gvfs"
-                                                             "gnupg"
-                                                             "light"
-                                                             "waybar"
-                                                             "avahi"
-                                                             "mako"
-                                                             "grim"
-                                                             "slurp"
-                                                             "wl-clipboard"
-                                                             "bluez"
-                                                             "blueman"
-                                                             "opendoas"
-                                                             "wireguard-tools"
-                                                             "xdg-desktop-portal"
-                                                             "xdg-desktop-portal-wlr"
-                                                             "v4l2loopback-linux-module"
-                                                             "docker"
-                                                             "linux-pam"
-                                                             "pulseaudio"
-                                                             "libx11"
-                                                             "xorg-server-xwayland"
-                                                             "fprintd"
-                                                             "wireplumber"
-                                                             "qemu"
-                                                             "spice"
-                                                             "xf86-video-qxl"
-                                                             "zsh"
                                                              "mesa"
                                                              "mesa-utils"
-                                                             "glu"
+                                                             "linux-pam"
-                                                             "vulkan-loader"
+
-                                                             "vulkan-validationlayers"
+                                                             
+                                                             "openssl"                  ;; system packages
+                                                             "ncurses"                  ;; usefull packages needed by scripts or packages
+                                                             "acpi"
+                                                             "git"
+                                                             "binutils"
+                                                             "nss-certs"
+                                                             "opendoas"
+                                                             "chrony"
+                                                             "gnupg"
+                                                                                           "flatpak"
+                                                                                           "man-db"
+                                                                                           "man-pages"
+                                                                                           "docker"
+
+
+                                                             "alsa-utils"               ;; sound and bluetooth
+                                                             "pulseaudio"               ;; i am the one who knocks (and you hear it :3)
+                                                             "bluez"
+                                                             "blueman"
+                                                             "wireplumber"
+
+
+                                                             "glu"                      ;; drivers or modules s runtime packages or headers
+                                                             "vulkan-loader"            ;; usefull for devlopmet as headers or runtime dependicies with those headers
+                                                             "vulkan-validationlayers"  ;; mostly graphics
                                                              "vulkan-tools"
                                                              "vulkan-headers"
                                                              "spirv-tools"
                                                              "spirv-headers"
+                                                                                           "shaderc"
                                                              "sdl2"
+                                                                                           "glm"
                                                              "openal"
                                                              "freealut"
-                                                             "wxwidgets"
+                                                             "xf86-video-qxl"
-                                                             "libpcap"
                                                              "v4l2loopback-linux-module"
+                                                             "fuse@2"
+
+
+                                                             "xdg-desktop-portal"       ;; graphics
+                                                             "xdg-desktop-portal-wlr"   ;; xdg and other display utilities
+                                                             "xorg-server-xwayland"
+                                                             "libx11"
+
+
+                                                             "wireguard-tools"          ;; misc
+                                                             "qemu"                     ;; shit i cant sort, they exist
+                                                             "dconf"
+                                                             "avahi"
+                                                             "libpcap"
                                                              "neovim"))
                            (list swaylock-effects-new virt-manager-new freya-ca-certs)
                            %my-base-packages))
@@ -147,8 +152,6 @@
                     (avahi-configuration
                       (publish? #f) ;; do not advertise this machiene
                       (publish-workstation? #f))) ; do not advertise, I want this to be as silent as possible
-               (service docker-service-type)
-               ;(service chrony-sericve-type)
                (service nix-service-type)
                (service libvirt-service-type
                         (libvirt-configuration
@@ -162,6 +165,10 @@
                               (fast-connectable? #t)))
                (service pam-limits-service-type)
                (service fprintd-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

modules/home-config/ca-certs/freya_ca.crt

@@ -1,11 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBnDCCAUKgAwIBAgIRANSS7G2uorge5TXlGr7z2qswCgYIKoZIzj0EAwIwLDEQ
-MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz
-MTAwNDIxMzczMFoXDTMzMTAwMTIxMzczMFowLDEQMA4GA1UEChMHZnJleWFDQTEY
-MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEvyoFgV7LYPyYzubVKEAmDRtp/1Fd/+/txbFBOXE0lX3EC0pPgfr2G8S7FC5P
-aNv+ZxmnSSI8vLJbVofLKNu3GaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB
-/wQIMAYBAf8CAQEwHQYDVR0OBBYEFIWAMA1zgd/KEOAV/26yfuJS48O1MAoGCCqG
-SM49BAMCA0gAMEUCIQDX9oivOL5hueuikrAEoiVw0jwTOOQ51zEQD1v4Xlp1RQIg
-LitR7EYp6R0ejK66ZSE0cUdsF/4WbgtrlS3p/MQgDdw=
------END CERTIFICATE-----

modules/home-config/ca-certs/freya_intermediate.crt

@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBxTCCAWqgAwIBAgIQKD7wGJ+2vQCA1+8z2waLiTAKBggqhkjOPQQDAjAsMRAw
-DgYDVQQKEwdmcmV5YUNBMRgwFgYDVQQDEw9mcmV5YUNBIFJvb3QgQ0EwHhcNMjMx
-MDA0MjEzNzMxWhcNMzMxMDAxMjEzNzMxWjA0MRAwDgYDVQQKEwdmcmV5YUNBMSAw
-HgYDVQQDExdmcmV5YUNBIEludGVybWVkaWF0ZSBDQTBZMBMGByqGSM49AgEGCCqG
-SM49AwEHA0IABAygCEQ06w0AKgqXVWCL1iX0oRqS6QEb0VY49zZimPRVmI+FdJ0O
-KB4kANOJABYyFfpzoK9omJXdz6BvsFHx6c+jZjBkMA4GA1UdDwEB/wQEAwIBBjAS
-BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQFRP1PrOhDg13b9m/oPHg4IAuy
-KjAfBgNVHSMEGDAWgBSFgDANc4HfyhDgFf9usn7iUuPDtTAKBggqhkjOPQQDAgNJ
-ADBGAiEAoY0OsXihuhxIQAx8Fp5agkE70UaOHmT5JLJhVGH7sQYCIQCzId4kEMJ8
-N4/afVgJI7R5hHbcu1Wge40SSkMx1pplFA==
------END CERTIFICATE-----

modules/home-config/ca-certs/freya_intermediate_ca.crt

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBxjCCAWugAwIBAgIRAKDzyQOSQ6q84fqZBGlmZQ8wCgYIKoZIzj0EAwIwLDEQ
+MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz
+MTAyODEzNDAzNloXDTMzMTAyNTEzNDAzNlowNDEQMA4GA1UEChMHZnJleWFDQTEg
+MB4GA1UEAxMXZnJleWFDQSBJbnRlcm1lZGlhdGUgQ0EwWTATBgcqhkjOPQIBBggq
+hkjOPQMBBwNCAAQnCVugNyAxPBHS8jiF5mJmUvFUbYSL5OWzkSCMjac3FXwLTqe8
+AxPga5jHATf2Kt7laq5BYm7jB4M+TcJsdM3Mo2YwZDAOBgNVHQ8BAf8EBAMCAQYw
+EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUbDJYRGXitoGNJ9r+vbJp0lU5
+4VgwHwYDVR0jBBgwFoAUZhpq20aVnG7megVbECcu2kyom8kwCgYIKoZIzj0EAwID
+SQAwRgIhAOZHh1skE3xE9NHpTQS8cUqiJ+cBLwcIGUguKOUf5hj9AiEA3IoFdhsO
+hAErELhLd5FM3Yxl3j/TzHslvsD4QyeNhG4=
+-----END CERTIFICATE-----

modules/home-config/ca-certs/freya_root_ca.crt

@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBnDCCAUKgAwIBAgIRAPVH+EAJd7BV1oocsZ1LQLEwCgYIKoZIzj0EAwIwLDEQ
+MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz
+MTAyODEzNDAzNVoXDTMzMTAyNTEzNDAzNVowLDEQMA4GA1UEChMHZnJleWFDQTEY
+MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEvVC5H2UQZQxMJxKnWkNF7kKNXVDpY2N81yFXRb+K/MKw3aQTI1ukJ6A3AmZP
+P9urbt/wOHI2zBuodGi4gaLBSaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB
+/wQIMAYBAf8CAQEwHQYDVR0OBBYEFGYaattGlZxu5noFWxAnLtpMqJvJMAoGCCqG
+SM49BAMCA0gAMEUCIQCCyubbf8AUq+PPrnBRQ/WFYKH3mwUXcDT7VZoLm+/q+gIg
+YdSLl4AnWfDLlaTTZspft2fq5rEFCB5N+4p/67vSsmY=
+-----END CERTIFICATE-----

modules/home-config/ca-certs/tinternet_root_ca.crt

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0DCCAXagAwIBAgIRAKk5OC0K/5fULwXrMQuONpIwCgYIKoZIzj0EAwIwRjEd
+MBsGA1UEChMUQ2VydGlmaWNhdGVBdXRob3JpdHkxJTAjBgNVBAMTHENlcnRpZmlj
+YXRlQXV0aG9yaXR5IFJvb3QgQ0EwHhcNMjMxMTA0MDIwMzU1WhcNMzMxMTAxMDIw
+MzU1WjBGMR0wGwYDVQQKExRDZXJ0aWZpY2F0ZUF1dGhvcml0eTElMCMGA1UEAxMc
+Q2VydGlmaWNhdGVBdXRob3JpdHkgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABKZzRX5AdjTTzkPr3tUw4SiTYI85sDsrvh7qWCSY70htRk/ldo3q1C3+
+Y1h11ZHha9niYPFEQbAyvupM8nw2hrejRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNV
+HRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBRPy7zJUi60Mx1uvJVL9rD8+XK+3jAK
+BggqhkjOPQQDAgNIADBFAiEAsA5ha5E/pv4UBdIX0XmYqk905hch9YkM0aM1idXK
+2/QCIDQMv88O698/domTyYnIHi2qoSyEl3aKTbntgGE/CNHj
+-----END CERTIFICATE-----

modules/home-packages/certs.scm

@@ -17,7 +17,7 @@
                         #:recursive? #t))
     (build-system trivial-build-system)
     (license license:mpl2.0)
-    (home-page "https://tylerm.dev")
+    (home-page "https://freya.cat")
     (arguments
       `(#:modules
         ((guix build utils))

modules/home-packages/freedesktop.scm

@@ -0,0 +1,55 @@
+(define-module (home-packages freedesktop)
+                #:use-module (guix download)
+                #:use-module ((guix licenses) #:prefix license:)
+                #:use-module (guix gexp)
+                #:use-module (guix build-system meson)
+                #:use-module (guix build-system qt)
+                #:use-module (guix build-system cmake)
+                #:use-module (guix build utils)
+                #:use-module (guix build glib-or-gtk-build-system)
+                #:use-module (guix packages)
+                #:use-module (guix git-download)
+                #:use-module (guix utils)
+                #:use-module (gnu packages)
+                #:use-module (gnu packages gl)
+                #:use-module (gnu packages linux)
+                #:use-module (gnu packages image)
+                #:use-module (gnu packages qt)
+                #:use-module (gnu packages cmake)
+                #:use-module (gnu packages gcc)
+                #:use-module (gnu packages pkg-config)
+                #:use-module (gnu packages freedesktop)
+                #:use-module (gnu packages xorg)
+                #:use-module (gnu packages glib)
+                #:use-module (gnu packages man)
+                #:use-module (gnu packages wm))
+
+(define-public wl-mirror
+  (package
+    (name "wl-mirror")
+    (version "0.13.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/Ferdi265/wl-mirror")
+                     (commit (string-append "v" version))
+                     (recursive? #t)))
+              (file-name (git-file-name name version))
+              (sha256
+                (base32
+                  "0vkd73x5r2585s3w1ckvslc2mq9qbzrm5xkwg8gpy9ydaxhn8hmp"))))
+    (inputs (list wayland egl-wayland mesa))
+    (native-inputs (list pkg-config scdoc wayland-protocols))
+    (build-system cmake-build-system)
+    (arguments (list
+                 #:tests? #f
+                 #:phases
+                 #~(modify-phases %standard-phases
+                    (add-before 'configure 'touch
+                      (lambda _
+                        (invoke "touch" "proto/wayland-protocols/.git")
+                        (invoke "touch" "proto/wlr-protocols/.git"))))))
+    (home-page "bleh")
+    (synopsis "mirror displays")
+    (description "mirror displays")
+    (license license:expat)))

modules/home-packages/golang.scm

@@ -1,833 +0,0 @@
-(define-module (home-packages golang)
-               #:use-module ((guix licenses) #:prefix license:)
-               #:use-module (guix gexp)
-               #:use-module (gnu packages base)
-               #:use-module (gnu packages version-control)
-               #:use-module (gnu packages package-management)
-               #:use-module (gnu packages build-tools)
-               #:use-module (gnu packages)
-               #:use-module (guix packages)
-               #:use-module (gnu packages)
-               #:use-module (guix git-download)
-               #:use-module (guix download)
-               #:use-module (gnu packages golang)
-               #:use-module (guix build-system go)
-               #:use-module (guix build-system trivial)
-               #:use-module (guix build utils)
-               #:use-module (guix utils))
-
-(define (go-package name version url hash path inputs)
-  (package
-    (name name)
-    (version version)
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url url)
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-                (base32
-                  hash))))
-    (build-system go-build-system)
-    (propagated-inputs inputs)
-    (arguments
-      `(#:go ,go-1.20
-        #:import-path ,path
-        #:phases %standard-phases
-        #:install-source? #t
-        #:tests? #f))
-    (synopsis (string-append name " go package"))
-    (description (string-append name " go package"))
-    (home-page url)
-    (license license:expat)))
-
-(define (go-version-go-package name version url hash path inputs)
-    (package
-      (inherit (go-package name version url hash path inputs))
-      (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url url)
-                     (commit (go-version->git-ref version))))
-              (file-name (git-file-name name version))
-              (sha256
-                (base32
-                  hash))))))
-
-(define (commit-go-package name comm url hash path inputs)
-    (package
-      (inherit (go-package name comm url hash path inputs))
-      (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url url)
-                     (commit comm)))
-              (file-name (git-file-name name comm))
-              (sha256
-                (base32
-                  hash))))))
-
-
-(define (source-only gopackage)
-    (package
-      (inherit gopackage)
-      (arguments
-        (substitute-keyword-arguments (package-arguments gopackage)
-         ((#:phases phases)
-           #~(modify-phases #$phases
-                (delete 'build)))))))
-
-(define (set-go gopackage gover)
-    (package
-      (inherit gopackage)
-      (arguments
-        (substitute-keyword-arguments (package-arguments gopackage)
-         ((#:go _) gover)))))
-
-(define (set-unpack gopackage unpack)
-    (package
-      (inherit gopackage)
-      (arguments
-        (substitute-keyword-arguments (package-arguments gopackage)
-         ((#:unpack-path _) unpack)))))
-
-(define (set-inputs gopackage inputs)
-    (package
-      (inherit gopackage)
-      (native-inputs inputs)))
-
-
-(define go-github-com-matttproud-golang-protobuf-extensions
-  (source-only (go-package
-    "go-github-com-matttproud-golang-protobuf-extensions"
-    "2.0.0"
-    "https://github.com/matttproud/golang_protobuf_extensions"
-    "0jw4vjycwx0a82yvixmp25805krdyqd960y8lnyggllb6br0vh41"
-    "github.com/matttproud/golang_protobuf_extensions"
-    (list))))
-
-(define go-github-com-beorn7-perks
-  (source-only (go-package
-    "go-github-com-beorn7-perks"
-    "1.0.1"
-    "https://github.com/beorn7/perks"
-    "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"
-    "github.com/beorn7/perks"
-    (list))))
-
-(define go-github-com-golang-protobuf
-  (source-only (go-package
-    "go-github-com-golang-protobuf"                         ; name
-    "1.5.3"                                                 ; version
-    "https://github.com/golang/protobuf"                    ; url
-    "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i"  ; hash
-    "github.com/golang/protobuf"                            ; path
-    (list))))                                               ; inputs 
-
-(define go-go-uber-org-multierr
-  (go-package
-    "go-go-uber-org-multierr"
-    "1.11.0"
-    "https://github.com/uber-go/multierr"
-    "1s6skad93nbsq4b0sy5dsgacrdh2kzg0p8wjlhvff49vasqsi3qx"
-    "go.uber.org/multierr"
-    (list)))
-
-(define go-go-uber-org-zap
-  (go-package
-    "go-go-uber-org-zap"
-    "1.26.0"
-    "https://github.com/uber-go/zap"
-    "1aw7zba4f06835vm6l6j1y1jaz2p92gi2nv52hfn1a62gixj8nq4"
-    "go.uber.org/zap"
-    (list go-go-uber-org-multierr)))
-
-(define go-github-com-cespare-xxhash
-  (go-package
-    "go-github-com-cespare-xxhash"
-    "2.2.0"
-    "https://github.com/cespare/xxhash"
-    "055xvgyv78xl6bdj8kgy0105n9cq33w4rb0sg84lp9r85i9qx2l5"
-    "github.com/cespare/xxhash"
-    (list)))
-
-(define go-golang-org-x-exp
-  (source-only (go-version-go-package
-    "go-golang-org-x-exp"                                   ; name
-    "v0.0.0-20230310171629-522b1b587ee0"                    ; version
-    "https://go.googlesource.com/exp"                       ; url
-    "054hbk826n3kprk75m19ik89mnicbshq6kdiwd60xxfczdjf88rn"  ; hash
-    "golang.org/x/exp"                                      ; path
-    (list))))                                               ; inputs 
-
-(define go-golang-org-x-sync
-  (source-only (go-package
-    "go-golang-org-x-text"                                  ; namie
-    "0.3.0"                                                 ; version
-    "https://go.googlesource.com/sync"                      ; url
-    "0jmkqah45db9nz6yjdd8vvanpjfzb5lsv6bxf0d1dih4zhp4l8kc"  ; hash
-    "golang.org/x/sync"                                     ; path
-    (list))))                                               ; inputs 
-
-(define go-golang-org-x-text
-  (source-only (go-package
-    "go-golang-org-x-text"                                  ; namie
-    "0.11.0"                                                ; version
-    "https://go.googlesource.com/text"                      ; url
-    "1a0d6f9qqzd9njd8xb59mjrfv5jrz8130crcxbqaiy7lk434nq1k"  ; hash
-    "golang.org/x/text"                                     ; path
-    (list))))                                               ; inputs 
-
-(define go-golang-org-x-term
-  (source-only (go-package
-    "go-golang-org-x-term"                                  ; namie
-    "0.10.0"                                                ; version
-    "https://go.googlesource.com/term"                      ; url
-    "19abybnsqix924d9ak4p93bgq1312zp1yk11bilrrmsjplhbrzqf"  ; hash
-    "golang.org/x/term"                                     ; path
-    (list))))                                               ; inputs 
-
-(define go-golang-org-x-net
-  (source-only (go-package
-    "go-golang-org-x-net"                                   ; name
-    "0.14.0"                                                ; version
-    "https://go.googlesource.com/net"                       ; url
-    "0pk9pfd5n5hlg5zx1ab3gfzi6lfcs41dfds6fyn661g5xs00l9s1"  ; hash
-    "golang.org/x/net"                                      ; path
-    (list))))                                               ; inputs 
-
-
-(define go-golang-org-x-crypto
-  (source-only (go-package 
-    "go-golang-org-x-crypto"                                ; name
-    "0.12.0"                                                ; version
-    "https://go.googlesource.com/crypto"                    ; url
-    "00cg67w0n01a64fc4kqg5j7r47fx5y9vyqlanwb60513dv6lzacs"  ; hash
-    "golang.org/x/crypto"                                   ; path
-    (list))))                                               ; inputs 
-
-(define go-golang-org-x-sys
-  (source-only (go-package
-    "go-golang-org-x-sys"                                   ; name
-    "0.11.0"                                                ; version
-    "https://go.googlesource.com/sys"                       ; url
-    "1pp0479l9w92kr6p97d19s8y0hj16gblg4hvdqqzcrf3d9mr4cs3"  ; hash
-    "golang.org/x/sys"                                      ; path
-    (list))))                                               ; inputs 
-
-(define go-github-com-quic-go-qtls-go1-20
-  (go-package
-    "go-github-com-quic-go-qtls-go1-20"                     ; name
-    "0.3.4"                                                 ; version
-    "https://github.com/quic-go/qtls-go1-20"                ; url
-    "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn"  ; hash
-    "github.com/quic-go/qtls-go1-20"                        ; path
-    (list go-golang-org-x-crypto                            ; inputs 
-          go-golang-org-x-sys)))
-
-(define go-github-com-google-go-cmp
-  (source-only (go-package
-    "go-github-com-google-go-cmp"
-    "0.5.9"
-    "https://github.com/google/go-cmp"
-    "0a13m7l1jrysa7mrlmra8y7n83zcnb23yjyg3a609p8i9lxkh1wm"
-    "github.com/google/go-cmp/go"
-    (list))))
-
-(define go-github-com-hashicorp-go-uuid
-  (go-package
-    "go-github-com-hashicorp-go-uuid"
-    "1.0.3"
-    "https://github.com/hashicorp/go-uuid"
-    "0wd4maaq20alxwcvfhr52rzfnwwpmc2a698ihyr0vfns2sl7gkzk"
-    "github.com/hashicorp/go-uuid"
-    (list)))
-
-(define go-github-com-google-uuid
-  (go-package
-    "go-github-com-google-uuid"
-    "1.3.1"
-    "https://github.com/google/uuid"
-    "1pd1lkl50prswl91dpwml66s2ildjqipnsqi9a7m25lv3l008417"
-    "github.com/google/uuid"
-    (list)))
-
-(define go-github-com-marten-seemann-qtls-go1-19
-  (set-go (go-package
-    "go-github-com-marten-seemann-qtls-go1-19"
-    "0.3.3"
-    "https://github.com/quic-go/qtls-go1-19"
-    "07i56533033cd0kn67fvyyvwbmfwfdk3y5x5wl4y00zplyhhys9q"
-    "github.com/marten-seemann/qtls-go1-19"
-    (list go-golang-org-x-sys
-          go-golang-org-x-crypto))
-    go-1.19))
-
-(define go-github-com-lucas-clemente-quic-go
-  (set-go (go-package
-    "go-github-com-lucas-clemente-quic-go"
-    "0.31.1"
-    "https://github.com/quic-go/quic-go"
-    "1vn72wlcyb4j2lw3pfqfvhb3pz7r61j3sddj4r1sf32vc3csis97"
-    "github.com/lucas-clemente/quic-go"
-    (list go-golang-org-x-crypto
-          go-golang-org-x-net
-          go-golang-org-x-exp
-          go-golang-org-x-sys
-          go-github-com-marten-seemann-qtls-go1-19))
-    go-1.19))
-
-(define go-github-com-quic-go-quic-go
-  (go-package
-    "go-github-com-quic-go-quic-go"                         ; name
-    "0.39.0"                                                ; version
-    "https://github.com/quic-go/quic-go"                    ; url
-    "0jiwh97xpvswrbq5glnafc2jc3ybpl17ffa0cg9x3f03raa2q8vg"  ; hash
-    "github.com/quic-go/quic-go"                            ; path
-    (list go-golang-org-x-crypto                            ; inputs 
-          go-golang-org-x-exp
-          go-golang-org-x-net
-          go-golang-org-x-sys
-          go-github-com-quic-go-qtls-go1-20)))
-
-(define go-github-com-prometheus-procfs
-  (go-package
-    "go-github-com-prometheus-procfs"                       ; name
-    "0.8.0"                                                 ; version
-    "https://github.com/prometheus/procfs"                  ; url
-    "0k2d27pm6q6im42x8ikwz0d4sb31wn6rvfs9wlf51d9gldncmpqz"  ; hash
-    "github.com/prometheus/procfs"                          ; path
-    (list go-golang-org-x-sys)))                            ; inputs 
-
-(define go-github-com-prometheus-client-model
-  (source-only (go-package
-    "go-github-com-prometheus-client-model"                 ; name
-    "0.4.0"                                                 ; version
-    "https://github.com/prometheus/client_model"            ; url
-    "0w3hxsc0qmb5vdm8lyhsvkm0g9yk81vrpcyf31haysvid8yjrzg0"  ; hash
-    "github.com/prometheus/client_model"                    ; path
-    (list go-github-com-golang-protobuf))))                 ; inputs 
-
-(define go-github-com-prometheus-common
-  (source-only (go-package
-    "go-github-com-prometheus-common"                       ; name
-    "0.37.0"                                                ; version
-    "https://github.com/prometheus/common"                  ; url
-    "161ayg76ag1h21kaf0qycpy7cizvy3xrm0dn598hj91n44v4z0hf"  ; hash
-    "github.com/prometheus/common"                          ; path
-    (list go-github-com-golang-protobuf                     ; inputs 
-          go-github-com-matttproud-golang-protobuf-extensions
-          go-github-com-prometheus-client-model))))
-
-(define go-github-com-prometheus-client-golang
-  (source-only (go-package
-    "go-github-com-prometheus-client-golang"                ; name
-    "1.14.0"                                                ; version
-    "https://github.com/prometheus/client_golang"           ; url
-    "041br6n309bajwdv871f69fwy1yq3vk46rmzxnkr1ldpq1bhd63n"  ; hash
-    "github.com/prometheus/client_golang"                   ; path
-    (list go-github-com-prometheus-client-model             ; inputs 
-          go-github-com-prometheus-procfs
-          go-github-com-prometheus-common))))
-  
-(define go-github-com-klauspost-cpuid-v2
-  (go-package
-    "go-github-com-klauspost-cpuid-v2"                      ; name
-    "2.2.5"                                                 ; version
-    "https://github.com/klauspost/cpuid"                    ; url
-    "127jlppxs226lnq499rjnjyzgmp849xlxhq7380w2ypdkhvafni1"  ; hash
-    "github.com/klauspost/cpuid/v2"                         ; path
-    (list)))                                                ; inputs 
-
-(define go-github-com-libdns-libdns
-  (go-package
-    "go-github-com-libdns-libdns"                           ; name
-    "0.2.1"                                                 ; version
-    "https://github.com/libdns/libdns"                      ; url
-    "1ix668h4n2n9iph4xiznzdfw7hy0ijy906mvnys4kq9f0v9ih4bg"  ; hash
-    "github.com/libdns/libdns"                              ; path
-    (list)))                                                ; inputs 
-
-(define go-github-com-mholt-acmez
-  (go-package
-    "go-github-com-mholt-acmez"                             ; name
-    "1.2.0"                                                 ; version
-    "https://github.com/mholt/acmez"                        ; url
-    "1wzkgbgnp23vbcz4nc3c8x7vi1lkqp36485f7g05zbshc7hzby6d"  ; hash
-    "github.com/mholt/acmez"                                ; path
-     (list go-go-uber-org-zap                               ; inputs 
-           go-golang-org-x-crypto
-           go-golang-org-x-text
-           go-golang-org-x-net)))
-
-(define go-github-com-miekg-dns
-  (go-package
-    "go-github-com-miekg-dns"                               ; name
-    "1.1.50"                                                ; version
-    "https://github.com/miekg/dns"                          ; url
-    "1svvx9qamy3hy0ms8iwbisqjmfkbza0zljmds6091siq150ggmws"  ; hash
-    "github.com/miekg/dns"                                  ; path
-    (list go-golang-org-x-net                               ; inputs 
-          go-golang-org-x-sys)))
-
-(define go-github-com-zeebo-blake3
-  (go-package
-    "go-github-com-zeebo-blake3"                            ; name
-    "0.2.3"                                                 ; version
-    "https://github.com/zeebo/blake3"                       ; url
-    "1pkk97d1jwfcg3hs9g09zbwn31l96icx1vk4d9l2rhcvfw0aw0fc"  ; hash
-    "github.com/zeebo/blake3"                               ; path
-    (list go-github-com-klauspost-cpuid-v2)))               ; inputs 
-
-(define go-github-com-caddy-certmagic
-  (go-package
-    "go-github-com-caddy-certmagic"                         ; name
-    "0.19.2"                                                ; version
-    "https://github.com/caddyserver/certmagic"              ; url
-    "07a1xiynbbaqm7qzg0q1xhvab99x8mvzr2rw68npxws4dshgdv5f"  ; hash
-    "github.com/caddyserver/certmagic"                      ; path
-    (list go-github-com-klauspost-cpuid-v2                  ; inputs 
-          go-github-com-libdns-libdns
-          go-go-uber-org-zap
-          go-golang-org-x-crypto
-          go-github-com-mholt-acmez
-          go-github-com-zeebo-blake3
-          go-github-com-miekg-dns
-          go-golang-org-x-sys
-          go-golang-org-x-net
-          go-golang-org-x-text)))
-
-(define go-github-com-quic-go-qpack
-  (go-package
-    "go-github-com-quic-go-qpack"                           ; name
-    "0.4.0"                                                 ; version
-    "https://github.com/quic-go/qpack"                      ; url
-    "00mjz445hhx4yar5l8p21bpp4d06jyg2ajw0ax7bh64d37l4kx39"  ; hash
-    "github.com/quic-go/qpack"                              ; path
-    (list go-golang-org-x-net)))                            ; inputs 
-
-(define go-google-golang-org-protobuf
-  (source-only (go-package
-    "go-google-golang-org-protobuf"                         ; name
-    "1.31.0"                                                ; version
-    "https://go.googlesource.com/protobuf"                  ; url
-    "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0"  ; hash
-    "google.golang.org/protobuf"                            ; path
-    (list go-github-com-google-go-cmp                       ; inputs 
-          go-github-com-golang-protobuf))))
-
-(define go-github-com-google-cel-go
-  (source-only (go-package
-    "go-github-com-google-cel-go"
-    "0.18.1"
-    "https://github.com/google/cel-go"
-    "07jp5n266jyk74zaj1n1g15apn2nw1lr6v5zmi13fhir91k6sybr"
-    "github.com/google/cel-go"
-    (list))))
-
-(define go-github-com-klauspost-compress
-  (go-package
-    "go-github-com-klauspost-compress"
-    "1.17.0"
-    "https://github.com/klauspost/compress"
-    "1fjch04mz11lyikzw1xmm541wc5fkvxk18a9wgzxvdvszs84xfjn"
-    "github.com/klauspost/compress"
-    (list)))
-
-(define go-github-com-rs-xid
-  (go-package
-    "go-github-com-rs-xid"
-    "1.2.1"
-    "https://github.com/rs/xid"
-    "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j"
-    "github.com/rs/xid"
-    (list)))
-
-(define go-github-com-micromdm-scep
-  (source-only (go-package
-    "go-github-com-micromdm-scep"
-    "2.1.0"
-    "https://github.com/micromdm/scep"
-    "1a3knshfmh8lniz098ir0rl7ixb2a0zwvdlwy22a6q8fsicfk40q"
-    "github.com/micromdm/scep"
-    (list))))
-
-(define go-github-com-smallstep-certificates
-  (source-only (go-package
-    "go-github-com-smallstep-certificates"
-    "0.25.0"
-    "https://github.com/smallstep/certificates"
-    "1f7ignpnsj5q1qfdn040hjh9gzix4bg88wspjzx0qms9s9c42n1g"
-    "github.com/smallstep/certificates"
-    (list go-github-com-rs-xid
-          go-github-com-micromdm-scep))))
-
-(define go-github-com-smallstep-truststore
-  (source-only (go-package
-    "go-github-com-smallstep-truststore"
-    "0.12.1"
-    "https://github.com/smallstep/truststore"
-    "06a73r4h69q3626x14xcc4rkiparyvhwbn19g22y2r9pgvxirfi9"
-    "github.com/smallstep/truststore"
-    (list))))
-
-(define gopkg-in-square-go-jose-v2
-  (go-package
-    "gopkg-in-square-go-jose-v2"
-    "2.6.0"
-    "https://github.com/square/go-jose"
-    "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"
-    "gopkg.in/square/go-jose.v2"
-    (list go-golang-org-x-crypto)))
-
-(define go-filippo-io-edwards25519
-  (go-package
-    "go-filippo-io-edwards25519"
-    "1.0.0"
-    "https://github.com/FiloSottile/edwards25519"
-    "01m8hpaj0cwp250f7b0din09cf8j6j5y631grx67qfhvfrmwr1zr"
-    "filippo.io/edwards25519"
-    (list)))
-
-(define go-github-com-masterminds-goutils
-  (go-package
-    "go-github-com-masterminds-goutils"
-    "1.1.1"
-    "https://github.com/Masterminds/goutils"
-    "09m4mbcdlv9ng3xcrmjlxi0niavby52y9nl2jhjnbx1xxpjw0jrh"
-    "github.com/Masterminds/goutils"
-    (list)))
-
-(define go-github-com-shopspring-decimal
-  (go-package
-    "go-github-com-shopspring-decimal"
-    "1.3.1"
-    "https://github.com/shopspring/decimal"
-    "1w1wjv2aqyqp22s8gc2nxp8gk4h0dxvp15xsn5lblghaqjcd239h"
-    "github.com/shopspring/decimal"
-    (list)))
-
-(define go-github-com-imdario-mergo
-  (go-package
-    "go-github-com-imdario-mergo"
-    "1.0.0"
-    "https://github.com/imdario/mergo"
-    "037k2bd97vnbyhn2sczxk0j6ijmv06n1282f76i3ky73s3qmqnlf"
-    "github.com/imdario/mergo"
-    (list)))
-
-(define go-github-com-huandu-xstrings
-  (go-package
-    "go-github-com-huandu-xstrings"
-    "1.4.0"
-    "https://github.com/huandu/xstrings"
-    "0y6afn5yp5pw1gjc4a6gxxkj753w2aaw46nwbi7scnqdqlb2l3cp"
-    "github.com/huandu/xstrings"
-    (list)))
-
-(define go-github-com-mitchellh-reflectwalk
-  (go-package
-    "go-github-com-mitchellh-reflectwalk"
-    "1.0.2"
-    "https://github.com/mitchellh/reflectwalk"
-    "1nxgb4gskzv045539vb312n0a443308dvh1akz7vi6x1l0z46zsm"
-    "github.com/mitchellh/reflectwalk"
-    (list)))
-
-(define go-github-com-mitchellh-copystructure
-  (go-package
-    "go-github-com-mitchellh-copystructure"
-    "1.2.0"
-    "https://github.com/mitchellh/copystructure"
-    "1izw243b3r03nvgnnxvk706l3s3v3q7k69kq3n4asnzjkcymq7sm"
-    "github.com/mitchellh/copystructure"
-    (list go-github-com-mitchellh-reflectwalk)))
-
-(define go-github-com-spf13-cast
-  (go-package
-    "go-github-com-spf13-cast"
-    "1.5.1"
-    "https://github.com/spf13/cast"
-    "05ahl8kicdhz95rxraavqsfsb8bvj03abpk8zclypy1gchc0vm7y"
-    "github.com/spf13/cast"
-    (list)))
-
-(define go-github-com-masterminds-semver
-  (go-package
-    "go-github-com-masterminds-semver"
-    "3.2.1"
-    "https://github.com/Masterminds/semver"
-    "1h4c647dgq6k5q78j3m98ccdrzd7kbcq4ahdy25j72rbxjmci8al"
-    "github.com/Masterminds/semver"
-    (list)))
-
-(define go-github-com-masterminds-sprig
-  (go-package
-    "go-github-com-masterminds-sprig"
-    "3.2.2"
-    "https://github.com/Masterminds/sprig"
-    "0wfbzhmv971si9gx9c77gz89b9va2y03bhdmds9hzal4i7cccw2x"
-    "github.com/Masterminds/sprig"
-    (list go-github-com-masterminds-goutils
-          go-github-com-masterminds-semver
-          go-github-com-google-uuid
-          go-golang-org-x-crypto
-          go-github-com-shopspring-decimal
-          go-github-com-huandu-xstrings
-          go-github-com-imdario-mergo
-          go-github-com-spf13-cast
-          go-github-com-mitchellh-copystructure)))
-
-(define go-step-sm-crypto
-  (source-only (go-package
-    "go-step-sm-crypto"
-    "0.35.1"
-    "https://github.com/smallstep/crypto"
-    "0fb77246iyxhw91d52ph6b3bl32182xs3cw1fzhs884km9wary8v"
-    "go.step.sm/crypto"
-    (list gopkg-in-square-go-jose-v2
-          go-filippo-io-edwards25519
-          go-github-com-masterminds-sprig))))
-
-(define go-step-sm-cli-utils
-  (source-only (go-package
-    "go-step-sm-cli-utils"
-    "0.8.0"
-    "https://github.com/smallstep/cli-utils"
-    "1239ivvmjvmmy5jkv6n7zg9qpk5wlnsb4prw4k3fx3nycx8nd3pa"
-    "go.step.sm/cli-utils"
-    (list))))
-
-(define go-github-com-go-logr-logr
-  (go-package
-    "go-github-com-go-logr-logr"
-    "1.2.4"
-    "https://github.com/go-logr/logr"
-    "1ara5lacbzwqw8m6800837jgf5gbcfj6namm0zwzb45xqgfl64c0"
-    "github.com/go-logr/logr"
-    (list)))
-
-(define go-github-com-go-logr-stdr
-  (go-package
-    "go-github-com-go-logr-stdr"
-    "1.2.2"
-    "https://github.com/go-logr/stdr"
-    "1dl2rzvjacwqlnvw7azrxqbh4jvzaq8v399f6drs146l39ss21c1"
-    "github.com/go-logr/stdr"
-    (list go-github-com-go-logr-logr)))
-
-(define go-github-com-grpc-ecosystem-grpc-gateway
-  (source-only (go-package
-    "go-github-com-grpc-ecosystem-grpc-gateway"
-    "2.18.0"
-    "https://github.com/grpc-ecosystem/grpc-gateway"
-    "0rkymxrwm4bk2sizawnrmn54jjkiwlzh2mxrsz435lhrzk3zfmhm"
-    "github.com/grpc-ecosystem/grpc-gateway"
-    (list))))
-
-(define go-google-golang-org-genproto
-  (source-only (commit-go-package
-    "go-google-golang-org-genproto"
-    "e6e6cdab5c137738d2c1bc9d66183cfbd9f440d1"
-    "https://github.com/googleapis/go-genproto"
-    "1c7dm3iwc0k25ynxqnzfqf9mn47fw5sy4sbgm5v4akg1klzkvkpg"
-    "google.golang.org/genproto"
-    (list))))
-
-(define go-google-golang-org-grpc
-  (go-package
-    "go-google-golang-org-grpc"
-    "1.58.2"
-    "https://github.com/grpc/grpc-go"
-    "1qchzb1kv03mjd5k4j5lcr3arwvlridgfmsdlv9grmnpx7caw8sf"
-    "google.golang.org/grpc"
-    (list go-google-golang-org-protobuf
-          go-golang-org-x-sys
-          go-golang-org-x-net
-          go-golang-org-x-text
-          go-google-golang-org-genproto)))
-
-(define go-opentelemetry-io-proto-otlp
-  (source-only (set-unpack (go-package
-    "go-opentelemetry-io-proto-otlp"
-    "1.0.0"
-    "https://github.com/open-telemetry/opentelemetry-proto-go"
-    "0w69grih4qv8pw6ywpa9f675mixrxhqzcqafrp6ibrd7z3mdzfyq"
-    "go.opentelemetry.io/proto"
-    (list go-github-com-grpc-ecosystem-grpc-gateway))
-  "go.opentelemetry.io/proto/otlp")))
-
-(define go-opentelemetry-io-otel
-  (go-package
-    "go-opentelemetry-io-otel"
-    "1.19.0"
-    "https://github.com/open-telemetry/opentelemetry-go"
-    "06lmf7pnxp9b5ciy5yv7qwzph8k7w2m48g7p72fl5y3g57lh8v7w"
-    "go.opentelemetry.io/otel"
-    (list go-github-com-go-logr-stdr
-          go-opentelemetry-io-proto-otlp
-          go-google-golang-org-grpc)))
-
-(define go-github-com-yuin-goldmark
-  (go-package
-    "go-github-com-yuin-goldmark"
-    "1.5.5"
-    "https://github.com/yuin/goldmark"
-    "0kziqic2rgnb0fyng9rmlg8akk4bv07qhscy4n6z45f235r1l955"
-    "github.com/yuin/goldmark"
-    (list)))
-
-(define go-github-com-dlclark-regexp2
-  (go-package
-    "go-github-com-dlclark-regexp2"
-    "1.10.0"
-    "https://github.com/dlclark/regexp2"
-    "137jrvg6w6ivc0qm4zgk3hjf06kfl900m8730hbd5xnhxzyf6717"
-    "github.com/dlclark/regexp2"
-    (list)))
-
-(define go-github-com-alecthomas-chroma
-  (go-package
-    "go-github-com-alecthomas-chroma"
-    "2.7.0"
-    "https://github.com/alecthomas/chroma"
-    "0i4ck23gn0v7x6r8wa2k7qiwhxpxqqnaknb9iy9rz8pjcj14ai75"
-    "github.com/alecthomas/chroma/v2"
-    (list go-github-com-dlclark-regexp2)))
-
-(define go-github-com-yuin-goldmark-highlighting
-  (set-go (set-inputs (go-version-go-package
-    "go-github-com-yuin-goldmark-highlighting"
-    "v2.0.0-20230729083705-37449abec8cc"
-    "https://github.com/yuin/goldmark-highlighting"
-    "163jbi8si9qxcabzni39qypj495y48rabkkchc03ay68p19v160y"
-    "github.com/yuin/goldmark-highlighting/v2"
-    (list))
-    (list (set-go (go-package
-              "go-github-com-yuin-goldmark"
-              "1.4.15"
-              "https://github.com/yuin/goldmark"
-              "0qs08hy288zdr0xpd49rp8h1048s1n7frmzcmb8diqpcv5hvbmgm"
-              "github.com/yuin/goldmark"
-              (list)) 
-            go-1.14)
-          (set-go (go-package
-              "go-github-com-alecthomas-chroma"
-              "2.2.0"
-              "https://github.com/alecthomas/chroma"
-              "0rxsi4kdf363p6ysvxvgndbvcb0a5zgm0iaxkkqllj3m8nfwmzlk"
-              "github.com/alecthomas/chroma/v2"
-              (list go-std-1.17 go-github-com-dlclark-regexp2))
-            go-1.14)))
-    go-1.14))
-
-(define go-github-com-mitchellh-go-ps
-  (go-package
-    "go-github-com-mitchellh-go-ps"
-    "1.0.0"
-    "https://github.com/mitchellh/go-ps"
-    "0ipcbz66x7q8xczi7cyfq06y7n7v0syvkp730vn9jrn7s8f5ag0z"
-    "github.com/mitchellh/go-ps"
-    (list)))
-
-(define go-github-com-tailscale-tscert
-  (commit-go-package
-    "go-github-com-tailscale-tscert"
-    "28a91b69a0467442178b62e2cfb9ab272ed3b64c"
-    "https://github.com/tailscale/tscert"
-    "0zzpkff4nrknh345nqiaz88hvlc5pynhzyws02f3rlcyjh7kj2sh"
-    "github.com/tailscale/tscert"
-    (list go-golang-org-x-sys
-          go-github-com-mitchellh-go-ps)))
-
-(define go-opentelemetry-io-contrib
-  (go-package
-    "go-opentelemetry-io-contrib"
-    "1.20.0"
-    "https://github.com/open-telemetry/opentelemetry-go-contrib"
-    "0vsv2ihjk3i3k1mwkdjngcp497knw85fz1m32lycl6qf3fcpzaiy"
-    "go.opentelemetry.io/contrib"
-    (list)))
-
-(define go-github-com-dustin-go-humanize
-  (go-package
-    "go-github-com-dustin-go-humanize"
-    "1.0.1"
-    "https://github.com/dustin/go-humanize"
-    "1iyhd90pnmxh64nhsh6k02c1b1glpmhh4whga9jgb9g0i5hz3sya"
-    "github.com/dustin/go-humanize"
-    (list)))
-
-(define go-github-com-burntsushi-toml
-  (go-package
-    "go-github-com-burntsushi-toml"
-    "1.3.2"
-    "https://github.com/BurntSushi/toml"
-    "1s1d3622al03xgx84iqai384ycfp5hgy2r6h4db29byamqgk530l"
-    "github.com/BurntSushi/toml"
-    (list)))
-
-(define-public caddy
-  (package
-    (name "caddy")
-    (version "2.7.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                      (url "https://github.com/caddyserver/caddy")
-                      (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-                (base32
-                  "0jgbkj0azkbs828vsd3gycpab8pycgf55vrxkvnfmwfjpdiq1551"))))
-    (build-system go-build-system)
-    (inputs (list go-github-com-hashicorp-go-uuid
-                  go-github-com-burntsushi-toml
-                  go-github-com-dustin-go-humanize
-                  go-github-com-yuin-goldmark
-                  go-github-com-yuin-goldmark-highlighting
-                  go-github-com-tailscale-tscert
-                  go-github-com-google-cel-go
-                  go-step-sm-crypto
-                  go-step-sm-cli-utils
-                  go-github-com-smallstep-certificates
-                  go-github-com-smallstep-truststore
-                  go-opentelemetry-io-otel
-                  go-opentelemetry-io-contrib
-                  go-github-com-google-uuid
-                  go-github-com-lucas-clemente-quic-go
-                  go-github-com-prometheus-client-golang
-                  go-github-com-prometheus-procfs
-                  go-github-com-prometheus-common
-                  go-google-golang-org-protobuf
-                  go-github-com-beorn7-perks
-                  go-github-com-cespare-xxhash
-                  go-go-uber-org-zap
-                  go-golang-org-x-term
-                  go-github-com-caddy-certmagic
-                  go-github-com-quic-go-quic-go
-                  go-github-com-quic-go-qpack
-                  go-github-com-klauspost-compress
-                  go-github-com-golang-protobuf
-                  go-golang-org-x-net
-                  go-golang-org-x-sync))
-    (arguments
-      `(#:go ,go-1.20
-        #:substitutable? #f
-        #:install-source? #t
-        #:import-path "github.com/caddyserver/caddy"
-        #:tests? #f
-        #:phases (modify-phases %standard-phases
-                   (replace 'build
-                     (lambda arguments
-                       (apply (assoc-ref %standard-phases
-                                        'build)
-                             `(,@arguments #:import-path
-                               "github.com/caddyserver/caddy/cmd/caddy")))))))
-    (synopsis "A powerful, enterprise-ready, open source web server with automatic HTTPS written in Go ")
-    (description "Caddy simplifies your infrastructure. It takes care of TLS certificate renewals, OCSP stapling, static file serving, reverse proxying, Kubernetes ingress, and more. 
-                 Its modular architecture means you can do more with a single, static binary that compiles for any platform.
-                 Caddy runs great in containers because it has no dependencies—not even libc. Run Caddy practically anywhere.")
-    (home-page "https://caddyserver.com/")
-    (license license:asl2.0)))

modules/home-packages/mozillia.scm

@@ -5,28 +5,21 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages linux)
+  #:use-module (guix utils)
+  #:use-module (guix build utils)
   #:use-module (nonguix build-system binary)
   #:use-module (guix build-system trivial)
   #:use-module (nongnu packages mozilla))
 
-(define firefox*
-  (package/inherit
-   firefox
-    (inputs
-    (modify-inputs
-     (package-inputs firefox)
-     (delete "pipewire")
-     (append pipewire)))))
-
 (define-public firefox-wayland-new
   (package
-    (inherit firefox*)
+    (inherit firefox)
     (name "firefox-wayland-new")
     (native-inputs '())
     (inputs
      `(("bash" ,bash-minimal)
        ("pipewire" ,pipewire)
-       ("firefox" ,firefox*)))
+       ("firefox" ,firefox)))
     (build-system trivial-build-system)
     (arguments
      '(#:modules ((guix build utils))

modules/home-packages/wm.scm

@@ -10,7 +10,7 @@
 (define-public swaylock-effects-new
   (package
     (inherit swaylock-effects)
-    (version "1.6.11")
+    (version "1.7.0.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -18,5 +18,5 @@
                      (commit (string-append "v" version))))
               (sha256
                 (base32
-                  "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
+                  "0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj"))))
     (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))

shinji.scm

@@ -14,16 +14,23 @@
     (mapped-devices (list (mapped-device
                 (source (uuid
                       "5c5dcb22-62b1-41af-9116-b8fdfba83ca2"))
-                (target "cryptroot")
+                (target "root")
                 (type luks-device-mapping))))
-  
+
     (file-systems (cons* (file-system
                             (mount-point "/")
-                            (device "/dev/mapper/cryptroot")
+                            (device "/dev/mapper/root")
                             (type "btrfs")
                             (dependencies mapped-devices))
                          (file-system
                             (mount-point "/boot/efi")
                             (device (uuid "AD5A-4DF3"
                                   'fat32))
-                            (type "vfat")) %base-file-systems)))
+                            (type "vfat")) %base-file-systems))
+
+	(swap-devices
+	  (list
+		(swap-space
+		  (target "/swapfile")
+		  (dependencies (filter (file-system-mount-point-predicate "/")
+								file-systems))))))