diff --git a/flake.lock b/flake.lock index e317b57..9d7c452 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1757385184, - "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", + "lastModified": 1757598712, + "narHash": "sha256-5PWVrdMp8u31Q247jqnJcwxKg3MJrs1TadTyTBRVBDY=", "owner": "nix-community", "repo": "home-manager", - "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", + "rev": "6d7c11a0adee0db21e3a8ef90ae07bb89bc20b8f", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1757130842, - "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757341549, - "narHash": "sha256-fRnT+bwP1sB6ne7BLw4aXkVYjr+QCZZ+e4MhbokHyd4=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d1fa9fa266631335618373f8faad570df6f9ede", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757406327, - "narHash": "sha256-j0V1ba9Op2caXdtmcBJfc1Q6RSzwt6PCxEy3XuDlf3E=", + "lastModified": 1757593421, + "narHash": "sha256-kd/Vux1qSO4NKW/L/UF1xZay4NniWgIOzOYZHzPL2cM=", "owner": "nix-community", "repo": "nixvim", - "rev": "77eb9ea9cccd71a80d10b47d324ceb6390ba3c2b", + "rev": "e7140f963edf7d90499563d56cf48c7d87c76214", "type": "github" }, "original": { diff --git a/home-manager/programs/hypr/hyprland.nix b/home-manager/programs/hypr/hyprland.nix index 5554481..ba26b63 100644 --- a/home-manager/programs/hypr/hyprland.nix +++ b/home-manager/programs/hypr/hyprland.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, configPath, ... }: { wayland.windowManager.hyprland = { enable = true; @@ -13,7 +13,7 @@ "ghostty" "swww-daemon" "eww daemon" - #"swww img ${configPath}/assets/ena/wallpaper.png" + "swww img ${configPath}/assets/ena/wallpaper.png" ]; # === Input settings === diff --git a/home-manager/programs/hypr/hyprlock.nix b/home-manager/programs/hypr/hyprlock.nix index ebb8ae5..fefbcf6 100644 --- a/home-manager/programs/hypr/hyprlock.nix +++ b/home-manager/programs/hypr/hyprlock.nix @@ -11,14 +11,14 @@ }; background = [ { - #path = "${configPath}/assets/ena/wallpaper.png"; + path = "${configPath}/assets/ena/wallpaper.png"; blur_passes = 3; blur_size = 8; } ]; image = [ { - #path = "${configPath}/assets/pfp.jpg"; + path = "${configPath}/assets/pfp.jpg"; size = 150; border_size = 4; border_color = "rgb(0C96F9)"; diff --git a/hosts/eva-03/configuration.nix b/hosts/eva-03/configuration.nix index 79de159..7eb7435 100644 --- a/hosts/eva-03/configuration.nix +++ b/hosts/eva-03/configuration.nix @@ -2,7 +2,15 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, pkgs-unstable, inputs, hostname, ... }: +{ + config, + configPath, + hostname, + inputs, + pkgs, + pkgs-unstable, + ... +}: { imports = @@ -139,7 +147,7 @@ # Enable ollama services.ollama = { - enable = true; + enable = false; host = "0.0.0.0"; openFirewall = true; acceleration = "cuda"; @@ -283,8 +291,7 @@ wirelesstools #unstable - #pkgs-unstable.tailscale - pkgs-unstable.ollama + pkgs-unstable.crush (pkgs-unstable.llama-cpp.override { cudaSupport = true; }) #fonts @@ -294,7 +301,15 @@ ]; home-manager = { - extraSpecialArgs = { inherit inputs hostname; }; + extraSpecialArgs = { + inherit + # config + configPath + inputs + pkgs-unstable + hostname + ; + }; users = { "rogueking" = import ./../../home-manager/home.nix; };