configuration.nix

@@ -67,17 +67,16 @@
   # services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  programs.zsh.enable = true;
   users.users.mir = {
     isNormalUser = true;
     description = "Miranda Marquez";
     extraGroups = [ "networkmanager" "wheel" "input" "audio" ];
-    shell = pkgs.zsh;
     packages = with pkgs; [
       # firefox
       # home-manager
       # thunderbird
       git
+      zsh
       gparted
       ntfs3g
     ];

flake.lock

@@ -140,6 +140,28 @@
         "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"
+      }
+    },
     "lix": {
       "flake": false,
       "locked": {
@@ -182,6 +204,26 @@
         "url": "https://git.lix.systems/lix-project/nixos-module"
       }
     },
+    "mir-home": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1711226465,
+        "narHash": "sha256-vIpr+9Zkv0VCVtABfkwXcWN6m99kRkvdLKJPpOQ5Ivk=",
+        "ref": "main",
+        "rev": "757921a3844424623791230d4c07e1ebbc63221c",
+        "revCount": 3,
+        "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,
@@ -214,6 +256,22 @@
         "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"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1714340308,
@@ -238,7 +296,8 @@
         "home-manager-unstable": "home-manager-unstable",
         "lix": "lix",
         "lix-module": "lix-module",
-        "nixpkgs": "nixpkgs",
+        "mir-home": "mir-home",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }

flake.nix

@@ -26,6 +26,9 @@
       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;

modules/shell.nix

@@ -1,35 +1,13 @@
 { config, lib, pkgs, ... }:
 {
-  # programs.bash = {
+  programs.bash = {
-  #   enable = true;
-  #   shellAliases = {
-  #     ls = "eza";
-  #     tree = "eza -T";
-  #   };
-  #   initExtra = ''
-  #   export EDITOR=emacs\ -nw
-  #   '';
-  # };
-  programs.zsh = {
     enable = true;
     shellAliases = {
       ls = "eza";
       tree = "eza -T";
     };
-    initExtraFirst = ''
+    initExtra = ''
     export EDITOR=emacs\ -nw
-      source ~/.p10k.zsh
     '';
-    enableCompletion = true;
-    # autosuggestions.enable = true;
-    zplug = {
-      enable = true;
-      plugins = [
-        { name = "zsh-users/zsh-autosuggestions"; } # Simple plugin installation
-        { name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; } # Installations with additional options. For the list of options, please refer to Zplug README.
-	{ name = "zdharma-continuum/fast-syntax-highlighting"; }
-      ];
-    };
-
   };
 }