Merge pull request #14 from redyf/dev

Dev
redyf · Jan 12, 2024 · bc75aa8 · bc75aa8
2 parents 00b6cee + 1ae090d
commit bc75aa8
Show file tree

Hide file tree

Showing 188 changed files with 903 additions and 16,520 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Redyf's NixOS config for desktop, laptop and WSL";
+  description = "Redyf's NixOS config for desktop and WSL";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -28,6 +28,16 @@
       url = "github:shaunsingh/SFMono-Nerd-Font-Ligaturized";
       flake = false;
     };
+
+    monolisa = {
+      url = "github:redyf/monolisa";
+      flake = false;
+    };
+
+    berkeley = {
+      url = "github:redyf/berkeley";
+      flake = false;
+    };
   };
 
   outputs =
@@ -76,57 +86,34 @@
                 { programs.hyprland.enable = true; }
               ];
             };
-        laptop = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = {
-            inherit inputs hyprland;
-          };
-          modules = [
-            ./hosts/laptop/configuration.nix
-            home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-                useUserPackages = true;
-                useGlobalPkgs = false;
-                extraSpecialArgs = { inherit inputs; };
-                users.redyf = ./home/laptop/laptop.nix;
-              };
-            }
-            hyprland.nixosModules.default
-            { programs.hyprland.enable = true; }
-          ];
-        };
-        wsl = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            { nix.registry.nixpkgs.flake = nixpkgs; }
-            ./hosts/wsl/configuration.nix
-            home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-                useUserPackages = true;
-                useGlobalPkgs = false;
-                users.red = ./home/wsl/home.nix;
-              };
-            }
-            NixOS-WSL.nixosModules.wsl
-          ];
-        };
+      wsl = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          {nix.registry.nixpkgs.flake = nixpkgs;}
+          ./hosts/wsl/configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useUserPackages = true;
+              useGlobalPkgs = false;
+              users.red = ./home/wsl/home.nix;
+            };
+          }
+          NixOS-WSL.nixosModules.wsl
+        ];
       };
-      devShells = forAllSystems (system:
-        let
-          pkgs = nixpkgsFor.${system};
-        in
-        {
-          default = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              git
-              nixpkgs-fmt
-              statix
-            ];
-          };
-        });
-
+    };
+    devShells = forAllSystems (system: let
+      pkgs = nixpkgsFor.${system};
+    in {
+      default = pkgs.mkShell {
+        buildInputs = with pkgs; [
+          git
+          nixpkgs-fmt
+          statix
+        ];
+      };
+    });
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
     };
 }