removed lingering nixpkgs-fmt
This commit is contained in:
@@ -52,11 +52,13 @@ in {
|
||||
yamlls.enable = true;
|
||||
lua-ls = {
|
||||
enable = true;
|
||||
settings.telemetry.enable = false;
|
||||
settings.diagnostics = {
|
||||
settings = {
|
||||
telemetry.enable = false;
|
||||
diagnostics = {
|
||||
globals = ["vim"];
|
||||
};
|
||||
};
|
||||
};
|
||||
tsserver = {
|
||||
enable = false; # TS/JS
|
||||
};
|
||||
|
||||
@@ -32,7 +32,7 @@ in {
|
||||
alejandra.enable = true;
|
||||
stylua.enable = true;
|
||||
shfmt.enable = true;
|
||||
nixpkgs_fmt.enable = true;
|
||||
nixpkgs_fmt.enable = false;
|
||||
google_java_format.enable = false;
|
||||
prettier = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
{ config
|
||||
, lib
|
||||
, modulesPath
|
||||
, ...
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
kernelModules = [ ];
|
||||
availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
kernelModules = [];
|
||||
luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910";
|
||||
postDeviceCommands = lib.mkAfter ''
|
||||
mkdir /mnt
|
||||
@@ -18,51 +19,51 @@
|
||||
btrfs subvolume snapshot /mnt/root-blank /mnt/root
|
||||
'';
|
||||
};
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
supportedFilesystems = [ "btrfs" ];
|
||||
kernelModules = ["kvm-amd"];
|
||||
extraModulePackages = [];
|
||||
supportedFilesystems = ["btrfs"];
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" "compress=zstd" ];
|
||||
options = ["subvol=root" "compress=zstd"];
|
||||
};
|
||||
|
||||
"/home" = {
|
||||
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" "compress=zstd" ];
|
||||
options = ["subvol=home" "compress=zstd"];
|
||||
};
|
||||
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" "compress=zstd" "noatime" ];
|
||||
options = ["subvol=nix" "compress=zstd" "noatime"];
|
||||
};
|
||||
|
||||
"/persist" = {
|
||||
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" "compress=zstd" ];
|
||||
options = ["subvol=persist" "compress=zstd"];
|
||||
};
|
||||
|
||||
"/var/log" = {
|
||||
device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=log" "compress=zstd" ];
|
||||
options = ["subvol=log" "compress=zstd"];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/12CE-A600";
|
||||
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
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
# Yanked from fufexan!
|
||||
{
|
||||
inputs,
|
||||
homeImports,
|
||||
self,
|
||||
...
|
||||
{ inputs
|
||||
, homeImports
|
||||
, self
|
||||
, ...
|
||||
}: {
|
||||
flake.nixosConfigurations = let
|
||||
flake.nixosConfigurations =
|
||||
let
|
||||
# custom paths
|
||||
userConfig = "${self}/home";
|
||||
systemConfig = "${self}/system";
|
||||
@@ -26,8 +26,9 @@
|
||||
inherit (import "${systemConfig}") shared;
|
||||
|
||||
# get these into the module system
|
||||
specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules;};
|
||||
in {
|
||||
specialArgs = { inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules; };
|
||||
in
|
||||
{
|
||||
cnix = nixosSystem {
|
||||
inherit specialArgs;
|
||||
modules =
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
# Other utilities and tools
|
||||
openssl # Required for some crates that involve networking or encryption
|
||||
# alejandra
|
||||
alejandra
|
||||
# nixd
|
||||
# pyright
|
||||
# yaml-language-server
|
||||
|
||||
Reference in New Issue
Block a user