Skip to content

Commit

Permalink
Recommission wiretop with better laptop
Browse files Browse the repository at this point in the history
  • Loading branch information
itslychee committed Feb 12, 2025
1 parent 18a16bf commit 994f90d
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 60 deletions.
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion hive.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ in
];
wiretop.imports = [
./modules/roles/graphical
{ system.stateVersion = "24.05"; }
{ system.stateVersion = "24.11"; }
];
}
38 changes: 13 additions & 25 deletions hosts/wiretop/default.nix
Original file line number Diff line number Diff line change
@@ -1,32 +1,20 @@
{ pkgs, ... }:
{
boot = {
loader.systemd-boot.enable = true;
initrd.availableKernelModules = [
"xhci_pci"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
kernelModules = [ "kvm-intel" ];
};

hey = {
hostKeys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINnq/AyE9T+4uA4/707mECHbt+5ZzeaK3zFW4AUEMvi";
users.lychee = {
packages = [
pkgs.firefox
pkgs.minicom
];
};
};
boot.loader.systemd-boot.enable = true;
hey.hostKeys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAWO20sj075BlyT08kubpDUpbFFKjrz1YNo2CfTeVPWv";
networking.networkmanager.enable = true;
programs.wireshark.enable = true;

services.xserver = {
services.desktopManager.plasma6.enable = true;
services.displayManager.sddm = {
wayland.enable = true;
enable = true;
displayManager.lightdm.enable = true;
desktopManager.lxqt.enable = true;
};
environment.systemPackages = [
(pkgs.vesktop.override {
withMiddleClickScroll = true;
withSystemVencord = true;
})
];

# hey cutie, don't touch!
system.stateVersion = "24.05";
}
49 changes: 27 additions & 22 deletions hosts/wiretop/hardware.nix
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
# 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,
modulesPath,
...
}:

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

boot.initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"usbhid"
"usb_storage"
"sd_mod"
"sdhci_pci"
"rtsx_pci_sdmmc"
];
boot.initrd.systemd.enable = true;
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/860f0369-de80-4aea-b9c5-31a127e7df84";
boot.extraModulePackages = [ ];

fileSystems."/" = {
device = "/dev/disk/by-uuid/c94d0961-d23a-44e2-b948-a23af7d0345d";
fsType = "ext4";
};

boot.initrd.luks.devices."root" = {
device = "/dev/disk/by-uuid/faa34ed7-6d4d-45ca-8a9c-b0c01eff7c9e";
crypttabExtraOpts = [ "fido2-device=auto" ];
};

fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/86048cc2-c111-4118-9d9b-03083fccd0d6";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/8E46-6726";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E3F9-13FA";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};

swapDevices = lib.singleton {
device = "/dev/disk/by-uuid/fc1faaf9-2137-4780-a1c0-926cfb3aa99a";
device = "/dev/disk/by-uuid/dc22753e-27ee-4d5b-85ec-2a955e75733a";
};

networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.bluetooth.enable = true;
}
3 changes: 3 additions & 0 deletions hosts/wiretop/networking.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{

}

0 comments on commit 994f90d

Please sign in to comment.