Normalize indentation
Why isn't .editorconfig working...?
This commit is contained in:
parent
984e56ba67
commit
5d28b53778
2
env/desktop/nix/base.nix
vendored
2
env/desktop/nix/base.nix
vendored
|
@ -8,7 +8,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
# TODO: fork?
|
# TODO: fork?
|
||||||
(import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos")
|
(import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos")
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.daniel = {
|
home-manager.users.daniel = {
|
||||||
|
|
44
env/laptop/hardware.nix
vendored
44
env/laptop/hardware.nix
vendored
|
@ -1,32 +1,32 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122";
|
{ device = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/3EB9-C18F";
|
{ device = "/dev/disk/by-uuid/3EB9-C18F";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
nix.maxJobs = lib.mkDefault 4;
|
nix.maxJobs = lib.mkDefault 4;
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
# High-DPI console
|
# High-DPI console
|
||||||
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
|
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
|
||||||
}
|
}
|
||||||
|
|
6
env/nix/machines/third.nix
vendored
6
env/nix/machines/third.nix
vendored
|
@ -31,13 +31,13 @@
|
||||||
xft-dpi=260
|
xft-dpi=260
|
||||||
'';
|
'';
|
||||||
|
|
||||||
swapDevices = [ { device = "/swapfile"; size = (1024*16); } ];
|
swapDevices = [ { device = "/swapfile"; size = (1024*16); } ];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
# fallocate -l 16G /swapfile
|
# fallocate -l 16G /swapfile
|
||||||
resumeDevice = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122";
|
resumeDevice = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122";
|
||||||
# sudo filefrag -v /swapfile | head -n 4 | tail -n 1 | \
|
# sudo filefrag -v /swapfile | head -n 4 | tail -n 1 | \
|
||||||
# tr -s "[:blank:]" | field 5 | tr -d ":"
|
# tr -s "[:blank:]" | field 5 | tr -d ":"
|
||||||
kernelParams = [ "resume_offset=874496" ];
|
kernelParams = [ "resume_offset=874496" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
4
env/nix/machines/wallwart.nix
vendored
4
env/nix/machines/wallwart.nix
vendored
|
@ -22,8 +22,8 @@
|
||||||
systemPackages = with pkgs; [ ntfs3g ];
|
systemPackages = with pkgs; [ ntfs3g ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/storage/ext".options = [ "defaults" "user" "nofail" ];
|
fileSystems."/storage/ext".options = [ "defaults" "user" "nofail" ];
|
||||||
fileSystems."/storage/butter".options = [ "defaults" "auto" "nofail" ];
|
fileSystems."/storage/butter".options = [ "defaults" "auto" "nofail" ];
|
||||||
fileSystems."/storage/windows" = {
|
fileSystems."/storage/windows" = {
|
||||||
device = "/dev/disk/by-uuid/AE624593624560E7";
|
device = "/dev/disk/by-uuid/AE624593624560E7";
|
||||||
fsType = "ntfs";
|
fsType = "ntfs";
|
||||||
|
|
2
env/nix/modules/bluetooth.nix
vendored
2
env/nix/modules/bluetooth.nix
vendored
|
@ -1,3 +1,3 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
}
|
}
|
||||||
|
|
4
env/nix/modules/de/graphics.nix
vendored
4
env/nix/modules/de/graphics.nix
vendored
|
@ -1,6 +1,6 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
imports = [ ../lightdm.nix ];
|
imports = [ ../lightdm.nix ];
|
||||||
fonts.fonts = with pkgs; [ iosevka ];
|
fonts.fonts = with pkgs; [ iosevka ];
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport = true;
|
driSupport = true;
|
||||||
|
|
18
env/nix/modules/de/sway.nix
vendored
18
env/nix/modules/de/sway.nix
vendored
|
@ -1,7 +1,7 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
|
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
|
||||||
in {
|
in {
|
||||||
imports = [ ./graphics.nix ];
|
imports = [ ./graphics.nix ];
|
||||||
programs = {
|
programs = {
|
||||||
|
@ -43,12 +43,12 @@ in {
|
||||||
disableWhileTyping = false;
|
disableWhileTyping = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
gtkUsePortal = true;
|
gtkUsePortal = true;
|
||||||
extraPortals = with pkgs; [
|
extraPortals = with pkgs; [
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
unstable.xdg-desktop-portal-wlr
|
unstable.xdg-desktop-portal-wlr
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
2
env/nix/modules/fish.nix
vendored
2
env/nix/modules/fish.nix
vendored
|
@ -1,7 +1,7 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
|
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
|
||||||
in {
|
in {
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
2
env/nix/modules/neovim.nix
vendored
2
env/nix/modules/neovim.nix
vendored
|
@ -1,6 +1,6 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
let
|
||||||
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
|
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
|
||||||
aliases = { vim = "nvim"; vi = "nvim"; };
|
aliases = { vim = "nvim"; vi = "nvim"; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
4
env/nix/modules/pulseaudio.nix
vendored
4
env/nix/modules/pulseaudio.nix
vendored
|
@ -1,9 +1,9 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
hardware.pulseaudio = {
|
hardware.pulseaudio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
support32Bit = true;
|
support32Bit = true;
|
||||||
package = pkgs.pulseaudioFull;
|
package = pkgs.pulseaudioFull;
|
||||||
};
|
};
|
||||||
nixpkgs.config.pulseaudio = true;
|
nixpkgs.config.pulseaudio = true;
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
}
|
}
|
||||||
|
|
10
env/nix/modules/users/daniel.nix
vendored
10
env/nix/modules/users/daniel.nix
vendored
|
@ -1,8 +1,8 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
users.users.daniel = {
|
users.users.daniel = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" ];
|
extraGroups = [ "wheel" "docker" ];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
home = "/home/daniel/.home";
|
home = "/home/daniel/.home";
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
fortune # fun sayings
|
fortune # fun sayings
|
||||||
|
@ -43,5 +43,5 @@
|
||||||
niv # dependency pinning?
|
niv # dependency pinning?
|
||||||
lorri # project envrc - like asdf-vm?
|
lorri # project envrc - like asdf-vm?
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
6
env/nix/modules/users/valerie.nix
vendored
6
env/nix/modules/users/valerie.nix
vendored
|
@ -1,7 +1,7 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
users.users.valerie = {
|
users.users.valerie = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
home = "/home/valerie";
|
home = "/home/valerie";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
4
env/nix/pkgs/home.nix
vendored
4
env/nix/pkgs/home.nix
vendored
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
home.stateVersion = "20.03";
|
home.stateVersion = "20.03";
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue