chore: run nixpkgs-fmt
This commit is contained in:
parent
ce814cac82
commit
b41bce8ce2
10 changed files with 22 additions and 19 deletions
|
|
@ -19,7 +19,8 @@
|
||||||
];
|
];
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
fedfer-main-laptop-nixos = nixpkgs.lib.nixosSystem rec {
|
fedfer-main-laptop-nixos = nixpkgs.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{pkgs, ...}: {
|
{ pkgs, ... }: {
|
||||||
programs.password-store = {
|
programs.password-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.pass-wayland.withExtensions ( exts: [exts.pass-checkup exts.pass-audit]);
|
package = pkgs.pass-wayland.withExtensions (exts: [ exts.pass-checkup exts.pass-audit ]);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
] ++ (with pkgs.open-vsx; [
|
] ++ (with pkgs.open-vsx; [
|
||||||
jeanp413.open-remote-ssh
|
jeanp413.open-remote-ssh
|
||||||
antfu.unocss
|
antfu.unocss
|
||||||
]);
|
]);
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"workbench.iconTheme" = "material-icon-theme";
|
"workbench.iconTheme" = "material-icon-theme";
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
{ pkgs, lib, ... }: {
|
{ pkgs, lib, ... }: {
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[
|
||||||
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../nixosModules/default.nix
|
../../nixosModules/default.nix
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
|
|
@ -14,12 +15,14 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/58d4396b-d87c-419b-ac35-c4d282ef05b1";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/58d4396b-d87c-419b-ac35-c4d282ef05b1";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/F5D9-1046";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/F5D9-1046";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }: {
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#further move these options into settings
|
#further move these options into settings
|
||||||
config = lib.mkIf config.settings.services.openssh.enable {
|
config = lib.mkIf config.settings.services.openssh.enable {
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
security.pam = {
|
security.pam = {
|
||||||
services.sshd = {
|
services.sshd = {
|
||||||
name = "sshd";
|
name = "sshd";
|
||||||
unixAuth = true;
|
unixAuth = true;
|
||||||
googleAuthenticator.enable = config.settings.services.pam.sshd.useGoogleAuth;
|
googleAuthenticator.enable = config.settings.services.pam.sshd.useGoogleAuth;
|
||||||
gnupg.enable = config.settings.services.pam.sshd.gnupg;
|
gnupg.enable = config.settings.services.pam.sshd.gnupg;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue