diff --git a/flake.lock b/flake.lock index ee131c6..90349bf 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-DuhR3y0gPZG0AJ2FDd+nUKzQMwT+c/DFIUWNDQ5Uyx4=", - "path": "/nix/store/2m1w98k01vbk9fc6j15lkbr6pv8hr983-source/home/ags", + "path": "/nix/store/p911sghwmq5gyrny21waw7198xcfda9r-source/home/ags", "type": "path" }, "original": { - "path": "/nix/store/2m1w98k01vbk9fc6j15lkbr6pv8hr983-source/home/ags", + "path": "/nix/store/p911sghwmq5gyrny21waw7198xcfda9r-source/home/ags", "type": "path" } }, @@ -109,22 +109,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -188,24 +172,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fzgo": { "inputs": { "flake-parts": "flake-parts", @@ -225,27 +191,6 @@ "url": "https://git.thomasave.be/thomasave/fzgo.git" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1736911212, - "narHash": "sha256-OLly4X2kN1tDb2gMYcWeim6uJECPoc52ltJsz1iD5Ug=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "ff9414d9ea7b16a375d41cde8f6f193de7e5db72", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -275,11 +220,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737120639, + "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", "type": "github" }, "original": { @@ -358,7 +303,7 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -567,38 +512,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1722421184, @@ -633,11 +546,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -649,11 +562,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -686,11 +599,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736963235, - "narHash": "sha256-omBKcx+0U7N6E6HRtLLUX3Jy4U2/I4IV/W/U/jIXBQA=", + "lastModified": 1737124029, + "narHash": "sha256-6x2thGZfTl9gqIFiE4Q6qkieGqrmrDwCwVdgUjTuVzQ=", "owner": "nix-community", "repo": "NUR", - "rev": "0755c44a34a4fece9fb3d436a8b359e373d845fd", + "rev": "d9bf183b61de7e0f1358ddaa856cdd84d7286628", "type": "github" }, "original": { @@ -701,7 +614,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -726,7 +639,6 @@ "inputs": { "ags": "ags", "fzgo": "fzgo", - "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", "hyprsplit": "hyprsplit", @@ -737,21 +649,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -847,31 +744,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8f7f842..d33167f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,9 +23,6 @@ url = "https://git.thomasave.be/thomasave/WorkTimer"; ref = "cli"; }; - ghostty = { - url = "github:ghostty-org/ghostty"; - }; nixos-06cb-009a-fingerprint-sensor = { url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor?ref=24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/utils/desktop.nix b/home/utils/desktop.nix index 60f0364..4d4e140 100644 --- a/home/utils/desktop.nix +++ b/home/utils/desktop.nix @@ -13,7 +13,7 @@ ]; home.packages = with pkgs; [ - inputs.ghostty.packages.${pkgs.system}.default + ghostty onlyoffice-bin telegram-desktop webcord @@ -27,7 +27,7 @@ gnome-calendar file-roller zip - # heroic + heroic cmake jellyfin-media-player chromium diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index 669efdd..a6cccda 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -19,6 +19,10 @@ in { # boot.kernelParams = ["amd_pstate=active"]; # boot.initrd.kernelModules = [ "amdgpu" ]; + nixpkgs.config.cudaSupport = true; + services.ollama = { + enable = true; + }; services.logind.extraConfig = ''HandlePowerKey=suspend''; # Virtualization @@ -105,5 +109,30 @@ in { boot.extraModprobeConfig = "options vfio-pci ids=10de:1b80,10de:10f0,1002:67df,1002:aaf0"; services.greetd.enable = lib.mkForce false; }; + vfio-nvidia.configuration = { + boot.blacklistedKernelModules = [ "k10temp" "nvidia" "nouveau" ]; + boot = { + initrd.kernelModules = [ + "kvm-amd" + "vfio_pci" + "vfio" + "vfio_iommu_type1" + "amdgpu" + ]; + kernelParams = [ + "amd_pstate=active" + "amd_iommu=on" + "vfio-pci.ids=10de:1b80,10de:10f0" + ]; + postBootCommands = '' + DEVS="0000:0b:00.0 0000:0b:00.1 + for DEV in $DEVS; do + echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override + done + modprobe -i vfio-pci + ''; + }; + boot.extraModprobeConfig = "options vfio-pci ids=10de:1b80,10de:10f0"; + }; }; }