From 00c8654a02716808dd8709d89bb14ddd1dae4870 Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@gmail.com>
Date: Thu, 16 Jan 2025 02:52:03 -0800
Subject: add sounds

---
 nix/flake.lock                    | 16 ++++++++++++++++
 nix/flake.nix                     |  1 +
 nix/modules/home/mako.nix         |  4 ++--
 nix/systems/installer/default.nix |  9 ++++-----
 4 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'nix')

diff --git a/nix/flake.lock b/nix/flake.lock
index 1bfaf27..7f4353b 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -307,6 +307,7 @@
         "nur": "nur",
         "scripts": "scripts",
         "sops-nix": "sops-nix",
+        "sounds": "sounds",
         "wallpapers": "wallpapers"
       }
     },
@@ -368,6 +369,21 @@
         "type": "github"
       }
     },
+    "sounds": {
+      "locked": {
+        "lastModified": 1737024247,
+        "narHash": "sha256-OTtqUYIe713ti4vaa8hS1Z0UvD/X4J9XkLzKgl2+RBE=",
+        "owner": "ret2pop",
+        "repo": "sounds",
+        "rev": "9714690a6d216f9c55bfe56969d6e7d98768559f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ret2pop",
+        "repo": "sounds",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/nix/flake.nix b/nix/flake.nix
index 787b3a7..6399947 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -25,6 +25,7 @@
     sops-nix.url = "github:Mic92/sops-nix";
     scripts.url = "github:ret2pop/scripts";
     wallpapers.url = "github:ret2pop/wallpapers";
+    sounds.url = "github:ret2pop/sounds";
   };
 
   outputs = { nixpkgs, home-manager, nur, disko, lanzaboote, sops-nix, ... }@attrs: {
diff --git a/nix/modules/home/mako.nix b/nix/modules/home/mako.nix
index 2a93508..eb70eee 100644
--- a/nix/modules/home/mako.nix
+++ b/nix/modules/home/mako.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ lib, config, sounds, ... }:
 {
   services.mako = {
     enable = true;
@@ -9,7 +9,7 @@
     font = "Fira Code 10";
     defaultTimeout = 3000;
     extraConfig = ''
-on-notify=exec mpv /home/${config.monorepo.vars.userName}/sounds/notification.wav --no-config --no-video
+on-notify=exec mpv ${sounds}/polite.ogg --no-config --no-video
 '';
   };
 }
diff --git a/nix/systems/installer/default.nix b/nix/systems/installer/default.nix
index 02f3b7e..8b95009 100644
--- a/nix/systems/installer/default.nix
+++ b/nix/systems/installer/default.nix
@@ -26,14 +26,13 @@ if [ "$(id -u)" -eq 0 ]; then
 fi
 ping -q -c1 google.com &>/dev/null && echo "online! Proceeding with the installation..." || nmtui
 cd
-if [ ! -d "$HOME/toughnix/" ]; then
-  git clone https://git.nullring.xyz/monorepo.git
+if [ ! -d "$HOME/monorepo/" ]; then
+  git clone --recurse-submodules https://git.nullring.xyz/monorepo.git
   cd monorepo
   git checkout "${commits.monorepoCommitHash}"
 fi
-vim "$HOME/monorepo/nix/modules/default.nix"
-vim "$HOME/monorepo/nix/modules/vars.nix"
-sudo nix --experimental-features "nix-command flakes" run "github:nix-community/disko/${commits.diskoCommitHash}" -- --mode destroy,format,mount "$HOME/monorepo/nix/systems/desktop/sda-simple.nix"
+vim "$HOME/monorepo/nix/systems/continuity/default.nix"
+sudo nix --experimental-features "nix-command flakes" run "github:nix-community/disko/${commits.diskoCommitHash}" -- --mode destroy,format,mount "$HOME/monorepo/nix/modules/sda-simple.nix"
 cd /mnt
 sudo nixos-install --flake $HOME/monorepo/nix#continuity
 sudo cp $HOME/monorepo "/mnt/home/$(ls /mnt/home/)/"
-- 
cgit