From 67ea731529edad87dffdeff3798b08f3aa3fd94b Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 13 Aug 2023 09:18:15 -0400 Subject: [PATCH] misc small changes --- hosts/gerg-desktop/containers/{website.nix => website.nix_} | 0 hosts/gerg-desktop/main.nix | 1 + hosts/iso/main.nix | 1 - lib/default.nix | 2 +- modules/misc.nix | 6 ++++++ modules/nix.nix | 2 +- 6 files changed, 9 insertions(+), 3 deletions(-) rename hosts/gerg-desktop/containers/{website.nix => website.nix_} (100%) diff --git a/hosts/gerg-desktop/containers/website.nix b/hosts/gerg-desktop/containers/website.nix_ similarity index 100% rename from hosts/gerg-desktop/containers/website.nix rename to hosts/gerg-desktop/containers/website.nix_ diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix index 852cc1d..e6dcf25 100644 --- a/hosts/gerg-desktop/main.nix +++ b/hosts/gerg-desktop/main.nix @@ -60,6 +60,7 @@ statix alejandra nix-index + element-desktop ; inherit (nvim-flake.packages.${pkgs.system}) neovim; lint = pkgs.writeShellScriptBin "lint" '' diff --git a/hosts/iso/main.nix b/hosts/iso/main.nix index 643aa18..e83dc97 100644 --- a/hosts/iso/main.nix +++ b/hosts/iso/main.nix @@ -16,7 +16,6 @@ }; bootConfig = { disable = true; - stage2patch.disable = true; }; }; imports = [ diff --git a/lib/default.nix b/lib/default.nix index a90210f..bdf7b99 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -56,7 +56,7 @@ in { ++ [ { networking.hostName = name; - nixpkgs = {inherit system;}; + nixpkgs.hostPlatform = system; } ]; } diff --git a/modules/misc.nix b/modules/misc.nix index 401ef9b..c1cfced 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -39,6 +39,12 @@ _: { i18n.defaultLocale = "en_US.UTF-8"; #time settings time.timeZone = "America/New_York"; + # For`info` command. + documentation.info.enable = false; + # NixOS manual and such. + documentation.nixos.enable = false; + + programs.command-not-found.enable = false; }; _file = ./misc.nix; } diff --git a/modules/nix.nix b/modules/nix.nix index db05989..cf5ab93 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -8,7 +8,7 @@ inputs: { # let alias = inputs // {nixpkgs = inputs.unstable;}; - flakes = lib.filterAttrs (_: v: v._type == "flake") alias; + flakes = lib.filterAttrs (_: lib.isType "flake") alias; in { nix.nixPath = lib.mapAttrsToList (x: _: "${x}=flake:${x}") flakes; nix.registry = lib.mapAttrs (_: flake: {inherit flake;}) flakes;