merge test

2025-04-30 13:41:48 +02:00
parent e257ff991d 7fb65ea258
commit 4364cc2d16
25 changed files with 1381 additions and 167 deletions
--- a/flake.nix.orig
+++ b/flake.nix.orig
@@ -0,0 +1,98 @@
+{
+  description = "My NixOS Flake";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    xmonad-contrib = {
+      url = "github:xmonad/xmonad-contrib";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nur = { url = "github:nix-community/NUR"; };
+
+    neovim-nightly-overlay = {
+      url = "github:nix-community/neovim-nightly-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    wpaperd = {
+      url = "github:danyspin97/wpaperd";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+  };
+
+  outputs = { nixpkgs, xmonad-contrib, home-manager, nur, ... }@inputs: {
+    formatter.x86_64-linux =
+      nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
+    nixosConfigurations = {
+      eliasLaptop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./machines/configuration-laptop.nix
+          ./home/services/pipewire.nix
+          nur.modules.nixos.default
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+<<<<<<< HEAD
+              #useGlobalPkgs = true;
+=======
+>>>>>>> test
+              useUserPackages = true;
+              extraSpecialArgs = { inherit inputs; };
+              users.elias = import ./home/default-laptop.nix;
+            };
+            nixpkgs.overlays = [
+              (final: prev: {
+                xmobar = final.haskellPackages.callPackage
+                  ./home/programs/xmonad/src/xmobar/default.nix { };
+              })
+              inputs.neovim-nightly-overlay.overlays.default
+              inputs.wpaperd.overlays.default
+              inputs.nur.overlays.default
+              (import overlays/minlog.nix)
+              (import overlays/obsidian.nix)
+            ];
+          }
+        ] ++ xmonad-contrib.nixosModules;
+      };
+      eliasDesktop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./machines/configuration-desktop.nix
+          ./home/services/pipewire.nix
+          nur.modules.nixos.default
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+<<<<<<< HEAD
+              #useGlobalPkgs = true;
+=======
+>>>>>>> test
+              useUserPackages = true;
+              extraSpecialArgs = { inherit inputs; };
+              users.elias = import ./home/default-desktop.nix;
+            };
+            nixpkgs.overlays = [
+              (final: prev: {
+                xmobar = final.haskellPackages.callPackage
+                  ./home/programs/xmonad/src/xmobar/default.nix { };
+              })
+              inputs.neovim-nightly-overlay.overlays.default
+              inputs.wpaperd.overlays.default
+              inputs.nur.overlays.default
+              (import overlays/minlog.nix)
+              (import overlays/obsidian.nix)
+            ];
+          }
+        ] ++ xmonad-contrib.nixosModules;
+      };
+    };
+  };
+}