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

Update nix

Browse Source
This commit is contained in:
Alexander Bantyev 2020-04-28 20:48:57 +03:00
parent 26b0a3cb0f
commit ee5583bdf1
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
5 changed files with 99 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
flake.lock generated
View File

@ -95,6 +95,24 @@
"type": "github"
}
},
"mobile-broadband-provider-info": {
"flake": false,
"info": {
"lastModified": 1586238386,
"narHash": "sha256-a2mHxmTkQr9bwuzfS7h8NWPDnAutmorm1IaOb2Ytvag=",
"revCount": 595
},
"locked": {
"ref": "master",
"rev": "43755b833aa4f0c79f2d6f04c1a2231ba106ea85",
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"
},
"original": {
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"
}
},
"mtxclient": {
"flake": false,
"info": {
@ -133,6 +151,25 @@
"type": "github"
}
},
"nix": {
"info": {
"lastModified": 1588020791,
"narHash": "sha256-I+GqqEKT1WTD+nAp1qU/9+cT40YwkvF4CJikMtzri8c="
},
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"owner": "NixOS",
"repo": "nix",
"rev": "6521c92ce8289a5f9e959c6789ab24dacdad082e",
"type": "github"
},
"original": {
"id": "nix",
"type": "indirect"
}
},
"nixpkgs": {
"info": {
"narHash": "sha256-OnpEWzNxF/AU4KlqBXM2s5PWvfI5/BS6xQrPvkF5tO8="
@ -202,6 +239,23 @@
}
},
"nixpkgs_3": {
"info": {
"lastModified": 1585405475,
"narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE="
},
"locked": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b88ff468e9850410070d4e0ccd68c7011f15b2be",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-20.03-small",
"type": "indirect"
}
},
"nixpkgs_4": {
"info": {
"lastModified": 1587452212,
"narHash": "sha256-Sn9xtMrUYmXCT33yQjNh0tWFwY7jF5x4vCUrkcXDMCE="
@ -219,7 +273,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"info": {
"lastModified": 1587390417,
"narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8="
@ -242,9 +296,11 @@
"base16-unclaimed-schemes": "base16-unclaimed-schemes",
"home-manager": "home-manager",
"materia-theme": "materia-theme",
"mobile-broadband-provider-info": "mobile-broadband-provider-info",
"mtxclient": "mtxclient",
"nheko": "nheko",
"nixpkgs": "nixpkgs_3",
"nix": "nix",
"nixpkgs": "nixpkgs_4",
"nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland",
"simple-nixos-mailserver": "simple-nixos-mailserver",
@ -316,7 +372,7 @@
},
"inputs": {
"haskell-nix": "haskell-nix",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"ref": "flake",

7
flake.nix
View File

@ -85,9 +85,14 @@
url = "ssh://git@github.com/serokell/yt-utilities";
ref = "flake";
};
mobile-broadband-provider-info = {
type = "git";
url = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info";
flake = false;
};
};
outputs = { nixpkgs, ... }@inputs: {
outputs = { nixpkgs, nix, ... }@inputs: {
nixosConfigurations = with nixpkgs.lib;
let
hosts = map (fname: builtins.head (builtins.match "(.*)\\.nix" fname))

1
modules/applications/packages.nix
View File

@ -66,7 +66,6 @@
git-crypt
nix-patch
waypipe
cachix
inputs.yt-utilities.defaultPackage.x86_64-linux
] ++ (with pkgs.kdeApplications; [
ark

26
modules/packages.nix
View File

@ -2,13 +2,24 @@
let
filterGit =
builtins.filterSource (type: name: name != ".git" || type != "directory");
old = import inputs.nixpkgs-old ({ config = config.nixpkgs.config; localSystem = { system = "x86_64-linux"; }; });
in
{
system = "x86_64-linux";
old = import inputs.nixpkgs-old ({
config = config.nixpkgs.config;
localSystem = { inherit system; };
});
in {
nixpkgs.overlays = [
inputs.nix.overlay
(self: super:
rec {
nur = (import inputs.NUR { pkgs = old; nurpkgs = pkgs; }).repos;
nix = super.nix // {
meta = super.nix.meta // { platforms = lib.platforms.unix; };
};
nur = (import inputs.NUR {
pkgs = old;
nurpkgs = pkgs;
}).repos;
inherit (nur.balsoft.pkgs) termNote lambda-launcher nix-patch;
@ -67,6 +78,13 @@ in
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 {

18
modules/workspace/kde/default.nix
View File

@ -2,11 +2,15 @@
with import ../../../support.nix { inherit lib config; }; {
xdg.portal.enable = true;
# services.flatpak.enable = true;
xdg.portal.extraPortals = [pkgs.plasma5.xdg-desktop-portal-kde];
services.dbus.packages =
[ pkgs.plasma5.xdg-desktop-portal-kde pkgs.flatpak pkgs.firefox pkgs.systemd ];
xdg.portal.extraPortals = [ pkgs.plasma5.xdg-desktop-portal-kde ];
services.dbus.packages = [
pkgs.plasma5.xdg-desktop-portal-kde
pkgs.flatpak
pkgs.firefox
pkgs.systemd
];
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
home-manager.users.balsoft.home.packages = [pkgs.qt5ct];
home-manager.users.balsoft.home.packages = [ pkgs.qt5ct ];
environment.sessionVariables = {
DESKTOP_SESSION = "kde";
QT_XFT = "true";
@ -17,7 +21,7 @@ with import ../../../support.nix { inherit lib config; }; {
QT_AUTO_SCREEN_SCALE_FACTOR = "0";
GTK_USE_PORTAL = "1";
DE = "kde";
QT_QPA_PLATFORMTHEME="kde";
QT_QPA_PLATFORMTHEME = "kde";
};
#home-manager.users.balsoft.xdg.configFile."qt5ct/qt5ct.conf".source = ./qt5ct.conf;
home-manager.users.balsoft.xdg.configFile."kdeglobals".text = genIni {
@ -133,7 +137,7 @@ with import ../../../support.nix { inherit lib config; }; {
$DRY_RUN_CMD cp ${./user-places.xbel} ~/.local/share/user-places.xbel
$DRY_RUN_CMD chmod 777 ~/.local/share/user-places.xbel
'';
before = [];
after = ["linkGeneration"];
before = [ ];
after = [ "linkGeneration" ];
};
}