diff --git a/flake.lock b/flake.lock index 283f9b7..187d704 100644 --- a/flake.lock +++ b/flake.lock @@ -377,6 +377,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -504,7 +522,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { @@ -681,6 +699,25 @@ "type": "gitlab" } }, + "nixGL": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1752054764, + "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "owner": "nix-community", + "repo": "nixGL", + "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixGL", + "type": "github" + } + }, "nixd": { "inputs": { "flake-parts": "flake-parts_4", @@ -828,7 +865,7 @@ "inputs": { "flake-compat": "flake-compat_3", "lib-aggregate": "lib-aggregate", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1754459064, @@ -844,6 +881,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1748189127, @@ -906,6 +959,21 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1746378225, + "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "93e8cdce7afc64297cfec447c311470788131cd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1754454387, "narHash": "sha256-ViCy7RR3EhFC8Fj6CPrwiuM/M/jdqTsUVxX3XyKlo5w=", @@ -921,22 +989,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_8": { "locked": { "lastModified": 1754214453, @@ -955,16 +1007,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -976,7 +1028,7 @@ "nixpkgs-stable" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1754262585, @@ -996,7 +1048,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1754474936, @@ -1039,7 +1091,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1072,8 +1124,9 @@ "niri": "niri", "niri-unstable": "niri-unstable", "nix-matlab": "nix-matlab", + "nixGL": "nixGL", "nixd": "nixd", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", "nixvim": "nixvim", @@ -1116,7 +1169,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1227,6 +1280,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1331,7 +1399,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1754061284, diff --git a/flake.nix b/flake.nix index f39d611..cf9deb9 100644 --- a/flake.nix +++ b/flake.nix @@ -89,5 +89,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; ghostty.url = "github:ghostty-org/ghostty"; + nixGL.url = "github:nix-community/nixGL"; }; } diff --git a/home/programs/terminal/ghostty.nix b/home/programs/terminal/ghostty.nix index 07ece8c..dfb0da2 100644 --- a/home/programs/terminal/ghostty.nix +++ b/home/programs/terminal/ghostty.nix @@ -6,9 +6,10 @@ }: { stylix.targets.ghostty.enable = true; + nixGL.packages = inputs.nixGL.packages; programs.ghostty = { enable = true; - package = inputs.ghostty.packages.${pkgs.system}.ghostty; + package = config.lib.nixGL.wrap inputs.ghostty.packages.${pkgs.system}.ghostty; settings = { font-family = [ "Symbols Nerd Font" diff --git a/pkgs/wallpapers.nix b/pkgs/wallpapers.nix index ec30964..a2a3501 100644 --- a/pkgs/wallpapers.nix +++ b/pkgs/wallpapers.nix @@ -73,8 +73,8 @@ let } { name = "city.jpeg"; - url = "https://i.imgur.com/F8WcIQK.jpeg"; - sha256 = "1y4mvy26iq284p8b2xh2ygbjfw9r00v9d77hjjw4wmnc3216v1jy"; + url = "https://i.imgur.com/pUG5lpl.jpeg"; + sha256 = "0zsfih9c09mkjdlimla6bmilkdvj7hqsavqc729w9ymxxqfyyyqj"; } { name = "jw-follow-the-wind.jpeg"; @@ -88,14 +88,13 @@ in stdenvNoCC.mkDerivation { name = "wallpapers"; phases = [ "installPhase" ]; - installPhase = - '' - mkdir -p $out - '' - + ( - map (wallpaper: "ln -s ${wallpaper} $out/${wallpaper.name}") wallpaperSrcs - |> builtins.concatStringsSep "\n" - ); + installPhase = '' + mkdir -p $out + '' + + ( + map (wallpaper: "ln -s ${wallpaper} $out/${wallpaper.name}") wallpaperSrcs + |> builtins.concatStringsSep "\n" + ); meta = { description = "My wallpapers"; };