Formatting

This commit is contained in:
2024-07-28 03:00:57 -07:00
parent 8777df84f3
commit a808f58b6e
4 changed files with 82 additions and 55 deletions

View File

@@ -10,14 +10,18 @@
}; };
}; };
outputs = { self, nixpkgs, ... }@inputs: { outputs =
nixosConfigurations.default = nixpkgs.lib.nixosSystem { { self, nixpkgs, ... }@inputs:
specialArgs = {inherit inputs;}; {
modules = [ nixosConfigurations.default = nixpkgs.lib.nixosSystem {
./hosts/cap-nr200p/configuration.nix specialArgs = {
./modules/nixos/hyprland.nix inherit inputs;
inputs.home-manager.nixosModules.default };
]; modules = [
./hosts/cap-nr200p/configuration.nix
./modules/nixos/hyprland.nix
inputs.home-manager.nixosModules.default
];
};
}; };
};
} }

View File

@@ -5,10 +5,10 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@@ -25,7 +25,10 @@
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# Enable flakes # Enable flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ]; #-# nix.settings.experimental-features = [
"nix-command"
"flakes"
]; # -#
# Set your time zone. # Set your time zone.
time.timeZone = "America/Los_Angeles"; time.timeZone = "America/Los_Angeles";
@@ -84,14 +87,18 @@
users.users.caperren = { users.users.caperren = {
isNormalUser = true; isNormalUser = true;
description = "Corwin Perren"; description = "Corwin Perren";
extraGroups = [ "networkmanager" "wheel" "input" ]; extraGroups = [
"networkmanager"
"wheel"
"input"
];
packages = with pkgs; [ packages = with pkgs; [
# thunderbird # thunderbird
]; ];
}; };
# Install firefox. # Install firefox.
programs.firefox.enable = true; #-# programs.firefox.enable = true; # -#
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@@ -99,8 +106,8 @@
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget # wget
lf lf
git git
wofi wofi
@@ -156,7 +163,7 @@
]; ];
programs.thunar.enable = true; programs.thunar.enable = true;
programs.thunar.plugins = with pkgs.xfce; [ programs.thunar.plugins = with pkgs.xfce; [
thunar-archive-plugin thunar-archive-plugin
thunar-volman thunar-volman
]; ];
@@ -169,19 +176,21 @@
security.sudo = { security.sudo = {
enable = true; enable = true;
extraRules = [{ extraRules = [
commands = [ {
{ commands = [
command = "${pkgs.systemd}/bin/reboot"; {
options = [ "NOPASSWD" ]; command = "${pkgs.systemd}/bin/reboot";
} options = [ "NOPASSWD" ];
{ }
command = "${pkgs.systemd}/bin/poweroff"; {
options = [ "NOPASSWD" ]; command = "${pkgs.systemd}/bin/poweroff";
} options = [ "NOPASSWD" ];
]; }
groups = [ "wheel" ]; ];
}]; groups = [ "wheel" ];
}
];
}; };
programs.steam = { programs.steam = {
@@ -202,7 +211,7 @@
# 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 = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];

View File

@@ -1,28 +1,42 @@
# 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, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/0ffc75db-278d-4d96-99ee-4d17e6b1a9c2"; device = "/dev/disk/by-uuid/0ffc75db-278d-4d96-99ee-4d17e6b1a9c2";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/5BDD-941D"; device = "/dev/disk/by-uuid/5BDD-941D";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
}; "fmask=0022"
"dmask=0022"
];
};
swapDevices = [ ]; swapDevices = [ ];

View File

@@ -1,4 +1,5 @@
{ pkgs, config, ... }: { { pkgs, config, ... }:
{
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
@@ -63,10 +64,9 @@
pkgs.slurp pkgs.slurp
pkgs.nwg-displays pkgs.nwg-displays
(pkgs.waybar.overrideAttrs (oldAttrs: { (pkgs.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
}) }))
)
]; ];
xdg.portal.enable = true; xdg.portal.enable = true;