flakes: Migrate the config and miku to flakes
This commit is contained in:
@@ -1,73 +0,0 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
mkHost = (import ../modules { lib = lib; pkgs = pkgs; }).mkHost;
|
||||
in mkHost config {
|
||||
userName = "alexander";
|
||||
hostName = "ayame";
|
||||
wireless = true;
|
||||
wifiInterface = "wlan0";
|
||||
overlays = [ "nur" "unstable" ];
|
||||
hardwareImports = [ "intel" "mobile" ];
|
||||
programImports = [
|
||||
"zsh" "mpv" "git" "tmux" "firefox" "gnome-terminal" "gnome"
|
||||
];
|
||||
extraImports = [ "distributed-build/offload.nix" ];
|
||||
extraPackages = pkgs: with pkgs; [
|
||||
unstable.firmwareLinuxNonFree unstable.sof-firmware
|
||||
];
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/root";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/boot";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/cf3b1e1c-c245-4452-ad49-68ac72369e77"; }
|
||||
];
|
||||
extraOptions = old: {
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = false;
|
||||
efi.canTouchEfiVariables = false;
|
||||
grub = {
|
||||
enable = true;
|
||||
efiInstallAsRemovable = true;
|
||||
device = "nodev";
|
||||
efiSupport = true;
|
||||
# The UEFI is pretty wonky
|
||||
forcei686 = true;
|
||||
};
|
||||
};
|
||||
extraModprobeConfig = "";
|
||||
initrd = {
|
||||
availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_acpi" ];
|
||||
kernelModules = [
|
||||
"kvm-intel" "i915"
|
||||
];
|
||||
};
|
||||
# This spams the console and takes up so much CPU time
|
||||
kernelParams = [ "modprobe.blacklist=arizona_spi" ];
|
||||
kernelModules = [];
|
||||
extraModulePackages = [];
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
};
|
||||
|
||||
/*systemd.services = {
|
||||
rfkill-workaround = {
|
||||
enable = true;
|
||||
description = "Work around rfkill having the Wifi blocked at boot";
|
||||
before = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "rfkill unblock all";
|
||||
};
|
||||
};
|
||||
};*/
|
||||
};
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
{ config, pkgs, modulesPath, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./generic.nix
|
||||
../modules/hardware/generic.nix ../modules/hardware/video.nix
|
||||
../modules/users/fuck-xi.nix
|
||||
../modules/programs/zsh ../modules/programs/tmux ../modules/programs/emacs ../modules/programs/firefox ../modules/programs/gnome-terminal ../modules/programs/gnome
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(import (builtins.fetchGit {
|
||||
url = "https://github.com/nix-community/emacs-overlay.git";
|
||||
ref = "master";
|
||||
rev = "ce0e9482d53d69bedc8416d8a984d00e17607826";
|
||||
}))
|
||||
|
||||
# Unstable, NUR, ...
|
||||
(import ../overlays/unstable.nix pkgs)
|
||||
(import ../overlays/nur.nix pkgs)
|
||||
(import ../overlays/custom.nix pkgs)
|
||||
];
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
emacsPgtkGcc
|
||||
];
|
||||
|
||||
sessionVariables = {
|
||||
# Prevent us from having to always type it out
|
||||
#NIXOS_CONFIG = "\${HOME}/Development/Personal/nixos-config/hosts/isla.nix";
|
||||
};
|
||||
};
|
||||
|
||||
networking = {
|
||||
interfaces.enp6s0.useDHCP = false;
|
||||
hostName = "isla";
|
||||
# Nix otherwise has a conflict with this option
|
||||
wireless.enable = lib.mkForce false;
|
||||
|
||||
# Allow scream to connect to this host
|
||||
firewall.allowedUDPPorts = [ 4010 ];
|
||||
};
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
extraModprobeConfig = "";
|
||||
initrd = {
|
||||
availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "amdgpu" "vendor-reset" ];
|
||||
kernelModules = [];
|
||||
};
|
||||
kernelParams = [];
|
||||
kernelModules = [];
|
||||
extraModulePackages = [];
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
};
|
||||
|
||||
services = {
|
||||
emacs.package = pkgs.emacsPgtkGcc;
|
||||
};
|
||||
|
||||
systemd.services.NetworkManager-wait-online.enable = false;
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/root";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
};
|
||||
swapDevices = [ ];
|
||||
}
|
||||
199
hosts/miku.nix
199
hosts/miku.nix
@@ -1,20 +1,6 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
mkHost = (import ../modules { lib = lib; pkgs = pkgs; }).mkHost;
|
||||
in mkHost config {
|
||||
userName = "alexander";
|
||||
hostName = "miku";
|
||||
primaryInterface = "enp6s0";
|
||||
overlays = [ "nur" "unstable" "stable" "simple" "custom" "emacs" ];
|
||||
hardwareImports = [ "amdgpu" "amd" ];
|
||||
programImports = [
|
||||
"zsh" "git" "mpv" "tmux" "emacs" "firefox" "i18n" "gamemode" "gnome" #"gnome-terminal"
|
||||
"alacritty" "sway" "waybar" "swaync" "kanshi"
|
||||
"distributed-build/builder.nix"
|
||||
"music"
|
||||
];
|
||||
extraImports = [ "virtualisation/gaming.nix" "virtualisation" ];
|
||||
{
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/root";
|
||||
@@ -29,12 +15,11 @@ in mkHost config {
|
||||
fsType = "ext4";
|
||||
};
|
||||
};
|
||||
extraPackages = pkgs: with pkgs; [
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
emacsPgtkGcc
|
||||
gajim-mainwindow
|
||||
virt-manager unstable.qemu scream
|
||||
#gamemode # Custom package
|
||||
#key-mapper # Custom package
|
||||
virt-manager qemu scream
|
||||
replaysorcery # Custom package
|
||||
#evdev-proxy # Custom package
|
||||
vfio-isolate # Custom Package
|
||||
@@ -44,77 +29,138 @@ in mkHost config {
|
||||
mumble
|
||||
piper
|
||||
anime-dl trackma # Custom package
|
||||
unstable.thunderbird
|
||||
thunderbird
|
||||
multimc-wrapped # Custom package
|
||||
nwg-launchers
|
||||
];
|
||||
extraOptions = old: {
|
||||
system.autoUpgrade.channel = "https://nixos.org/channels/nixos-unstable";
|
||||
|
||||
ptw = {
|
||||
programs = {
|
||||
mpv.primaryScreen = "C27F398";
|
||||
adb.enable = true;
|
||||
sway.enable = true;
|
||||
alacritty.enable = true;
|
||||
emacs.enable = true;
|
||||
firefox.enable = true;
|
||||
git.enable = true;
|
||||
#gnome-terminal.enable = true;
|
||||
mpv.enable = true;
|
||||
tmux.enable = true;
|
||||
waybar.enable = true;
|
||||
xournalpp.enable = true;
|
||||
zsh.enable = true;
|
||||
};
|
||||
services = {
|
||||
gamemode.enable = true;
|
||||
#gnome.enable = true;
|
||||
kanshi = let
|
||||
horizontal = "Samsung Electric Company C27F398 H4ZR101145";
|
||||
vertical = "Goldstar Company Ltd IPS235 305NDPHKN600";
|
||||
|
||||
boot = {
|
||||
extraModprobeConfig = ''
|
||||
helpers = import ../lib/helpers/kanshi.nix;
|
||||
mkProfile = helpers.mkProfile;
|
||||
wallpaperScript = helpers.mkWallpaperScript {
|
||||
inherit pkgs config;
|
||||
};
|
||||
in {
|
||||
enable = true;
|
||||
profiles = {
|
||||
homeMultihead = mkProfile {
|
||||
outputs = [
|
||||
{
|
||||
criteria = vertical;
|
||||
status = "enable";
|
||||
mode = "1920x1080";
|
||||
transform = "90";
|
||||
position = "-1080,0";
|
||||
}
|
||||
{
|
||||
criteria = horizontal;
|
||||
status = "enable";
|
||||
mode = "1920x1080";
|
||||
position = "0,0";
|
||||
}
|
||||
];
|
||||
name = "homeMultihead";
|
||||
script = wallpaperScript;
|
||||
};
|
||||
};
|
||||
};
|
||||
swaync.enable = true;
|
||||
key-mapper.enable = true;
|
||||
};
|
||||
system = {
|
||||
i18n.enable = true;
|
||||
singleUser = "alexander";
|
||||
primaryInterface = "enp6s0";
|
||||
hostName = "miku";
|
||||
};
|
||||
virtualisation = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
programs.adb.enable = true;
|
||||
|
||||
boot = {
|
||||
extraModprobeConfig = ''
|
||||
options kvm_amd nested=1
|
||||
options vfio-pci ids=1002:67df,1002:aaf0
|
||||
options amdgpu dpm=0
|
||||
'';
|
||||
initrd = {
|
||||
availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "amdgpu" "vendor-reset" ];
|
||||
kernelModules = [
|
||||
"amdgpu" # GPU (duh)
|
||||
"kvm-amd" "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" # Virt
|
||||
"uinput" # key-mapper
|
||||
"vendor-reset"
|
||||
];
|
||||
};
|
||||
kernelParams = [
|
||||
"amd_iommu=on"
|
||||
"iommu=pt"
|
||||
"sysrq_always_enabled=1"
|
||||
"kvm.ignore_msrs=1"
|
||||
"kvm.report_ignored_msrs=N"
|
||||
"fbcon=rotate:3"
|
||||
"quiet"
|
||||
"tsc=unstable"
|
||||
initrd = {
|
||||
availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "amdgpu" ]; #"vendor-reset" ];
|
||||
kernelModules = [
|
||||
"amdgpu" # GPU (duh)
|
||||
"kvm-amd" "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" # Virt
|
||||
"uinput" # key-mapper
|
||||
#"vendor-reset"
|
||||
];
|
||||
extraModulePackages = [ pkgs.linuxPackages_xanmod.vendor-reset ];
|
||||
};
|
||||
kernelParams = [
|
||||
"amd_iommu=on"
|
||||
"iommu=pt"
|
||||
"sysrq_always_enabled=1"
|
||||
"kvm.ignore_msrs=1"
|
||||
"kvm.report_ignored_msrs=N"
|
||||
"fbcon=rotate:3"
|
||||
"quiet"
|
||||
"tsc=unstable"
|
||||
];
|
||||
|
||||
#extraModulePackages = [ pkgs.linuxPackages_xanmod.vendor-reset ];
|
||||
|
||||
#extraModulePackages = [ pkgs.linuxPackages.vendor-reset ];
|
||||
# NOTE: A regression appears to have happend between 5.10 and 5.12
|
||||
# which leads to the RX590 to have the fence fallback timer on
|
||||
# sdma0 time out (whatever this means). Maybe bisect?
|
||||
kernelPackages = pkgs.linuxPackages_xanmod;
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-wlr
|
||||
];
|
||||
};
|
||||
services = {
|
||||
ratbagd.enable = true;
|
||||
flatpak.enable = true;
|
||||
etesync-dav.enable = true;
|
||||
connman.extraConfig = ''
|
||||
#extraModulePackages = [ pkgs.linuxPackages.vendor-reset ];
|
||||
# NOTE: A regression appears to have happend between 5.10 and 5.12
|
||||
# which leads to the RX590 to have the fence fallback timer on
|
||||
# sdma0 time out (whatever this means). Maybe bisect?
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-wlr
|
||||
];
|
||||
};
|
||||
services = {
|
||||
ratbagd.enable = true;
|
||||
flatpak.enable = true;
|
||||
etesync-dav.enable = true;
|
||||
connman.extraConfig = ''
|
||||
WriteResolvConf=false
|
||||
'';
|
||||
udev = {
|
||||
#packages = with pkgs; [ key-mapper ];
|
||||
extraRules = ''
|
||||
KERNEL=="uinput", GROUP="input", MODE="0660"
|
||||
'';
|
||||
xserver = {
|
||||
enable = true;
|
||||
layout = "de";
|
||||
libinput.enable = true;
|
||||
displayManager.gdm = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
};
|
||||
gnome.gnome-keyring.enable = true;
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
# sway
|
||||
#"_JAVA_AWT_NONREPARENTING" = 1;
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
# sway
|
||||
#"_JAVA_AWT_NONREPARENTING" = 1;
|
||||
|
||||
# Wayland
|
||||
"QT_QPA_PLATFORM" = "wayland-egl";
|
||||
@@ -148,17 +194,6 @@ in mkHost config {
|
||||
Restart = "always";
|
||||
};
|
||||
};
|
||||
#key-mapper = {
|
||||
# description = "A tool to change the mapping of your input device buttons";
|
||||
# wantedBy = [ "default.target" ];
|
||||
# serviceConfig = {
|
||||
# Type = "simple";
|
||||
# ExecStart = "${pkgs.key-mapper}/bin/key-mapper-service";
|
||||
# Restart = "always";
|
||||
# # NOTE: The Tartarus may not be connected, so don't fail if we cannot set the preset
|
||||
# ExecPostStart = "${pkgs.key-mapper}/bin/key-mapper --command start --preset NOOP --device \"Razer Razer Tartarus V2\"; exit 0";
|
||||
# };
|
||||
#};
|
||||
replaysorcery = {
|
||||
description = "An open-source, instant-replay solution for Linux";
|
||||
#wantedBy = [ "default.target" ];
|
||||
|
||||
Reference in New Issue
Block a user