From 63a724f656c2ed20325ed09e6be3edac2670fac4 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Mon, 28 Dec 2020 18:05:28 +0300
Subject: [PATCH] updoots

---
 flake.lock                          | 12 ++++++------
 hosts/lungmen.nix                   |  4 ++--
 overlays/kak-lsp.nix                | 13 +++++++++++++
 overlays/kakoune-unwrapped.nix      | 11 +++++++++++
 profiles/develop/editor/kakoune.nix | 14 +++++++++-----
 profiles/network/dns/default.nix    |  6 +++++-
 users/patriot/home.nix              |  4 ++--
 7 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 overlays/kak-lsp.nix
 create mode 100644 overlays/kakoune-unwrapped.nix

diff --git a/flake.lock b/flake.lock
index 19131db..96b5dc8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1608681543,
-        "narHash": "sha256-6YNP8GBG0nhqLMQVkCBxRirTYaaGhI8gKCwgcJ5+sLc=",
+        "lastModified": 1609081855,
+        "narHash": "sha256-wxTOLR1BSMojbJ8N2pIsaf6+AD4WZNeCSP34OKiJfvE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3627ec4de58d7fbda13c82dfec94eace10198f23",
+        "rev": "5263fe459413a411e51355bfae5b5673b481dbe3",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1608700021,
-        "narHash": "sha256-timIYNV0uwrbjg5L3zloUbPeFpBXnEtosbUaWdqR72U=",
+        "lastModified": 1609120269,
+        "narHash": "sha256-gVPp8Pnxp9a2TE6FAU6fGR8IfLEFIft3r06OtJ/o3/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2ae527c50e049570dd25132f9325527aa2320e32",
+        "rev": "950c5e1879e57d9aedf64db53b4ec6f59f2ac17f",
         "type": "github"
       },
       "original": {
diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix
index a8f3598..c69e653 100644
--- a/hosts/lungmen.nix
+++ b/hosts/lungmen.nix
@@ -175,9 +175,9 @@ in
       listen_addresses = "*";
     };
     initialScript = pkgs.writeText "backend-initScript" ''
-      CREATE ROLE harmony WITH LOGIN PASSWORD 'harmony' CREATEDB;
+      CREATE ROLE patriot WITH LOGIN PASSWORD 'patriot' CREATEDB;
       CREATE DATABASE harmony;
-      GRANT ALL PRIVILEGES ON DATABASE harmony TO harmony;
+      GRANT ALL PRIVILEGES ON DATABASE harmony TO patriot;
     '';
   };
 
diff --git a/overlays/kak-lsp.nix b/overlays/kak-lsp.nix
new file mode 100644
index 0000000..78d3284
--- /dev/null
+++ b/overlays/kak-lsp.nix
@@ -0,0 +1,13 @@
+final: prev: {
+  kak-lsp = prev.kak-lsp.overrideAttrs (old: rec {
+    version = "0aaff957839ab24f5b33f9e58ebe0903073573b0";
+    src = prev.fetchFromGitHub rec {
+      owner = "kak-lsp";
+      repo = owner;
+      rev = version;
+      sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m";
+    };
+
+    cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c";
+  });
+}
diff --git a/overlays/kakoune-unwrapped.nix b/overlays/kakoune-unwrapped.nix
new file mode 100644
index 0000000..fd01d2f
--- /dev/null
+++ b/overlays/kakoune-unwrapped.nix
@@ -0,0 +1,11 @@
+final: prev: {
+  kakoune-unwrapped = prev.kakoune-unwrapped.overrideAttrs (old: rec {
+    version = "958a9431214dc4bece30aa30a8159e0bb8b5bbe7";
+    src = prev.fetchFromGitHub {
+      owner = "mawww";
+      repo = "kakoune";
+      rev = version;
+      sha256 = "sha256-KSFuM9WQxdUc7lFaDYGB9zZGOHuckto9SEd9cR7evKo=";
+    };
+  });
+}
diff --git a/profiles/develop/editor/kakoune.nix b/profiles/develop/editor/kakoune.nix
index b2e41db..8ec1a0d 100644
--- a/profiles/develop/editor/kakoune.nix
+++ b/profiles/develop/editor/kakoune.nix
@@ -1,10 +1,14 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [ kakoune ];
+{ pkgs, ... }:
+let
+  pkg = pkgs.kakoune-unwrapped;
+in
+{
+  environment.systemPackages = [ pkg ];
 
   environment.sessionVariables = {
-    EDITOR = "${pkgs.kakoune}/bin/kak";
-    VISUAL = "${pkgs.kakoune}/bin/kak";
+    EDITOR = "${pkg}/bin/kak";
+    VISUAL = "${pkg}/bin/kak";
   };
 
-  environment.shellAliases = { k = "${pkgs.kakoune}/bin/kak"; };
+  environment.shellAliases = { k = "${pkg}/bin/kak"; };
 }
diff --git a/profiles/network/dns/default.nix b/profiles/network/dns/default.nix
index 15fc2df..584d4b3 100644
--- a/profiles/network/dns/default.nix
+++ b/profiles/network/dns/default.nix
@@ -1 +1,5 @@
-{ imports = [ ./nextdns.nix ]; }
+{
+  imports = [ ./nextdns.nix ];
+
+  networking.resolvconf.useLocalResolver = true;
+}
diff --git a/users/patriot/home.nix b/users/patriot/home.nix
index cc0c3d8..1e1e671 100644
--- a/users/patriot/home.nix
+++ b/users/patriot/home.nix
@@ -16,8 +16,8 @@ let
 
   kideSrc = pkgs.fetchgit {
     url = "https://gitlab.com/yusdacra/kide.git";
-    rev = "40cb21c7e553fcc0fed99ed93dabbc1ffca0dbd0";
-    sha256 = "sha256-MLHyQWFs7/I12dzXGKJAIlyO3tw3y4otVeVjeXxrqY4=";
+    rev = "cfb159181291a3322cfbc5f12f0046330105b7a0";
+    sha256 = "sha256-O3afZnJCTL/cuefmhwLw9gBPIBNuLk3ifqF726J9faE=";
     fetchSubmodules = true;
   };
   kideFiles =