use local dotfiles repo

this allows customization and overriding

Author: wmertens

Readme.md

@@ -1,7 +1,33 @@
 # StratoKit dotfiles via home-manager
 
-This manages our dotfiles and enables direnv
+This manages our dotfiles and enables direnv.
 
-## Installation or upgrades
+## Installation
 
-Run `./switch.sh`
+If you don't have Nix installed yet or you're not sure about it supporting flakes, run
+
+```sh
+NIX_EXTRA_CONF='experimental-features = nix-command flakes' sh <(curl -L https://nixos.org/nix/install) --daemon
+```
+
+Once it's installed, open a new terminal.
+
+Add this repo to your flake registry by running:
+
+```sh
+nix registry add dotfiles github:StratoKit/dotfiles
+```
+
+Then to install or to update, just run it:
+
+```nix
+nix run dotfies
+```
+
+## Details
+
+This will create a local dotfiles repo that stores your configuration and is editable.
+
+On macOS, it is stored under `~/Library/dotfiles`, and on Linux, `~/.config/dotfiles`.
+
+This allows you to override everything, including the version of nixpkgs that is used.

default-flake.nix

@@ -0,0 +1,55 @@
+{
+  description = "StratoKit dotfiles flake, see https://github.com/StratoKit/dotfiles";
+
+  inputs = {
+    # You can choose a different flake here
+    dotfiles.url = "github:StratoKit/dotfiles";
+
+    # With this you can override nixpkgs or similarly home-manager
+    # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    # dotfiles.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = inputs:
+    let
+      # The auto-generated settings
+      settings = import ./settings.nix;
+      inherit (settings) username homeDirectory hostname system configDirectory;
+      # The inputs provided by the dotfiles repo
+      inherit (inputs.dotfiles) nixpkgs home-manager;
+
+      pkgs = inputs.dotfiles.pkgs.${system};
+    in
+    {
+      # The commands you can run
+      apps.${system} = {
+        # Just use the apps from the main repo
+        inherit (inputs.dotfiles.apps.${system}) default update;
+      };
+
+      # The home-manager configuration
+      homeConfigurations = {
+        ${username} = home-manager.lib.homeManagerConfiguration rec {
+          inherit pkgs;
+          modules = [
+            # This provides the default StratoKit configuration
+            (inputs.dotfiles.makeDefaults settings)
+
+            # Here you can add your own extra module files to import
+            # ./home.nix
+
+            # or specify them inline
+            # ({ config, pkgs, lib, ... }: {
+            #   nixpkgs.config = {
+            #     # allowUnfree = true;
+            #     # allowUnsupportedSystem = true;
+            #   };
+            # })
+
+            # Update this only when you know what you are doing
+            { home.stateVersion = "22.05"; }
+          ];
+        };
+      };
+    };
+}

default-readme.md

@@ -0,0 +1,13 @@
+# Local dotfiles
+
+This repo contains the local configuration for https://github.com/StratoKit/dotfiles.
+
+It is a git repository so you can create your own customizations.
+
+To update your dotfiles, run
+
+```sh
+nix run dotfiles
+```
+
+provided you have the correct registry setting, see the main repo for more information.

flake.lock

@@ -2,51 +2,48 @@
   description = "A Home Manager flake";
 
   inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+
+    # our default nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
-    home-manager.url = "github:nix-community/home-manager";
+
+    home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs:
+  outputs = { self, nixpkgs, flake-utils, home-manager }: {
+    inherit home-manager;
+    makeDefaults = import ./home.nix;
+  } //
+  flake-utils.lib.eachDefaultSystem (system:
     let
-      inherit (builtins) stringLength substring;
-
-      local = import ./local_auto.nix;
-
-      hasSuffix =
-        # Suffix to check for
-        suffix:
-        # Input string
-        content:
-        let
-          lenContent = stringLength content;
-          lenSuffix = stringLength suffix;
-        in
-        lenContent >= lenSuffix &&
-        substring (lenContent - lenSuffix) lenContent content == suffix;
-
-      username = local.username;
-      system = local.system;
-      homeDirectory = if (hasSuffix "darwin" system) then "/Users/${username}" else "/home/${username}";
-      extra = if (builtins.hasAttr "extra" local) then local.extra else null;
+      pkgs = nixpkgs.legacyPackages.${system};
+      thisHM = home-manager.packages.${system}.default;
+      install = pkgs.substituteAll {
+        src = ./install.sh;
+        isExecutable = true;
+        inherit (pkgs) bash git;
+        defaultFlake = ./default-flake.nix;
+        defaultReadme = ./default-readme.md;
+      };
+      update = pkgs.substituteAll {
+        src = ./update.sh;
+        isExecutable = true;
+        inherit (pkgs) bash;
+        homeManager = thisHM;
+      };
     in
     {
-      defaultPackage = inputs.home-manager.defaultPackage;
-      homeConfigurations = {
-        ${username} = inputs.home-manager.lib.homeManagerConfiguration rec {
-          inherit username homeDirectory system;
-          pkgs = inputs.nixpkgs.outputs.legacyPackages.${system};
-          configuration.imports = [
-            ({ config, pkgs, lib, ... }: {
-              nixpkgs.config = {
-                allowUnfree = true;
-                allowUnsupportedSystem = true;
-              };
-            })
+      inherit pkgs;
 
-            ./home.nix
-          ];
-        };
+      apps.default = {
+        type = "app";
+        program = "${install}";
+      };
+      apps.update = {
+        type = "app";
+        program = "${update}";
       };
-    };
+    }
+  );
 }

flake.nix

@@ -1,9 +1,7 @@
+# The settings that are auto-generated by the installer
+settings:
+# Returns a normal module
 { pkgs, lib, ... }:
-
-let
-  local = import ./local_auto.nix;
-  username = local.username;
-in
 {
   programs.nix-index.enable = true;
   programs.command-not-found.enable = false;
@@ -18,14 +16,17 @@ in
   programs.zsh.enable = true;
   programs.bash.enable = true;
 
-  home.packages = with pkgs; [
-    nixpkgs-fmt
+  home = {
+    inherit (settings) username homeDirectory;
+    packages = with pkgs; [
+      nixpkgs-fmt
 
-    nodejs
+      nodejs
 
-    pstree
-    rsync
-    sqlite-interactive
-    tree
-  ];
+      pstree
+      rsync
+      sqlite-interactive
+      tree
+    ];
+  };
 }