From 5f4cfd4676f5aaff50c99c811b2778fa5c7224bd Mon Sep 17 00:00:00 2001
From: Abhinav Sarkar <abhinav@abhinavsarkar.net>
Date: Mon, 1 Apr 2024 23:33:42 +0530
Subject: [PATCH] Fixes NIX_PATH

---
 home.nix                            |  1 -
 nix.nix                             |  2 +-
 packages/nixos-nixpkgs-198739.patch | 43 -----------------------------
 programs/fish.nix                   |  4 ++-
 system.nix                          |  1 +
 5 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 packages/nixos-nixpkgs-198739.patch

diff --git a/home.nix b/home.nix
index e470b29..934e033 100644
--- a/home.nix
+++ b/home.nix
@@ -24,7 +24,6 @@ in {
 
     sessionVariables = {
       EDITOR = "micro";
-      NIX_PATH = "/nix/var/nix/profiles/per-user/${username}/channels";
     };
 
     file."Applications/Home Manager Apps".source = let
diff --git a/nix.nix b/nix.nix
index 6c35d12..cb185ec 100644
--- a/nix.nix
+++ b/nix.nix
@@ -3,7 +3,7 @@
   nix = {
     package = pkgs.nixFlakes;
     registry.nixpkgs.flake = inputs.nixpkgs;
-    nixPath = [{ nixpkgs = inputs.nixpkgs.outPath; }];
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     extraOptions = ''
       keep-outputs = true
       keep-derivations = true
diff --git a/packages/nixos-nixpkgs-198739.patch b/packages/nixos-nixpkgs-198739.patch
deleted file mode 100644
index b149d74..0000000
--- a/packages/nixos-nixpkgs-198739.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 81bc5f7e4f9d0386d2be6773336b43c54098854e Mon Sep 17 00:00:00 2001
-From: loli <loli@headpats.uk>
-Date: Mon, 31 Oct 2022 01:51:36 +0100
-Subject: [PATCH] cloudflare-dyndns: use toPythonApplication fixes #198736
-
----
- pkgs/applications/networking/cloudflare-dyndns/default.nix | 4 ++--
- pkgs/top-level/all-packages.nix                            | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/applications/networking/cloudflare-dyndns/default.nix
-index 9b5abcbcbf397..b0cbab4adeeff 100644
---- a/pkgs/applications/networking/cloudflare-dyndns/default.nix
-+++ b/pkgs/applications/networking/cloudflare-dyndns/default.nix
-@@ -1,5 +1,5 @@
- { lib
--, buildPythonApplication
-+, buildPythonPackage
- , attrs
- , click
- , cloudflare
-@@ -11,7 +11,7 @@
- , requests
- }:
- 
--buildPythonApplication rec {
-+buildPythonPackage rec {
-   pname = "cloudflare-dyndns";
-   version = "4.1";
-   format = "pyproject";
-diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
-index dc860b31194c6..0d60542528aa8 100644
---- a/pkgs/top-level/all-packages.nix
-+++ b/pkgs/top-level/all-packages.nix
-@@ -3429,7 +3429,7 @@ with pkgs;
- 
-   cloudflared = callPackage ../applications/networking/cloudflared { };
- 
--  cloudflare-dyndns = python3Packages.cloudflare-dyndns;
-+  cloudflare-dyndns = with python3Packages; toPythonApplication cloudflare-dyndns;
- 
-   cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
- 
diff --git a/programs/fish.nix b/programs/fish.nix
index 4b710ce..a197cf8 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -24,7 +24,6 @@ in {
 
     interactiveShellInit = ''
       fzf_configure_bindings --git_status=\cs --history=\cr --variables=\cv --directory=\cf --git_log=\cg
-      neofetch
 
       if test -d (brew --prefix)"/share/fish/completions"
         set -p fish_complete_path (brew --prefix)/share/fish/completions
@@ -33,11 +32,14 @@ in {
       if test -d (brew --prefix)"/share/fish/vendor_completions.d"
         set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
       end
+
+      neofetch
     '';
 
     shellInit = ''
       # nix
       fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+      fenv source /run/current-system/etc/bashrc
       fenv source /etc/profiles/per-user/${username}/etc/profile.d/hm-session-vars.sh
       fish_add_path -m ~/.local/bin ~/.cabal/bin /etc/profiles/per-user/${username}/bin
       eval "$(${osConfig.homebrew.brewPrefix}/brew shellenv)"
diff --git a/system.nix b/system.nix
index ec31e95..2faef74 100644
--- a/system.nix
+++ b/system.nix
@@ -1,6 +1,7 @@
 { pkgs, inputs, ... }: {
   security.pam.enableSudoTouchIdAuth = true;
   system = {
+    checks.verifyNixChannels = true;
     defaults = {
       dock = {
         appswitcher-all-displays = false;