cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

removed lingering nixpkgs-fmt

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
home/modules/devtools/nixvim/plugins/lsp.nix
View File

@@ -52,9 +52,11 @@ 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;
globals = ["vim"]; diagnostics = {
globals = ["vim"];
};
}; };
}; };
tsserver = { tsserver = {

2
home/modules/devtools/nixvim/plugins/nonels.nix
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;

33
hosts/cnix/hardware-configuration.nix
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

159
hosts/default.nix
View File

@@ -1,88 +1,89 @@
# Yanked from fufexan! # Yanked from fufexan!
{ { inputs
inputs, , homeImports
homeImports, , self
self, , ...
...
}: { }: {
flake.nixosConfigurations = let flake.nixosConfigurations =
# custom paths let
userConfig = "${self}/home"; # custom paths
systemConfig = "${self}/system"; userConfig = "${self}/home";
hostConfig = "${self}/hosts"; systemConfig = "${self}/system";
hostConfig = "${self}/hosts";
cnstConfig = "${self}/home/users/cnst"; cnstConfig = "${self}/home/users/cnst";
toothpickConfig = "${self}/home/users/toothpick"; toothpickConfig = "${self}/home/users/toothpick";
adamConfig = "${self}/home/users/adam"; adamConfig = "${self}/home/users/adam";
userModules = "${self}/home/modules"; userModules = "${self}/home/modules";
systemModules = "${self}/system/modules"; systemModules = "${self}/system/modules";
# shorten paths # shorten paths
inherit (inputs.nixpkgs.lib) nixosSystem; inherit (inputs.nixpkgs.lib) nixosSystem;
mod = "${systemConfig}"; mod = "${systemConfig}";
# get the basic config to build on top of # get the basic config to build on top of
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 { {
inherit specialArgs; cnix = nixosSystem {
modules = inherit specialArgs;
shared modules =
++ [ shared
./cnix ++ [
"${mod}/boot/lanzaboote" ./cnix
"${mod}/nix/nh/cnix" "${mod}/boot/lanzaboote"
{ "${mod}/nix/nh/cnix"
home-manager = { {
users.cnst.imports = homeImports."cnst@cnix"; home-manager = {
extraSpecialArgs = specialArgs; users.cnst.imports = homeImports."cnst@cnix";
}; extraSpecialArgs = specialArgs;
} };
inputs.chaotic.nixosModules.default }
inputs.sops-nix.nixosModules.sops inputs.chaotic.nixosModules.default
(import "${mod}/dev") inputs.sops-nix.nixosModules.sops
]; (import "${mod}/dev")
];
};
toothpc = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./toothpc
"${mod}/boot/lanzaboote"
"${mod}/nix/nh/toothpc"
{
home-manager = {
users.toothpick.imports = homeImports."toothpick@toothpc";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
(import "${mod}/dev")
];
};
adampad = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./adampad
"${mod}/boot"
"${mod}/nix/nh/adampad"
{
home-manager = {
users.adam.imports = homeImports."adam@adampad";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
];
};
}; };
toothpc = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./toothpc
"${mod}/boot/lanzaboote"
"${mod}/nix/nh/toothpc"
{
home-manager = {
users.toothpick.imports = homeImports."toothpick@toothpc";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
(import "${mod}/dev")
];
};
adampad = nixosSystem {
inherit specialArgs;
modules =
shared
++ [
./adampad
"${mod}/boot"
"${mod}/nix/nh/adampad"
{
home-manager = {
users.adam.imports = homeImports."adam@adampad";
extraSpecialArgs = specialArgs;
};
}
inputs.chaotic.nixosModules.default
inputs.sops-nix.nixosModules.sops
];
};
};
} }

2
system/dev/default.nix
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