materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: change remove rnix-lsp, add nil and nixpkgs-fmt, move nix default package to common

This commit is contained in:
Mateusz Słodkowicz 2024-03-11 16:15:04 +01:00
parent c88c7c029a
commit 8ecb892244
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configurations/host/Old-materusPC/configuration.nix
View File

@ -82,7 +82,6 @@ in
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];
nix.package = pkgs.nixFlakes;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
nix.settings.substituters = [ nix.settings.substituters = [

4
configurations/host/materusPC/extraHome.nix
View File

@ -13,7 +13,7 @@
enableTerminalExtra = lib.mkDefault true; enableTerminalExtra = lib.mkDefault true;
enableNixDevel = lib.mkDefault true; enableNixDevel = lib.mkDefault true;
editor.code.fhs.enable = 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.clang
llvmpkgs.llvm llvmpkgs.llvm
llvmpkgs.bintools llvmpkgs.bintools
@ -26,6 +26,8 @@
gcc gcc
gdb gdb
nil nil
nixfmt
nixpkgs-fmt
cmake cmake
gnumake gnumake
ninja ninja

4
configurations/profile/common/nixpkgs.nix
View File

@ -21,9 +21,9 @@ in
}; };
config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [materusArg.cfg.configInputs.emacs-overlay.overlay]; 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 { config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry {
nixpkgs-stable = { nixpkgs-stable = {
from = { type = "indirect"; id = "nixpkgs-stable"; }; from = { type = "indirect"; id = "nixpkgs-stable"; };
flake = materusCfg.materusFlake.inputs.nixpkgs-stable; flake = materusCfg.materusFlake.inputs.nixpkgs-stable;
}; };

8
configurations/profile/common/packages/default.nix
View File

@ -8,7 +8,7 @@ with materusArg.pkgs.lib;
#Single Packages #Single Packages
options.materus.profile.packages.home-manager = mkPrivateVar materusArg.cfg.configInputs.home-manager.packages.${pkgs.system}.home-manager; 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; options.materus.profile.packages.firefox = mkPrivateVar pkgs.firefox;
#Package Lists #Package Lists
options.materus.profile.packages.list.nixRelated = mkPrivateVar (with pkgs; [ options.materus.profile.packages.list.nixRelated = mkPrivateVar (with pkgs; [
nix-prefetch nix-prefetch
@ -20,14 +20,14 @@ with materusArg.pkgs.lib;
nix-tree nix-tree
nix-diff nix-diff
nix-ld nix-ld
rnix-hashes nil
rnix-lsp nixpkgs-fmt
nixpkgs-review nixpkgs-review
]); ]);
options.materus.profile.packages.list.desktopApps = mkPrivateVar (with pkgs; [ options.materus.profile.packages.list.desktopApps = mkPrivateVar (with pkgs; [
barrier barrier
(discord.override { nss = nss_latest; withOpenASAR = true; withTTS = true;}) (discord.override { nss = nss_latest; withOpenASAR = true; withTTS = true; })
tdesktop tdesktop
mpv mpv
ani-cli ani-cli

1
configurations/profile/os/nix.nix
View File

@ -5,7 +5,6 @@ in
{ {
options.materus.profile.nix.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable materus nix settings"; options.materus.profile.nix.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable materus nix settings";
config.nix = lib.mkIf cfg.enable { config.nix = lib.mkIf cfg.enable {
package = lib.mkDefault pkgs.nixVersions.unstable;
settings = { settings = {
experimental-features = [ "nix-command" "flakes" "repl-flake" "no-url-literals" ]; experimental-features = [ "nix-command" "flakes" "repl-flake" "no-url-literals" ];