Skip to content

Commit

Permalink
use alejandra code formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
brckd committed Mar 4, 2024
1 parent 3d3ad1b commit 6f1b9b2
Show file tree
Hide file tree
Showing 34 changed files with 532 additions and 377 deletions.
8 changes: 3 additions & 5 deletions configs/droid/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{ pkgs, ... }:

{
{pkgs, ...}: {
system.stateVersion = "23.11";

nix.extraOptions = ''
experimental-features = nix-command flakes
'';

environment.packages = with pkgs; [ zsh ];
environment.packages = with pkgs; [zsh];

user.shell = "${pkgs.zsh}/bin/zsh";
user.shell = "${pkgs.zsh}/bin/zsh";
}
8 changes: 3 additions & 5 deletions configs/home/bricked/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{ nix-colors, ... }:

{
{nix-colors, ...}: {
home = {
username = "bricked";
homeDirectory = "/home/bricked";
Expand All @@ -13,8 +11,8 @@
programs.starship.enable = true;
programs.kitty.enable = true;
programs.fastfetch.enable = true;
programs.git.enable = true;
programs.gh.enable = true;
programs.git.enable = true;
programs.gh.enable = true;

# Desktop environment
wayland.windowManager.hyprland = {
Expand Down
8 changes: 3 additions & 5 deletions configs/home/droid/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{ ... }:

{
{...}: {
# Terminal
programs.zsh.enable = true;
programs.starship.enable = true;
programs.fastfetch.enable = true;
programs.git.enable = true;
programs.gh.enable = true;
programs.git.enable = true;
programs.gh.enable = true;

# Editor
programs.nixvim = {
Expand Down
6 changes: 2 additions & 4 deletions configs/home/john/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{ nix-colors, ... }:

{
{nix-colors, ...}: {
home = {
username = "bricked";
homeDirectory = "/home/bricked";
Expand All @@ -12,7 +10,7 @@
programs.zsh.enable = true;
programs.starship.enable = true;
programs.kitty.enable = true;
programs.git.enable = true;
programs.git.enable = true;

# Desktop environment
wayland.windowManager.hyprland = {
Expand Down
21 changes: 9 additions & 12 deletions configs/nixos/desktop/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).

{ config, lib, pkgs, ... }:

{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
config,
lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];

# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
Expand Down Expand Up @@ -37,9 +39,6 @@
# Enable the X11 windowing system.
# services.xserver.enable = true;




# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
Expand Down Expand Up @@ -112,6 +111,4 @@
#
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "24.05"; # Did you read the comment?

}

9 changes: 6 additions & 3 deletions configs/nixos/desktop/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{ config, pkgs, nix-colors, ... }:

{
config,
pkgs,
nix-colors,
...
}: {
imports = [
./configuration.nix
];
Expand Down Expand Up @@ -55,7 +58,7 @@
bricked = {
isNormalUser = true;
description = "Bricked";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = ["networkmanager" "wheel"];
};
};

Expand Down
44 changes: 24 additions & 20 deletions configs/nixos/desktop/hardware-configuration.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:

{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];

fileSystems."/" =
{ device = "/dev/disk/by-uuid/062f2ee6-0a6f-4deb-bba0-6cba82b84bcc";
fsType = "ext4";
};
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];

fileSystems."/" = {
device = "/dev/disk/by-uuid/062f2ee6-0a6f-4deb-bba0-6cba82b84bcc";
fsType = "ext4";
};

boot.initrd.luks.devices."luks-0a8bfaf6-78ee-4c5d-885c-79a77514a2e6".device = "/dev/disk/by-uuid/0a8bfaf6-78ee-4c5d-885c-79a77514a2e6";

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/ABCF-243B";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/ABCF-243B";
fsType = "vfat";
};

swapDevices = [ ];
swapDevices = [];

# 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
Expand Down
21 changes: 9 additions & 12 deletions configs/nixos/laptop/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).

{ config, lib, pkgs, ... }:

{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
config,
lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];

# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
Expand Down Expand Up @@ -37,9 +39,6 @@
# Enable the X11 windowing system.
# services.xserver.enable = true;




# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
Expand Down Expand Up @@ -112,6 +111,4 @@
#
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment?

}

13 changes: 8 additions & 5 deletions configs/nixos/laptop/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{ config, pkgs, nix-colors, ... }:

{
config,
pkgs,
nix-colors,
...
}: {
imports = [
./configuration.nix
];
Expand Down Expand Up @@ -44,7 +47,7 @@
networking.protonvpn = {
enable = true;
endpoint = "138.199.7.234";
publicKey = "ozbmrTpgMTEuR1N7KguQD6qCMJzamTNYtFungG3xpQ0=";
publicKey = "ozbmrTpgMTEuR1N7KguQD6qCMJzamTNYtFungG3xpQ0=";
privateKeyFile = /root/secrets/protonvpn;
dns.enable = true;
};
Expand All @@ -54,12 +57,12 @@
bricked = {
isNormalUser = true;
description = "Bricked";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = ["networkmanager" "wheel"];
};
john = {
isNormalUser = true;
description = "John";
extraGroups = [ "networkmanager" ];
extraGroups = ["networkmanager"];
};
};

Expand Down
44 changes: 24 additions & 20 deletions configs/nixos/laptop/hardware-configuration.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:

{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "sdhci_acpi" "rtsx_usb_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];

fileSystems."/" =
{ device = "/dev/disk/by-uuid/821922b7-7e01-440e-b005-9880ac00e2f1";
fsType = "ext4";
};
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "sd_mod" "sdhci_acpi" "rtsx_usb_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

fileSystems."/" = {
device = "/dev/disk/by-uuid/821922b7-7e01-440e-b005-9880ac00e2f1";
fsType = "ext4";
};

boot.initrd.luks.devices."luks-2875592c-ce00-48d9-8b48-bd0016e122d4".device = "/dev/disk/by-uuid/2875592c-ce00-48d9-8b48-bd0016e122d4";

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/EA05-0FC2";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/EA05-0FC2";
fsType = "vfat";
};

swapDevices = [ ];
swapDevices = [];

# 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
Expand Down
Loading

0 comments on commit 6f1b9b2

Please sign in to comment.