jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

24.05 + polymc

Browse Source
This commit is contained in:
Danilo Reyes 2024-06-01 11:51:06 -06:00
parent 320f140f52
commit 84f2ea8d53
8 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base.nix
View File

@ -14,7 +14,7 @@
extraSpecialArgs = { inherit inputs outputs; };
users.jawz = import ./home-manager/default.nix;
};
system.stateVersion = "23.11";
system.stateVersion = "24.05";
time = {
timeZone = "America/Mexico_City";
hardwareClockInLocalTime = true;
@ -122,6 +122,10 @@
};
};
programs = {
nh = {
enable = true;
clean.enable = true;
};
starship.enable = true;
tmux.enable = true;
fzf.fuzzyCompletion = true;
@ -143,7 +147,7 @@
};
avahi = {
enable = true;
nssmdns = true;
nssmdns4 = true;
};
openssh = {
enable = true;

46
flake.nix
View File

@ -2,10 +2,10 @@
description = "A very basic flake";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};
@ -46,15 +46,15 @@
gst-plugins-base
]);
});
mutter = gPrev.mutter.overrideAttrs (old: {
src = super.pkgs.fetchgit {
url = "https://gitlab.gnome.org/vanvugt/mutter.git";
# GNOME 45: triple-buffering-v4-45
rev = "0b896518b2028d9c4d6ea44806d093fd33793689";
sha256 =
"sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w=";
};
});
#mutter = gPrev.mutter.overrideAttrs (old: {
# src = super.pkgs.fetchgit {
# url = "https://gitlab.gnome.org/vanvugt/mutter.git";
# # GNOME 45: triple-buffering-v4-45
# rev = "0b896518b2028d9c4d6ea44806d093fd33793689";
# sha256 =
# "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w=";
# };
#});
});
lutris = super.lutris.override {
extraPkgs = pkgs: [
@ -69,19 +69,19 @@
fooyin = pkgsM.fooyin;
planify = pkgsU.planify;
gdtoolkit = pkgsU.gdtoolkit;
# gallery-dl = pkgsU.gallery-dl;
gallery-dl = super.gallery-dl.overrideAttrs (oldAttrs: rec {
pname = "gallery-dl";
version = "2023-05-28-master";
gallery-dl = pkgsU.gallery-dl;
#gallery-dl = super.gallery-dl.overrideAttrs (oldAttrs: rec {
# pname = "gallery-dl";
# version = "2023-05-28-master";
src = super.fetchFromGitHub {
owner = "mikf";
repo = "gallery-dl";
rev = "e35317118a1a4a7a2dc85ff5aa996f5f4d3f4197";
sha256 =
"sha256-aHGJZkt5fzF+iHVbHOyYswPLeZfwd6S+pRPXavIpFgI=";
};
});
# src = super.fetchFromGitHub {
# owner = "mikf";
# repo = "gallery-dl";
# rev = "e35317118a1a4a7a2dc85ff5aa996f5f4d3f4197";
# sha256 =
# "sha256-aHGJZkt5fzF+iHVbHOyYswPLeZfwd6S+pRPXavIpFgI=";
# };
#});
ns-usbloader = pkgsU.ns-usbloader;
handbrake = super.handbrake.override { useGtk = true; };
discord = super.discord.override { withOpenASAR = true; };

2
gnome.nix
View File

@ -3,6 +3,7 @@
{
services = {
gvfs.enable = true;
libinput.enable = true;
xserver = {
enable = true;
displayManager.gdm.enable = true;
@ -14,7 +15,6 @@
# experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
# '';
};
libinput.enable = true;
};
};
environment.gnome.excludePackages = (with pkgs; [

8
home-manager/default.nix
View File

@ -1,11 +1,5 @@
{ config, lib, pkgs, inputs, outputs, ... }: {
# let
# version = "23.11";
# home-manager = builtins.fetchTarball
# "https://github.com/nix-community/home-manager/archive/release-${version}.tar.gz";
# in {
# imports = [ (import "${home-manager}/nixos") ];
home.stateVersion = "23.11";
home.stateVersion = "24.05";
programs.bash = {
enable = true;

1
hosts/workstation/configuration.nix
View File

@ -68,6 +68,7 @@
allowedUDPPortRanges = openPortRanges;
};
};
nix = let
featuresList = [
"nixos-test"

4
hosts/workstation/hardware-configuration.nix
View File

@ -84,8 +84,8 @@
"/mnt/games" = btrfsMount "games" // { };
"/mnt/miniserver/pool" = nfsMount "miniserver" "pool" // { };
"/mnt/miniserver/jawz" = nfsMount "miniserver" "jawz" // { };
# "/mnt/server/pool" = nfsMount "server" "pool" // { };
# "/mnt/server/jawz" = nfsMount "server" "jawz" // { };
#"/mnt/server/pool" = nfsMount "server" "pool" // { };
#"/mnt/server/jawz" = nfsMount "server" "jawz" // { };
# "/mnt/miniserver/btrfs" = nfsMount "btrfs" // { };
"/boot" = {
device = "/dev/disk/by-uuid/ac6d349a-96b9-499e-9009-229efd7743a5";

4
modules/apps/gaming.nix
View File

@ -19,7 +19,7 @@ in {
gamemode # optimizes linux to have better gaming performance
heroic # install epic games
protonup-qt # update proton-ge
minecraft # minecraft official launcher
#minecraft # minecraft official launcher
polymc # minecraft launcher with mod support
ns-usbloader # load games into my switch
# grapejuice # roblox manager
@ -29,7 +29,7 @@ in {
pcsx2 # ps2 emulator
cemu # wii u emulator
dolphin-emu # wii emulator
citra-nightly # 3Ds emulator
#citra-nightly # 3Ds emulator
snes9x-gtk # snes emulator
ryujinx # switch emulator
];

6
pkgs/polymc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, ninja, jdk21, ghc_filesystem, zlib, file
{ stdenv, lib, fetchFromGitHub, cmake, ninja, jdk17, ghc_filesystem, zlib, file
, xorg, libpulseaudio, openal, qt6, glfw, pciutils, udev, glxinfo, qt6Packages
, libGL, flite, addOpenGLRunpath, vulkan-loader, msaClientID ? null
, extra-cmake-modules, makeWrapper, gamemode, mangohud, glfw-wayland-minecraft
@ -45,7 +45,7 @@ let
cmake
extra-cmake-modules
ninja
jdk21
jdk17
qt6.wrapQtAppsHook
file
ghc_filesystem
@ -68,7 +68,7 @@ let
postPatch = ''
# hardcode jdk paths
substituteInPlace launcher/java/JavaUtils.cpp \
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk21}/lib/openjdk/bin/java")'
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk17}/lib/openjdk/bin/java")'
'';
postFixup = ''