removed lingering nixpkgs-fmt

This commit is contained in:
cnst
2024-08-29 09:04:01 +02:00
parent 03599a2b35
commit 6befe2e0fe
5 changed files with 104 additions and 100 deletions

View File

@@ -52,11 +52,13 @@ in {
yamlls.enable = true; yamlls.enable = true;
lua-ls = { lua-ls = {
enable = true; enable = true;
settings.telemetry.enable = false; settings = {
settings.diagnostics = { telemetry.enable = false;
diagnostics = {
globals = ["vim"]; globals = ["vim"];
}; };
}; };
};
tsserver = { tsserver = {
enable = false; # TS/JS enable = false; # TS/JS
}; };

View File

@@ -32,7 +32,7 @@ in {
alejandra.enable = true; alejandra.enable = true;
stylua.enable = true; stylua.enable = true;
shfmt.enable = true; shfmt.enable = true;
nixpkgs_fmt.enable = true; nixpkgs_fmt.enable = false;
google_java_format.enable = false; google_java_format.enable = false;
prettier = { prettier = {
enable = true; enable = true;

View File

@@ -1,15 +1,16 @@
{ config {
, lib config,
, modulesPath lib,
, ... modulesPath,
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot = { boot = {
initrd = { initrd = {
availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
kernelModules = [ ]; kernelModules = [];
luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910"; luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910";
postDeviceCommands = lib.mkAfter '' postDeviceCommands = lib.mkAfter ''
mkdir /mnt mkdir /mnt
@@ -18,51 +19,51 @@
btrfs subvolume snapshot /mnt/root-blank /mnt/root btrfs subvolume snapshot /mnt/root-blank /mnt/root
''; '';
}; };
kernelModules = [ "kvm-amd" ]; kernelModules = ["kvm-amd"];
extraModulePackages = [ ]; extraModulePackages = [];
supportedFilesystems = [ "btrfs" ]; supportedFilesystems = ["btrfs"];
}; };
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd"; device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" ]; options = ["subvol=root" "compress=zstd"];
}; };
"/home" = { "/home" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd"; device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" "compress=zstd" ]; options = ["subvol=home" "compress=zstd"];
}; };
"/nix" = { "/nix" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd"; device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime" ]; options = ["subvol=nix" "compress=zstd" "noatime"];
}; };
"/persist" = { "/persist" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd"; device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=persist" "compress=zstd" ]; options = ["subvol=persist" "compress=zstd"];
}; };
"/var/log" = { "/var/log" = {
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd"; device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=log" "compress=zstd" ]; options = ["subvol=log" "compress=zstd"];
neededForBoot = true; neededForBoot = true;
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/12CE-A600"; device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" "umask=0077" ]; options = ["fmask=0022" "dmask=0022" "umask=0077"];
}; };
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -1,11 +1,11 @@
# Yanked from fufexan! # Yanked from fufexan!
{ { inputs
inputs, , homeImports
homeImports, , self
self, , ...
...
}: { }: {
flake.nixosConfigurations = let flake.nixosConfigurations =
let
# custom paths # custom paths
userConfig = "${self}/home"; userConfig = "${self}/home";
systemConfig = "${self}/system"; systemConfig = "${self}/system";
@@ -26,8 +26,9 @@
inherit (import "${systemConfig}") shared; inherit (import "${systemConfig}") shared;
# get these into the module system # get these into the module system
specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules;}; specialArgs = { inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules; };
in { in
{
cnix = nixosSystem { cnix = nixosSystem {
inherit specialArgs; inherit specialArgs;
modules = modules =

View File

@@ -24,7 +24,7 @@
# Other utilities and tools # Other utilities and tools
openssl # Required for some crates that involve networking or encryption openssl # Required for some crates that involve networking or encryption
# alejandra alejandra
# nixd # nixd
# pyright # pyright
# yaml-language-server # yaml-language-server