diff --git a/flake.lock b/flake.lock index 8e6e86e9..362004e5 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1743265529, - "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", + "lastModified": 1744289235, + "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", + "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1744038920, - "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=", + "lastModified": 1744919155, + "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a", + "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70", "type": "github" }, "original": { @@ -436,11 +436,11 @@ ] }, "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "lastModified": 1743953322, + "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1743905069, - "narHash": "sha256-XrZmg+aXDPMWscVfKjArwgjyo9Wtf8Kz1NmhtEOsCL0=", + "lastModified": 1744528518, + "narHash": "sha256-F3upSTM0XntGzO6VajVFLEEAJUHEKD4tUd7psn0+T0s=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "9cf17688ca7346f38d735a7e47339f8a1d895d86", + "rev": "5106f7e6857935aed04f579752095fdd2df4d3d1", "type": "github" }, "original": { @@ -492,11 +492,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1744052896, - "narHash": "sha256-8KlDFFdFbK2rT5a7nb7BY2eYILW0b/n3bqkA8p/bPWs=", + "lastModified": 1744849150, + "narHash": "sha256-eaKqF4Oc7atN7Y2yTTeAOLN05q+G2YY0597ukgAD2Cs=", "ref": "refs/heads/main", - "rev": "b15c2bfff6941bd2072eade13177433d7ab58a00", - "revCount": 5977, + "rev": "225e13c3cc83308175f0a9aa18cfa31324155034", + "revCount": 6003, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1741191527, - "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", + "lastModified": 1744468525, + "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", + "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", "type": "github" }, "original": { @@ -635,11 +635,11 @@ ] }, "locked": { - "lastModified": 1744015959, - "narHash": "sha256-MFzu2w1e142lC4sYUJaqQwgfRn1TcVZwRfvLhg0qvl0=", + "lastModified": 1744513377, + "narHash": "sha256-2ocy+qAVxTBmaK8MpAy7mpKIH+DYEzwf+KzXZX83oZ4=", "owner": "jas-singhfsu", "repo": "hyprpanel", - "rev": "93235f0fb1ec171055fc95f867edb5a341bcffb1", + "rev": "42943b3def85d8787d703778951944c8e791202b", "type": "github" }, "original": { @@ -715,11 +715,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743938762, - "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -754,11 +754,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744057897, - "narHash": "sha256-eLQt1nwY5TkWltZMhncTFnVIUqlJCNMU8iDOVS0Kpl4=", + "lastModified": 1744917937, + "narHash": "sha256-KzHhtTA54EwiOgxh3Vy81JhoIiQgZRDZlgo85a6K9TE=", "owner": "nix-community", "repo": "NUR", - "rev": "6123b345b32b960842a53c6c330e9575639c5f98", + "rev": "74f1b9f96f695deab80d45e6a9859f980b072436", "type": "github" }, "original": { @@ -865,11 +865,11 @@ ] }, "locked": { - "lastModified": 1743910657, - "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=", + "lastModified": 1744669848, + "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "523f58a4faff6c67f5f685bed33a7721e984c304", + "rev": "61154300d945f0b147b30d24ddcafa159148026a", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743961983, - "narHash": "sha256-azG6Dnaj4lPVBUMTINIbL6c7+u59IvhLGbceYxdmFxs=", + "lastModified": 1744910471, + "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=", "owner": "danth", "repo": "stylix", - "rev": "f98c2c42b210128f5a62099c12bc566b0050fea9", + "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51", "type": "github" }, "original": { @@ -1117,11 +1117,11 @@ ] }, "locked": { - "lastModified": 1741934139, - "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", + "lastModified": 1744644585, + "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", + "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b8d8ae4b..9f847777 100644 --- a/flake.nix +++ b/flake.nix @@ -89,6 +89,7 @@ system: nixpkgs: let config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) (import ./unfree.nix).allowed; + config.rocmSupport = true; in import nixpkgs { inherit system config; diff --git a/home/lilith/hyprland/default.nix b/home/lilith/hyprland/default.nix index 2349952a..003dea63 100644 --- a/home/lilith/hyprland/default.nix +++ b/home/lilith/hyprland/default.nix @@ -31,7 +31,7 @@ "[workspace special:keepass silent] keepassxc" ]; - windowrulev2 = [ + windowrule = [ "workspace special:keepass,class:org.keepassxc.KeePassXC,title:^(.*)(KeePassXC)(.*)$" "workspace unset,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC" ]; @@ -63,6 +63,8 @@ allow_tearing = false; }; + ecosystem.no_update_news = true; + decoration = { rounding = 10; diff --git a/hosts/lilith-pc/default.nix b/hosts/lilith-pc/default.nix index c40b3a68..dd474aac 100644 --- a/hosts/lilith-pc/default.nix +++ b/hosts/lilith-pc/default.nix @@ -11,10 +11,10 @@ in auto_styling.enable = true; ollama.enable = true; - hardware.opengl.extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-runtime-ext - ]; + hardware.opengl.extraPackages = [ pkgs.rocmPackages.clr.icd ]; + hardware.graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ]; + environment.systemPackages = [ pkgs.rocmPackages.clr.icd ]; + boot.kernelModules = [ "amdgpu" ]; home-manager.users."lilith".wayland.windowManager.hyprland.settings = { input.kb_layout = mkHostOverride "us"; diff --git a/system/core/persistence.nix b/system/core/persistence.nix index a695ec34..fc72a7c0 100644 --- a/system/core/persistence.nix +++ b/system/core/persistence.nix @@ -1,10 +1,4 @@ -{ - impermanence, - conf, - lib, - config, - ... -}: +{ impermanence, ... }: { imports = [ impermanence.nixosModule ]; diff --git a/system/optional/ollama.nix b/system/optional/ollama.nix index fda319ea..c1c3e716 100644 --- a/system/optional/ollama.nix +++ b/system/optional/ollama.nix @@ -2,5 +2,19 @@ { options.ollama.enable = lib.mkEnableOption "Enable Ollama server /w GPU acceleration"; - config.services.ollama = lib.mkIf config.ollama.enable { enable = true; }; + config.services.ollama = lib.mkIf config.ollama.enable { + enable = true; + host = "0.0.0.0"; + acceleration = "rocm"; + rocmOverrideGfx = "11.0.0"; + }; + config.networking.firewall = lib.mkIf config.ollama.enable { allowedTCPPorts = [ 11434 ]; }; + config.environment.persistence."/persist/cache".directories = lib.mkIf config.ollama.enable [ + { + directory = "/var/lib/private/ollama"; + user = "nouser"; + group = "nogroup"; + mode = "u=rwx,g=,o="; + } + ]; } diff --git a/unfree.nix b/unfree.nix index 3826fa29..e038300b 100644 --- a/unfree.nix +++ b/unfree.nix @@ -3,6 +3,6 @@ "steam" "steam-unwrapped" - "rocm-runtime-ext" + # "rocm-runtime-ext" ]; }