fmt + cryptoshop

kolyma-labs · Aug 26, 2024 · 03d9222 · 03d9222
1 parent bb646d6
commit 03d9222
Show file tree

Hide file tree

Showing 38 changed files with 394 additions and 396 deletions.
diff --git a/flake.nix b/flake.nix
@@ -36,127 +36,130 @@
 
   # In this context, outputs are mostly about getting home-manager what it
   # needs since it will be the one using the flake
-  outputs = {
-    self,
-    nixpkgs,
-    nixpkgs-unstable,
-    home-manager,
-    flake-utils,
-    ...
-  } @ inputs: let
-    inherit (self) outputs;
-
-    # Legacy packages are needed for home-manager
-    lib = nixpkgs.lib // home-manager.lib;
-
-    # Supported systems for your flake packages, shell, etc.
-    systems = [
-      "aarch64-linux"
-      "x86_64-linux"
-      "aarch64-darwin"
-      "x86_64-darwin"
-    ];
-
-    # This is a function that generates an attribute by calling a function you
-    # pass to it, with each system as an argument
-    forAllSystems = nixpkgs.lib.genAttrs systems;
-
-    # This is a function that generates an attribute by calling a function you
-    # pass to it, with each system as an argument
-    forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
-
-    # This is a function that generates an attribute by calling a function you
-    # pass to it, with each system as an argument
-    pkgsFor = lib.genAttrs systems (system:
-      import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      });
-
-    # Define a development shell for each system
-    devShellFor = system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
+  outputs =
+    { self
+    , nixpkgs
+    , nixpkgs-unstable
+    , home-manager
+    , flake-utils
+    , ...
+    } @ inputs:
+    let
+      inherit (self) outputs;
+
+      # Legacy packages are needed for home-manager
+      lib = nixpkgs.lib // home-manager.lib;
+
+      # Supported systems for your flake packages, shell, etc.
+      systems = [
+        "aarch64-linux"
+        "x86_64-linux"
+        "aarch64-darwin"
+        "x86_64-darwin"
+      ];
+
+      # This is a function that generates an attribute by calling a function you
+      # pass to it, with each system as an argument
+      forAllSystems = nixpkgs.lib.genAttrs systems;
+
+      # This is a function that generates an attribute by calling a function you
+      # pass to it, with each system as an argument
+      forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
+
+      # This is a function that generates an attribute by calling a function you
+      # pass to it, with each system as an argument
+      pkgsFor = lib.genAttrs systems (system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        });
+
+      # Define a development shell for each system
+      devShellFor = system:
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+            config.allowUnfree = true;
+          };
+        in
+        pkgs.mkShell {
+          NIX_CONFIG = "extra-experimental-features = nix-command flakes repl-flake";
+          buildInputs = with pkgs; [
+            nix
+            nil
+            git
+            nixd
+            just
+            nixpkgs-fmt
+            nixpkgs-lint
+          ];
+
+          # Set environment variables, if needed
+          shellHook = ''
+            # export SOME_VAR=some_value
+            echo "Welcome to Kolyma's dotfiles!"
+          '';
+        };
     in
-      pkgs.mkShell {
-        NIX_CONFIG = "extra-experimental-features = nix-command flakes repl-flake";
-        buildInputs = with pkgs; [
-          nix
-          nil
-          git
-          nixd
-          just
-          nixpkgs-fmt
-          nixpkgs-lint
-        ];
-
-        # Set environment variables, if needed
-        shellHook = ''
-          # export SOME_VAR=some_value
-          echo "Welcome to Kolyma's dotfiles!"
-        '';
-      };
-  in {
-    inherit lib;
-
-    # Your custom packages
-    # Acessible through 'nix build', 'nix shell', etc
-    packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;});
-
-    # Formatter for your nix files, available through 'nix fmt'
-    # Other options beside 'alejandra' include 'nixpkgs-fmt'
-    formatter =
-      forAllSystems (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
-
-    # Your custom packages and modifications, exported as overlays
-    overlays = import ./overlays {inherit inputs;};
-
-    # Reusable nixos modules you might want to export
-    # These are usually stuff you would upstream into nixpkgs
-    nixosModules = import ./modules/nixos;
-
-    # Reusable home-manager modules you might want to export
-    # These are usually stuff you would upstream into home-manager
-    homeManagerModules = import ./modules/home;
-
-    # Reusable server modules you might want to export
-    # These are usually stuff you would upstream services to global
-    serverModules = import ./modules/server;
-
-    # Reusable home-manager modules you might want to export
-    # These are usually stuff you would upstream into home-manager
-    # homeManagerModules = import ./modules/home;
-
-    # NixOS configuration entrypoint
-    # Available through 'nixos-rebuild --flake .#your-hostname'
-    nixosConfigurations = {
-      "Kolyma-1" = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
-        modules = [
-          # > Our main nixos configuration file <
-          ./nixos/kolyma-1/configuration.nix
-        ];
-      };
-      "Kolyma-2" = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
-        modules = [
-          # > Our main nixos configuration file <
-          ./nixos/kolyma-2/configuration.nix
-        ];
-      };
-      "Kolyma-3" = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
-        modules = [
-          # > Our main nixos configuration file <
-          ./nixos/kolyma-3/configuration.nix
-        ];
+    {
+      inherit lib;
+
+      # Your custom packages
+      # Acessible through 'nix build', 'nix shell', etc
+      packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
+
+      # Formatter for your nix files, available through 'nix fmt'
+      # Other options beside 'alejandra' include 'nixpkgs-fmt'
+      formatter =
+        forAllSystems (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
+
+      # Your custom packages and modifications, exported as overlays
+      overlays = import ./overlays { inherit inputs; };
+
+      # Reusable nixos modules you might want to export
+      # These are usually stuff you would upstream into nixpkgs
+      nixosModules = import ./modules/nixos;
+
+      # Reusable home-manager modules you might want to export
+      # These are usually stuff you would upstream into home-manager
+      homeManagerModules = import ./modules/home;
+
+      # Reusable server modules you might want to export
+      # These are usually stuff you would upstream services to global
+      serverModules = import ./modules/server;
+
+      # Reusable home-manager modules you might want to export
+      # These are usually stuff you would upstream into home-manager
+      # homeManagerModules = import ./modules/home;
+
+      # NixOS configuration entrypoint
+      # Available through 'nixos-rebuild --flake .#your-hostname'
+      nixosConfigurations = {
+        "Kolyma-1" = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs outputs; };
+          modules = [
+            # > Our main nixos configuration file <
+            ./nixos/kolyma-1/configuration.nix
+          ];
+        };
+        "Kolyma-2" = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs outputs; };
+          modules = [
+            # > Our main nixos configuration file <
+            ./nixos/kolyma-2/configuration.nix
+          ];
+        };
+        "Kolyma-3" = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs outputs; };
+          modules = [
+            # > Our main nixos configuration file <
+            ./nixos/kolyma-3/configuration.nix
+          ];
+        };
       };
