This commit is contained in:
Varris 2024-02-13 15:04:39 +01:00
parent 91b065d17d
commit 2a8ada6b01
11 changed files with 63 additions and 27 deletions

View File

@ -11,36 +11,40 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nur = {
url = "github:nix-community/NUR";
};
chaotic-nyx = {
url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
# url = "github:hyprwm/hyprland/12d79d63421e2ed3f31130755c7a37f0e4fb5cb1";
url = "github:hyprwm/hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
eww-systray = {
url = "github:ralismark/eww/tray-3";
inputs.nixpkgs.follows = "nixpkgs";
};
grub2-themes = {
url = "github:vinceliuice/grub2-themes";
inputs.nixpkgs.follows = "nixpkgs";
};
helix = {
url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:hyprwm/hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
nur = {
url = "github:nix-community/NUR";
};
wezterm = {
url = "github:happenslol/wezterm/add-nix-flake?dir=nix";
inputs.nixpkgs.follows = "nixpkgs";
@ -105,7 +109,9 @@
#edit as you see fit
hostName = "terra";
userName = "manuel";
emailAddress = "varris@posteo.net";
flakeDir = "/home/${userName}/.dotfiles";
#-------------------
in {
formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
overlays = import ./overlay.nix {inherit inputs;};
@ -121,6 +127,7 @@
modules = [
./system/configuration.nix
inputs.chaotic-nyx.nixosModules.default
inputs.grub2-themes.nixosModules.default
inputs.nur.nixosModules.nur
];
};
@ -131,6 +138,7 @@
inherit inputs;
inherit userName;
inherit flakeDir;
inherit emailAddress;
};
modules = [
./user/home.nix

View File

@ -26,7 +26,7 @@
openmw = prev.openmw.overrideAttrs (old: {
version = "9999";
src = inputs.openmw-git;
buildInputs = (prev.lib.lists.remove prev.mygui old.buildInputs) ++ [prev.libyamlcpp prev.luajit prev.collada-dom final.mygui-openmw];
buildInputs = (prev.lib.lists.remove prev.mygui old.buildInputs) ++ [prev.libyamlcpp prev.luajit prev.collada-dom prev.libsForQt5.qt5.qttools final.mygui-openmw];
cmakeFlags =
old.cmakeFlags
++ [

View File

@ -22,20 +22,33 @@
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = ["i2c-dev" "i2c-piix4"];
kernelParams = [
"amdgpu.ppfeaturemask=0xffffffff"
"amd_pstate.shared_mem=1"
"amd_pstate=active"
#quiet boot
"quiet"
"splash"
"vga=current"
"quiet"
"rd.udev.log_level=3"
"udev.log_priority=3"
"splash"
];
initrd.verbose = false;
consoleLogLevel = 0;
loader = {
efi = {
efiSysMountPoint = "/boot";
canTouchEfiVariables = true;
};
systemd-boot = {
enable = true;
configurationLimit = 10;
consoleMode = "auto";
};
timeout = 0;
};
};
@ -45,7 +58,7 @@
networking = {
hostName = "${hostName}"; #hostname declared in flake.nix
firewall.enable = false;
useNetworkd = true;
networkmanager.enable = true;
extraHosts = ''
192.168.0.18 steam.deck
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com
@ -92,6 +105,15 @@
}
];
};
wrappers = {
"wavemon" = {
source = "${pkgs.wavemon}/bin/wavemon";
owner = "root";
group = "root";
capabilities = "cap_net_admin+eip";
};
};
};
users.users.${userName} = {
@ -186,5 +208,5 @@
};
};
system.stateVersion = "23.05";
system.stateVersion = "23.11";
}

View File

@ -13,7 +13,7 @@
];
boot.initrd.availableKernelModules = ["nvme"];
boot.initrd.kernelModules = [];
boot.initrd.kernelModules = ["amdgpu"];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];

View File

@ -4,7 +4,7 @@
extraPackages = [pkgs.libvdpau-va-gl];
driSupport32Bit = true;
};
# chaotic.mesa-git.enable = true;
chaotic.mesa-git.enable = true;
hardware.steam-hardware.enable = true;

View File

@ -12,5 +12,5 @@
ssh.startAgent = true;
steam.enable = true;
};
chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda proton-ge-custom];
chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda];
}

View File

@ -1,4 +1,8 @@
{
pkgs,
config,
...
}: {
imports = [
./locate
./pipewire

View File

@ -18,7 +18,6 @@
gruvbox-dark-theme
indie-wiki-buddy
istilldontcareaboutcookies
nitter-redirect
privacy-badger
redirector
return-youtube-dislikes

View File

@ -83,6 +83,7 @@
:class "widget-systray"
(systray
:pack-direction "rtl"
:icon-size 26
)
)
)

View File

@ -98,6 +98,7 @@
};
exec-once = [
"${pkgs.networkmanagerapplet}/bin/nm-applet"
"${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp"
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
"${pkgs.ydotool}/bin/ydotoold"

View File

@ -4,6 +4,7 @@
lib,
inputs,
userName,
emailAddress,
...
}: {
imports = [
@ -152,7 +153,7 @@
enable = true;
lfs.enable = true;
userName = "Varris";
userEmail = "varris@posteo.net";
userEmail = "${emailAddress}";
};
nix-index = {
@ -170,7 +171,7 @@
enable = true;
settings = {
pinentry = "gtk2";
email = "varris@posteo.net";
email = "${emailAddress}";
};
};
};
@ -195,5 +196,5 @@
programs.home-manager.enable = true;
home.stateVersion = "23.05";
home.stateVersion = "23.11";
}