Merge branch 'master' into drop-petalburg

README.md

@@ -24,7 +24,6 @@ This flake takes a variety of upstream and third party flakes as inputs:
 - [iio-hyprland](https://github.com/JeanSchoeller/iio-hyprland): autorotate daemon for Hyprland.
 - [jovian](https://github.com/Jovian-Experiments/Jovian-NixOS): steam deck UI + optimizations.
 - [lanzaboote](https://github.com/nix-community/lanzaboote): secure boot for NixOS.
-- [nixhw](https://github.com/alyraffauf/nixhw): opinionated set of generic (AMD, Intel, Laptop, SSD) and specific (Framework 13, Yoga 9i, Thinkpad T440p) hardware configuration modules for NixOS.
 - [nur](https://github.com/nix-community/NUR): extra packages from the nix user repository.
 - [stylix](https://github.com/danth/stylix): system-wide color schemes and typography.
 - [sway](https://github.com/swaywm/sway): fantastic, rock-solid tiling compositor for wayland.
@@ -39,7 +38,7 @@ This flake takes a variety of upstream and third party flakes as inputs:
 - nixosModules.nixos: opinionated desktop, app, and service options.
 - nixosModules.users: basic user configuration options.
 
-In addition, this flake outputs NixOS configuration and home-manager configurations for all of my hosts and users, respectively.
+In addition, this flake outputs NixOS configurations, home-manager configurations, and various hardware modules for all of my hosts and users.
 
 ## Deploying to NixOS
 

hosts/mauville/home.nix

@@ -59,12 +59,12 @@
               ExecStart = "${pkgs.writeShellScript "backblaze-sync" ''
                 declare -A backups
                 backups=(
-                  ['/home/aly/pics/camera']="b2://aly-camera"
                   ['/home/aly/sync']="b2://aly-sync"
-                  ['/mnt/Media/Audiobooks']="b2://aly-audiobooks"
-                  ['/mnt/Media/Music']="b2://aly-music"
                   ['/mnt/Archive/Movies']="b2://aly-movies"
                   ['/mnt/Archive/Shows']="b2://aly-shows"
+                  ['/mnt/Media/Audiobooks']="b2://aly-audiobooks"
+                  ['/mnt/Media/Music']="b2://aly-music"
+                  ['/mnt/Media/Pictures']="b2://aly-pictures"
                 )
 
                 backblaze-b2 authorize_account `cat ${config.age.secrets.backblazeKeyId.path}` `cat ${config.age.secrets.backblazeKey.path}`

hosts/pacifidlog/default.nix

@@ -140,6 +140,7 @@ in {
     };
 
     desktop.hyprland.enable = true;
+    services.flatpak.enable = true;
 
     users.aly = {
       enable = true;

secrets/publicKeys/aly_mossdeep.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOCrKJ8OtS2JxrPUrTM3ZRPpyo8HX++Fuv/gWIsHoXzO achac@mossdeep

userModules/aly/default.nix

@@ -21,7 +21,6 @@
         keyFiles = [
           ../../secrets/publicKeys/aly_lavaridge.pub
           ../../secrets/publicKeys/aly_mauville.pub
-          ../../secrets/publicKeys/aly_mossdeep.pub
           ../../secrets/publicKeys/aly_rustboro.pub
         ];
       };