forked from foxora/nix
#1 hater of infinite recursion
This commit is contained in:
parent
43b04c3f8a
commit
a5bb1d1cc1
31 changed files with 946 additions and 851 deletions
|
|
@ -1,12 +1,10 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
upkgs,
|
||||
spkgs,
|
||||
root,
|
||||
...
|
||||
}: let
|
||||
hyprland-git = inputs.hyprland-git.packages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
|
|
@ -19,8 +17,6 @@ in {
|
|||
download-buffer-size = 524288000;
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot = rec {
|
||||
initrd.kernelModules = ["amdgpu"];
|
||||
|
|
@ -30,8 +26,8 @@ in {
|
|||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
||||
# kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4;
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
# kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4;
|
||||
kernelPackages = upkgs.linuxPackages_latest;
|
||||
kernelModules = ["v4l2loopback"];
|
||||
extraModulePackages = with kernelPackages; [v4l2loopback];
|
||||
|
||||
|
|
@ -107,7 +103,7 @@ in {
|
|||
enable = true;
|
||||
};
|
||||
|
||||
extraPortals = with pkgs; [
|
||||
extraPortals = with upkgs; [
|
||||
xdg-desktop-portal-termfilechooser
|
||||
];
|
||||
|
||||
|
|
@ -134,7 +130,7 @@ in {
|
|||
enable = true;
|
||||
enable32Bit = true;
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
extraPackages = with upkgs; [
|
||||
libva-vdpau-driver
|
||||
libvdpau-va-gl
|
||||
];
|
||||
|
|
@ -165,7 +161,7 @@ in {
|
|||
|
||||
udev = {
|
||||
enable = true;
|
||||
packages = with pkgs; [
|
||||
packages = with upkgs; [
|
||||
# adds via support for keyboards and stuffs :3 (needs reboot)
|
||||
via
|
||||
|
||||
|
|
@ -208,9 +204,9 @@ in {
|
|||
uid = 1000;
|
||||
extraGroups = ["wheel" "disk" "input" "video" "audio" "networkmanager" "games"];
|
||||
|
||||
shell = pkgs.zsh;
|
||||
shell = upkgs.zsh;
|
||||
|
||||
packages = with pkgs; [
|
||||
packages = with upkgs; [
|
||||
flatpak
|
||||
tree
|
||||
];
|
||||
|
|
@ -220,14 +216,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
|
||||
users.aurora = import ../../homes/aurora;
|
||||
extraSpecialArgs = {inherit inputs upkgs root;};
|
||||
};
|
||||
|
||||
programs = {
|
||||
# nix-ld runs unpatched dynamic binaries on nixos :3
|
||||
nix-ld.enable = true;
|
||||
|
|
@ -251,12 +239,12 @@ in {
|
|||
# to work properly on hyprland
|
||||
hyprland = {
|
||||
enable = true;
|
||||
package = hyprland-git.hyprland;
|
||||
portalPackage = hyprland-git.xdg-desktop-portal-hyprland;
|
||||
package = upkgs.hyprland-git.hyprland;
|
||||
portalPackage = upkgs.hyprland-git.xdg-desktop-portal-hyprland;
|
||||
};
|
||||
|
||||
river-classic = {
|
||||
package = upkgs.river-classic; # FIX: using upkgs version as zls is broken rn ;-;
|
||||
package = spkgs.river-classic; # FIX: using spkgs version as zls is broken rn ;-;
|
||||
enable = true;
|
||||
};
|
||||
|
||||
|
|
@ -268,7 +256,7 @@ in {
|
|||
# steam has to be enabled here
|
||||
steam = {
|
||||
enable = true;
|
||||
package = pkgs.millennium-steam;
|
||||
package = upkgs.millennium-steam;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
|
|
@ -277,7 +265,7 @@ in {
|
|||
|
||||
alvr = {
|
||||
enable = true;
|
||||
package = upkgs.alvr;
|
||||
package = spkgs.alvr;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
|
|
@ -300,7 +288,7 @@ in {
|
|||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
environment.systemPackages = with upkgs; [
|
||||
# linux packages!!!
|
||||
linuxPackages.v4l2loopback
|
||||
|
||||
|
|
@ -325,17 +313,17 @@ in {
|
|||
# waydroid needs it apparently for clipboard sharing??
|
||||
wl-clipboard
|
||||
(waydroid.override {
|
||||
python3Packages = pkgs.python312Packages;
|
||||
python3Packages = upkgs.python312Packages;
|
||||
})
|
||||
|
||||
# game stuff :3
|
||||
(lutris.override {
|
||||
extraPkgs = pkgs: [
|
||||
extraupkgs = upkgs: [
|
||||
libadwaita
|
||||
];
|
||||
})
|
||||
(steam.override {
|
||||
extraPkgs = pkgs: [
|
||||
extraupkgs = upkgs: [
|
||||
nss
|
||||
xorg.libX11
|
||||
xorg.libXScrnSaver
|
||||
|
|
@ -356,7 +344,7 @@ in {
|
|||
# Most users should NEVER change this value after the initial install, for any reason,
|
||||
# even if you've upgraded your system to a new NixOS release.
|
||||
#
|
||||
# This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
|
||||
# This value does NOT affect the Nixupkgs version your packages and OS are pulled from,
|
||||
# so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
|
||||
# to actually do that.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,55 +1,58 @@
|
|||
# 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")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@"];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
};
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@home"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nix" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@nix"];
|
||||
};
|
||||
|
||||
fileSystems."/games" =
|
||||
{ device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@games" ];
|
||||
};
|
||||
fileSystems."/games" = {
|
||||
device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@games"];
|
||||
};
|
||||
|
||||
fileSystems."/data" =
|
||||
{ device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@data" ];
|
||||
};
|
||||
fileSystems."/data" = {
|
||||
device = "/dev/disk/by-uuid/257dd2c7-59b1-431e-a5a1-c7db00b3312b";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@data"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/63DC-1AEB";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/63DC-1AEB";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
upkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
|
|
@ -12,20 +12,22 @@ in {
|
|||
};
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
amdgpu-ignore-ctx-privileges = super.fetchpatch {
|
||||
name = "cap_sys_nice_begone.patch";
|
||||
url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch";
|
||||
hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo=";
|
||||
};
|
||||
})
|
||||
];
|
||||
nixpkgs.channels.default = {
|
||||
upkgs.overlays = [
|
||||
(self: super: {
|
||||
amdgpu-ignore-ctx-privileges = super.fetchpatch {
|
||||
name = "cap_sys_nice_begone.patch";
|
||||
url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch";
|
||||
hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo=";
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
boot.kernelPatches = [
|
||||
{
|
||||
name = "amdgpu-ignore-ctx-privileges";
|
||||
patch = pkgs.amdgpu-ignore-ctx-privileges;
|
||||
patch = upkgs.amdgpu-ignore-ctx-privileges;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue