.gitignore

@@ -1,4 +1,3 @@
-result
 vim/bundle/
 tags*
 vim/view

flake.lock

@@ -16,6 +16,7 @@
       },
       "original": {
         "owner": "lnl7",
+        "ref": "master",
         "repo": "nix-darwin",
         "type": "github"
       }
@@ -43,16 +44,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1672500394,
-        "narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=",
-        "owner": "NixOS",
+        "lastModified": 1672441599,
+        "narHash": "sha256-5s/aa/0cpw6MNXQSiUedDnnMVleL/WThL8Q8jYNcc+g=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8",
+        "rev": "0c5a734cdeadc39d253018ad0f83fb77eac7ab08",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-22.11-darwin",
+        "owner": "nixos",
+        "ref": "nixpkgs-22.05-darwin",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,19 +1,23 @@
 {
-  description = "Tyrel Nix";
+	description = "Tyrel Nix";
+
+inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.05-darwin";
+    darwin.url = "github:lnl7/nix-darwin/master";
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
+
 
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    darwin.url = "github:lnl7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixpkgs"; 
-  };
+    # nix will normally use the nixpkgs defined in home-managers inputs, we only want one copy of nixpkgs though
 
-  outputs = { self, nixpkgs, home-manager, darwin }: {
-    darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem {
-      system = "x86_64-darwin";
-      modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ];
-    };
+};
+
+outputs = { self, nixpkgs, home-manager, darwin }: {
+  darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem {
+    system = "x86_64-darwin";
+    modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ]; # will be important later
   };
+};
 
 }

hosts/ts-tl-mbp/default.nix

@@ -8,20 +8,20 @@
   home-manager.useUserPackages = true;
   home-manager.users.tyrel = { pkgs, ... }: {
     home.stateVersion = "22.05";
-    #programs.tmux = { # my tmux configuration, for example
-    #  enable = true;
-    #  keyMode = "vi";
-    #  clock24 = true;
-    #  historyLimit = 10000;
-    #  plugins = with pkgs.tmuxPlugins; [
-    #    vim-tmux-navigator
-    #    gruvbox
-    #  ];
-    #  extraConfig = ''
-    #    new-session -s main
-    #    bind-key -n C-a send-prefix
-    #  '';
-    #};
+    programs.tmux = { # my tmux configuration, for example
+      enable = true;
+      keyMode = "vi";
+      clock24 = true;
+      historyLimit = 10000;
+      plugins = with pkgs.tmuxPlugins; [
+        vim-tmux-navigator
+        gruvbox
+      ];
+      extraConfig = ''
+        new-session -s main
+        bind-key -n C-a send-prefix
+      '';
+    };
   };
   homebrew = {
     enable = true;
@@ -31,7 +31,6 @@
     casks = [
       "alfred"
       "discord"
-      "neovim"
     ];
   };