blah

flake.lock

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

flake.nix

@@ -1,19 +1,20 @@
 {
-  description = "My first nix flake";
+	description = "Tyrel Nix";
 
 inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.05-darwin";
+    darwin.url = "github:lnl7/nix-darwin/master";
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
+
+
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     # nix will normally use the nixpkgs defined in home-managers inputs, we only want one copy of nixpkgs though
-    darwin.url = "github:lnl7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixpkgs"; # ...
+
 };
 
 outputs = { self, nixpkgs, home-manager, darwin }: {
   darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem {
-  # you can have multiple darwinConfigurations per flake, one per hostname
-
     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

@@ -1,38 +1,37 @@
 { pkgs, ... }:
 {
 
-  # Make sure the nix daemon always runs
   services.nix-daemon.enable = true;
-programs.zsh.enable = true;
-system.defaults.dock.autohide = true;
-home-manager.useGlobalPkgs = true;
-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.zsh.enable = true;
+  system.defaults.dock.autohide = true;
+  home-manager.useGlobalPkgs = true;
+  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
+      '';
+    };
+  };
+  homebrew = {
+    enable = true;
+    autoUpdate = true;
+    # updates homebrew packages on activation,
+    # can make darwin-rebuild much slower (otherwise i'd forget to do it ever though)
+    casks = [
+      "alfred"
+      "discord"
+    ];
   };
-};
-homebrew = {
-  enable = true;
-  autoUpdate = true;
-  # updates homebrew packages on activation,
-  # can make darwin-rebuild much slower (otherwise i'd forget to do it ever though)
-  casks = [
-    "alfred"
-    "discord"
-  ];
-};
 
 }