misc forgot to commit

2024-10-28 12:01:00 +01:00 · 2024-10-28 12:01:00 +01:00 · 0fbdb4aad3
parent 8ed486c268
commit 0fbdb4aad3
3 changed files with 5 additions and 1362 deletions
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@ -7,7 +7,11 @@
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

    nixpkgs-master.url = "github:nixos/nixpkgs/master";
+<<<<<<< HEAD
    nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a";
+=======
+    nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/19493dc0ad16ffd5414ac9b4e12179d0e1b98468";
+>>>>>>> d1ad881e (misc forgot to commit)

    home-manager = {
      url = "github:nix-community/home-manager/master";
--- a/modules/nixos/desktop/addons/hyprpaper/default.nix
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@ -44,5 +44,6 @@ in
        };
      };
    };
+
  };
 }