Merge remote-tracking branch 'origin/nixos' into nixos-work

modules/profiles/base.nix

@@ -63,7 +63,6 @@ in
       fish.enable = true;
       git.enable = true;
       gpg.enable = true;
-      vim.enable = true;
     };
   };
 
@@ -105,6 +104,7 @@ in
     up
     viu
     wget
+    vim
   ];
 
   fonts.fonts = with pkgs; [

modules/profiles/desktop.nix

@@ -21,7 +21,6 @@ with lib; {
       adb.enable = true;
       hyprland.enable = true;
       code.enable = true;
-      emacs.enable = true;
       firefox = {
         enable = true;
         arkenfox = {
@@ -77,6 +76,7 @@ with lib; {
       hub.enable = true;
       ledger.enable = true;
       logseq.enable = true;
+      nvim.enable = true;
       python.versions."311".enable = true;
       ssh = {
         enable = true;
@@ -103,7 +103,7 @@ with lib; {
 
     # ripping
     abcde
-    stable.handbrake # HACK to fix broken ffmpeg on unstable
+    handbrake
     picard
 
     # other

modules/profiles/work.nix

@@ -34,7 +34,7 @@ with lib; {
       };
       spotify.enable = true;
       thunar.enable = true;
-      vim.enable = true;
+      nvim.enable = true;
       zathura.enable = true;
     };