From ab91787826db2a2e1be06eab3b215b4dcaa0cff2 Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Wed, 17 Nov 2021 09:34:16 -0300
Subject: [PATCH] add amfora shortcut, update readme

---
 README.md                                     | 8 ++++++--
 users/misterio/features/desktop-sway/sway.nix | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0dbdaaf1..6613adc8 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,20 @@
 # My NixOS configurations
 
-Here's my NixOS/home-manager config files. Requires [Nix experimental command and flakes](https://nixos.wiki/wiki/Flakes).
+Here's my NixOS/home-manager config files. Requires [Nix flakes](https://nixos.wiki/wiki/Flakes).
 
 ## Structure
 - `flake.nix`: Entrypoint for both hosts (`nixos-rebuild --flake`) and home configurations (`home-manager --flake`). Also exposes a devshell for boostrapping (`nix develop` or `nix-shell`).
 - `hosts`: System-wide configuration for my machines.
   - `atlas`: Desktop PC - 32GB RAM, R5 3600x, RX 5700XT | Runs sway. Development, production, and gaming.
   - `merope`: Raspberry Pi 4 - 8GB RAM | Headless. Server usage.
+  - `maia`: Gf's PC - 16GB RAM, i5 6600, GTX 970 | Runs gnome. Production and gaming.
 - `users`: Home-manager configurations for my user(s)
   - `misterio`: That's me!
+  - `layla`: My sweet sweet girl
 - `modules`: A few modules i have for personal use (most should be upstreamed TBH)
-- `overlays`: A few custom packages (TODO make actual packages) and overwritten ones.
+- `overlays`: Patches and version overrides for some packages. Also callPackages stuff in `pkgs`.
+- `pkgs`: Some of my custom packages. There's a few others at [my NUR](https://github.com/misterio77/nur-packages).
+- `templates`: A couple project templates for different languages. Accessible via `nix init`.
 
 
 ## About the installation
diff --git a/users/misterio/features/desktop-sway/sway.nix b/users/misterio/features/desktop-sway/sway.nix
index 0a26e398..ae533c8b 100644
--- a/users/misterio/features/desktop-sway/sway.nix
+++ b/users/misterio/features/desktop-sway/sway.nix
@@ -14,6 +14,7 @@ let
   keyring = import ../trusted/keyring.nix { inherit pkgs; };
 
   # Programs
+  amfora = "${pkgs.amfora}/bin/amfora";
   discocss = "${pkgs.discocss}/bin/discocss";
   grimshot = "${pkgs.sway-contrib.grimshot}/bin/grimshot";
   kitty = "${pkgs.kitty}/bin/kitty";
@@ -223,6 +224,7 @@ in rec {
         "${modifier}+v" = "exec ${terminal} -e ${nvim}";
         "${modifier}+o" = "exec ${terminal} -e ${octave}";
         "${modifier}+m" = "exec ${terminal} -e ${neomutt}";
+        "${modifier}+a" = "exec ${terminal} -e ${amfora}";
         "${modifier}+b" = "exec ${qutebrowser}";
         "${modifier}+z" = "exec ${zathura}";
         "${modifier}+control+w" = "exec ${makoctl} invoke";