diff --git a/modules/system/core-packages.nix b/modules/system/core-packages.nix index 444cfc9..99e909d 100644 --- a/modules/system/core-packages.nix +++ b/modules/system/core-packages.nix @@ -29,17 +29,9 @@ allowBroken = true; }; # nixpkgs overlays - overlays = [ - #niri.overlays.niri - ]; + overlays = [ ]; }; - # flatpak - services.flatpak = { - enable = true; - }; - - # core programs to include in base system programs = { # necessary terminal programs gnupg.agent = { @@ -55,6 +47,11 @@ }; }; + # flatpak support + services.flatpak = { + enable = true; + }; + # installs a stub elf loader to print an error # message in the event that a user attempts # to run an elf binary not compiled for nixos. diff --git a/modules/system/core.nix b/modules/system/core.nix index dc022be..f02c624 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -10,12 +10,7 @@ { # other modules to load - imports = [ - - # core packages to load - self.nixosModules.core-packages - - ]; + imports = [ ]; # extra features nix.settings.experimental-features = [ @@ -41,12 +36,100 @@ }; # meanjin time - time.timeZone = lib.mkDefault "Austrlia/Brisbane"; + time.timeZone = lib.mkDefault "Australia/Brisbane"; # don't touch this system.stateVersion = lib.mkDefault "24.11"; documentation.dev.enable = true; + # nixpkgs settings + nixpkgs = { + # allows broken and ideologically impure packages + config = { + allowUnfree = true; + allowBroken = true; + }; + # nixpkgs overlays + overlays = [ ]; + }; + + programs = { + # necessary terminal programs + gnupg.agent = { + enable = true; + enableSSHSupport = true; + #pinentryPackage = [ ]; + }; + # binary support + nix-ld.enable = true; + appimage = { + enable = true; + binfmt = true; + }; + }; + + # flatpak support + services.flatpak = { + enable = true; + }; + + # installs a stub elf loader to print an error + # message in the event that a user attempts + # to run an elf binary not compiled for nixos. + environment.stub-ld.enable = true; + + # core packages to include in base system + environment.systemPackages = with pkgs; [ + + # nix utilities + nvd + nix-tree + nix-init + nix-index + nix-prefetch + nix-output-monitor + + # filesystem + ddrutility + smartmontools + ntfs3g + exfatprogs + btrfs-progs + + # compat tools + steam-run + android-cli + android-tools + + # cli tools + fd + bc + zip + icu + doas + tldr + wget + curl + file + tree + tokei + unzip + gnupg + s-tui + udiskie + busybox + ripgrep + killall + usbutils + pciutils + moreutils + libsecret + git-crypt + undervolt + magic-wormhole + + ]; + }; }