diff --git a/flake.lock b/flake.lock index 12675e9..199d428 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "materia-theme": { "flake": false, "locked": { - "lastModified": 1587550712, - "narHash": "sha256-RMifAu3dpSpXu4AdWXwO+zFgr7OHhgsj5oHOAfPNVF8=", + "lastModified": 1595824519, + "narHash": "sha256-cvKm3XONZy062P7XZdPQO98t0qmL/buiFM/oekTrfJQ=", "owner": "nana-4", "repo": "materia-theme", - "rev": "b36b379c9256b67e5f63a60c6faf6912f1845b66", + "rev": "c6aa571a1ba279e48f3f52610c9c6bedc2c9a0f8", "type": "github" }, "original": { @@ -101,22 +101,6 @@ "type": "github" } }, - "mobile-broadband-provider-info": { - "flake": false, - "locked": { - "lastModified": 1588667400, - "narHash": "sha256-xkUehl/Z0WpRDoRdNiEcMSU3A+BG7lcJRnrvRcn/0UQ=", - "ref": "master", - "rev": "8053c3edb73bed639a6f45bbf48bfa5fd418b61a", - "revCount": 597, - "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" - } - }, "nix": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -229,11 +213,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1593760204, - "narHash": "sha256-M/c2DTP6EUnSgnBYyVScApeHv5I+NbN57nn+px4bEaI=", + "lastModified": 1596043279, + "narHash": "sha256-PgQAn4NUVLLO058jyl73stME492PBv6On6HR+SbmCJ4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdac777becdbb8780c35be4f552c9d4518fe0bdb", + "rev": "9e453cc2b7d015ab7554be471f130825f2a44604", "type": "github" }, "original": { @@ -263,7 +247,6 @@ "home-manager": "home-manager", "lambda-launcher": "lambda-launcher", "materia-theme": "materia-theme", - "mobile-broadband-provider-info": "mobile-broadband-provider-info", "nix": "nix", "nixos-fhs-compat": "nixos-fhs-compat", "nixpkgs": "nixpkgs_4", diff --git a/flake.nix b/flake.nix index 97df10e..33872ea 100644 --- a/flake.nix +++ b/flake.nix @@ -68,11 +68,6 @@ 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; - }; nixos-fhs-compat = { type = "github"; owner = "balsoft"; diff --git a/modules/packages.nix b/modules/packages.nix index 326cacb..49ee1be 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -32,13 +32,6 @@ in { yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux; nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd; - - mobile-broadband-provider-info = - super.mobile-broadband-provider-info.overrideAttrs (oa: { - src = inputs.mobile-broadband-provider-info; - nativeBuildInputs = [ self.autoreconfHook ]; - buildInputs = [ self.libxslt ]; - }); }) ]; nixpkgs.config = { diff --git a/modules/workspace/fonts.nix b/modules/workspace/fonts.nix index cd0d0f1..48d4185 100644 --- a/modules/workspace/fonts.nix +++ b/modules/workspace/fonts.nix @@ -1,17 +1,8 @@ { pkgs, config, lib, ... }: -let - plex = pkgs.runCommand "ibm-plex" { - src = pkgs.fetchzip { - url = "https://github.com/IBM/plex/releases/download/v5.0.0/TrueType.zip"; - sha256 = - "sha256-KKw9pk5YmWpaMKnYKhjwHynHxx8c0F8U/fgoU9qimHY="; - }; - } - "mkdir -p $out/share/fonts/truetype; cp $src/**/*.ttf $out/share/fonts/truetype"; -in { +{ fonts = { fonts = with pkgs; [ - plex + ibm-plex hasklig nerdfonts material-design-icons