From 221fc8eba88abe50b0b295f75747087d043a5d96 Mon Sep 17 00:00:00 2001 From: Varris Date: Tue, 20 Sep 2022 15:26:47 +0200 Subject: [PATCH] update --- flake.lock | 181 +++++++++++++++++++++++++++++++++++++-- flake.nix | 46 ++++++++-- system/configuration.nix | 4 +- user/home.nix | 18 ++-- 4 files changed, 221 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 5bb33a3..e6bb6d3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,111 @@ { "nodes": { + "crane": { + "flake": false, + "locked": { + "lastModified": 1661875961, + "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "devshell": { + "flake": false, + "locked": { + "lastModified": 1660811669, + "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=", + "owner": "numtide", + "repo": "devshell", + "rev": "c2feacb46ee69949124c835419861143c4016fb5", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "dream2nix": { + "inputs": { + "alejandra": [ + "veloren", + "nci", + "nixpkgs" + ], + "crane": "crane", + "devshell": [ + "veloren", + "nci", + "devshell" + ], + "flake-utils-pre-commit": [ + "veloren", + "nci", + "nixpkgs" + ], + "gomod2nix": [ + "veloren", + "nci", + "nixpkgs" + ], + "mach-nix": [ + "veloren", + "nci", + "nixpkgs" + ], + "nixpkgs": [ + "veloren", + "nci", + "nixpkgs" + ], + "poetry2nix": [ + "veloren", + "nci", + "nixpkgs" + ], + "pre-commit-hooks": [ + "veloren", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1662507674, + "narHash": "sha256-vnXfje4pfTqDEqI837GCT+hNKqzfVwPen++gnLVO9F0=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "5ba9061857e3e265538c9785bb56bda2bb8f9bca", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, + "gamescope-git": { + "flake": false, + "locked": { + "lastModified": 1663577517, + "narHash": "sha256-tEYTVc7TNUHEJM6sTVYnEJ1JIbmL+JpEjLcjoqca9fA=", + "owner": "Plagman", + "repo": "gamescope", + "rev": "8608e017ecb91dc7b552507f174fc8b65090782b", + "type": "github" + }, + "original": { + "owner": "Plagman", + "repo": "gamescope", + "type": "github" + } + }, "grub2-themes": { "inputs": { "nixpkgs": [ @@ -89,6 +195,27 @@ "url": "https://gitlab.freedesktop.org/mesa/mesa.git" } }, + "nci": { + "inputs": { + "devshell": "devshell", + "dream2nix": "dream2nix", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1662507702, + "narHash": "sha256-Q8zfpLNCJublP7t4oHizr5tgsCS4BHFk7Fc7wzWbrzE=", + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "rev": "97aa58c683ccf628175118052b3306f40ac21ca0", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1663419078, @@ -104,18 +231,19 @@ "type": "indirect" } }, - "nur": { + "nixpkgs_2": { "locked": { - "lastModified": 1663485210, - "narHash": "sha256-FkpQBG88vqMzWON6iDKDwQWaU9P6qJX9FE6SaRqbd08=", - "owner": "nix-community", - "repo": "NUR", - "rev": "6fa90295fc02d44b74dd2c2a266ef6405eda6d1a", + "lastModified": 1662019588, + "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2da64a81275b68fdad38af669afeda43d401e94b", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "NUR", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, @@ -137,19 +265,36 @@ }, "root": { "inputs": { + "gamescope-git": "gamescope-git", "grub2-themes": "grub2-themes", "home-manager": "home-manager", "kakoune-smarttab": "kakoune-smarttab", "kakoune-sort-selections": "kakoune-sort-selections", "mesa-git": "mesa-git", "nixpkgs": "nixpkgs", - "nur": "nur", "rofi-theme": "rofi-theme", "sway-git": "sway-git", + "veloren": "veloren", "wlroots-git": "wlroots-git", "xorg-git": "xorg-git" } }, + "rust-overlay": { + "flake": false, + "locked": { + "lastModified": 1662433378, + "narHash": "sha256-DqMtTtIownl+UIPG1O917IH10UF0Hwql636p22vOJfw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "12aa8ea4381b28b7a3118f96682dc3ffb13fb6b6", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sway-git": { "flake": false, "locked": { @@ -181,6 +326,24 @@ "type": "github" } }, + "veloren": { + "inputs": { + "nci": "nci" + }, + "locked": { + "lastModified": 1663531058, + "narHash": "sha256-faPxE+M6zBlf0cKM01LAutTHAz4QYYw/fNNhQQzm/Qo=", + "owner": "veloren", + "repo": "veloren", + "rev": "7a7db28907c1572121c1439a4c1ddf4d87b2f9e7", + "type": "github" + }, + "original": { + "owner": "veloren", + "repo": "veloren", + "type": "github" + } + }, "wlroots-git": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 779eb1e..5503da6 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nur = { - url = "github:nix-community/NUR"; - }; - # Kakoune Plugins kakoune-smarttab = { url = "github:andreyorst/smarttab.kak"; @@ -41,6 +37,11 @@ flake = false; }; + gamescope-git = { + url = "github:Plagman/gamescope"; + flake = false; + }; + xorg-git = { url = "git+https://gitlab.freedesktop.org/xorg/xserver.git"; flake = false; @@ -56,9 +57,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + veloren = { + url = "github:veloren/veloren"; + }; + }; - outputs = { self, nixpkgs, home-manager, nur, ... }@inputs: + outputs = { self, nixpkgs, home-manager, veloren, ... }@inputs: let username = "manuel"; hostname = "terra"; @@ -71,7 +76,7 @@ allowUnfree = true; allowUnsupportedSystem = true; }; - overlays = [ self.overlays.default nur.overlay ]; + overlays = [ self.overlays.default ]; }; in { @@ -83,12 +88,12 @@ ]; }; - wlroots = prev.wlroots.overrideAttrs (old: { + wlroots-git = prev.wlroots.overrideAttrs (old: { version = "0.16.0"; src = inputs.wlroots-git; }); - sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { + sway-unwrapped = (prev.sway-unwrapped.overrideAttrs (old: { version = "1.8"; buildInputs = old.buildInputs ++ [ prev.xorg.xcbutilwm @@ -98,7 +103,14 @@ prev.cmake ]; src = inputs.sway-git; - }); + })).override + { + wlroots = wlroots-git; + }; + + waybar = prev.waybar.override { + wlroots = wlroots-git; + }; xwayland = prev.xwayland.overrideAttrs (old: { version = "22.2"; @@ -109,6 +121,22 @@ ]; }); + steam = prev.steam.override { + extraPkgs = pkgs: [ + pkgs.gnome.zenity + pkgs.gamescope + pkgs.libkrb5 + pkgs.keyutils + ]; + }; + + gamescope = prev.gamescope.overrideAttrs (old: { + version = "3.11.45"; + src = inputs.gamescope-git; + }); + + inherit (veloren.packages."${system}") veloren-voxygen; + }); nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem diff --git a/system/configuration.nix b/system/configuration.nix index bb22df1..ff57ca7 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -43,7 +43,7 @@ }; initrd.availableKernelModules = [ "amdgpu" ]; - kernelPackages = pkgs.linuxPackages_xanmod_latest; + kernelPackages = pkgs.linuxPackages_latest; kernelModules = [ "i2c-dev" "i2c-piix4" ]; }; @@ -173,7 +173,7 @@ enable = true; wlr.enable = true; extraPortals = [ - pkgs.xdg-desktop-portal-gtk + #pkgs.xdg-desktop-portal-gtk ]; }; diff --git a/user/home.nix b/user/home.nix index 4c232d4..6672ac5 100644 --- a/user/home.nix +++ b/user/home.nix @@ -35,11 +35,17 @@ pkgs.twemoji-color-font pkgs.xivlauncher pkgs.sxiv + pkgs.veloren-voxygen + pkgs.gamescope + + pkgs.wineWowPackages.stagingFull + pkgs.protontricks ]; home.sessionVariables = { EDITOR = "kak"; GTK_USE_PORTAL = "1"; + WINEDLLOVERRIDES = "winemenubuilder.exe=d"; }; fonts.fontconfig.enable = true; @@ -66,19 +72,23 @@ package = pkgs.gruvbox-dark-gtk; name = "gruvbox-dark"; }; + font = { name = "JetBrainsMono Nerd Font"; size = 9; }; + iconTheme = { package = pkgs.gruvbox-dark-icons-gtk; name = "oomox-gruvbox-dark"; }; + cursorTheme = { package = pkgs.capitaine-cursors; name = "capitaine-cursors-white"; size = 32; }; + }; programs.git = { @@ -111,14 +121,6 @@ download = "/mnt/hdd/Downloads"; }; - xdg.mimeApps = { - enable = true; - defaultApplications = { - "inode/directory" = [ "thunar.desktop" ]; - "text/html" = [ "firefox.desktop" ]; - }; - }; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards