This commit is contained in:
dusk 2020-12-28 18:05:28 +03:00
parent ed926635df
commit 63a724f656
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
7 changed files with 48 additions and 16 deletions

View File

@ -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": {

View File

@ -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;
'';
};

13
overlays/kak-lsp.nix Normal file
View File

@ -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";
});
}

View File

@ -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=";
};
});
}

View File

@ -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"; };
}

View File

@ -1 +1,5 @@
{ imports = [ ./nextdns.nix ]; }
{
imports = [ ./nextdns.nix ];
networking.resolvconf.useLocalResolver = true;
}

View File

@ -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 =