From 67edd7ba89d98e7534394dab674360da99f40e3d Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Mon, 4 Dec 2023 07:35:44 -0800 Subject: update to 23.11 and break down flakes Update to 23.11 for both nix and home-manager. Break down the flake in multiple parts (hosts, devshell) so that they are easier to maintain. The main reason to start this is because `nix flake check` was failing, the flake was not correct. --- flake/devshell.nix | 41 +++++++++++++++++++++++++++++++++++++++++ flake/mba.nix | 20 ++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 flake/devshell.nix create mode 100644 flake/mba.nix (limited to 'flake') diff --git a/flake/devshell.nix b/flake/devshell.nix new file mode 100644 index 0000000..f096bfe --- /dev/null +++ b/flake/devshell.nix @@ -0,0 +1,41 @@ +{ inputs, ... }: { + imports = [ + inputs.devshell.flakeModule + inputs.treefmt-nix.flakeModule + inputs.pre-commit-hooks.flakeModule + ]; + + perSystem = { config, pkgs, inputs', ... }: { + devShells.default = pkgs.mkShell { + name = "dotfiles"; + + packages = [ + ]; + + TREEFMT_CONFIG_FILE = config.treefmt.build.configFile; + }; + + treefmt = { + projectRootFile = ".git/config"; + + # list of supported programs + # https://github.com/numtide/treefmt-nix + programs = { + nixpkgs-fmt.enable = true; + shfmt.enable = true; + yamlfmt.enable = true; + taplo.enable = true; + }; + }; + + pre-commit = { + settings = { + hooks = { + # deadnix.enable = true; + shellcheck.enable = true; + treefmt.enable = true; + }; + }; + }; + }; +} diff --git a/flake/mba.nix b/flake/mba.nix new file mode 100644 index 0000000..60ac876 --- /dev/null +++ b/flake/mba.nix @@ -0,0 +1,20 @@ +{ nixpkgs, home-manager, darwin, inputs, ... }: + +let + default-system = "aarch64-darwin"; + + nixpkgsConfig = { + config = { + allowUnfree = true; + }; + }; +in +{ + system = darwin.lib.darwinSystem { + system = default-system; + modules = [ + ../hosts/mba + home-manager.darwinModules.home-manager + ]; + }; +} -- cgit 1.4.1