Emacs and inputs updated

- Added org-roam in Emacs
- Flake inputs updated
- Other little modifications

pkgs/ungoogled-chromium/default.nix

@@ -1,10 +1,10 @@
-{ prev, pkgs, ... }:
+{ prev, ... }:
 
 prev.runCommandNoCC "wrap-chromium"
-{ buildInputs = with pkgs; [ makeWrapper ]; }
+{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
   ''
-    makeWrapper ${c}/bin/chromium $out/bin/chromium \
+    makeWrapper ${prev.pkgs.chromium}/bin/chromium $out/bin/chromium \
       --add-flags "--enable-features=UseOzonePlatform" \
       --add-flags "--ozone-platform=wayland"
-    ln -sf ${c}/share $out/share
+    ln -sf ${prev.pkgs.chromium}/share $out/share
   ''

pkgs/vscodium/default.nix

@@ -1,10 +1,10 @@
-{ prev, pkgs, ... }:
+{ prev, ... }:
 
 prev.runCommandNoCC "codium"
-{ buildInputs = with pkgs; [ makeWrapper ]; }
+{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
   ''
-    makeWrapper ${prev.vscodium}/bin/codium $out/bin/codium \
+    makeWrapper ${prev.pkgs.vscodium}/bin/codium $out/bin/codium \
       --add-flags "--enable-features=UseOzonePlatform" \
       --add-flags "--ozone-platform=wayland"
-    ln -sf ${prev.vscodium}/share $out/share
+    ln -sf ${prev.pkgs.vscodium}/share $out/share
   ''

users/profiles/emacs/default.nix

@@ -12,18 +12,12 @@
   };
 
   home.packages = with pkgs; [
-<<<<<<< HEAD
-=======
     python-language-server
     python
->>>>>>> 651ab71 (Emacs and inputs updated)
     fd
     ag
     nixpkgs-fmt
     rnix-lsp
-<<<<<<< HEAD
-  ] ++ (if config.network.hostname != "mbp" then python-language-server else [ ]);
-=======
     (
       makeDesktopItem {
         name = "org-protocol";
@@ -36,5 +30,4 @@
       }
     )
   ];
->>>>>>> 651ab71 (Emacs and inputs updated)
 }