set laptop up again

This commit is contained in:
Greg Leyda 2023-01-31 16:48:36 -05:00
parent b2af978996
commit 6e99b9e9c9
7 changed files with 28 additions and 20 deletions

View file

@ -62,6 +62,18 @@
./nix.nix ./nix.nix
]; ];
}; };
gerg-laptop = lib.nixosSystem {
inherit system pkgs;
specialArgs = {inherit inputs settings;};
modules = [
inputs.sxhkd-flake.nixosModules.sxhkd
inputs.home-manager.nixosModules.home-manager
./home-manager
./configuration.nix
./systems/laptop.nix
./nix.nix
];
};
}; };
}; };
} }

View file

@ -14,8 +14,6 @@
alsa-utils #volume control alsa-utils #volume control
btrfs-progs #for external harddrive btrfs-progs #for external harddrive
vlc #play stuff vlc #play stuff
bitwarden #store stuff
qbittorrent #steal stuff
webcord # talk to people (gross) webcord # talk to people (gross)
feh #for wallpaper feh #for wallpaper
xfce.mousepad xfce.mousepad

View file

@ -1,14 +1,14 @@
{ {
hardware.nvidia.prime = { hardware.nvidia = {
prime = {
sync.enable = true; sync.enable = true;
amdgpuBusId = "PCI:5:0:0"; amdgpuBusId = "PCI:5:0:0";
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
nvidia = { };
nvidiaPersistenced = false; nvidiaPersistenced = false;
nvidiaSettings = false; nvidiaSettings = false;
modesetting.enable = true; modesetting.enable = true;
}; };
};
services.xserver = { services.xserver = {
videoDrivers = ["modesetting" "nvidia"]; videoDrivers = ["modesetting" "nvidia"];
}; };

View file

@ -25,6 +25,10 @@
m: m:
../modules + ("/" + m + ".nix") ../modules + ("/" + m + ".nix")
); );
environment.systemPackages = with pkgs; [
bitwarden #store stuff
qbittorrent #steal stuff
];
networking.hostName = "gerg-desktop"; networking.hostName = "gerg-desktop";
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;

View file

@ -25,12 +25,6 @@
networking.hostName = "gerg-laptop"; networking.hostName = "gerg-laptop";
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
#environment.systemPackages = with pkgs; [
# xorg.xf86videoamdgpu
#];
#don't think i need this^
# user managment
users = { users = {
defaultUserShell = pkgs.zsh; defaultUserShell = pkgs.zsh;
users."${settings.username}" = { users."${settings.username}" = {