From 31b8c3c663d7e72037f5fb8c888f99157f41008e Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Fri, 3 Nov 2023 10:43:24 -0400 Subject: [PATCH] name change, docker, yuzu, swapfile, other things --- home-config/git/gitconfig | 4 ++-- home-config/home-configuration.scm | 3 +++ home-config/nix-home-manager/home.nix | 5 +++-- home-config/ssh/config | 12 ++++++------ home-config/sway/config.d/keybinds | 4 ---- home-config/zsh/zprofile | 2 +- modules/home-config/base-system.scm | 17 ++++++++++++++--- modules/home-config/ca-certs/freya_ca.crt | 11 ----------- .../home-config/ca-certs/freya_intermediate.crt | 12 ------------ .../ca-certs/freya_intermediate_ca.crt | 12 ++++++++++++ modules/home-config/ca-certs/freya_root_ca.crt | 11 +++++++++++ shinji.scm | 13 ++++++++++--- 12 files changed, 62 insertions(+), 44 deletions(-) delete mode 100644 modules/home-config/ca-certs/freya_ca.crt delete mode 100644 modules/home-config/ca-certs/freya_intermediate.crt create mode 100755 modules/home-config/ca-certs/freya_intermediate_ca.crt create mode 100755 modules/home-config/ca-certs/freya_root_ca.crt diff --git a/home-config/git/gitconfig b/home-config/git/gitconfig index 1090f25..0260067 100644 --- a/home-config/git/gitconfig +++ b/home-config/git/gitconfig @@ -1,7 +1,7 @@ [user] signingkey = 4F6BC11CEBB2F24214B90FAC9FF6937B829E565A - email = tylerm@tylerm.dev - name = Tyler Murphy + email = freya@freyacat.org + name = Freya Murphy [commit] gpgsign = true [init] diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 5c044e2..5bf4a3b 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -101,6 +101,9 @@ "hicolor-icon-theme" + "font-google-noto-sans-cjk" ;; fonts + + "alacritty" ;; gui applicatiosn "wlogout" ;; applications that gui :0 "waybar" diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 66e5967..4dc91f9 100644 --- a/home-config/nix-home-manager/home.nix +++ b/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.homeDirectory = "/home/tylerm"; + home.username = "freya"; + 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 @@ -27,6 +27,7 @@ cider gzdoom unityhub + yuzu-early-access #steam # Rust diff --git a/home-config/ssh/config b/home-config/ssh/config index 65fad34..d8d18a4 100644 --- a/home-config/ssh/config +++ b/home-config/ssh/config @@ -1,12 +1,12 @@ Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" -Host icarus - HostName icarus.tylerm.dev - User tylerm +Host garchomp + HostName garchomp.freya.cat + User freya -Host tardis - HostName tardis.tylerm.dev - User tylerm +Host yveltal + HostName yveltal.freya.cat + User freya Port 1111 Host stationery diff --git a/home-config/sway/config.d/keybinds b/home-config/sway/config.d/keybinds index bfc6f56..7278d49 100644 --- a/home-config/sway/config.d/keybinds +++ b/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%- diff --git a/home-config/zsh/zprofile b/home-config/zsh/zprofile index 553eada..207e477 100644 --- a/home-config/zsh/zprofile +++ b/home-config/zsh/zprofile @@ -37,7 +37,7 @@ $HOME/.guix-home/on-first-login 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/tylerm/.local/share/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 diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index 47fb02b..9b5e782 100644 --- a/modules/home-config/base-system.scm +++ b/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) @@ -24,6 +25,7 @@ #:use-module (gnu services nix) #:use-module (gnu services sound) #:use-module (gnu services avahi) + #:use-module (gnu services docker) #:use-module (gnu services spice) #:use-module (gnu services virtualization) #:use-module (home-packages wm) @@ -50,16 +52,21 @@ (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") - (comment "Tyler Murphy") + (name "freya") + (comment "freya") (group "users") - (home-directory "/home/tylerm") + (home-directory "/home/freya") (shell (file-append zsh "/bin/zsh")) (supplementary-groups '("wheel" "audio" "lp" "plugdev" "libvirt" "kvm" "netdev" "video" "tty"))) %base-user-accounts)) @@ -81,6 +88,9 @@ "chrony" "gnupg" "flatpak" + "man-db" + "man-pages" + "docker" "alsa-utils" ;; sound and bluetooth @@ -152,6 +162,7 @@ (fast-connectable? #t))) (service pam-limits-service-type) (service fprintd-service-type) + (service docker-service-type) (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))) ;; This is the default list of services we diff --git a/modules/home-config/ca-certs/freya_ca.crt b/modules/home-config/ca-certs/freya_ca.crt deleted file mode 100644 index 06be120..0000000 --- a/modules/home-config/ca-certs/freya_ca.crt +++ /dev/null @@ -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----- diff --git a/modules/home-config/ca-certs/freya_intermediate.crt b/modules/home-config/ca-certs/freya_intermediate.crt deleted file mode 100644 index 44bfa35..0000000 --- a/modules/home-config/ca-certs/freya_intermediate.crt +++ /dev/null @@ -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----- diff --git a/modules/home-config/ca-certs/freya_intermediate_ca.crt b/modules/home-config/ca-certs/freya_intermediate_ca.crt new file mode 100755 index 0000000..487bedb --- /dev/null +++ b/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----- diff --git a/modules/home-config/ca-certs/freya_root_ca.crt b/modules/home-config/ca-certs/freya_root_ca.crt new file mode 100755 index 0000000..36309d8 --- /dev/null +++ b/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----- diff --git a/shinji.scm b/shinji.scm index 4135663..e27210d 100644 --- a/shinji.scm +++ b/shinji.scm @@ -1,4 +1,4 @@ -(use-modules (home-config base-system) +(se-modules (home-config base-system) (gnu)) (operating-system @@ -16,7 +16,7 @@ "5c5dcb22-62b1-41af-9116-b8fdfba83ca2")) (target "cryptroot") (type luks-device-mapping)))) - + (file-systems (cons* (file-system (mount-point "/") (device "/dev/mapper/cryptroot") @@ -26,4 +26,11 @@ (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))))))