diff --git a/README.md b/README.md index 32b2a22..94476a5 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ - Look into this for headscale https://carlosvaz.com/posts/setting-up-headscale-on-nixos/ - Look into this for home assistant configuration https://nixos.wiki/wiki/Home_Assistant https://myme.no/posts/2021-11-25-nixos-home-assistant.html - This person seams to know what they are doing with home manager https://github.com/arvigeus/nixos-config/ +- https://nixos-and-flakes.thiscute.world/ ## Configuration set up git configuration for local development: `git config core.hooksPath .hooks` diff --git a/flake.nix b/flake.nix index efffbd2..aaf2266 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,6 @@ }; outputs = { - self, nixpkgs, disko, nixos-hardware, @@ -60,22 +59,28 @@ home-manager.backupFileExtension = "backup"; home-manager.extraSpecialArgs = {inherit inputs;}; }; - forEachSystem = nixpkgs.lib.genAttrs [ + systems = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + forEachSystem = nixpkgs.lib.genAttrs systems; forEachPkgs = lambda: forEachSystem (system: lambda nixpkgs.legacyPackages.${system}); callPackage = nixpkgs.lib.callPackageWith (nixpkgs // {lib = lib;}); lib = callPackage ./util {} // nixpkgs.lib; in { + packages = forEachPkgs (import ./pkgs); + + formatter = forEachPkgs (system: system.alejandra); + nixosConfigurations = { # Leyla Laptop horizon = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs lib;}; modules = [ + ./overlays home-manager.nixosModules.home-manager home-manager-config ./hosts/horizon/configuration.nix @@ -86,6 +91,7 @@ twilight = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs lib;}; modules = [ + ./overlays home-manager.nixosModules.home-manager home-manager-config ./hosts/twilight/configuration.nix @@ -95,6 +101,7 @@ defiant = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs lib;}; modules = [ + ./overlays disko.nixosModules.disko home-manager.nixosModules.home-manager home-manager-config diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..4957ab8 --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,7 @@ +{...}: { + nixpkgs.overlays = [ + ( + self: super: import ../pkgs {pkgs = super;} + ) + ]; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 87a13d7..b02ba6c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,2 +1,3 @@ -_: { +{...}: { + # package = pkgs.callPackage ./package.nix {}; } diff --git a/users/leyla/default.nix b/users/leyla/default.nix index 2698b8e..2c1f87b 100644 --- a/users/leyla/default.nix +++ b/users/leyla/default.nix @@ -27,7 +27,7 @@ in { then { isNormalUser = true; extraGroups = ( - ["networkmanager" "wheel"] + ["networkmanager" "wheel" "dialout"] ++ lib.lists.optional (!cfg.isTerminalUser) "adbusers" ); diff --git a/users/leyla/packages.nix b/users/leyla/packages.nix index 1406f6d..8aa3a72 100644 --- a/users/leyla/packages.nix +++ b/users/leyla/packages.nix @@ -61,6 +61,8 @@ in { dbeaver-bin bruno qFlipper + proxmark3 + mfoc # system tools protonvpn-gui