refactor: align architecture with srid/nixos-config

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -1 +1,2 @@
 result
+.direnv

flake.nix

@@ -1,4 +1,6 @@
 {
+  description = "A home-manager template providing useful tools & settings for Nix-based development";
+
   inputs = {
     # Principle inputs (updated by `nix run .#update`)
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -7,17 +9,18 @@
 
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixos-flake.url = "github:srid/nixos-flake";
+
+    # see https://github.com/nix-systems/default/blob/main/default.nix
+    systems.url = "github:nix-systems/default";
   };
 
-  outputs = inputs@{ self, ... }:
+  outputs = inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
+      systems = import inputs.systems;
       imports = [
         inputs.nixos-flake.flakeModule
       ];
 
-      flake.homeModules.default = ./home.nix;
-
       flake.templates.default = {
         description = "A `home-manager` template providing useful tools & settings for Nix-based development";
         path = builtins.path {
@@ -31,25 +34,36 @@
       perSystem = { self', pkgs, ... }:
         let
           # TODO: Change username
-          myUserName = "john";
+          myUserName = "runner";
         in
         {
           legacyPackages.homeConfigurations.${myUserName} =
-            self.nixos-flake.lib.mkHomeConfiguration
+            inputs.self.nixos-flake.lib.mkHomeConfiguration
               pkgs
               ({ pkgs, ... }: {
-                imports = [ self.homeModules.default ];
+                # Edit the contents of the ./home directory to install packages and modify dotfile configuration in your
+                # $HOME.
+                #
+                # https://nix-community.github.io/home-manager/index.html#sec-usage-configuration
+                imports = [ ./home ];
                 home.username = myUserName;
                 home.homeDirectory = "/${if pkgs.stdenv.isDarwin then "Users" else "home"}/${myUserName}";
                 home.stateVersion = "22.11";
               });
 
+          formatter = pkgs.nixpkgs-fmt;
+
           # Enables 'nix run' to activate.
           apps.default.program = self'.packages.activate-home;
 
           # Enable 'nix build' to build the home configuration, but without
           # activating.
           packages.default = self'.legacyPackages.homeConfigurations.${myUserName}.activationPackage;
+
+          devShells.default = pkgs.mkShell {
+            name = "nix-dev-home";
+            nativeBuildInputs = with pkgs; [ just ];
+          };
         };
     };
 }

home/default.nix

@@ -0,0 +1,9 @@
+{
+  imports = [
+    # This loads ./neovim/default.nix - neovim configured for Haskell dev, and other things.
+    ./neovim
+    ./starship.nix
+    ./terminal.nix
+    # Add more of your home-manager modules here.
+  ];
+}

home/starship.nix

@@ -0,0 +1,23 @@
+{
+  # Starship configuration from this example:
+  # https://github.com/srid/nixos-config/blob/f9cf0def19fbc7aa1e836be481ce50d214e34036/home/starship.nix#L4-L19
+  programs.starship = {
+    enable = true;
+    settings = {
+      username = {
+        style_user = "blue bold";
+        style_root = "red bold";
+        format = "[$user]($style) ";
+        disabled = false;
+        show_always = true;
+      };
+      hostname = {
+        ssh_only = false;
+        ssh_symbol = "🌐 ";
+        format = "on [$hostname](bold red) ";
+        trim_at = ".local";
+        disabled = false;
+      };
+    };
+  };
+}

home.nix → home/terminal.nix

@@ -1,29 +1,50 @@
-# Edit this to install packages and modify dotfile configuration in your
-# $HOME.
-#
-# https://nix-community.github.io/home-manager/index.html#sec-usage-configuration
-{ pkgs, ... }: {
-  imports = [
-    # This loads ./home/neovim/default.nix - neovim configured for Haskell dev, and other things.
-    ./home/neovim
-    # Add more of your home-manager modules here.
-  ];
+{ pkgs, ... }:
 
+# Platform-independent terminal setup
+{
   # Nix packages to install to $HOME
   #
   # Search for packages here: https://search.nixos.org/packages
   home.packages = with pkgs; [
-    tmate
-    nix-info
-    cachix
-    lazygit # Better git UI
+    # Unix tools
     ripgrep # Better `grep`
+    fd
+    sd
+    tree
+
+    # Nix dev
+    cachix
     nil # Nix language server
+    nix-info
+    nixpkgs-fmt
     nixci
+
+    # Dev
+    gh
+    just
+    lazygit # Better git UI
+    tmate
   ];
 
+  home.shellAliases = rec {
+    e = "nvim";
+    g = "git";
+    lg = "lazygit";
+    t = "tree";
+  };
+
   # Programs natively supported by home-manager.
   programs = {
+    bat.enable = true;
+    # Type `z <pat>` to cd to some directory
+    zoxide.enable = true;
+    # Type `<ctrl> + r` to fuzzy search your shell history
+    fzf.enable = true;
+    jq.enable = true;
+    nix-index.enable = true;
+    htop.enable = true;
+
+
     # on macOS, you probably don't need this
     bash = {
       enable = true;
@@ -47,12 +68,5 @@
       enable = true;
       nix-direnv.enable = true;
     };
-
-    # Want to configure starship? See this example:
-    # https://github.com/srid/nixos-config/blob/f9cf0def19fbc7aa1e836be481ce50d214e34036/home/starship.nix#L4-L19
-    starship.enable = true;
-
-    # Type `z <pat>` to cd to some directory
-    zoxide.enable = true;
   };
 }

justfile

@@ -0,0 +1,36 @@
+# Like GNU `make`, but `just` rustier.
+# https://just.systems/man/en/chapter_19.html
+# run `just` from this directory to see available commands
+
+# Default command when 'just' is run without arguments
+default:
+  @just --list
+
+# Print nix flake inputs and outputs
+io:
+  nix flake metadata
+  nix flake show
+
+# Update nix flake
+update:
+  nix flake update
+
+# Lint nix files
+lint:
+  nix fmt
+
+# Check nix flake
+check:
+  nix flake check
+
+# Build nix flake
+build: lint check
+  nix build
+
+# Remove build output link (no garbage collection)
+clean:
+  rm -f ./result
+
+# Run nix flake to setup environment
+run: lint check
+  nix run