configuration.nix

@@ -51,7 +51,6 @@
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;
-    # enable = false;
     xkb = {
       layout = "us";
       variant = "";

flake.lock

@@ -107,48 +107,6 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "mir-home",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1706981411,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-23.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "mir-home": {
-      "inputs": {
-        "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1710884109,
-        "narHash": "sha256-yvA99Zk063TILHMRfbqmU0gHdFJ6vsRK9Ihefs9Edt0=",
-        "ref": "main",
-        "rev": "9aedd27579787ae9b94ffab2db688c3440c1fa70",
-        "revCount": 1,
-        "type": "git",
-        "url": "https://git.marq42.xyz/mir/home"
-      },
-      "original": {
-        "ref": "main",
-        "type": "git",
-        "url": "https://git.marq42.xyz/mir/home"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1701282334,
@@ -181,22 +139,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1701282334,
-        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "apple-silicon": "apple-silicon",
@@ -204,8 +146,7 @@
         "emacs-config": "emacs-config",
         "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
-        "mir-home": "mir-home",
+        "nixpkgs": "nixpkgs",
-        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },

flake.nix

@@ -15,9 +15,6 @@
       url = "github:nix-community/home-manager"; #/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
-    mir-home = {
-      url = "git+https://git.marq42.xyz/mir/home?ref=main";
-    };
     emacs-config = {
       url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
       flake = false;
@@ -77,7 +74,8 @@
 	    }
 	    ./galvatron/hardware-configuration.nix
 	    inputs.apple-silicon.nixosModules.apple-silicon-support
-	    inputs.home-manager-unstable.nixosModules.home-manager {
+	    inputs.home-manager-unstable.nixosModules.home-manager
+	    {
 	      home-manager.useGlobalPkgs = true;
 	      home-manager.useUserPackages = true;
 	      home-manager.users.mir = import ./home.nix;

home.nix

@@ -20,7 +20,6 @@ with lib.hm.gvariant;
     pkgs.fzf
     pkgs.nerdfonts
     pkgs.eza
-    pkgs.python3
     # pkgs.gnupg
     # pkgs.python3
     # (pkgs.python3.withPackages(
@@ -80,10 +79,7 @@ with lib.hm.gvariant;
     package = pkgs.gitFull;
     userName = "mir";
     userEmail = "mirmarq428@gmail.com";
-    extraConfig = {
+    extraConfig.credential.helper = "store";
-      credential.helper = "store";
-      init.defaultBranch = "main";
-    };
   };
   programs.firefox = {
     enable = true;
@@ -97,10 +93,10 @@ with lib.hm.gvariant;
   # programs.gdb = {
   #   enable = true;
   # };
-  # home.file.".emacs.d" = {
+  home.file.".emacs.d" = {
-  #   source = inputs.emacs-config;
+    source = inputs.emacs-config;
-  #   recursive = true;
+    recursive = true;
-  # };
+  };
   home.file.".face".source = builtins.fetchurl {
     url = "https://marq42.xyz/rena.webp";
     sha256 = "10x3qvfdp79fmbbi7ljnqx419xmwpiyyr4pfxhynh3xq7fd0laz2";