parent
d2b3336f13
commit
e68b978c77
6 changed files with 51 additions and 49 deletions
|
@ -69,10 +69,6 @@
|
||||||
preserve_split = "yes";
|
preserve_split = "yes";
|
||||||
};
|
};
|
||||||
|
|
||||||
master = {
|
|
||||||
new_is_master = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
gestures = {
|
gestures = {
|
||||||
workspace_swipe = false;
|
workspace_swipe = false;
|
||||||
};
|
};
|
||||||
|
|
|
@ -56,7 +56,6 @@
|
||||||
# devtools
|
# devtools
|
||||||
github-desktop
|
github-desktop
|
||||||
gh
|
gh
|
||||||
codeql
|
|
||||||
vscode
|
vscode
|
||||||
jetbrains.ruby-mine
|
jetbrains.ruby-mine
|
||||||
jetbrains.rider
|
jetbrains.rider
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
# 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 = [ "ahci" "ohci_pci" "ehci_pci" "xhci_pci" "pata_jmicron" "aic7xxx" "firewire_ohci" "usb_storage" "usbhid" "floppy" "sd_mod" "sr_mod" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/805a68e8-b1d8-40b3-a264-58a90044b610";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/5190c160-67ec-45b2-bded-b7e6f858cb76"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
# 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
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
|
@ -31,10 +31,10 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
"banana" = mkSystem {
|
"sunfish" = mkSystem {
|
||||||
specialArgs = commonArgs;
|
specialArgs = commonArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./banana/configuration.nix
|
./sunfish/configuration.nix
|
||||||
home-manager
|
home-manager
|
||||||
home
|
home
|
||||||
];
|
];
|
||||||
|
|
|
@ -91,7 +91,7 @@
|
||||||
swayidle
|
swayidle
|
||||||
wofi
|
wofi
|
||||||
swaylock
|
swaylock
|
||||||
gnome.gnome-keyring
|
gnome-keyring
|
||||||
gtklock
|
gtklock
|
||||||
tailscale
|
tailscale
|
||||||
];
|
];
|
||||||
|
@ -105,15 +105,11 @@
|
||||||
winePackages.fonts
|
winePackages.fonts
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "banana";
|
networking.hostName = "sunfish";
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
boot.loader.grub.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.grub.device = "nodev";
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.loader.grub.efiSupport = false;
|
|
||||||
|
|
||||||
#boot.loader.systemd-boot.enable = true;
|
|
||||||
#boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
boot.initrd.systemd.enable = true;
|
boot.initrd.systemd.enable = true;
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
45
hosts/sunfish/hardware-configuration.nix
Normal file
45
hosts/sunfish/hardware-configuration.nix
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
# 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" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
|
||||||
|
boot.initrd.kernelModules = [];
|
||||||
|
boot.kernelModules = ["kvm-intel"];
|
||||||
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/8050c8ec-0625-498d-99f6-198d58f65c79";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/efi" = {
|
||||||
|
device = "/dev/disk/by-uuid/4EAD-75BA";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = ["fmask=0077" "dmask=0077"];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{device = "/dev/disk/by-uuid/1a21fac9-5a8e-4ae1-ae44-5049211d56fc";}
|
||||||
|
];
|
||||||
|
|
||||||
|
# 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
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
Loading…
Reference in a new issue