common: change remove rnix-lsp, add nil and nixpkgs-fmt, move nix default package to common
This commit is contained in:
parent
c88c7c029a
commit
8ecb892244
|
@ -82,7 +82,6 @@ in
|
|||
./hardware-configuration.nix
|
||||
];
|
||||
boot.supportedFilesystems = [ "ntfs" ];
|
||||
nix.package = pkgs.nixFlakes;
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.auto-optimise-store = true;
|
||||
nix.settings.substituters = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
enableTerminalExtra = lib.mkDefault true;
|
||||
enableNixDevel = lib.mkDefault true;
|
||||
editor.code.fhs.enable = true;
|
||||
editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in[
|
||||
editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in [
|
||||
llvmpkgs.clang
|
||||
llvmpkgs.llvm
|
||||
llvmpkgs.bintools
|
||||
|
@ -26,6 +26,8 @@
|
|||
gcc
|
||||
gdb
|
||||
nil
|
||||
nixfmt
|
||||
nixpkgs-fmt
|
||||
cmake
|
||||
gnumake
|
||||
ninja
|
||||
|
|
|
@ -21,9 +21,9 @@ in
|
|||
};
|
||||
config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [materusArg.cfg.configInputs.emacs-overlay.overlay];
|
||||
|
||||
|
||||
config.nix.package = lib.mkDefault pkgs.nixUnstable;
|
||||
config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry {
|
||||
nixpkgs-stable = {
|
||||
nixpkgs-stable = {
|
||||
from = { type = "indirect"; id = "nixpkgs-stable"; };
|
||||
flake = materusCfg.materusFlake.inputs.nixpkgs-stable;
|
||||
};
|
||||
|
|
|
@ -8,7 +8,7 @@ with materusArg.pkgs.lib;
|
|||
#Single Packages
|
||||
options.materus.profile.packages.home-manager = mkPrivateVar materusArg.cfg.configInputs.home-manager.packages.${pkgs.system}.home-manager;
|
||||
options.materus.profile.packages.firefox = mkPrivateVar pkgs.firefox;
|
||||
|
||||
|
||||
#Package Lists
|
||||
options.materus.profile.packages.list.nixRelated = mkPrivateVar (with pkgs; [
|
||||
nix-prefetch
|
||||
|
@ -20,14 +20,14 @@ with materusArg.pkgs.lib;
|
|||
nix-tree
|
||||
nix-diff
|
||||
nix-ld
|
||||
rnix-hashes
|
||||
rnix-lsp
|
||||
nil
|
||||
nixpkgs-fmt
|
||||
nixpkgs-review
|
||||
]);
|
||||
|
||||
options.materus.profile.packages.list.desktopApps = mkPrivateVar (with pkgs; [
|
||||
barrier
|
||||
(discord.override { nss = nss_latest; withOpenASAR = true; withTTS = true;})
|
||||
(discord.override { nss = nss_latest; withOpenASAR = true; withTTS = true; })
|
||||
tdesktop
|
||||
mpv
|
||||
ani-cli
|
||||
|
|
|
@ -5,7 +5,6 @@ in
|
|||
{
|
||||
options.materus.profile.nix.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable materus nix settings";
|
||||
config.nix = lib.mkIf cfg.enable {
|
||||
package = lib.mkDefault pkgs.nixVersions.unstable;
|
||||
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" "repl-flake" "no-url-literals" ];
|
||||
|
|
Loading…
Reference in New Issue