use NUR as flake input

closes #12

flake.nix

@@ -19,25 +19,24 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, homeage, agenix, ... }: {
+  outputs = { nixpkgs, home-manager, homeage, agenix, nur, ... }: {
-    nixosConfigurations = {
+    nixosConfigurations.pim = nixpkgs.lib.nixosSystem {
-      pim = nixpkgs.lib.nixosSystem {
+      system =  "x86_64-linux";
-        system =  "x86_64-linux";
+      modules = [
-        modules = [
+        ./configuration.nix
-          ./configuration.nix
+        agenix.nixosModules.default
-          agenix.nixosModules.default
+        home-manager.nixosModules.home-manager {
-          home-manager.nixosModules.home-manager {
+          home-manager.extraSpecialArgs = { inherit nur; };
-            home-manager.useGlobalPkgs = true;
+          home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
+          home-manager.useUserPackages = true;
-            home-manager.users.pim = {
+          home-manager.users.pim = {
-              imports = [
+            imports = [
-                ./home
+              ./home
-                homeage.homeManagerModules.homeage
+              homeage.homeManagerModules.homeage
-              ];
+            ];
-            };
+          };
-          }
+        }
-        ];
+      ];
-      };
     };
   };
 }

home/default.nix

@@ -1,10 +1,13 @@
-{ pkgs, config, ... }:
+{ pkgs, nur, ... }:
 
+let
+  nur-no-pkgs = import (nur) { inherit pkgs; nurpkgs = pkgs; };
+in
 {
   imports = [
     ./bash
     ./neovim
-    ./firefox
+    (import ./firefox nur-no-pkgs) # TODO: bit of a hack, but better than before
     ./ssh
     ./syncthing
     ./alacritty

home/firefox/addons.nix

@@ -1,4 +1,4 @@
-{nurpkgs, lib, ...}@args:
+{ nurpkgs, lib, ... }@args:
 let
   rycee-addons = nurpkgs.repos.rycee.firefox-addons;
   custom-addons = import ./custom-addons.nix args;

home/firefox/default.nix

@@ -1,8 +1,8 @@
-{pkgs, lib, ...}@args:
+nurpkgs:
+{ pkgs, lib, ... }@args:
 
 let
-  nurpkgs = import (builtins.fetchTarball {url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; sha256 = "1gb3wkmyl6xbs4kval2ml48nlil39853dj62rxfrlk9i2nky2ly4"; }) { inherit pkgs; };
+  firefoxAddons = import ./addons.nix (args // { inherit nurpkgs; });
-  firefoxAddons = import ./addons.nix  (args // {inherit nurpkgs; });
   firefoxSettings = {
     "browser.aboutConfig.showWarning" = false;
     "browser.toolbars.bookmarks.visibility" = "always";

switch.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-sudo nixos-rebuild switch --flake ./#pim --impure
+sudo nixos-rebuild switch --flake ./#pim