From ec91773b25ee8bd7c3e36031ec0970e7bc30c6bd Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Fri, 21 Jun 2024 14:11:32 -0400 Subject: [PATCH] update kaworu and start dotfiles update --- :w | 51 +++++++++++++++++++++++++++ README.md | 4 +-- channels.scm | 4 +-- guix-strap/guix-install | 4 +-- guix-strap/guix-password | 2 +- home-config/git/gitconfig | 4 +-- home-config/gtk/gtk-3.0/bookmarks | 4 +-- home-config/gtk/gtkrc-2.0 | 2 +- home-config/nix-home-manager/home.nix | 4 +-- home-config/ssh/config | 12 +++---- modules/home-config/base-system.scm | 7 ++-- modules/home-packages/certs.scm | 2 +- modules/home-packages/mozillia.scm | 20 +++++------ 13 files changed, 83 insertions(+), 37 deletions(-) create mode 100644 :w diff --git a/:w b/:w new file mode 100644 index 0000000..a39c566 --- /dev/null +++ b/:w @@ -0,0 +1,51 @@ +#!/run/current-system/profile/bin/bash + +USER_PASSWORD="" +ROOT_PASSWORD="" + +source ./guix-env +source ./guix-log + +get_root_password() { + read -s -p "Root password: " PASSWORD + printf "\n" + read -s -p "Confirm password: " PASSWORD_CONFIRM + printf "\n" + if [ "$PASSWORD" == "$PASSWORD_CONFIRM" ]; then + ROOT_PASSWORD=$PASSWORD + return + else + ERROR "Passwords do not match" + get_root_password + fi +} + +get_user_password() { + read -s -p "User password: " PASSWORD + printf "\n" + read -s -p "Confirm password: " PASSWORD_CONFIRM + printf "\n" + if [ "$PASSWORD" == "$PASSWORD_CONFIRM" ]; then + USER_PASSWORD=$PASSWORD + return + else + ERROR "Passwords do not match" + get_user_password + fi +} + +EVENT "Setup /etc/shadow for root and user" + +get_root_password +get_user_password + +cat << EOF | chroot /mnt +passwd +$ROOT_PASSWORD +$ROOT_PASSWORD +passwd freya +$USER_PASSWORD +$USER_PASSWORD +EOF + +EVENT "Successfully set passwords" diff --git a/README.md b/README.md index 770a648..a3442f4 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ - Boot and create partitions using graphical installer - Bail out right before installation begins, go to terminal - 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 + - Download latest version of configuration using `curl -o main.tar.gz https://g.freya.dev/freya/dotfiles/archive/main.tar.gz` and unpack using tar - Authorize nonguix channel using `curl -o signkey.pub https://substitutes.nonguix.org/signing-key.pub and guix archive --authorize < signkey.pub` - 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` - When installed, proceed -- Reboot into system, assign root and tylerm user a password +- Reboot into system, assign root and freya user a password - Setup system completely - Clone guix-config to proper location - Reconfigure system diff --git a/channels.scm b/channels.scm index 0016f37..8f448a1 100644 --- a/channels.scm +++ b/channels.scm @@ -3,7 +3,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "c4886c0cb608e1b36969f195eb2f7ea25a37ac89") + "e3f87960915e3ef0b1d6a5a15281b3d4e9ee4d38") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" @@ -14,7 +14,7 @@ (url "https://gitlab.com/nonguix/nonguix") (branch "master") (commit - "61279f68f2b617ab868a094db856188602fc880b") + "877ed8cc4eee26ddde3d7d200c19c370c6bf7cb1") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" diff --git a/guix-strap/guix-install b/guix-strap/guix-install index fbfb19a..3b3cb14 100755 --- a/guix-strap/guix-install +++ b/guix-strap/guix-install @@ -15,8 +15,8 @@ guix time-machine -C ../channels.scm -- system -L ../modules --substitute-urls=' EVENT "Installing User Environment" -USER=tylerm -guix shell git -- git clone https://g.tylerm.dev/tylerm/dotfiles /mnt/home/$USER/.config/guix +USER=freya +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 diff --git a/guix-strap/guix-password b/guix-strap/guix-password index 008ad14..a39c566 100755 --- a/guix-strap/guix-password +++ b/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 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/gtk/gtk-3.0/bookmarks b/home-config/gtk/gtk-3.0/bookmarks index 031170a..3412d1a 100644 --- a/home-config/gtk/gtk-3.0/bookmarks +++ b/home-config/gtk/gtk-3.0/bookmarks @@ -1,2 +1,2 @@ -file:///home/tylerm/code -file:///home/tylerm/sync +file:///home/freya/code +file:///home/freya/sync diff --git a/home-config/gtk/gtkrc-2.0 b/home-config/gtk/gtkrc-2.0 index e6697d4..25fd8e8 100644 --- a/home-config/gtk/gtkrc-2.0 +++ b/home-config/gtk/gtkrc-2.0 @@ -1,7 +1,7 @@ # DO NOT EDIT! This file will be overwritten by LXAppearance. # Any customization should be done in ~/.gtkrc-2.0.mine instead. -include "/home/tylerm/.gtkrc-2.0.mine" +include "/home/freya/.gtkrc-2.0.mine" gtk-theme-name="Lavanda-Sea-Dark" gtk-icon-theme-name="Adwaita" gtk-font-name="Cantarell 11" diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 289be29..e425b7b 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 diff --git a/home-config/ssh/config b/home-config/ssh/config index 9bd4669..88b89c3 100644 --- a/home-config/ssh/config +++ b/home-config/ssh/config @@ -1,17 +1,17 @@ Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" Host icarus - HostName icarus.tylerm.dev - User tylerm + HostName icarus.freya.cat + User freya Host tardis - HostName tardis.tylerm.dev - User tylerm + HostName tardis.freya.cat + User freya Port 1111 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/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index e35e0fa..db91682 100644 --- a/modules/home-config/base-system.scm +++ b/modules/home-config/base-system.scm @@ -27,7 +27,6 @@ #:use-module (gnu services avahi) #: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)) @@ -58,10 +57,10 @@ ;; The list of user accounts ('root' is implicit). (users (cons* (user-account - (name "tylerm") - (comment "Tyler Murphy") + (name "freya") + (comment "Freya Murphy") (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"))) %base-user-accounts)) diff --git a/modules/home-packages/certs.scm b/modules/home-packages/certs.scm index 5e356f8..442c8b2 100644 --- a/modules/home-packages/certs.scm +++ b/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)) diff --git a/modules/home-packages/mozillia.scm b/modules/home-packages/mozillia.scm index ced4b64..34f582f 100644 --- a/modules/home-packages/mozillia.scm +++ b/modules/home-packages/mozillia.scm @@ -9,24 +9,19 @@ #: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*) (name "firefox-wayland-new") - (native-inputs '()) + (source #f) + (version "0.1") + (synopsis "Simple wrapper for pipewire in firefox") + (description "Simple wrapper for pipewire in firefox") + (home-page "http://mozilla.org/") + (license license:mpl2.0) (inputs `(("bash" ,bash-minimal) ("pipewire" ,pipewire) - ("firefox" ,firefox*))) + ("firefox" ,firefox))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) @@ -47,6 +42,7 @@ (format port "#!~a \n export LD_LIBRARY_PATH=~a \n export MOZ_ENABLE_WAYLAND=1 \n +export MOZ_USE_XINPUT2=1 \n exec ~a $@\n" (string-append bash "/bin/bash") (string-append pipewire "/lib")