From daf5f1be087ad20aec520040a8b3df8aab14feab Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 29 Mar 2024 23:40:24 +0000
Subject: [PATCH] fixes for nixos stable

---
 backports/default.nix           | 11 +++++++----
 hosts/nullbox/configuration.nix |  1 -
 hosts/slab/configuration.nix    |  1 -
 system/programs/unbound.nix     |  2 +-
 system/sessions/hyprland.nix    |  9 ++++++++-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/backports/default.nix b/backports/default.nix
index 7b1f8cf..f6e8ffa 100644
--- a/backports/default.nix
+++ b/backports/default.nix
@@ -2,9 +2,7 @@ nixfiles: final: prev:
 let
   inherit (prev) callPackage fetchFromGitHub;
   inherit (prev.lib) recurseIntoAttrs optionalAttrs;
-
-  xz-hold = nixfiles.inputs.nixpkgs-unstable.legacyPackages.${prev.system}.xz.version == "5.6.1";
-  xz-fixed = (nixfiles.inputs.nixpkgs-staging-next.legacyPackages.${prev.system}.xz);
+  isNewer = ref: ver: (builtins.compareVersions ver ref) == 1;
 
   # if you can't do version based just make it time based and deal with it in a
   # month if it's not fixed
@@ -19,4 +17,9 @@ let
     };
   in recurseIntoAttrs (callPackage "${src}/pkgs/applications/graphics/gimp/plugins" {});
 in (optionalAttrs gap-hold { gimpPlugins = gimpPlugins-gap; }) //
-  (optionalAttrs xz-hold { xz=xz-fixed; })
+  # can't optionalAttrs for version checks because it breaks lazy eval and causes infinite recursion
+  {
+    obsidian = let
+      pkg = final.callPackage "${nixfiles.inputs.nixpkgs-unstable}/pkgs/applications/misc/obsidian" { electron = final.electron_28; };
+    in if isNewer "1.4.16" prev.obsidian.version then prev.obsidian else pkg;
+  }
diff --git a/hosts/nullbox/configuration.nix b/hosts/nullbox/configuration.nix
index fde0533..1175355 100644
--- a/hosts/nullbox/configuration.nix
+++ b/hosts/nullbox/configuration.nix
@@ -59,7 +59,6 @@
       common.remoteAccess.enable = true;
       sessions.plasma.enable = lib.mkDefault false;
       sessions.hyprland.enable = lib.mkDefault true;
-      sessions.hyprland.useFlake = true;
       hardware.nvidia.modesetting.enable = true;
       packageSets.gaming.enable = true;
     };
diff --git a/hosts/slab/configuration.nix b/hosts/slab/configuration.nix
index e182258..551b8fb 100644
--- a/hosts/slab/configuration.nix
+++ b/hosts/slab/configuration.nix
@@ -54,7 +54,6 @@
       fun.enable = true;
     };
     sessions.hyprland.enable = lib.mkDefault true;
-    sessions.hyprland.useFlake = true;
     sessions.plasma.enable = lib.mkDefault false;
     programs = {
       adb.enable = true;
diff --git a/system/programs/unbound.nix b/system/programs/unbound.nix
index 541aec4..940295e 100644
--- a/system/programs/unbound.nix
+++ b/system/programs/unbound.nix
@@ -8,7 +8,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    networking.networkmanager.dns = "none";
+    networking.networkmanager.dns = lib.mkDefault "none";
     services.unbound = {
       enable = true;
       settings = {
diff --git a/system/sessions/hyprland.nix b/system/sessions/hyprland.nix
index a0dcf2a..41613ec 100644
--- a/system/sessions/hyprland.nix
+++ b/system/sessions/hyprland.nix
@@ -12,7 +12,14 @@ in
 
   options.nixfiles.sessions.hyprland = {
     enable = lib.mkEnableOption "hyprland configuration";
-    useFlake = lib.mkEnableOption "hyprland flake package";
+    useFlake = lib.mkOption {
+      description = "Whether to use the Hyprland flake package";
+      type = lib.types.bool;
+      # enable if not on nixpkgs stable
+      defaultText = "config.nixfiles.nixpkgs != inputs.nixpkgs";
+      default = config.nixfiles.nixpkgs != inputs.nixpkgs;
+      example = true;
+    };
   };
 
   config = lib.mkIf cfg.enable {