Merge pull request #25 from AxelSilverdew/main

.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

darwin/flake.nix

@@ -67,23 +67,24 @@
           (
             { 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;
-
-              # Here we can create our user
-              uses.users.${username} = {
-                home = "/Users/${username}";
-              };
+                extraSpecialArgs = specialArgs;
 
                 # And a home-manager configuration for them
-              home-manager.users.${username} = {
+                users.${username} = {
                   imports = [ ./home.nix ];
 
                   home.username = username;
                 };
+              };
+              # Here we can create our user
+              uses.users.${username} = {
+                home = "/Users/${username}";
+              };
 
               # Here we set our (networking) host name and computer name. They should usually be the same
               networking.hostName = hostname;

darwin/system.nix

@@ -1,4 +1,4 @@
-{config, ...}:
+{ config, ... }:
 # This section apply settings to the system configuration only available on macOS
 # see <https://daiderd.com/nix-darwin/manual/index.html#sec-options> for more options
 {

system/configuration.nix

@@ -100,7 +100,8 @@
     "flakes"
   ];
 
-  nix.registry.nixpkgs = {
+  nix = {
+    registry.nixpkgs = {
       from = {
         id = "nixpkgs";
         type = "indirect";
@@ -112,7 +113,7 @@
       };
     };
 
-  nix.gc.automatic = true;
+    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.
@@ -131,5 +132,6 @@
     # 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?
 }