diff --git a/flake.lock b/flake.lock index 634b6d2..2648b07 100644 --- a/flake.lock +++ b/flake.lock @@ -385,23 +385,6 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1715853528, - "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", - "type": "github" - }, - "original": { - "owner": "libgit2", - "ref": "v1.8.1", - "repo": "libgit2", - "type": "github" - } - }, "master": { "locked": { "lastModified": 1736742312, @@ -478,7 +461,6 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "git-hooks-nix": "git-hooks-nix", - "libgit2": "libgit2", "nixpkgs": [ "stable" ], @@ -486,16 +468,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1732892090, - "narHash": "sha256-Ka/uNdaqpTAiVL++4MPHg8fG5o1tiJeY6G2t5UiKhd8=", + "lastModified": 1736798728, + "narHash": "sha256-Em+CXWHBgLG2m106Hs11FmVlsCr3ZQedTosJvRF2gnE=", "owner": "NixOS", "repo": "nix", - "rev": "64000481168d1da9d2519f055dd1fdee22275c21", + "rev": "2cb0ddfe4eb216fab6d826c1056743c152722720", "type": "github" }, "original": { "owner": "NixOS", - "ref": "64000481168d1da9d2519f055dd1fdee22275c21", + "ref": "2cb0ddfe4eb216fab6d826c1056743c152722720", "repo": "nix", "type": "github" } @@ -680,11 +662,11 @@ ] }, "locked": { - "lastModified": 1736742095, - "narHash": "sha256-G5ZsiqzjIICWQQemgDKPBgI1K+vlYGqbc42gqQW5s/Q=", + "lastModified": 1736799472, + "narHash": "sha256-gkW0sjhr+PqdcvnIP3WnJvTcKEFtbo147IfKC2zbKZw=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "7b2cbea0895cc98fdeefd957b6edef36ee2c837b", + "rev": "00404b2c890470649d7cea6e2fb596875531add9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 46e6eda..6ec18e9 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ type = "github"; owner = "NixOS"; repo = "nix"; - ref = "64000481168d1da9d2519f055dd1fdee22275c21"; + ref = "2cb0ddfe4eb216fab6d826c1056743c152722720"; inputs.nixpkgs.follows = "stable"; }; nixos-generators = { diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/_vfio.nix similarity index 96% rename from hosts/gerg-desktop/vfio.nix rename to hosts/gerg-desktop/_vfio.nix index 9e28fa1..fcf4c97 100644 --- a/hosts/gerg-desktop/vfio.nix +++ b/hosts/gerg-desktop/_vfio.nix @@ -26,6 +26,14 @@ let }; in { + #hardware.amdgpu = { + # amdvlk = { + # enable = true; + # support32Bit.enable = true; + # }; + # initrd.enable = true; + # opencl.enable = true; + #}; environment.etc = { "Xorg/1_mon.conf".source = "${_dir}/1_mon.conf"; "Xorg/2_mon.conf".source = "${_dir}/2_mon.conf"; @@ -33,6 +41,8 @@ in services.xserver = { + videoDrivers = [ "amdgpu" ]; + displayManager.setupCommands = lib.mkBefore '' if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then ${lib.getExe cfg_monitors} diff --git a/hosts/gerg-desktop/boot.nix b/hosts/gerg-desktop/boot.nix index 51cc1aa..4a7153b 100644 --- a/hosts/gerg-desktop/boot.nix +++ b/hosts/gerg-desktop/boot.nix @@ -23,6 +23,9 @@ in reboot '') ]; + systemd.tmpfiles.rules = [ + "L+ /var/lib/sbctl - - - - /persist/secureboot" + ]; boot = { initrd = { @@ -58,7 +61,7 @@ in lanzaboote = { enable = true; - pkiBundle = "/etc/secureboot"; + pkiBundle = "/var/lib/sbctl"; configurationLimit = 10; package = lib.mkForce ( pkgs.writeShellApplication { diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix index 9c95976..4dbae45 100644 --- a/hosts/gerg-desktop/main.nix +++ b/hosts/gerg-desktop/main.nix @@ -75,20 +75,32 @@ #sync.enable = true; }; }; - services.xserver.videoDrivers = [ - "nvidia" - "amdgpu" - ]; - - hardware.amdgpu = { - amdvlk = { - enable = true; - support32Bit.enable = true; - }; - initrd.enable = true; - opencl.enable = true; + services.xserver = { + videoDrivers = [ + "nvidia" + ]; + displayManager.setupCommands = lib.mkBefore '' + ${lib.getExe pkgs.xorg.xrandr} \ + --output DP-0 \ + --mode 3440x1440 \ + --rate 120 \ + --primary \ + --pos 0x0 \ + --output HDMI-0 \ + --mode 1920x1080 \ + --rate 120 \ + --pos 3440x360 + ''; + serverFlagsSection = '' + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" + Option "BlankTime" "0" + ''; }; + services.libinput.mouse.accelProfile = "flat"; + programs = { steam.enable = true; diff --git a/hosts/gerg-desktop/services/immich.nix b/hosts/gerg-desktop/services/immich.nix index 6e5ce16..a0e4c90 100644 --- a/hosts/gerg-desktop/services/immich.nix +++ b/hosts/gerg-desktop/services/immich.nix @@ -9,7 +9,7 @@ createDB = true; }; mediaLocation = "/persist/services/immich"; - machine-learning.enable = false; + machine-learning.enable = true; settings = null; port = 2283; host = "0.0.0.0"; diff --git a/hosts/gerg-desktop/services/nginx.nix b/hosts/gerg-desktop/services/nginx.nix index 2bdd7a1..1a00aee 100644 --- a/hosts/gerg-desktop/services/nginx.nix +++ b/hosts/gerg-desktop/services/nginx.nix @@ -41,6 +41,7 @@ recommendedTlsSettings = true; # For immich clientMaxBodySize = "50000M"; + proxyTimeout = "600s"; virtualHosts = builtins.mapAttrs ( diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix index 8cdd6cc..47fbcc5 100644 --- a/hosts/gerg-desktop/zfs.nix +++ b/hosts/gerg-desktop/zfs.nix @@ -6,9 +6,7 @@ { #link some stuff systemd.tmpfiles.rules = [ - "L+ /etc/zfs/zpool.cache - - - - /persist/zfs/zpool.cache" - "L+ /etc/secureboot - - - - /persist/secureboot" "L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key" "L+ /etc/ssh/ssh_host_ed25519_key.pub - - - - /persist/ssh/ssh_host_ed25519_key.pub" "L /etc/nixos/flake.nix - - - - /home/gerg/Projects/nixos/flake.nix" diff --git a/modules/hardware.nix b/modules/hardware.nix index cc8a20e..fe2f8cf 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -16,15 +16,17 @@ in }) (lib.mkIf (!cfg.sound.disable) { security.rtkit.enable = true; - hardware.pulseaudio.enable = lib.mkForce false; # disable pulseAudio - services.pipewire = { - enable = true; - alsa = { + services = { + pulseaudio.enable = lib.mkForce false; # disable pulseAudio + pipewire = { enable = true; - support32Bit = true; + alsa = { + enable = true; + support32Bit = true; + }; + pulse.enable = true; + jack.enable = false; }; - pulse.enable = true; - jack.enable = false; }; }) diff --git a/modules/misc.nix b/modules/misc.nix index 0372f33..d0188cb 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -11,36 +11,39 @@ }; config = { + nixpkgs.config = { allowAliases = false; allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree; }; + local.packages = { + inherit (pkgs) + bottom # view tasks + efibootmgr # efi editor + nix-output-monitor # nom nom nom nom; + nix-tree # view packages + pciutils # lspci + nixos-rebuild-ng + ; + nix-janitor = pkgs.symlinkJoin { + name = "nix-janitor"; + paths = [ nix-janitor.packages.default ]; + nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; + postBuild = '' + wrapProgram "$out/bin/janitor" \ + --suffix PATH : ${lib.makeBinPath [ config.nix.package ]} + ''; + }; + + }; + programs.git.enable = true; # Mr sandro why services.libinput.enable = true; programs.nano.enable = false; - environment.defaultPackages = lib.mkForce ( - builtins.attrValues { - inherit (pkgs) - bottom # view tasks - efibootmgr # efi editor - nix-output-monitor # nom nom nom nom; - nix-tree # view packages - pciutils # lspci - ; - nix-janitor = pkgs.symlinkJoin { - name = "nix-janitor"; - paths = [ nix-janitor.packages.default ]; - nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; - postBuild = '' - wrapProgram "$out/bin/janitor" \ - --suffix PATH : ${lib.makeBinPath [ config.nix.package ]} - ''; - }; - } - ); + environment.defaultPackages = lib.mkForce [ ]; #enable ssh programs.mtr.enable = true; # ping and traceroute @@ -78,5 +81,7 @@ documentation.nixos.enable = false; # Useless with flakes (without configuring) programs.command-not-found.enable = false; + + system.switch.enableNg = true; }; }