From 34930f16280229e256e638b9e7f394201f272a03 Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Mon, 20 Apr 2020 16:44:24 +0300
Subject: [PATCH] feat: rofi

---
 modules/applications/default.nix        |  2 ++
 modules/applications/rofi.nix           | 12 ++++++++++
 modules/applications/xmonad/default.nix | 17 +++++++-------
 modules/applications/xmonad/xmonad.hs   | 15 +++++++------
 modules/overlay.nix                     |  1 +
 nix/sources.json                        | 30 ++++++++++++-------------
 6 files changed, 46 insertions(+), 31 deletions(-)
 create mode 100644 modules/applications/rofi.nix

diff --git a/modules/applications/default.nix b/modules/applications/default.nix
index 4229468..439b661 100644
--- a/modules/applications/default.nix
+++ b/modules/applications/default.nix
@@ -9,5 +9,7 @@
     ./locale.nix
     ./memes.nix
     ./alacritty.nix
+    ./rofi.nix
   ];
 }
+
diff --git a/modules/applications/rofi.nix b/modules/applications/rofi.nix
new file mode 100644
index 0000000..e4daf41
--- /dev/null
+++ b/modules/applications/rofi.nix
@@ -0,0 +1,12 @@
+{ ... }: {
+  home-manager.users.adrielus.programs.rofi = {
+    enable = true;
+    font = "Source Code Pro 16";
+    location = "center";
+    padding = 10;
+    lines = 7;
+    fullscreen = false;
+    cycle = true;
+    theme = "solarized_alternate";
+  };
+}
diff --git a/modules/applications/xmonad/default.nix b/modules/applications/xmonad/default.nix
index ad448d5..13eb445 100644
--- a/modules/applications/xmonad/default.nix
+++ b/modules/applications/xmonad/default.nix
@@ -6,16 +6,15 @@
       config = ./xmonad.hs;
     };
 
-    programs.rofi = {
-      enable = true;
-      font = "Source Code Pro 16";
-      location = "center";
-      padding = 10;
-      lines = 7;
-      fullscreen = false;
-    };
-
     home.file.".config/plasma-workspace/env/set_window_manager.sh".text =
       "export KDEWM=/home/adrielus/.nix-profile/bin/xmonad";
   };
+
+  # services.compton = {
+  # enable = true;
+  # activeOpacity = "0.8";
+  # inactiveOpacity = "0.8";
+  # fade = true;
+  # shadow = true;
+  # };
 }
diff --git a/modules/applications/xmonad/xmonad.hs b/modules/applications/xmonad/xmonad.hs
index 47a36f5..529a259 100644
--- a/modules/applications/xmonad/xmonad.hs
+++ b/modules/applications/xmonad/xmonad.hs
@@ -10,12 +10,13 @@ import           XMonad.Hooks.ManageDocks
 
 main =
   xmonad
-    $ docks
-    $ kdeConfig { modMask    = mod4Mask
-                , layoutHook = myLayoutHook
-                , manageHook = myManagerHook <+> manageHook kdeConfig
-                , terminal   = myTerminal
-                }
+    $                docks
+    $                kdeConfig
+                       { modMask    = mod4Mask
+                       , layoutHook = myLayoutHook
+                       , manageHook = manageDocks <+> myManagerHook <+> manageHook kdeConfig
+                       , terminal   = myTerminal
+                       }
     `additionalKeys` keymap
  where
   kdeFloats =
@@ -37,7 +38,7 @@ main =
     composeAll [ className =? name --> doFloat | name <- kdeFloats ]
 
   myTerminal    = "alacritty"
-  keymap        = [((mod4Mask, xK_P), spawn "rofi -show run")]
+  keymap        = [((mod4Mask, xK_p), spawn "rofi -show run")]
 
   uniformBorder = join $ join $ join Border
   border        = uniformBorder 4
diff --git a/modules/overlay.nix b/modules/overlay.nix
index cfab1bf..a5a8fff 100644
--- a/modules/overlay.nix
+++ b/modules/overlay.nix
@@ -20,6 +20,7 @@ in {
         # unstable stuff
         brave = unstable.brave;
         ghc = unstable.ghc;
+        vscodium = unstable.vscodium;
       })
   ];
 
