diff --git a/channels.scm b/channels.scm index 0016f37..6e28141 100644 --- a/channels.scm +++ b/channels.scm @@ -3,7 +3,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "c4886c0cb608e1b36969f195eb2f7ea25a37ac89") + "3f83dc5587573f173b1f61864c9b510f05de84b1") (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") + "def38a656de0a6a2aca7da59d2d6ff824782420c") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 5bf4a3b..c970103 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -121,10 +121,11 @@ "syncthing" "filezilla" "pinentry" + "firefox-wayland" "ungoogled-chromium")) (list neovim-new ;; custom made packages easyeffects ;; thanks guix for not having them or doing them wrong >:( - firefox-wayland-new + ;;firefox-wayland-new lavanda-gtk-theme zsh-autosuggestions freya-ca-certs @@ -162,6 +163,7 @@ (".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")))) (service home-pipewire-service-type) diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 4dc91f9..f5d86c3 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -28,6 +28,7 @@ gzdoom unityhub yuzu-early-access + sonar-scanner-cli #steam # Rust diff --git a/home-config/scripts/chem.js b/home-config/scripts/chem.js new file mode 100644 index 0000000..afc1c41 --- /dev/null +++ b/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; diff --git a/home-config/ssh/config b/home-config/ssh/config index d8d18a4..821815f 100644 --- a/home-config/ssh/config +++ b/home-config/ssh/config @@ -11,7 +11,7 @@ Host yveltal Host stationery HostName stationery.faith - User tylerm + User freya Host queeg Hostname queeg.cs.rit.edu @@ -24,7 +24,7 @@ Host nitron Host github.com Hostname github.com User tam2214 - IdentityFile /home/tylerm/.ssh/id_rit + IdentityFile /home/freya/.ssh/id_rit Host * KexAlgorithms -sntrup761x25519-sha512@openssh.com diff --git a/home-config/sway/scripts.d/auto.sh b/home-config/sway/scripts.d/auto.sh index 2bbd14b..cda516c 100755 --- a/home-config/sway/scripts.d/auto.sh +++ b/home-config/sway/scripts.d/auto.sh @@ -11,7 +11,7 @@ autotiling & /usr/bin/gnome-keyring-daemon --foreground & -GTK_THEME=">:(" waybar & +GTK_THEME="Adwaita-dark" waybar & discord --enable-features=UseOzonePlatform --ozone-platform=wayland & element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland & diff --git a/home-config/zsh/zprofile b/home-config/zsh/zprofile index 207e477..de6a1d1 100644 --- a/home-config/zsh/zprofile +++ b/home-config/zsh/zprofile @@ -50,6 +50,9 @@ export PATH=$PATH:$LOCAL_PROFILE/bin 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 diff --git a/home-config/zsh/zshrc b/home-config/zsh/zshrc index 4782ca4..6ce0709 100644 --- a/home-config/zsh/zshrc +++ b/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 \ diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index 9b5e782..79f6383 100644 --- a/modules/home-config/base-system.scm +++ b/modules/home-config/base-system.scm @@ -68,7 +68,7 @@ (group "users") (home-directory "/home/freya") (shell (file-append zsh "/bin/zsh")) - (supplementary-groups '("wheel" "audio" "lp" "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 "sof-firmware" ;; core system diff --git a/modules/home-config/ca-certs/tinternet_root_ca.crt b/modules/home-config/ca-certs/tinternet_root_ca.crt new file mode 100644 index 0000000..de6cdcd --- /dev/null +++ b/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----- diff --git a/modules/home-packages/mozillia.scm b/modules/home-packages/mozillia.scm index ced4b64..a7d8763 100644 --- a/modules/home-packages/mozillia.scm +++ b/modules/home-packages/mozillia.scm @@ -5,6 +5,8 @@ #: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)) @@ -16,7 +18,12 @@ (modify-inputs (package-inputs firefox) (delete "pipewire") - (append pipewire))))) + (append pipewire))) + (arguments + (substitute-keyword-arguments (package-arguments firefox) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'check))))))) (define-public firefox-wayland-new (package diff --git a/shinji.scm b/shinji.scm index e27210d..75a5ba9 100644 --- a/shinji.scm +++ b/shinji.scm @@ -1,4 +1,4 @@ -(se-modules (home-config base-system) +(use-modules (home-config base-system) (gnu)) (operating-system