Merge pull request #89 from yuanw/standalone

Standalone

.gitignore

@@ -42,3 +42,6 @@ terraform.rc
 .lego/
 wireguard-keys
 AdGuardHome.yaml
+/.pre-commit-config.yaml
+
+diff.json

devshell.nix

@@ -7,6 +7,7 @@
       # See https://haskell.flake.page/devshell#composing-devshells
       inputsFrom = [
         config.treefmt.build.devShell
+        config.pre-commit.devShell
       ];
     };
   };

flake.nix

@@ -33,7 +33,9 @@
     };
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
     treefmt-nix.url = "github:numtide/treefmt-nix";
-    nixos-flake.url = "github:srid/nixos-flake";
+    pre-commit.url = "github:cachix/pre-commit-hooks.nix";
+    pre-commit.inputs.nixpkgs.follows = "nixpkgs";
+
   };
 
 
@@ -47,13 +49,13 @@
       ];
       imports = [
         ./devshell.nix
-        # ./packages
         ./hosts
         ./modules
-        # ./systemModule.nix
-        inputs.nixos-flake.flakeModule
+        inputs.pre-commit.flakeModule
         inputs.treefmt-nix.flakeModule
       ];
       perSystem.treefmt.imports = [ ./treefmt.nix ];
+      # https://github.com/cachix/pre-commit-hooks.nix/blame/30d1c34bdbfe3dd0b8fbdde3962180c56cf16f12/flake-module.nix
+      perSystem.pre-commit.settings.hooks.treefmt.enable = true;
     };
 }

hosts/default.nix

@@ -1,4 +1,10 @@
 { self, inputs, system, ... }:
+let
+  nixosSystem = args:
+    inputs.nixpkgs.lib.nixosSystem ({ specialArgs = { inherit inputs; }; } // args);
+  darwinSystem = args:
+    inputs.nix-darwin.lib.darwinSystem ({ specialArgs = { inherit inputs; }; } // args);
+in
 {
   flake = {
     nixosConfigurations = {
@@ -37,20 +43,20 @@
           ./yuan-mac.nix
         ];
       };
-      WK01174 = self.nixos-flake.lib.mkMacosSystem "aarch64-darwin" {
-        imports = [
-          inputs.self.nixosModules.common
-          inputs.self.nixosModules.darwin
+      WK01174 = darwinSystem {
+        system = "aarch64-darwin";
+        modules = [
           ./wk01174.nix
         ];
       };
-      wf17084 = self.nixos-flake.lib.mkMacosSystem "x86_64-darwin" {
-        imports = [
-          inputs.self.nixosModules.common
-          inputs.self.nixosModules.darwin
+      wf17084 =  darwinSystem {
+        system = "x86_64-darwin"  ;
+        modules = [
           ./wf17084.nix
         ];
       };
+
+
     };
 
   };

hosts/wf17084.nix

@@ -1,5 +1,10 @@
-{ pkgs, config, ... }: {
+{ pkgs, inputs, config, ... }:
+{
 
+  imports = [
+    inputs.self.nixosModules.common
+    inputs.self.nixosModules.darwin
+  ];
   my = {
     username = "yuanwang";
     name = "Yuan Wang";
@@ -8,6 +13,8 @@
     gpgKey = "19AD3F6B1A5BF3BF";
     homeDirectory = "/Users/yuanwang";
   };
+
+
   home-manager.users.${config.my.username}.programs = {
     go = {
       enable = true;
@@ -77,6 +84,6 @@
       mainWorkspaceDir = "$HOME/workiva";
     };
     wm.yabai.enable = true;
+    workShell.enable = true;
   };
-  programs = { workShell.enable = true; };
 }

hosts/wk01174.nix

@@ -1,4 +1,10 @@
-{ pkgs, config, ... }: {
+{ pkgs, inputs, config, ... }: {
+
+  imports = [
+    inputs.self.nixosModules.common
+    inputs.self.nixosModules.darwin
+  ];
+
   my = {
     username = "yuanwang";
     name = "Yuan Wang";
@@ -79,6 +85,7 @@
       mainWorkspaceDir = "$HOME/workspaces";
     };
     wm.yabai.enable = true;
+
+    workShell.enable = true;
   };
-  programs = { workShell.enable = true; };
 }

modules/common.nix

@@ -1,4 +1,4 @@
-{ flake, config, ... }:
+{ inputs, config, ... }:
 {
   nix = {
     # configureBuildUsers = true;
@@ -48,12 +48,12 @@
       allowUnsupportedSystem = true;
     };
     overlays = [
-      flake.inputs.emacs.overlay
-      flake.inputs.nur.overlay
-      flake.inputs.agenix.overlays.default
+      inputs.emacs.overlay
+      inputs.nur.overlay
+      inputs.agenix.overlays.default
       (_final: _prev: {
-        stable = flake.inputs.nixpkgs-stable.legacyPackages.${_prev.system};
-        mesa = flake.inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa;
+        stable = inputs.nixpkgs-stable.legacyPackages.${_prev.system};
+        mesa = inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa;
         # use this variant if unfree packages are needed:
         # unstable = import nixpkgs-unstable {
         #   inherit system;

modules/default.nix

@@ -25,16 +25,7 @@
     darwin.imports = [
       ./brew.nix
       ./wm/yabai.nix
-      ../macintosh.nix
-      # ({  ... }: {
-      #        })
+      ./macintosh.nix
     ];
-
-
-    # desktop = ./desktop.nix;
-    # gnome = ./gnome.nix;
-    # gotosocial = ./gotosocial.nix;
-    # nix-remote-builders = ./nix-remote-builders.nix;
-    # server = ./server.nix;
   };
 }

home.nix → modules/home.nix

@@ -5,21 +5,21 @@
   home.homeDirectory = config.my.homeDirectory;
   # https://rycee.gitlab.io/home-manager/release-notes.html#sec-release-22.11
   home.stateVersion = "22.11";
-  home.packages = (import ./modules/packages.nix { inherit pkgs; })
+  home.packages = (import ./packages.nix { inherit pkgs; })
     ++ lib.optionals pkgs.stdenvNoCC.isDarwin
-    (import ./modules/macos_packages.nix { inherit pkgs; })
+    (import ./macos_packages.nix { inherit pkgs; })
     ++ lib.optionals pkgs.stdenvNoCC.isLinux
-    (import ./modules/linux_packages.nix { inherit pkgs; });
+    (import ./linux_packages.nix { inherit pkgs; });
 
   xdg = {
     enable = true;
     configFile = {
       # "startpage".source = ./startpage;
       "wallpapers/haskell-red-noise.png".source =
-        ./pictures/haskell-red-noise.png;
-      "wallpapers/doom.svg".source = ./pictures/doomEmacs.svg;
+        ../pictures/haskell-red-noise.png;
+      "wallpapers/doom.svg".source = ../pictures/doomEmacs.svg;
       "wallpapers/nix-wallpaper-dracula.png".source =
-        ./pictures/nix-wallpaper-dracula.png;
+        ../pictures/nix-wallpaper-dracula.png;
     };
   };
   manual.manpages.enable = false;