diff --git a/nix/sources.json b/nix/sources.json
index 46accb4..a14be6d 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d28e8f7d40e2683d57589f8ffa7568bdf89d316f",
-        "sha256": "0pfafab0bfs4zcld41awamwz6wn3snw1p9h2aid6pgxkbrm9r5sx",
+        "rev": "7f6ed1ca162507f20b4d98472f17492df2cd91c3",
+        "sha256": "1prbprnmhaib69ppirimwiwbz5zkqllqf9v0prrnb2yq403df0y2",
         "type": "tarball",
-        "url": "https://github.com/nix-community/NUR/archive/d28e8f7d40e2683d57589f8ffa7568bdf89d316f.tar.gz",
+        "url": "https://github.com/nix-community/NUR/archive/7f6ed1ca162507f20b4d98472f17492df2cd91c3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "agnoster": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "xzfc",
         "repo": "cached-nix-shell",
-        "rev": "94e4eb97aa84e1e9c4ecb5ebe2b08b9da22df2a2",
-        "sha256": "0pzwknpc4qrh9pv5z0xvldql2dkj9ddksvaci86a4f8cnd86p2l6",
+        "rev": "0e73944dc31132d2aa9a769f4cc677eea6984bec",
+        "sha256": "1hzrjvxk9rpqdxw0v27ngn5k3andm1xfkak4ly75x6gxwgb5mdw5",
         "type": "tarball",
-        "url": "https://github.com/xzfc/cached-nix-shell/archive/94e4eb97aa84e1e9c4ecb5ebe2b08b9da22df2a2.tar.gz",
+        "url": "https://github.com/xzfc/cached-nix-shell/archive/0e73944dc31132d2aa9a769f4cc677eea6984bec.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "easy-purescript-nix": {
@@ -65,10 +65,10 @@
         "homepage": "https://rycee.gitlab.io/home-manager/",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "0d1ca254d0f213a118459c5be8ae465018132f74",
-        "sha256": "0sw8lw825gg04h6js42bvackgydi5m0xsjvnb5gxlqv45qw8rxjq",
+        "rev": "b78b5fa4a073dfcdabdf0deb9a8cfd56050113be",
+        "sha256": "03w8fy9shw42kv1pcqq0vkmm54nw3gdpjqd2yncgn0926sacgdnp",
         "type": "tarball",
-        "url": "https://github.com/rycee/home-manager/archive/0d1ca254d0f213a118459c5be8ae465018132f74.tar.gz",
+        "url": "https://github.com/rycee/home-manager/archive/b78b5fa4a073dfcdabdf0deb9a8cfd56050113be.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -89,10 +89,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs-channels",
-        "rev": "e10c65cdb35b6a66491e47e5a85f5d456b4f4eea",
-        "sha256": "19csb2s3wyav83zcw9dw488zk2fnz6wcxxz8q6hy43dbph86hxwm",
+        "rev": "b67bc34d4e3de1e89b8bb7cd6e375ba44f1ae8ca",
+        "sha256": "1q9a64bl5afflgpa2iaw1q7z7s08c8xq9w6lndlnc5c3siajrp8v",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/e10c65cdb35b6a66491e47e5a85f5d456b4f4eea.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/b67bc34d4e3de1e89b8bb7cd6e375ba44f1ae8ca.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {
@@ -101,10 +101,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "nixos",
         "repo": "nixpkgs-channels",
-        "rev": "9b0d2f3fd153167b0c8ce84bb71e766a39ed4c9d",
-        "sha256": "0yyr83zdaa04v8dsla28pk0nqnihxzkgfr8j0m3prgj2w4gd9ajz",
+        "rev": "b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb",
+        "sha256": "0cggpdks4qscyirqwfprgdl91mlhjlw24wkg0riapk5f2g2llbpq",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs-channels/archive/9b0d2f3fd153167b0c8ce84bb71e766a39ed4c9d.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs-channels/archive/b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "snack": {