From 3664746d6b8a4775065cdc1ae447691ec49a44eb Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Tue, 22 Mar 2022 16:37:19 +0100
Subject: [PATCH] Pull dotfiles directly from github

---
 flake.lock        | 36 ++++++++++++++++++++++++++++--------
 flake.nix         | 13 ++++++++++++-
 programs/rofi.nix |  4 ++--
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2f019e4..9aabea2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "dotfiles": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1646666700,
+        "narHash": "sha256-RYIWLAgxtVEwtHAETeQDzF84Sk2mWtyzLlli0MvWNG4=",
+        "owner": "h7x4abk3g",
+        "repo": "dotfiles",
+        "rev": "678c83b1908fe37f8a3a9f2c8a3a91adb7a6c5aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "h7x4abk3g",
+        "repo": "dotfiles",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1643933536,
-        "narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
+        "lastModified": 1647175256,
+        "narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2860d7e3bb350f18f7477858f3513f9798896831",
+        "rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
         "type": "github"
       },
       "original": {
@@ -23,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1646406548,
-        "narHash": "sha256-xp+3f76ycZXNf9pG65Ef9KfDl1fas2UQu/cBe/pLd+c=",
+        "lastModified": 1647820583,
+        "narHash": "sha256-2awN2f/dXpVvms6zo2e4TBaZDtQNucMrruqNPIvb518=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "47cd6702934434dd02bc53a67dbce3e5493e33a2",
+        "rev": "01e87b327aa89d9d60fba192085bccddaa2d1b24",
         "type": "github"
       },
       "original": {
@@ -38,6 +54,7 @@
     },
     "root": {
       "inputs": {
+        "dotfiles": "dotfiles",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "secrets": "secrets"
@@ -50,8 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1646662541,
-        "narHash": "sha256-v37mxxTONQqQY9NKMx5ngFCGaT0BfAaO2nT1KNXB1jM=",
+        "lastModified": 1647943275,
+        "narHash": "sha256-uSrGOtugLzyoyOtE1Bzv0HdlO1OJIl+rzoAZbxKP43c=",
+        "ref": "main",
+        "rev": "c76aa71028beca7f8c44adc6e6881b88843b4bb9",
+        "revCount": 20,
         "type": "git",
         "url": "file:///home/h7x4/git/nix-secrets"
       },
diff --git a/flake.nix b/flake.nix
index 548d6d1..ffb68cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,11 @@
       url = "github:nix-community/home-manager/release-21.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    
+    dotfiles = {
+      url = "github:h7x4abk3g/dotfiles";
+      flake = false;
+    };
 
     # Nix expressions and keys (TODO: move keys to another solution like agenix)
     # which should be kept from the main repo for privacy reasons.
@@ -20,7 +25,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, secrets, ... }: let
+  outputs = { self, nixpkgs, home-manager, secrets, dotfiles, ... }: let
     system = "x86_64-linux";
 
     pkgs = import nixpkgs {
@@ -37,6 +42,11 @@
     specialArgs = {
       secrets = secrets.outputs.default;
       colorTheme = import ./common/colors.nix;
+      inputs = {
+        home-manager = home-manager;
+        secrets = secrets;
+        dotfiles = dotfiles;
+      };
     };
 
   in {
@@ -82,6 +92,7 @@
     in {
       Tsuki = nixSys "tsuki" {};
       Eisei = nixSys "eisei" {};
+      kasei = nixSys "kasei" {};
     };
 
   };
diff --git a/programs/rofi.nix b/programs/rofi.nix
index 18301b0..ab1ead9 100644
--- a/programs/rofi.nix
+++ b/programs/rofi.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}:
+{pkgs, inputs, ...}:
 {
   programs.rofi = {
     enable = true;
@@ -14,7 +14,7 @@
     # ];
 
     font = "Droid Sans 12";
-    theme = ../../general/.config/rofi/themes/blank.rasi;
+    theme = "${inputs.dotfiles}/general/.config/rofi/themes/blank.rasi";
 
     extraConfig = {
       modi = "window,run,drun,ssh,windowcd";