From 6b21c45093c2a51f1726434d795ae198c3a213db Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Mon, 22 Jul 2024 11:05:38 +0200 Subject: [PATCH] Update --- flake.lock | 37 ++++++++++--------------------------- flake.nix | 2 -- general/packages.nix | 1 + general/system.nix | 1 - general/user/packages.nix | 4 ++-- 5 files changed, 13 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 6a7e2ab..0009b93 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1721534365, + "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721413321, + "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { @@ -73,24 +73,7 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "thunderbird-128": "thunderbird-128" - } - }, - "thunderbird-128": { - "locked": { - "lastModified": 1720892092, - "narHash": "sha256-239SLhSZ6teuTXBC+Ejiyupp7Bv7ESDNPyx+7MKEiUI=", - "owner": "vcunat", - "repo": "nixpkgs", - "rev": "22601be95cba9652b9f8fce48580a1924e53cd5f", - "type": "github" - }, - "original": { - "owner": "vcunat", - "ref": "p/thunderbird-128", - "repo": "nixpkgs", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index beae129..fafc5e7 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,6 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; - - thunderbird-128.url = "github:vcunat/nixpkgs/?ref=p/thunderbird-128"; }; outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: { diff --git a/general/packages.nix b/general/packages.nix index 45e8f7f..4dff58b 100644 --- a/general/packages.nix +++ b/general/packages.nix @@ -29,6 +29,7 @@ fonts = { packages = with pkgs; [ + twemoji-color-font noto-fonts noto-fonts-cjk noto-fonts-lgc-plus diff --git a/general/system.nix b/general/system.nix index 658a947..4bbde4f 100644 --- a/general/system.nix +++ b/general/system.nix @@ -100,7 +100,6 @@ xdg.portal.enable = true; # Sound - sound.enable = false; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/general/user/packages.nix b/general/user/packages.nix index f5463ff..5895ba3 100644 --- a/general/user/packages.nix +++ b/general/user/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, thunderbird-128, ... }: +{ pkgs, lib, config, ... }: let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) @@ -32,7 +32,7 @@ in { organicmaps # Messaging - thunderbird-128.legacyPackages.x86_64-linux.thunderbird-128 + thunderbird-128 discord vesktop whatsapp-for-linux