Run alejandra

Signed-off-by: Tristan Druyen <tristan@vault81.de>
This commit is contained in:
Tristan D. 2023-09-12 21:44:15 +02:00
parent 1bbb38031c
commit 3a2886df79
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
5 changed files with 59 additions and 54 deletions

View file

@ -1,15 +1,15 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. pkgs,
./hardware-configuration.nix ...
]; }: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
nix = { nix = {
package = pkgs.nixFlakes; package = pkgs.nixFlakes;
@ -65,7 +65,7 @@
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = ["amdgpu"];
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { services.xserver = {
@ -101,7 +101,7 @@
users.users.tristand = { users.users.tristand = {
isNormalUser = true; isNormalUser = true;
description = "Tristan Druyen"; description = "Tristan Druyen";
extraGroups = [ "networkmanager" "wheel" "libvirtd" ]; extraGroups = ["networkmanager" "wheel" "libvirtd"];
shell = pkgs.fish; shell = pkgs.fish;
}; };
@ -134,17 +134,16 @@
# programs.mtr.enable = true; # programs.mtr.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
# List services that you want to enable: # List services that you want to enable:
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22 80 443 ]; networking.firewall.allowedTCPPorts = [22 80 443];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
@ -156,5 +155,4 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?
} }

View file

@ -32,7 +32,7 @@
doom ; what makes DOOM look the way it does doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs doom-dashboard ; a nifty splash screen for Emacs
doom-quit ; DOOM quit-message prompts when you quit Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs
(emoji +unicode) ; 🙂 ;;(emoji +unicode) ; 🙂
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
;;hydra ;;hydra
;;indent-guides ; highlighted indent columns ;;indent-guides ; highlighted indent columns

View file

@ -19,28 +19,31 @@
}; };
outputs = { outputs = {
self, home-manager, nixpkgs, tuxedo-nixos, nix-doom-emacs self,
home-manager,
nixpkgs,
tuxedo-nixos,
nix-doom-emacs,
}: { }: {
nixosConfigurations = { nixosConfigurations = {
nixos-pulse = nixpkgs.lib.nixosSystem { nixos-pulse = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
{ _module.args.nix-doom-emacs-module = nix-doom-emacs.hmModule; } {_module.args.nix-doom-emacs-module = nix-doom-emacs.hmModule;}
./home.nix ./home.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
} }
tuxedo-nixos.nixosModules.default tuxedo-nixos.nixosModules.default
{ {
hardware.tuxedo-control-center.enable = true; hardware.tuxedo-control-center.enable = true;
hardware.tuxedo-control-center.package = tuxedo-nixos.packages.x86_64-linux.default; hardware.tuxedo-control-center.package = tuxedo-nixos.packages.x86_64-linux.default;
} }
]; ];
}; };
}; };
}; };
} }

View file

@ -1,33 +1,37 @@
# 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, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "uas" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "uas" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" "amdgpu" ]; boot.kernelModules = ["kvm-amd" "amdgpu"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0"; device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102"; boot.initrd.luks.devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/B471-B193"; device = "/dev/disk/by-uuid/B471-B193";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53"; } {device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";}
]; ];
# 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
@ -49,5 +53,4 @@
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.hip}" "L+ /opt/rocm/hip - - - - ${pkgs.hip}"
]; ];
} }

View file

@ -1,12 +1,11 @@
{ nix-doom-emacs-module, ... }: {nix-doom-emacs-module, ...}: {
{ home-manager.users.tristand = {pkgs, ...}: {
home-manager.users.tristand = { pkgs, ... }: {
imports = [ imports = [
nix-doom-emacs-module nix-doom-emacs-module
]; ];
nix = { nix = {
settings.experimental-features = [ "nix-command" "flakes" ]; settings.experimental-features = ["nix-command" "flakes"];
}; };
programs.doom-emacs = { programs.doom-emacs = {
@ -18,7 +17,7 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Tristan Druyen"; userName = "Tristan Druyen";
userEmail = "tristan@vault81.de"; userEmail = "tristan@vault81.de";
aliases = { aliases = {
ci = "commit"; ci = "commit";
@ -49,6 +48,8 @@
thunderbird thunderbird
]; ];
home.stateVersion = "23.05"; home.stateVersion = "23.05";
services.emacs = {
enable = true;
};
}; };
} }