From efa33e2b308f7de627fd74fb4cf85476b15f730a Mon Sep 17 00:00:00 2001
From: ark-lamp-umbrella <ark-lamp-umbrella@noreply.codeberg.org>
Date: Mon, 22 Apr 2024 00:14:46 -0700
Subject: [PATCH] flakes working

---
 configuration.nix   |  2 +-
 fish/shellinit.fish |  2 +-
 flake.lock          | 19 ++++++++++++++++++-
 flake.nix           |  9 +++++++--
 home.nix            |  4 ++--
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 3b52449..85bc495 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -143,7 +143,7 @@
   programs.fish = {
     enable = true;
     # Enable starship prompt
-    interactiveShellInit = builtins.readFile("/etc/nixos/fish/shellinit.fish");
+    interactiveShellInit = builtins.readFile ./fish/shellinit.fish;
   };
   programs.steam = {
     enable = true;
diff --git a/fish/shellinit.fish b/fish/shellinit.fish
index 24f4b0f..a57d0a1 100644
--- a/fish/shellinit.fish
+++ b/fish/shellinit.fish
@@ -1,4 +1,4 @@
 set fish_greeting
 keychain --eval /home/ark/.ssh/id_ed25519 | source && clear
-source (/home/ark/.nix-profile/bin/starship init fish --print-full-init | psub)
+source (/etc/profiles/per-user/ark/bin/starship init fish --print-full-init | psub)
 alias ls=lsd
diff --git a/flake.lock b/flake.lock
index f5d56d3..33c36af 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,10 +37,27 @@
         "type": "github"
       }
     },
+    "nur": {
+      "locked": {
+        "lastModified": 1713763264,
+        "narHash": "sha256-mUK2TyUpS/yTtN3ml2rt2eAYaa+nplrFRbWdgugOn0o=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "707903b469fe2c1423f58a21e864fe7388bdf86d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nur": "nur"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 50b6bf0..de205af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,14 +10,19 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nur = {
+      url = "github:nix-community/NUR/master";
+    };
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, ... }: {
+  outputs = inputs@{ nixpkgs, home-manager, nur, ... }: { 
     nixosConfigurations = {
       ark-desktop-nixos = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           ./configuration.nix
+          { nixpkgs.overlays = [ nur.overlay ]; }
+
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
@@ -28,4 +33,4 @@
       };
     };
   };
-}
+} 
diff --git a/home.nix b/home.nix
index ffb925c..a8e7175 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   home.username = "ark";
@@ -131,7 +131,7 @@
             ];
           }
         ];
-        userChrome = builtins.readFile ./userChrome.css;
+        userChrome = builtins.readFile ./firefox/userChrome.css;
       };
     };
     alacritty = {