diff --git a/flake.lock b/flake.lock index 552d232e..64ff9255 100644 --- a/flake.lock +++ b/flake.lock @@ -2,14 +2,15 @@ "nodes": { "awesome-wallpapers": { "inputs": { + "git-hooks": "git-hooks", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781031430, - "narHash": "sha256-AcJTjMpnffSJ6bpTDEaGcJ/31rOOYDgGr/2L2yH7H0Y=", + "lastModified": 1786698894, + "narHash": "sha256-yZHP8Tqn/ClxwGCTsZnyT5HRFGRY0eeMWtlK43qJbtc=", "owner": "anotherhadi", "repo": "awesome-wallpapers", - "rev": "0147e19341039fd3b01d36c3cbaa9571105fb777", + "rev": "deda1a9868be6f516405115068f3ed5038395340", "type": "github" }, "original": { @@ -180,21 +181,6 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1780532242, - "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=", - "owner": "ipetkov", - "repo": "crane", - "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "default-creds": { "inputs": { "bun2nix": "bun2nix_2", @@ -267,6 +253,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1777699697, @@ -358,27 +360,6 @@ } }, "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "nvf", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -418,6 +399,28 @@ "git-hooks": { "inputs": { "flake-compat": "flake-compat", + "nixpkgs": [ + "awesome-wallpapers", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ] @@ -460,11 +463,11 @@ ] }, "locked": { - "lastModified": 1781783441, - "narHash": "sha256-v7rAVyX0DGAYqei3FxWPDJLqrzJrEsue2DVBEDApxQo=", + "lastModified": 1786621994, + "narHash": "sha256-ygaOQQFGv3QHcNMoGBor22Dm5GouzmwYucrUfX6oTxQ=", "owner": "oxcl", "repo": "nix-flake-helium-browser", - "rev": "aabc12cf6518480d83b2b5d06d2eecf86a25273f", + "rev": "810640b8a7aa504d3962ec8bb857f8252aad6547", "type": "github" }, "original": { @@ -621,11 +624,11 @@ ] }, "locked": { - "lastModified": 1782030356, - "narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=", + "lastModified": 1786249295, + "narHash": "sha256-Y2mSr+HLKYoOsjiackgilxkHXe8gkJ3z4hFFekjQX3I=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3017088b49efd404f78e3b104f553b97e4af786b", + "rev": "14d55b8069119e3b88da7aa2f6c97f86a2cd3cd6", "type": "github" }, "original": { @@ -642,11 +645,11 @@ "website-builder": "website-builder" }, "locked": { - "lastModified": 1781774207, - "narHash": "sha256-pUHOn5uRbY1yOdeBgfm/UpkVkN9YrLUxl7jZnN1emyo=", + "lastModified": 1784997863, + "narHash": "sha256-oTMag4I9MW3bstuOKqzc0F1OqxO49lLa9jkSkRe3EqA=", "owner": "rasmus-kirk", "repo": "nixarr", - "rev": "67952a6e79a298396e909d35f7ee35b23f754c43", + "rev": "282ce99b31d52d72cca281e3d26d3dd267946800", "type": "github" }, "original": { @@ -660,11 +663,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1782166108, - "narHash": "sha256-/EtnQBcKbsaCAGQ5VRcplrHRkR4ryqyLMpBfkVuG9Xw=", + "lastModified": 1786528975, + "narHash": "sha256-8KuasCs+mVQ7WbLONUf/QB7NZeQvovyXRyxAj4nOOzY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "875776f0252fcb8618bb948640a0d1f7a5b362be", + "rev": "3e7edd9afe17e45521300e041c65de3015f4a302", "type": "github" }, "original": { @@ -675,16 +678,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1786535285, + "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -736,11 +739,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1786384358, - "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=", + "lastModified": 1786599213, + "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a", + "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", "type": "github" }, "original": { @@ -845,11 +848,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1786430034, - "narHash": "sha256-Vux08kA5PICwS2sViCMfwVLAHNoH8TkKAeBo25LjpMI=", + "lastModified": 1786535285, + "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70cc4559b10a6062b05ff1af17e0add065ccaed9", + "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5", "type": "github" }, "original": { @@ -861,40 +864,15 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", - "type": "github" + "lastModified": 1784796856, + "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz" }, "original": { - "owner": "nixos", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "notashelf-tuigreet": { - "inputs": { - "crane": "crane", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1781718334, - "narHash": "sha256-Ova9OQemsGRmg2b22W9HQSRhtjwS1C9mLUtkYqEjyRs=", - "owner": "NotAShelf", - "repo": "tuigreet", - "rev": "a75f469d51a11b35f9766153d35d15c535b268a6", - "type": "github" - }, - "original": { - "owner": "NotAShelf", - "repo": "tuigreet", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nur": { @@ -905,11 +883,11 @@ ] }, "locked": { - "lastModified": 1786612668, - "narHash": "sha256-drUMW/BXNEKe5wzw2yM7ea/g7CnObPcwRNVp9ap0yQk=", + "lastModified": 1786700839, + "narHash": "sha256-DtB4Byceo3tyyZNsmwuM0YZSO76VaUaGMSxVjdwYQyw=", "owner": "nix-community", "repo": "nur", - "rev": "a5ef785fafbf01c361372d7dc8e0f1591aeeacd3", + "rev": "3c7c14b16718033c171babfd3020006c05d724d8", "type": "github" }, "original": { @@ -966,18 +944,16 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_5", + "flake-compat": "flake-compat_3", "mnw": "mnw", - "nixpkgs": "nixpkgs_9", - "systems": "systems_4" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1781997110, - "narHash": "sha256-6D6xtYN5t1kZGNd69eMZsRBkgX5Df1roErn/kFR1C+A=", + "lastModified": 1786433999, + "narHash": "sha256-rbOp2g0UCYt+evTnCGCKBQGqSMfwX4RTXneNbeHqOAk=", "owner": "notashelf", "repo": "nvf", - "rev": "320f60b97075a58d38b90fc5e39f478421dbd38a", + "rev": "a213644cadd5f90bf18b0c409f08f282b30e55e3", "type": "github" }, "original": { @@ -1011,7 +987,7 @@ "blog": "blog", "default-creds": "default-creds", "disko": "disko", - "git-hooks": "git-hooks", + "git-hooks": "git-hooks_2", "helium-browser": "helium-browser", "home-manager": "home-manager", "iknowyou": "iknowyou", @@ -1021,7 +997,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", - "notashelf-tuigreet": "notashelf-tuigreet", "nur": "nur", "nvf": "nvf", "nvf-config": "nvf-config", @@ -1029,27 +1004,6 @@ "stylix": "stylix" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "notashelf-tuigreet", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780975129, - "narHash": "sha256-428T1pLXnbVeUgZx2wWEkbvl3ZORjras34ANZ3ACp5A=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "fe64e6b409dc513274d2941f8da13bbd0fdcf44e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1057,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1781943681, - "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", + "lastModified": 1786629091, + "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", "owner": "Mic92", "repo": "sops-nix", - "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", "type": "github" }, "original": { @@ -1077,13 +1031,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_5", + "systems": "systems_4", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -1164,21 +1118,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 4041ac04..768be28a 100644 --- a/flake.nix +++ b/flake.nix @@ -40,10 +40,6 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - notashelf-tuigreet = { - url = "github:NotAShelf/tuigreet"; - inputs.nixpkgs.follows = "nixpkgs"; - }; helium-browser = { url = "github:oxcl/nix-flake-helium-browser"; inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/home/programs/tui/nvf/languages.nix b/home/programs/tui/nvf/languages.nix index 3a9b3f20..7c35f240 100644 --- a/home/programs/tui/nvf/languages.nix +++ b/home/programs/tui/nvf/languages.nix @@ -84,7 +84,7 @@ go.enable = true; markdown = { enable = true; - format.type = ["prettierd"]; + format.type = ["prettier"]; extensions = { markview-nvim = { enable = true; diff --git a/nixos/tuigreet.nix b/nixos/tuigreet.nix index f0796f71..1836e651 100644 --- a/nixos/tuigreet.nix +++ b/nixos/tuigreet.nix @@ -1,12 +1,11 @@ { pkgs, - inputs, config, lib, ... }: let c = config.lib.stylix.colors; - tuigreet = inputs.notashelf-tuigreet.packages.${pkgs.stdenv.hostPlatform.system}.default; + tuigreet = pkgs.tuigreet; theme = lib.concatStringsSep ";" [ "border=#${c.base0D}"