update NixOS configuration and journal twice

5 files changed, 16 insertions, 14 deletions

diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix
index d068383..bebd670 100644
--- a/nix/modules/home/default.nix
+++ b/nix/modules/home/default.nix
@@ -159,15 +159,16 @@
 				              ardour
 				              audacity
 					            blender
+                      foxdot
 			                fluidsynth
 			                qjackctl
 			                qsynth
 			                qpwgraph
 			                imagemagick
+                      supercollider
 			                inkscape
 			                kdePackages.kdenlive
 			                kicad
-                      reaper
                       murmur
 					          ]) else []);
 
diff --git a/nix/modules/home/firefox.nix b/nix/modules/home/firefox.nix
index 986fccf..7e51433 100644
--- a/nix/modules/home/firefox.nix
+++ b/nix/modules/home/firefox.nix
@@ -13,7 +13,7 @@
         name = "default";
         isDefault = true;
 
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
           ublock-origin
           tree-style-tab
           firefox-color
diff --git a/nix/modules/home/mako.nix b/nix/modules/home/mako.nix
index d9a4610..14edde8 100644
--- a/nix/modules/home/mako.nix
+++ b/nix/modules/home/mako.nix
@@ -2,14 +2,14 @@
 {
   services.mako = {
     enable = lib.mkDefault config.monorepo.profiles.graphics.enable;
-    backgroundColor = "#11111bf8";
-    textColor = "#cdd6f4";
-    borderColor = "#89b4faff";
-    borderRadius = 1;
-    font = "Fira Code 10";
-    defaultTimeout = 3000;
-    extraConfig = ''
-on-notify=exec mpv ${sounds}/polite.ogg --no-config --no-video
-'';
+    settings = {
+      on-notify = "exec mpv ${sounds}/polite.ogg --no-config --no-video";
+      background-color = "#11111bf8";
+      text-color = "#cdd6f4";
+      border-color = "#89b4faff";
+      border-radius = 1;
+      font = "Fira Code 10";
+      default-timeout = 3000;
+    };
   };
 }
diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix
index 1087ebc..709caf0 100644
--- a/nix/modules/home/user.nix
+++ b/nix/modules/home/user.nix
@@ -37,7 +37,8 @@
       graphviz jq
 
       # Apps
-      octaveFull vesktop grim swww vim 
+      octaveFull
+      vesktop grim swww vim 
 
       # Sound/media
       pavucontrol alsa-utils imagemagick ffmpeg helvum
@@ -85,7 +86,7 @@ nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-
 
   services = {
     gpg-agent = {
-      pinentryPackage = pkgs.pinentry-emacs;
+      pinentry.package = pkgs.pinentry-emacs;
       enable = true;
       extraConfig = ''
       allow-emacs-pinentry
diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix
index 263cc58..ef0f5fd 100644
--- a/nix/modules/home/zsh.nix
+++ b/nix/modules/home/zsh.nix
@@ -2,7 +2,7 @@
 {
   programs.zsh = {
     enable = true;
-    initExtra = ''
+    initContent = ''
     umask 0022
     export EXTRA_CCFLAGS="-I/usr/include"
     source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh