From 0e561881338b900d7abec6f4258c336869013378 Mon Sep 17 00:00:00 2001
From: Greg Leyda <isnortpennies@protonmail.com>
Date: Sun, 10 Jul 2022 15:30:58 -0400
Subject: [PATCH] various tweaks

---
 configuration.nix      |  1 +
 flake.nix              | 20 ++++++++++----------
 home-manager.nix       |  2 ++
 home-manager/dunst.nix |  4 ++--
 packages.nix           |  3 ++-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 62d55d5..a75ed88 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,6 +9,7 @@
       ./packages.nix
       ./fonts.nix
       ./thunar.nix
+      ./nur.nix
     ];
   nix = {
     package = pkgs.nixFlakes;
diff --git a/flake.nix b/flake.nix
index ccfa685..cf05284 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,12 +1,13 @@
 {
   description = "testing";
   inputs = {
-    nixpkgs.url = "nixpkgs/master";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixkpkgs.follows = "nixpkgs";
+    nur.url = "github:nix-community/NUR";
   };
 
-  outputs = { nixpkgs, home-manager, ... }:
+  outputs = { nixpkgs, home-manager, nur, ... }:
   let
     system = "x86_64-linux";
     pkgs = import nixpkgs {
@@ -14,6 +15,7 @@
       config = {
         allowUnfree = true;
         packageOverrides = super: let self = super.pkgs; in {
+          #more overrides can go here
           nerdfonts-overpass = self.nerdfonts.override {
             fonts = [ "Overpass" ];
           };
@@ -24,20 +26,18 @@
   in {
     homeManagerConfiguration = {
       gerg = home-manager.lib.homeManagerConfiguration {
-        inherit system pkgs;
-        username = "gerg";
-        homeDirectory = "/home/gerg";
-        configuration = {
-          imports = [
-            ./home-manager.nix
-          ];
-        };
+        inherit pkgs;
+        modules = [
+          nur.nixosModules.nur
+          ./home-manager.nix
+        ];
       };
     };
     nixosConfigurations = {
       gerg-laptop = lib.nixosSystem { 
         inherit system pkgs;
         modules = [
+          nur.nixosModules.nur
           ./configuration.nix
         ];
       };
diff --git a/home-manager.nix b/home-manager.nix
index 5b5b6e4..5dce472 100755
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -14,6 +14,8 @@
   ];
   programs.home-manager.enable = true;
   home = {
+    username = "gerg";
+    homeDirectory = "/home/gerg";
     stateVersion = "22.11";
     file = {
       ".background-image".source = ./images/stars.jpg;
diff --git a/home-manager/dunst.nix b/home-manager/dunst.nix
index 2fae6c2..04c1c22 100755
--- a/home-manager/dunst.nix
+++ b/home-manager/dunst.nix
@@ -3,8 +3,8 @@
   services.dunst = {
     enable = true;
     iconTheme = {
-      name = "Papirus";
-      package = pkgs.papirus-icon-theme;
+      package = pkgs.flat-remix-icon-theme;
+      name = "Flat-Remix-Blue-Dark";
       size = "128X128";
     };
     settings = {
diff --git a/packages.nix b/packages.nix
index 50ed247..66d6dd9 100755
--- a/packages.nix
+++ b/packages.nix
@@ -21,6 +21,7 @@ environment.systemPackages = with pkgs; [
      dash
      #user/gui
      discord
+     spotify
      spotify-tray
      vlc
      bitwarden
@@ -45,5 +46,5 @@ environment.systemPackages = with pkgs; [
      gpick
      xclip
      alsa-utils
-   ];
+  ];
 }