-    };
 
-    # Development shells
-    devShell = lib.mapAttrs (system: _: devShellFor system) (lib.genAttrs systems {});
-    # devShells = lib.mapAttrs (system: _: devShellFor system) (lib.genAttrs systems {});
-  };
+      # Development shells
+      devShell = lib.mapAttrs (system: _: devShellFor system) (lib.genAttrs systems { });
+      # devShells = lib.mapAttrs (system: _: devShellFor system) (lib.genAttrs systems {});
+    };
 }
diff --git a/home/muzaffar.nix b/home/muzaffar.nix
@@ -1,12 +1,11 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  config,
-  outputs,
-  packages,
-  self,
-  ...
+{ inputs
+, lib
+, pkgs
+, config
+, outputs
+, packages
+, self
+, ...
 }: {
   imports = [
     outputs.homeManagerModules.zsh

diff --git a/home/sakhib.nix b/home/sakhib.nix
@@ -1,12 +1,11 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  config,
-  outputs,
-  packages,
-  self,
-  ...
+{ inputs
+, lib
+, pkgs
+, config
+, outputs
+, packages
+, self
+, ...
 }: {
   imports = [
     outputs.homeManagerModules.zsh

diff --git a/home/shakhzod.nix b/home/shakhzod.nix
@@ -1,12 +1,11 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  config,
-  outputs,
-  packages,
-  self,
-  ...
+{ inputs
+, lib
+, pkgs
+, config
+, outputs
+, packages
+, self
+, ...
 }: {
   imports = [
     outputs.homeManagerModules.zsh

diff --git a/modules/home/nixpkgs/default.nix b/modules/home/nixpkgs/default.nix
@@ -1,4 +1,4 @@
-{outputs, ...}: {
+{ outputs, ... }: {
   config = {
     nixpkgs = {
       # You can add overlays here

diff --git a/modules/home/packages/default.nix b/modules/home/packages/default.nix
@@ -1,9 +1,9 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
+{ config
+, pkgs
+, lib
+, ...
+}:
+let
   linux = with pkgs; [
     # Add new packages here
     docker-compose
@@ -59,7 +59,8 @@
     # Selfmade programs
     fp
   ];
-in {
+in
+{
   config = {
     # Packages to be installed on my machine
     home.packages = globals ++ linux;

diff --git a/modules/home/topgrade/default.nix b/modules/home/topgrade/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   config = {
     programs.topgrade = {
       enable = true;
@@ -17,10 +17,10 @@
           assume_yes = true;
           no_self_update = true;
         };
-        commands = {};
+        commands = { };
         linux = {
           nix_arguments = "--flake github:kolyma-labs/instances";
-          home_manager_arguments = ["--flake" "github:kolyma-labs/instances"];
+          home_manager_arguments = [ "--flake" "github:kolyma-labs/instances" ];
         };
       };
     };

diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   imports = [
     ./zoxide.nix
     ./starship.nix

diff --git a/modules/home/zsh/starship.nix b/modules/home/zsh/starship.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   # Prettier terminal prompt
   programs.starship = {
     enable = true;

diff --git a/modules/home/zsh/zoxide.nix b/modules/home/zsh/zoxide.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   # Zpxide path integration
   programs.zoxide = {
     enable = true;