From a13b707221c48bc254dd9ed335a9c5d4045b0f0d Mon Sep 17 00:00:00 2001
From: baduhai <baduhai@pm.me>
Date: Thu, 22 Dec 2022 19:09:42 -0300
Subject: [PATCH] Modified dotfiles

---
 flake.nix                          |  5 ++++-
 hosts/desktops/common/packages.nix |  2 +-
 users/desktops/common/home.nix     | 23 +++++------------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index b16aca4..fc80332 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,9 +19,11 @@
     nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs-stable"; };
     
     homepage = { url = "github:baduhai/homepage"; flake = false; };
+
+    dotfiles = { url = "github:baduhai/dotfiles"; flake = false; };
   };
 
-  outputs = inputs @ { self, nixpkgs, home-manager, nur, kmonad, nixpkgs-stable, home-manager-stable, deploy-rs, agenix, nixos-generators, homepage, ... }: {
+  outputs = inputs @ { self, nixpkgs, home-manager, nur, kmonad, nixpkgs-stable, home-manager-stable, deploy-rs, agenix, nixos-generators, homepage, dotfiles, ... }: {
     nixosConfigurations = {
       io = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -40,6 +42,7 @@
             nixpkgs.overlays = [
               nur.overlay
               agenix.overlay
+              deploy-rs.overlay
             ];
           }
         ];
diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 25606c8..1110c71 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -12,7 +12,6 @@
     bat
     bitwarden
     chatterino2
-    deploy-rs
     fd
     filelight
     firefox-wayland # Until firefox moves to using wayland by default
@@ -59,6 +58,7 @@
     })
     # Packages from 3rd party overlays
     agenix
+    deploy-rs
     nur.repos.baduhai.koi
     nur.repos.baduhai.emulationstation-de
   ];
diff --git a/users/desktops/common/home.nix b/users/desktops/common/home.nix
index eca482f..6b2faa5 100644
--- a/users/desktops/common/home.nix
+++ b/users/desktops/common/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ inputs, config, pkgs, lib, ... }:
 
 {
   home = {
@@ -14,23 +14,10 @@
     ];
     file = {
       # Dotfiles that can't be managed via home-manager
-      ".local/share/color-schemes/BreezeDarkNeutral.colors".source = pkgs.fetchurl {
-        url = "https://raw.githubusercontent.com/baduhai/dotfiles/master/color-schemes/BreezeDarkNeutral.colors";
-        sha256 = "Fw5knhpV47HlgYvbHFzfi6M6Tk2DTlAuFUYc2WDDBc8=";
-      };
-      ".config/MangoHud/MangoHud.conf".source = pkgs.fetchurl {
-        url = "https://raw.githubusercontent.com/baduhai/dotfiles/master/MangoHud/MangoHud.conf";
-        sha256 = "WCRsS6njtU4aR7tMiX8oWa2itJyy04Zp7wfwV20SLZs=";
-      };
-      ".config/kitty/search.py".source = pkgs.fetchurl {
-        url = "https://raw.githubusercontent.com/baduhai/dotfiles/master/kitty/search.py";
-        sha256 = "mi5GB8CmWafAdp3GYnsQM4VHpXhuaVYX7YDT+9426Jc=";
-      };
-      ".config/kitty/scroll_mark.py".source = pkgs.fetchurl {
-        url = "https://raw.githubusercontent.com/baduhai/dotfiles/master/kitty/scroll_mark.py";
-        sha256 = "Abif6LIOCiXyDdQMZ4pQnLK++It0VYIM+WE7Oydwkfo=";
-      };
-      ".config/electron-flags.conf".text = "--ozone-platform-hint=auto";
+      ".local/share/color-schemes/BreezeDarkNeutral.colors".source = "${inputs.dotfiles}/color-schemes/BreezeDarkNeutral.colors";
+      ".config/MangoHud/MangoHud.conf".source = "${inputs.dotfiles}/MangoHud/MangoHud.conf";
+      ".config/kitty/search.py".source = "${inputs.dotfiles}/kitty/search.py";
+      ".config/kitty/scroll_mark.py".source = "${inputs.dotfiles}/kitty/scroll_mark.py";
       # Autostart programs
       ".config/autostart/org.kde.yakuake.desktop".source = config.lib.file.mkOutOfStoreSymlink "/var/run/current-system/sw/share/applications/org.kde.yakuake.desktop";
       ".config/autostart/koi.desktop".source = config.lib.file.mkOutOfStoreSymlink "/var/run/current-system/sw/share/applications/koi.desktop";