Cleanup redshirt

This commit is contained in:
Felix Albrigtsen 2023-05-26 13:48:43 +02:00
parent a33204c85b
commit 4e8eacce37
3 changed files with 20 additions and 13 deletions

View File

@ -47,7 +47,9 @@
inherit inputs; inherit inputs;
}; };
modules = [ modules = [
./hosts/chapel/configuration.nix ./hosts/redshirt/configuration.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
sops-nix.nixosModules.sops
]; ];
}; };
}; };

View File

@ -1,5 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports =
[ [
@ -29,14 +28,14 @@
}; };
# The NixOS module enables critical components needed to run Hyprland properly, such as: polkit, xdg-desktop-portal-hyprland, graphics drivers, fonts, dconf, xwayland, and adding a proper Desktop Entry to your Display Manager. # The NixOS module enables critical components needed to run Hyprland properly, such as: polkit, xdg-desktop-portal-hyprland, graphics drivers, fonts, dconf, xwayland, and adding a proper Desktop Entry to your Display Manager.
programs.hyprland = { #programs.hyprland = {
enable = true; # enable = true;
package = pkgs.unstable.hyprland; # package = pkgs.unstable.hyprland;
}; #};
services.xserver.displayManager = { services.xserver.displayManager = {
lightdm.enable = true; lightdm.enable = true;
defaultSession = "hyprland"; #defaultSession = "hyprland";
}; };
# Configure keymap in X11 # Configure keymap in X11
@ -57,12 +56,15 @@
}; };
users.users.felixalb = { users.users.felixalb = {
extraGroups = [ "networkmanager" ]; extraGroups = [ "networkmanager" ];
shell = pkgs.zsh;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zsh zsh
neovim
git
ripgrep
rsync
cifs-utils cifs-utils
]; ];

View File

@ -14,16 +14,18 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/1446d565-a448-471f-bb7d-2fa519492573"; { device = "/dev/disk/by-uuid/0d709ab3-0d10-46eb-9e4f-10a320af703e";
fsType = "ext4"; fsType = "btrfs";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/678A-B7E8"; { device = "/dev/disk/by-uuid/6EE9-1C06";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices =
[ { device = "/dev/disk/by-uuid/2067bbb4-b4fa-4326-9f58-4018857058a7"; }
];
# 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
@ -33,6 +35,7 @@
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }