diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix index 2ef3d36c..8245a78b 100644 --- a/nixos/boxes/foureighty/default.nix +++ b/nixos/boxes/foureighty/default.nix @@ -30,15 +30,6 @@ enable = true; }; - nix.nixPath = [ - "nixpkgs=https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - "home-manager=https://github.com/rycee/home-manager/archive/release-20.09.tar.gz" - ]; - - fonts.fontconfig.enable = true; - programs.steam.enable = true; home-manager.users.cyryl = {...}: { imports = [ ../../home-manager @@ -50,5 +41,7 @@ home.file.".config/i3/status.toml".source = ../../../.config/i3/status-double-bat.toml; }; + fonts.fontconfig.enable = true; + programs.steam.enable = true; } diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix index be609ad1..21393935 100644 --- a/nixos/boxes/skinnyv/default.nix +++ b/nixos/boxes/skinnyv/default.nix @@ -33,13 +33,6 @@ }; time.timeZone = "Europe/London"; - nix.nixPath = [ - "nixpkgs=https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - "home-manager=https://github.com/rycee/home-manager/archive/release-20.09.tar.gz" - ]; - fonts.fontconfig.enable = true; home-manager.users.cyryl = {...}: { imports = [ diff --git a/nixos/common.nix b/nixos/common.nix index b2a1ef0b..fae3326a 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -60,6 +60,13 @@ in daemonNiceLevel = 19; gc.automatic = true; optimise.automatic = true; + nixPath = [ + "nixpkgs=https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz" + "cyplo-mindforger=https://github.com/cyplo/nixpkgs/archive/mindforger1.52.tar.gz" + "nixos-config=/etc/nixos/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + "home-manager=https://github.com/rycee/home-manager/archive/release-20.09.tar.gz" + ]; }; system = { diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 8d143e8c..ef924ec7 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -21,7 +21,7 @@ home.packages = with pkgs; [ keybase-gui unstable.electrum - mindforger trilium-desktop typora + (import {}).mindforger trilium-desktop typora digikam anarchism zoom-us ssb-patchwork passff-host