Update fg42 to use master

flake.lock

@@ -197,11 +197,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1712765858,
-        "narHash": "sha256-gWRdIXmNsgOKFNiFOAzo4hleJsl03vu9nLPrkmwmTwY=",
+        "lastModified": 1712798444,
+        "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "53c4cc48b71bbd98d65fb4c7bc0e2ea22d9a6672",
+        "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
         "noether": "noether"
       },
       "locked": {
-        "lastModified": 1712786536,
-        "narHash": "sha256-nQJRWtZk/TkusN8l2pjo5VcO2oEXjASCT0UH5f83APE=",
+        "lastModified": 1712913470,
+        "narHash": "sha256-4k0NGJ4b/sd7IU/4Pth6uDBWO6R8fZwFTPnG3BlUOWA=",
         "ref": "refs/heads/master",
-        "rev": "dc949d26c47a65aff48ea43ab841005fb43a494e",
-        "revCount": 1089,
+        "rev": "26c1a6074dd9f9e08ee5f54af6766e43d1c2956d",
+        "revCount": 1098,
         "type": "git",
         "url": "https://devheroes.codes/FG42/FG42"
       },
@@ -495,11 +495,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1712760404,
-        "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
+        "lastModified": 1712909959,
+        "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
+        "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
         "type": "github"
       },
       "original": {
@@ -510,11 +510,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711715736,
-        "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
+        "lastModified": 1712757991,
+        "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
+        "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932",
         "type": "github"
       },
       "original": {
@@ -695,15 +695,16 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1712776989,
-        "narHash": "sha256-DiZoTYM8FptB4DkyrzdFDMDIMECNCdYpnthjhi0NaRs=",
-        "rev": "5241f9f243cb6099a185db12552a32f70509ada6",
-        "revCount": 48,
+        "lastModified": 1712846008,
+        "narHash": "sha256-0739q1QSpprLrlqdmQeSM9ynqmuqHagmRLnyMEy47Xc=",
+        "ref": "refs/tags/v0.1.8",
+        "rev": "e53688bcc79e5e3142bb2c912d59965c086dafe4",
+        "revCount": 49,
         "type": "git",
         "url": "https://devheroes.codes/lxsameer/noether"
       },
       "original": {
-        "rev": "5241f9f243cb6099a185db12552a32f70509ada6",
+        "ref": "refs/tags/v0.1.8",
         "type": "git",
         "url": "https://devheroes.codes/lxsameer/noether"
       }

users/lxsameer/desktop.nix

@@ -16,7 +16,8 @@
 { lib, pkgs, inputs, ... }@params:
 let
   modules = import ../../modules params;
-in {
+in
+{
 
   imports = [
     (modules.git {
@@ -68,7 +69,7 @@ in {
   home.extraOutputsToInstall = [ "man" ];
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
-    params.fg42
+    params.fg42.none
     # archives
     zip
     xz
@@ -254,7 +255,7 @@ in {
 
       "yubi_switch" = ''gpg-connect-agent "scd serialno" "learn --force" /bye'';
 
-      maryland = ''ssh -t -L 5900:localhost:5900 mary 'x11vnc -localhost -display :0'';
+      maryland = ''ssh -t -v -L 5900:localhost:5900 mary@mary'';
     };
 
     initExtra = ''
@@ -373,7 +374,7 @@ in {
     systemctl --user import-environment XMODIFIERS GTK_IM_MODULE QT_IM_MODULE CLUTTER_IM_MODULE
   '';
   xsession.scriptPath = ".fg42-xsession";
-  xsession.windowManager.command = "${params.fg42}/bin/fg42-wm";
+  xsession.windowManager.command = "/etc/profiles/per-user/lxsameer/bin/fg42-wm"; #  "${params.fg42}/bin/fg42-wm";
 
   services.dunst.enable = true;
   services.pasystray.enable = true;

users/lxsameer/fg42.el

@@ -29,7 +29,7 @@
 
 (setq fg42/font '("Fira Code" 10))
 (when-wm
- (setq fg42/font '("Fira Code" 8)))
+ (setq fg42/font '("Fira Code" 10)))
 
 
 (provide '.fg42)

utils/default.nix

@@ -17,18 +17,18 @@
 rec {
   # Add a command to the shell to create the disk
   create-disk = writeScriptBin "create-disk" ''
-  #!${stdenv.shell}
+    #!${stdenv.shell}
 
-  qemu-img create -f qcow2 vdisk1 40G
+    qemu-img create -f qcow2 vdisk1 40G
   '';
 
   bootImage = image: (writeScriptBin "boot-${image.name}" ''
-  #!${stdenv.shell}
+    #!${stdenv.shell}
 
-  SLIRP=yes ${qemu}/bin/qemu-system-x86_64 -enable-kvm -m 2048 -boot d \
-      -cdrom ${image} -hda vdisk1 -vga std \
-      -net user,hostfwd=tcp::10022-:22 \
-      -netdev user,id=eth -device e1000,netdev=eth
+    SLIRP=yes ${qemu}/bin/qemu-system-x86_64 -enable-kvm -m 2048 -boot d \
+        -cdrom ${image} -hda vdisk1 -vga std \
+        -net user,hostfwd=tcp::10022-:22 \
+        -netdev user,id=eth -device e1000,netdev=eth
 
   '');
 

worlds/majin.nix

@@ -69,7 +69,7 @@ let
 
   lxsameer = pkgs.callPackage ../users/lxsameer/default.nix {};
 
-  fg42 = inputs.fg42.packages.${system}.default;
+  fg42 = inputs.fg42.packages.${system};
   inVM = (utils.sanitizeBuilderConfig hostBuilderConfig).inVM;
   host = if inVM then "majinVM" else "majin";