From 74718e9162dca86f43f41e49cf4bc46737370c22 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Fri, 29 Sep 2023 15:00:10 +0200 Subject: [PATCH] Moar stuff - add fonts.fontDir - add MS fonts for better word document compat - add nextcloud, rustdesk & tutanota desktop --- configuration.nix | 4 ++++ flake.lock | 24 ++++++++++++------------ flake.nix | 9 +++++++++ home.nix | 3 +++ 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/configuration.nix b/configuration.nix index 53cdf6a..72a71b1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -51,8 +51,11 @@ boot.plymouth.enable = true; + fonts.fontDir.enable = true; fonts.fonts = with pkgs; [ emacs-all-the-icons-fonts + corefonts + vistafonts noto-fonts noto-fonts-cjk noto-fonts-emoji @@ -169,6 +172,7 @@ fish git neovim + veracrypt vim virt-manager virt-viewer diff --git a/flake.lock b/flake.lock index 91d538a..f54e9e3 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1695896121, - "narHash": "sha256-kLxNtqWxQZWndMhhDJyrNZK1EWl+5ctR9BbcG8t+9dc=", + "lastModified": 1695978843, + "narHash": "sha256-xeKBrbNT5dQK3ZkZWrji7/mqRJNf+Avbz93zR67t+XQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7f45bea11d98f9f542bcdeadeeaa33472c1224e2", + "rev": "ec14828ed25f48db0c94f49d29ebe1a455a5a58c", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695559356, - "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1695559356, - "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nur": { "locked": { - "lastModified": 1695894374, - "narHash": "sha256-dFHs2dCJgxTMyQ0NtfcyEqx1yyWjmCMk2ek7Jdmyo/o=", + "lastModified": 1695988627, + "narHash": "sha256-2okyXjZ1LjHJgX4wJXcH34dxFAieZ7hNNkBXmoRH1Mw=", "owner": "nix-community", "repo": "NUR", - "rev": "6eab0ede48c2df5b756db76a20f5c655cbfab5d9", + "rev": "b286ae7094de09e613dab025dbc48e27af03ed5a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7721ad4..f9450aa 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,15 @@ { description = "flake for nixos-pulse"; + nixConfig = { + extra-trusted-substituters = [ + "https://nix-community.cachix.org" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; + inputs = { nixpkgs = { url = "github:NixOS/nixpkgs/nixos-23.05"; diff --git a/home.nix b/home.nix index b997c6a..cd74cf1 100644 --- a/home.nix +++ b/home.nix @@ -327,6 +327,7 @@ in { firefox jellyfin-media-player neofetch + nextcloud-client onlyoffice-bin nodejs_20 kate @@ -346,6 +347,8 @@ in { zstd rnix-lsp texlive.combined.scheme-full + rustdesk + tutanota-desktop signal-desktop statix tailscale