Update modules/applications/emacs/default.nix modules/applications/packages.nix modules/matrix-synapse.nix modules/nginx.nix modules/packages.nix modules/workspace/mopidy.nix nix/sources.json
This commit is contained in:
parent
f9dcccd464
commit
37606a82ca
GPG Key ID:
E081FF12ADCB4AD5
@ -51,14 +51,14 @@
|
||||
|
||||
home.packages = [
|
||||
(pkgs.makeDesktopItem {
|
||||
terminal = "False";
|
||||
terminal = "false";
|
||||
type = "Application";
|
||||
name = "emacsclient";
|
||||
genericName = "Text editor";
|
||||
desktopName = "Emacs client";
|
||||
mimeType = "text/plain";
|
||||
exec = "emacsclient -s /tmp/emacs1000/server -c %F";
|
||||
categories = "Development;TextEditor;";
|
||||
categories = "Development;TextEditor;Utility;";
|
||||
icon = "emacs";
|
||||
})
|
||||
pkgs.clang
|
||||
|
||||
@ -20,15 +20,7 @@
|
||||
frei0r
|
||||
ffmpeg-full
|
||||
ghc
|
||||
(all-hies.selection {
|
||||
selector = p:
|
||||
let
|
||||
ghcVersion =
|
||||
builtins.concatStringsSep "" (builtins.splitVersion ghc.version);
|
||||
in { ${"ghc${ghcVersion}"} = p.${"ghc${ghcVersion}"}; };
|
||||
})
|
||||
haskellPackages.hoogle
|
||||
haskellPackages.hindent
|
||||
clang
|
||||
clang-tools
|
||||
lldb
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
(builtins.toJSON config.secrets.matrix.mautrix-whatsapp.registration))
|
||||
];
|
||||
};
|
||||
services.postgresql.enable = true;
|
||||
home-manager.users.balsoft.xsession.windowManager.i3.config.startup = [{
|
||||
command = "anbox launch --package=com.whatsapp --component=.HomeActivity";
|
||||
}];
|
||||
|
||||
@ -30,4 +30,8 @@
|
||||
} // default;
|
||||
};
|
||||
};
|
||||
security.acme = {
|
||||
email = "balsoft@balsoft.ru";
|
||||
acceptTerms = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,8 +16,6 @@ in { pkgs, config, lib, ... }: {
|
||||
|
||||
inherit (nur.balsoft.pkgs) termNote lambda-launcher nix-patch;
|
||||
|
||||
nixfmt = self.callPackage imports.nixfmt { };
|
||||
|
||||
inherit (import imports.niv { }) niv;
|
||||
|
||||
all-hies = import imports.all-hies { };
|
||||
@ -70,7 +68,8 @@ in { pkgs, config, lib, ... }: {
|
||||
src = imports.nheko;
|
||||
});
|
||||
|
||||
sway-unwrapped = (new.sway-unwrapped.override { wlroots = wlroots'; }).overrideAttrs
|
||||
sway-unwrapped =
|
||||
(new.sway-unwrapped.override { wlroots = wlroots'; }).overrideAttrs
|
||||
(oa: rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "sway";
|
||||
@ -101,33 +100,10 @@ in { pkgs, config, lib, ... }: {
|
||||
|
||||
nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
|
||||
|
||||
mopidy = super.mopidy.overridePythonAttrs (oa: {
|
||||
src = imports.mopidy;
|
||||
propagatedBuildInputs = with self.pythonPackages; [
|
||||
gst-python
|
||||
pygobject3
|
||||
pykka2
|
||||
tornado_4
|
||||
requests
|
||||
setuptools
|
||||
dbus-python
|
||||
protobuf
|
||||
];
|
||||
});
|
||||
mpd-mpris = super.mpd-mpris.overrideAttrs
|
||||
(oa: { patches = [ ./mpd-mpris.patch ]; });
|
||||
|
||||
mopidy-youtube = super.mopidy-youtube.overridePythonAttrs (oa: {
|
||||
propagatedBuildInputs = oa.propagatedBuildInputs
|
||||
++ (with self.pythonPackages; [ cachetools requests-cache ]);
|
||||
src = imports.mopidy-youtube;
|
||||
});
|
||||
mopidy-gmusic = super.mopidy-gmusic.overridePythonAttrs (oa: {
|
||||
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ self.pythonPackages.protobuf ];
|
||||
});
|
||||
mpd-mpris = super.mpd-mpris.overrideAttrs (oa: {
|
||||
patches = [ ./mpd-mpris.patch ];
|
||||
});
|
||||
|
||||
mautrix-telegram = old.mautrix-telegram;
|
||||
inherit (old) mautrix-telegram;
|
||||
|
||||
pythonPackages = super.pythonPackages.override {
|
||||
overrides = (self: super: {
|
||||
@ -142,7 +118,6 @@ in { pkgs, config, lib, ... }: {
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
ebtables = old.ebtables;
|
||||
} // (if config.device == "Prestigio-Laptop" then {
|
||||
grub2 = super.pkgsi686Linux.grub2;
|
||||
@ -161,18 +136,13 @@ in { pkgs, config, lib, ... }: {
|
||||
"nixpkgs=/etc/nixpkgs"
|
||||
"nixos-config=/etc/nixos/configuration.nix"
|
||||
];
|
||||
binaryCaches = [
|
||||
"https://cache.nixos.org"
|
||||
"https://cache.balsoft.ru"
|
||||
];
|
||||
binaryCaches = [ "https://cache.nixos.org" "https://cache.balsoft.ru" ];
|
||||
|
||||
trustedUsers = [ "root" "balsoft" "@wheel" ];
|
||||
|
||||
optimise.automatic = true;
|
||||
|
||||
binaryCachePublicKeys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"all-hies.cachix.org-1:JjrzAOEUsD9ZMt8fdFbzo3jNAyEWlPAwdVuHw4RD43k="
|
||||
];
|
||||
binaryCachePublicKeys =
|
||||
[ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
{
|
||||
services.mopidy = {
|
||||
enable = true;
|
||||
extensionPackages = with pkgs; [ mopidy-gmusic mopidy-youtube ];
|
||||
extensionPackages = with pkgs; [ mopidy-youtube ];
|
||||
configuration = (if (!isNull config.secrets.gpmusic) then ''
|
||||
[gmusic]
|
||||
username = ${config.secrets.gpmusic.user}
|
||||
|
||||
@ -53,10 +53,10 @@
|
||||
"homepage": "",
|
||||
"owner": "rycee",
|
||||
"repo": "home-manager",
|
||||
"rev": "4e50809c78c1d3241c063987292960e7173f8573",
|
||||
"sha256": "1y1mwm11zlwqdrqcb9x4blj079vwcq9xw80b5v9mp9myiv714z0c",
|
||||
"rev": "5baa0c300f2c524e2a3f154cf4ee2688ef734f41",
|
||||
"sha256": "1jsk4q0z4d0wr5hcxkk2z73yyi1dq604whhdpag5nm4sqwm7484p",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/rycee/home-manager/archive/4e50809c78c1d3241c063987292960e7173f8573.tar.gz",
|
||||
"url": "https://github.com/rycee/home-manager/archive/5baa0c300f2c524e2a3f154cf4ee2688ef734f41.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"materia-theme": {
|
||||
@ -162,10 +162,10 @@
|
||||
"homepage": "https://github.com/nixos/nixpkgs",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs-channels",
|
||||
"rev": "8130f3c1c2bb0e533b5e150c39911d6e61dcecc2",
|
||||
"sha256": "154nrhmm3dk5kmga2w5f7a2l6j79dvizrg4wzbrcwlbvdvapdgkb",
|
||||
"rev": "22a3bf9fb9edad917fb6cd1066d58b5e426ee975",
|
||||
"sha256": "089hqg2r2ar5piw9q5z3iv0qbmfjc4rl5wkx9z16aqnlras72zsa",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nixos/nixpkgs-channels/archive/8130f3c1c2bb0e533b5e150c39911d6e61dcecc2.tar.gz",
|
||||
"url": "https://github.com/nixos/nixpkgs-channels/archive/22a3bf9fb9edad917fb6cd1066d58b5e426ee975.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-old": {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user