rebase: set flake again since it was deleted during rebase due to merge conflicts

rebase: so much to learn
2024-11-08 00:59:19 +01:00 · 2024-11-08 00:57:03 +01:00
1 changed files with 8 additions and 0 deletions
--- a/modules/nixos/desktop/addons/hyprpaper/default.nix
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@ -1,7 +1,15 @@
 {
  config,
+<<<<<<< HEAD
  lib,
  namespace,
+=======
+  inputs,
+  lib,
+  namespace,
+  pkgs,
+  system,
+>>>>>>> 8f3c53de (hyprland: setup hyprpanel, fix nvidia issues, accomodate new shadow config)
  ...
 }:
 let
Author	SHA1	Message	Date
Christoph Hollizeck	9fe3608d15	rebase: set flake again since it was deleted during rebase due to merge conflicts	2024-11-08 00:59:19 +01:00
Christoph Hollizeck	9bd51f9318	rebase: so much to learn	2024-11-08 00:57:03 +01:00