balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch to weechat-matrix

Browse Source
This commit is contained in:
Alexander Bantyev 2020-05-08 08:20:58 +03:00
parent 4ee3f8bf71
commit c92780a915
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
6 changed files with 8 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
flake.lock generated
View File

@ -111,44 +111,6 @@
"url": "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"
}
},
"mtxclient": {
"flake": false,
"info": {
"lastModified": 1587078014,
"narHash": "sha256-wmlXEd5IKZzkEonWzK7Kn7JNla0tPzf1piU6b2ztxW0="
},
"locked": {
"owner": "nheko-reborn",
"repo": "mtxclient",
"rev": "61ddbb23893b1079e1b3d4bcf4aeca7718b7faa5",
"type": "github"
},
"original": {
"owner": "nheko-reborn",
"ref": "v0.3.0",
"repo": "mtxclient",
"type": "github"
}
},
"nheko": {
"flake": false,
"info": {
"lastModified": 1587684386,
"narHash": "sha256-vilOyK5pz3sozbkrykr4u9AjaZanZpnc7Dodm9eKXYs="
},
"locked": {
"owner": "nheko-reborn",
"repo": "nheko",
"rev": "14ce840649f201281017aac957b61b1f2118f5a1",
"type": "github"
},
"original": {
"owner": "nheko-reborn",
"ref": "v0.7.1",
"repo": "nheko",
"type": "github"
}
},
"nix": {
"info": {
"lastModified": 1588697973,
@ -276,13 +238,13 @@
},
"nixpkgs_3": {
"info": {
"lastModified": 1588110642,
"narHash": "sha256-A5Sqy2PAJOYaTIjHOTo3ZFbUtd1r6uZf9ymcbSyMh9Q="
"lastModified": 1588848333,
"narHash": "sha256-+t4PW8kLBe1VOZL8SFUTu3P1rNPulhYFwxkxrV2yyYY="
},
"locked": {
"owner": "nixos",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0ebabf60a3febbd0ba4b401b13503e1fae24934",
"rev": "c83f7b89c96e1f81d1745b65d2134b1e278f8c99",
"type": "github"
},
"original": {
@ -314,8 +276,6 @@
"home-manager": "home-manager",
"materia-theme": "materia-theme",
"mobile-broadband-provider-info": "mobile-broadband-provider-info",
"mtxclient": "mtxclient",
"nheko": "nheko",
"nix": "nix",
"nixos-fhs-compat": "nixos-fhs-compat",
"nixpkgs": "nixpkgs_3",
@ -323,7 +283,6 @@
"nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"tweeny": "tweeny",
"weechat-notify-send": "weechat-notify-send",
"weechat-scripts": "weechat-scripts",
"yt-utilities": "yt-utilities"
@ -348,24 +307,6 @@
"url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver"
}
},
"tweeny": {
"flake": false,
"info": {
"lastModified": 1582937217,
"narHash": "sha256-9rSIa3t+WBzqtydStZf1pNozR8vq1dCcIlWo9E7xa2M="
},
"locked": {
"owner": "mobius3",
"repo": "tweeny",
"rev": "7c10995cb5f019cf8991941e1ae69e055b8eec3c",
"type": "github"
},
"original": {
"owner": "mobius3",
"repo": "tweeny",
"type": "github"
}
},
"weechat-notify-send": {
"flake": false,
"info": {

20
flake.nix
View File

@ -36,26 +36,6 @@
repo = "materia-theme";
flake = false;
};
mtxclient = {
type = "github";
owner = "nheko-reborn";
repo = "mtxclient";
ref = "v0.3.0";
flake = false;
};
tweeny = {
type = "github";
owner = "mobius3";
repo = "tweeny";
flake = false;
};
nheko = {
type = "github";
owner = "nheko-reborn";
repo = "nheko";
ref = "v0.7.1";
flake = false;
};
nixpkgs-old = {
type = "github";
owner = "nixos";

2
modules/applications/weechat.nix
View File

@ -2,7 +2,7 @@
let
weechat = pkgs.weechat.override {
configure = { availablePlugins, ... }: {
scripts = with pkgs.weechatScripts; [ wee-slack ];
scripts = with pkgs.weechatScripts; [ wee-slack weechat-matrix ];
};
};
in {

79
modules/packages.nix
View File

@ -23,95 +23,18 @@ in {
inherit (nur.balsoft.pkgs) termNote lambda-launcher nix-patch;
all-hies = import inputs.all-hies { };
yt-utilities =
import (self.fetchgit config.secrets.yt-utilities.source) { };
mtxclient = super.mtxclient.overrideAttrs (oa: rec {
name = "${pname}-${version}";
buildInputs = with self; [
boost170
nlohmann_json
openssl
zlib
libsodium
olm
];
pname = "mtxclient";
cmakeFlags = oa.cmakeFlags ++ [
"-DBoost_NO_BOOST_CMAKE=ON"
"-DBoost_LIBRARY_DIR_RELEASE=${pkgs.boost170}"
];
version = "0.3.0";
src = inputs.mtxclient;
});
tweeny = self.stdenv.mkDerivation {
name = "tweeny";
src = inputs.tweeny;
nativeBuildInputs = with self; [ cmake ];
};
nheko = super.nheko.overrideAttrs (oa: rec {
name = "${pname}-${version}";
buildInputs = with self; [
nlohmann_json
qt5.qtquickcontrols2
mtxclient
olm
boost170
lmdb
spdlog
cmark
tweeny
qt5.qtbase
qt5.qtmultimedia
qt5.qttools
qt5.qtgraphicaleffects
];
cmakeFlags = oa.cmakeFlags ++ [
"-DBUILD_SHARED_LIBS=ON"
"-DBoost_NO_BOOST_CMAKE=ON"
"-DBoost_LIBRARY_DIR_RELEASE=${pkgs.boost170}"
];
pname = "nheko";
version = "0.7.0";
src = inputs.nheko;
});
nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
mpd-mpris = super.mpd-mpris.overrideAttrs
(oa: { patches = [ ./mpd-mpris.patch ]; });
mobile-broadband-provider-info =
super.mobile-broadband-provider-info.overrideAttrs (oa: {
src = inputs.mobile-broadband-provider-info;
nativeBuildInputs = [ self.autoreconfHook ];
buildInputs = [ self.libxslt ];
});
inherit (old) mautrix-telegram;
pythonPackages = super.pythonPackages.override {
overrides = (self: super: {
pykka2 = super.pykka.overridePythonAttrs (oa: {
src = inputs.pykka;
version = "2.0.1";
name = "pykka-2.0.1";
});
backports_functools_lru_cache =
super.backports_functools_lru_cache.overrideAttrs
(oldAttrs: oldAttrs // { meta.priority = 1000; });
});
};
ebtables = old.ebtables;
} // (if config.device == "Prestigio-Laptop" then {
grub2 = super.pkgsi686Linux.grub2;
} else
{ }))
})
(self: super: builtins.mapAttrs (_: v: pkgs.callPackage v.override { }) {
inherit (import inputs.nixpkgs-mopidy {
localSystem.system = "x86_64-linux";

1
modules/services.nix
View File

@ -44,5 +44,4 @@
virtualisation.libvirtd = {
enable = config.deviceSpecific.isHost;
};
virtualisation.anbox.enable = true;
}

7
modules/workspace/locale.nix
View File

@ -1,9 +1,6 @@
{ pkgs, config, lib, ... }: {
i18n = {
defaultLocale = "en_GB.UTF-8";
consoleFont = "cyr-sun16";
consoleKeyMap = "ruwin_cplk-UTF-8";
};
console.font = "cyr-sun16";
console.keyMap = "ruwin_cplk-UTF-8";
time.timeZone = "Europe/Moscow"; # Mother Russia
home-manager.users.balsoft.home.language = let