summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-10 18:38:38 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-10 18:38:38 +0100
commitff9335738b44ae431963dbcd8ef398ceec76545c (patch)
tree2fb19df9a8f7a5531872d7bd35fbf04aa82eb6a7
parent4b3f3279dd67d454a832f43f55f6c412350e9236 (diff)
downloaduser-config-ff9335738b44ae431963dbcd8ef398ceec76545c.tar.gz
user-config-ff9335738b44ae431963dbcd8ef398ceec76545c.zip
add nixfmt and apply it everywhere
-rw-r--r--kusanagi/nixos/configuration.nix31
-rw-r--r--kusanagi/nixos/gnome.nix37
-rw-r--r--kusanagi/nixos/hardware-configuration.nix44
-rw-r--r--kusanagi/nixos/kde.nix8
4 files changed, 55 insertions, 65 deletions
diff --git a/kusanagi/nixos/configuration.nix b/kusanagi/nixos/configuration.nix
index fc2f58c..5b7e416 100644
--- a/kusanagi/nixos/configuration.nix
+++ b/kusanagi/nixos/configuration.nix
@@ -5,12 +5,11 @@
{ config, pkgs, ... }:
{
- imports =
- [ # Include the results of the hardware scan.
- ./hardware-configuration.nix
- ./kde.nix
- #./gnome.nix
- ];
+ imports = [ # Include the results of the hardware scan.
+ ./hardware-configuration.nix
+ ./kde.nix
+ #./gnome.nix
+ ];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@@ -71,7 +70,8 @@
users.users.lx = {
isNormalUser = true;
description = "Alex";
- extraGroups = [ "networkmanager" "wheel" "yggdrasil" ]; # Enable ‘sudo’ for the user.
+ extraGroups =
+ [ "networkmanager" "wheel" "yggdrasil" ]; # Enable ‘sudo’ for the user.
};
nixpkgs.config.allowUnfree = true;
@@ -111,13 +111,12 @@
borgbackup
nomad
consul
+ nixfmt
alacritty
firefox
qutebrowser
- (tor-browser-bundle-bin.override {
- useHardenedMalloc = false;
- })
+ (tor-browser-bundle-bin.override { useHardenedMalloc = false; })
lagrange
thunderbird
keepassxc
@@ -132,8 +131,10 @@
programs.steam = {
enable = true;
- remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
- dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+ remotePlay.openFirewall =
+ true; # Open ports in the firewall for Steam Remote Play
+ dedicatedServer.openFirewall =
+ true; # Open ports in the firewall for Source Dedicated Server
};
# Some programs need SUID wrappers, can be configured further or are
@@ -152,11 +153,7 @@
services.yggdrasil = {
enable = true;
persistentKeys = true;
- settings = {
- Peers = [
- "tls://37.187.118.206:53103"
- ];
- };
+ settings = { Peers = [ "tls://37.187.118.206:53103" ]; };
};
# Open ports in the firewall.
diff --git a/kusanagi/nixos/gnome.nix b/kusanagi/nixos/gnome.nix
index 623d601..9d02459 100644
--- a/kusanagi/nixos/gnome.nix
+++ b/kusanagi/nixos/gnome.nix
@@ -1,24 +1,23 @@
-{ config, pkgs, ... }:
-{
+{ config, pkgs, ... }: {
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = [
- pkgs.gnome.cheese
- pkgs.gnome-photos
- pkgs.gnome.gnome-music
- #pkgs.gnome.gnome-terminal
- pkgs.gnome.gedit
- pkgs.epiphany
- pkgs.gnome.geary
- #pkgs.evince
- #pkgs.gnome.gnome-characters
- pkgs.gnome.totem
- pkgs.gnome.tali
- pkgs.gnome.iagno
- pkgs.gnome.hitori
- pkgs.gnome.atomix
- pkgs.gnome-tour
- pkgs.gnome-console
+ pkgs.gnome.cheese
+ pkgs.gnome-photos
+ pkgs.gnome.gnome-music
+ #pkgs.gnome.gnome-terminal
+ pkgs.gnome.gedit
+ pkgs.epiphany
+ pkgs.gnome.geary
+ #pkgs.evince
+ #pkgs.gnome.gnome-characters
+ pkgs.gnome.totem
+ pkgs.gnome.tali
+ pkgs.gnome.iagno
+ pkgs.gnome.hitori
+ pkgs.gnome.atomix
+ pkgs.gnome-tour
+ pkgs.gnome-console
];
environment.systemPackages = with pkgs; [
@@ -28,5 +27,5 @@
gnomeExtensions.appindicator
gnomeExtensions.dash-to-panel
gnome.gnome-terminal
- ]
+ ];
}
diff --git a/kusanagi/nixos/hardware-configuration.nix b/kusanagi/nixos/hardware-configuration.nix
index e4827aa..e7fa542 100644
--- a/kusanagi/nixos/hardware-configuration.nix
+++ b/kusanagi/nixos/hardware-configuration.nix
@@ -4,39 +4,37 @@
{ config, lib, pkgs, modulesPath, ... }:
{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
- boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+ boot.initrd.availableKernelModules =
+ [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
- boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/e3271725-effb-4b00-a5d4-8a7a64f55420";
+ boot.initrd.luks.devices.crypted.device =
+ "/dev/disk/by-uuid/e3271725-effb-4b00-a5d4-8a7a64f55420";
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/2f606c6b-8009-4158-b367-2e0cf1a57ade";
- fsType = "ext4";
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/2f606c6b-8009-4158-b367-2e0cf1a57ade";
+ fsType = "ext4";
+ };
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/0143-7D54";
- fsType = "vfat";
- };
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/0143-7D54";
+ fsType = "vfat";
+ };
- fileSystems."/home" =
- { device = "/dev/disk/by-uuid/f955ce34-f25e-4abf-8732-bcf17465f78c";
- fsType = "ext4";
- };
+ fileSystems."/home" = {
+ device = "/dev/disk/by-uuid/f955ce34-f25e-4abf-8732-bcf17465f78c";
+ fsType = "ext4";
+ };
- swapDevices = [
- {
- device = "/dev/disk/by-uuid/c78cfb77-75ee-4aae-9b24-b91f8eebb7c2";
- }
- ];
+ swapDevices =
+ [{ device = "/dev/disk/by-uuid/c78cfb77-75ee-4aae-9b24-b91f8eebb7c2"; }];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+ hardware.cpu.intel.updateMicrocode =
+ lib.mkDefault config.hardware.enableRedistributableFirmware;
}
diff --git a/kusanagi/nixos/kde.nix b/kusanagi/nixos/kde.nix
index 80ff523..653a8eb 100644
--- a/kusanagi/nixos/kde.nix
+++ b/kusanagi/nixos/kde.nix
@@ -1,10 +1,6 @@
-{ config, pkgs, ... }:
-{
+{ config, pkgs, ... }: {
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
- environment.systemPackages = with pkgs.libsForQt5; [
- kgpg
- ark
- ];
+ environment.systemPackages = with pkgs.libsForQt5; [ kgpg ark ];
}