Merge pull request #83 from sasaplus1/to-nix

to nix

Author: sasaplus1

.github/workflows/test.yml

@@ -22,6 +22,21 @@ jobs:
       - run: make deploy
       - run: make test
       - run: test "$(make test)" = 'done.'
+  home-manager:
+    name: home-manager
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - run: nix build ./home-manager --impure
   shellcheck:
     name: shellcheck
     runs-on: ubuntu-latest

.gitignore

@@ -1,3 +1,13 @@
+### Generated by gibo (https://github.com/simonwhitaker/gibo)
+### https://raw.github.com/github/gitignore/b4105e73e493bb7a20b5d7ea35efd5780ca44938/Nix.gitignore
+
+# Ignore build outputs from performing a nix-build or `nix build` command
+result
+result-*
+
+# Ignore automatically generated direnv output
+.direnv
+
 # repository local binaries
 /.bin/*
 

home-manager/flake.nix

@@ -17,9 +17,7 @@
     let
       system = builtins.currentSystem;
       pkgs = nixpkgs.legacyPackages.${system};
-    in
-    {
-      homeConfigurations.${builtins.getEnv "USER"} = home-manager.lib.homeManagerConfiguration {
+      homeConfig = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
 
         # Specify your home configuration modules here, for example,
@@ -29,5 +27,9 @@
         # Optionally use extraSpecialArgs
         # to pass through arguments to home.nix
       };
+    in
+    {
+      homeConfigurations.${builtins.getEnv "USER"} = homeConfig;
+      packages.${system}.default = homeConfig.activationPackage;
     };
 }

home-manager/home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 # NOTE: need --impure
 # $ home-manager switch --flake . --impure
@@ -37,9 +37,37 @@
     #   echo "Hello, ${config.home.username}!"
     # '')
 
+    pkgs.age
+    pkgs.ast-grep
+    pkgs.bash
+    pkgs.bash-completion
     pkgs.bat
+    pkgs.bitwarden-cli
+    pkgs.curl
+    pkgs.delta
+    pkgs.direnv
     pkgs.fac
+    pkgs.fd
+    pkgs.fswatch
+    pkgs.fzf
+    pkgs.gh
+    pkgs.ghq
+    pkgs.git
+    pkgs.gitleaks
+    pkgs.glow
+    pkgs.gron
+    pkgs.jq
+    pkgs.mmv-go
+    pkgs.neovim
     pkgs.ripgrep
+    pkgs.rsync
+    pkgs.sops
+    pkgs.tig
+    pkgs.tmux
+    pkgs.vim
+    pkgs.zoxide
+  ] ++ lib.optionals pkgs.stdenv.isDarwin [
+    pkgs.mas
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage