Compare commits

..

No commits in common. "4f6d409e8571ad2e2ebbbd235f370a6603e6ff03" and "f1b38b4085a17d055f3f40cda11d32908e90e48c" have entirely different histories.

3 changed files with 30 additions and 44 deletions

30
flake.lock generated
View File

@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1736955230,
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
"lastModified": 1723293904,
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
@ -331,11 +331,11 @@
},
"nixos-master": {
"locked": {
"lastModified": 1738404497,
"narHash": "sha256-8quEiiLZEmb1sDmBXik2zuPrneM2KfGNTD0Th3dgUcY=",
"lastModified": 1736856336,
"narHash": "sha256-++h4ivM+M5dTsD4xEgWCMsXQNW15KzCZfB37/InO11Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aedbfbb62892ddda99185685105a5a198e8414ea",
"rev": "deb4f62a8ad1971753042cdb34138f739110425f",
"type": "github"
},
"original": {
@ -347,11 +347,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1738297584,
"narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
"lastModified": 1736817698,
"narHash": "sha256-1m+JP9RUsbeLVv/tF1DX3Ew9Vl/fatXnlh/g5k3jcSk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9189ac18287c599860e878e905da550aa6dec1cd",
"rev": "2b1fca3296ddd1602d2c4f104a4050e006f4b0cb",
"type": "github"
},
"original": {
@ -379,11 +379,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1738406476,
"narHash": "sha256-EefAB0lz+bJb4a7C802AByCqeAE3LMVkxKg3MVkja38=",
"lastModified": 1736853974,
"narHash": "sha256-861AIG997tr2FlD+a5vGEQi3/7fUVwun79vDkZ/a+MM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dcdc2c2adfe1ff857efdaf14b554356ff8182283",
"rev": "62b598a93723c4808003e316bfd232da74767471",
"type": "github"
},
"original": {
@ -481,11 +481,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1736883042,
"narHash": "sha256-DFij3ZnNbP8bISN6ra6rKVb3CAhaX4jg3dDxJlDUFYA=",
"lastModified": 1736691253,
"narHash": "sha256-2/S4tyZgGFZfbwZJTa95XK1RanfsFmsxIPFZWgoUDec=",
"owner": "icewind1991",
"repo": "nvidia-patch-nixos",
"rev": "bb8ac52eff4c4e8df0a18ab444263f2619d0d25a",
"rev": "3a3b080ba7c2dc9b82ee90c1f7f1f98ed90e3ea7",
"type": "github"
},
"original": {

View File

@ -4,7 +4,7 @@ let
backendDomain = "ollama.giugl.io";
ollamaHost = "127.0.0.1";
ollamaPort = 11434;
ollamaPkg = pkgs.unstablePkgs.ollama-cuda;
ollamaPkg = pkgs.unstablePkgs.ollama;
in
{
environment = {

View File

@ -35,12 +35,12 @@ let
executable = true;
destination = "/bin/resolution.sh";
};
sunshinePkg = (pkgs.unstablePkgs.sunshine.override { cudaSupport = true; });
sunshinePkg = (pkgs.localPkgs.sunshine.override { cudaSupport = true; cudaPackages = pkgs.cudaPackages_12_4; boost = pkgs.boost186; });
in
{
boot.kernelModules = [ "uinput" ];
environment.systemPackages = with pkgs.unstablePkgs; [ gamemode heroic ];
environment.systemPackages = [ pkgs.unstablePkgs.gamemode ];
hardware = {
pulseaudio.enable = false;
@ -51,7 +51,6 @@ in
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.latest;
};
};
systemd.services.NetworkManager-wait-online.enable = pkgs.lib.mkForce false;
@ -95,7 +94,6 @@ in
origin_web_ui_allowed = "lan";
min_threads = 12;
log_path = "sunshine.log";
back_button_timeout = 2500;
};
applications = {
env = {
@ -130,37 +128,25 @@ in
}
];
}
{
name = "Heroic";
cmd = ''${pkgs.bash}/bin/bash -c "${pkgs.unstablePkgs.heroic}/bin/heroic"'';
prep-cmd = [
{
do = ''${pkgs.bash}/bin/bash -c "${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT}" ''${SUNSHINE_CLIENT_FPS}"'';
undo = ''${pkgs.bash}/bin/bash -c "${pkgs.procps}/bin/pkill heroic; ${pkgs.procps}/bin/pkill sunshine"'';
}
];
}
];
};
};
displayManager = {
autoLogin = {
inherit user;
enable = true;
};
sddm = {
enable = true;
wayland.enable = false;
};
};
xserver = {
enable = true;
videoDrivers = [ "nvidia" ];
desktopManager.xfce.enable = true;
desktopManager.gnome.enable = true;
displayManager = {
gdm = {
enable = true;
autoSuspend = false;
autoLogin = {
inherit user;
enable = true;
};
};
defaultSession = "gnome-xorg";
};
monitorSection = ''
HorizSync 5.0 - 1000.0