Merge branch 'master' into drop-petalburg
Some checks failed
nix-build / default-build (push) Has been cancelled
nix-build / fallarbor-build (push) Has been cancelled
nix-build / lavaridge-build (push) Has been cancelled
nix-build / mauville-build (push) Has been cancelled
nix-build / pacifidlog-build (push) Has been cancelled
nix-build / rustboro-build (push) Has been cancelled
nix-build / slateport-build (push) Has been cancelled
nix-check / fmt-check (push) Has been cancelled
nix-check / eval-check (push) Has been cancelled

This commit is contained in:
Aly Raffauf 2024-10-18 15:07:02 -04:00 committed by GitHub
commit 20006b02d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 5 additions and 7 deletions

View file

@ -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. - [iio-hyprland](https://github.com/JeanSchoeller/iio-hyprland): autorotate daemon for Hyprland.
- [jovian](https://github.com/Jovian-Experiments/Jovian-NixOS): steam deck UI + optimizations. - [jovian](https://github.com/Jovian-Experiments/Jovian-NixOS): steam deck UI + optimizations.
- [lanzaboote](https://github.com/nix-community/lanzaboote): secure boot for NixOS. - [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. - [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. - [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. - [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.nixos: opinionated desktop, app, and service options.
- nixosModules.users: basic user configuration 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 ## Deploying to NixOS

View file

@ -59,12 +59,12 @@
ExecStart = "${pkgs.writeShellScript "backblaze-sync" '' ExecStart = "${pkgs.writeShellScript "backblaze-sync" ''
declare -A backups declare -A backups
backups=( backups=(
['/home/aly/pics/camera']="b2://aly-camera"
['/home/aly/sync']="b2://aly-sync" ['/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/Movies']="b2://aly-movies"
['/mnt/Archive/Shows']="b2://aly-shows" ['/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}` backblaze-b2 authorize_account `cat ${config.age.secrets.backblazeKeyId.path}` `cat ${config.age.secrets.backblazeKey.path}`

View file

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

View file

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

View file

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