From 8db15c78d7557b94310757684c842cefe199cb33 Mon Sep 17 00:00:00 2001 From: AxelSilverdew Date: Sun, 5 May 2024 19:04:26 +0530 Subject: [PATCH 1/3] ci: Added nixfmt and statix --- .github/workflows/code_check.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/code_check.yml diff --git a/.github/workflows/code_check.yml b/.github/workflows/code_check.yml new file mode 100644 index 0000000..e9a621b --- /dev/null +++ b/.github/workflows/code_check.yml @@ -0,0 +1,26 @@ +name: Code Check +on: + push: + branches: + - "*" + pull_request: + branches: + - "*" +jobs: + lint: + name: Run nixfmt and statix + runs-on: ubuntu-latest + steps: + - name: Check out the code + uses: actions/checkout@v4 + - name: Install Nix + uses: cachix/install-nix-action@v26 + - name: Install nixfmt and statix + run: | + nix profile install nixpkgs#nixfmt-rfc-style nixpkgs#statix + - name: Run nixfmt + run: | + nixfmt --check ./**/*.nix + - name: Run statix + run: | + statix check From 8941d570b8f14fed3c271c78df7f9a2f201c8298 Mon Sep 17 00:00:00 2001 From: AxelSilverdew Date: Sun, 5 May 2024 19:26:25 +0530 Subject: [PATCH 2/3] lint: fixed formatting in darwin --- darwin/system.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwin/system.nix b/darwin/system.nix index 2679908..f7955da 100644 --- a/darwin/system.nix +++ b/darwin/system.nix @@ -1,4 +1,4 @@ -{config, ...}: +{ config, ... }: # This section apply settings to the system configuration only available on macOS # see for more options { From 47129554e4d2d5a9cad7c6a9667f2663e3295fe8 Mon Sep 17 00:00:00 2001 From: AxelSilverdew Date: Sun, 5 May 2024 19:30:48 +0530 Subject: [PATCH 3/3] lint: fixed some statix lints --- darwin/flake.nix | 23 +++++++-------- system/configuration.nix | 60 +++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/darwin/flake.nix b/darwin/flake.nix index 8183734..ab45d22 100644 --- a/darwin/flake.nix +++ b/darwin/flake.nix @@ -67,24 +67,25 @@ ( { config, ... }: { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; - # extraSpecialArgs is used to pass the inputs to the home-manager configuration - home-manager.extraSpecialArgs = specialArgs; + # extraSpecialArgs is used to pass the inputs to the home-manager configuration + extraSpecialArgs = specialArgs; + # And a home-manager configuration for them + users.${username} = { + imports = [ ./home.nix ]; + + home.username = username; + }; + }; # Here we can create our user uses.users.${username} = { home = "/Users/${username}"; }; - # And a home-manager configuration for them - home-manager.users.${username} = { - imports = [ ./home.nix ]; - - home.username = username; - }; - # Here we set our (networking) host name and computer name. They should usually be the same networking.hostName = hostname; networking.computerName = config.networking.hostName; diff --git a/system/configuration.nix b/system/configuration.nix index 66de527..cb91cd9 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -100,36 +100,38 @@ "flakes" ]; - nix.registry.nixpkgs = { - from = { - id = "nixpkgs"; - type = "indirect"; - }; - to = { - owner = "auxolotl"; - repo = "nixpkgs"; - type = "github"; + nix = { + registry.nixpkgs = { + from = { + id = "nixpkgs"; + type = "indirect"; + }; + to = { + owner = "auxolotl"; + repo = "nixpkgs"; + type = "github"; + }; }; + + gc.automatic = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . }; - - nix.gc.automatic = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "24.05"; # Did you read the comment? }