From 6da6046b739345f98891051901b4a9ea8720143a Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Sat, 24 May 2025 02:45:57 -0400 Subject: [PATCH] Update to 25.05 some bugs with new version i dont have time to sort out yet update js corepack pin lazygit insane ux choice with no config setting completions are now built-in pin to old nerdfonts I dont want to do this, but the new version just throw error after error at me pin neovim --- common/systemModules/stylix.nix | 33 ++- common/users/homeModules/dev/ide/default.nix | 2 +- common/users/homeModules/dev/javascript.nix | 2 +- common/users/homeModules/git.nix | 8 +- common/users/homeModules/nvim.nix | 5 +- common/users/homeModules/pinned.nix | 18 +- common/users/homeModules/zsh.nix | 1 - flake.lock | 231 +++++++++++++------ flake.nix | 6 +- 9 files changed, 212 insertions(+), 94 deletions(-) diff --git a/common/systemModules/stylix.nix b/common/systemModules/stylix.nix index 2448d89..c6fab79 100644 --- a/common/systemModules/stylix.nix +++ b/common/systemModules/stylix.nix @@ -1,16 +1,33 @@ { - pkgs, inputs, - stable, + pkgs, ... }: +let + oldPkgs = ( + import + (builtins.fetchGit { + # Descriptive name to make the store path easier to identify + name = "my-old-revision"; + url = "https://github.com/NixOS/nixpkgs/"; + ref = "refs/heads/nixpkgs-unstable"; + rev = "d9d87c51960050e89c79e4025082ed965e770d68"; + }) + { + inherit (pkgs) system; + } + ); + nerdfonts = oldPkgs.nerdfonts; +in { imports = [ inputs.stylix.nixosModules.stylix ]; - environment.systemPackages = [ - stable.nerdfonts - ]; + environment = { + systemPackages = [ + nerdfonts + ]; + }; stylix = { enable = true; image = ../../dotfiles/wallpaper.jpg; @@ -43,15 +60,15 @@ # name = "Twitter Color Emoji"; # }; sansSerif = { - package = stable.nerdfonts; + package = nerdfonts; name = "ComicShannsMono Nerd Font Mono"; }; serif = { - package = stable.nerdfonts; + package = nerdfonts; name = "ComicShannsMono Nerd Font Mono"; }; monospace = { - package = stable.nerdfonts; + package = nerdfonts; name = "ComicShannsMono Nerd Font Mono"; }; }; diff --git a/common/users/homeModules/dev/ide/default.nix b/common/users/homeModules/dev/ide/default.nix index 08eaae7..4f3b64a 100644 --- a/common/users/homeModules/dev/ide/default.nix +++ b/common/users/homeModules/dev/ide/default.nix @@ -23,7 +23,7 @@ in }; file = { vscode_neovim = { - source = "${pkgs.pinned.neovim}/bin/nvim"; + source = "${pkgs.pinned.vscode_neovim}/bin/nvim"; target = ".bin/vscode-neovim"; }; }; diff --git a/common/users/homeModules/dev/javascript.nix b/common/users/homeModules/dev/javascript.nix index 2b5e4f6..0ced0e5 100644 --- a/common/users/homeModules/dev/javascript.nix +++ b/common/users/homeModules/dev/javascript.nix @@ -35,7 +35,7 @@ in electron-fiddle typescript unstable.eslint - unstable.corepack_23 + unstable.corepack_24 node vsce esbuild diff --git a/common/users/homeModules/git.nix b/common/users/homeModules/git.nix index de93091..28bc43f 100644 --- a/common/users/homeModules/git.nix +++ b/common/users/homeModules/git.nix @@ -1,8 +1,12 @@ -{ pkgs, config, ... }: { +{ pkgs, config, ... }: +{ + imports = [ + ./pinned.nix + ]; home = { packages = with pkgs; [ git - lazygit + pinned.lazygit act gh ]; diff --git a/common/users/homeModules/nvim.nix b/common/users/homeModules/nvim.nix index 6bfcc62..a03e7b2 100644 --- a/common/users/homeModules/nvim.nix +++ b/common/users/homeModules/nvim.nix @@ -4,9 +4,12 @@ ... }: { + imports = [ + ./pinned.nix + ]; home = { packages = with pkgs; [ - neovim + pinned.neovim nvimpager ]; file = { diff --git a/common/users/homeModules/pinned.nix b/common/users/homeModules/pinned.nix index 839a854..5c7693a 100644 --- a/common/users/homeModules/pinned.nix +++ b/common/users/homeModules/pinned.nix @@ -26,7 +26,7 @@ ref = "refs/heads/nixpkgs-unstable"; rev = "0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb"; }) defaultOpts).vscode; - neovim = + vscode_neovim = (import (builtins.fetchGit { # Descriptive name to make the store path easier to identify name = "my-old-revision"; @@ -34,6 +34,14 @@ ref = "refs/heads/nixpkgs-unstable"; rev = "0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb"; }) defaultOpts).neovim; + neovim = + (import (builtins.fetchGit { + # Descriptive name to make the store path easier to identify + name = "my-old-revision"; + url = "https://github.com/NixOS/nixpkgs/"; + ref = "refs/heads/nixpkgs-unstable"; + rev = "14182c19701221692b84e7428e5b7281b099967a"; + }) defaultOpts).neovim; # removed for having out of date electron etcher = (import @@ -67,7 +75,13 @@ ref = "refs/heads/nixpkgs-unstable"; rev = "05bbf675397d5366259409139039af8077d695ce"; }) defaultOpts).gdb; - + # lazygit >=49 has an ugly root symbol with no config to remove it + lazygit = + (import (builtins.fetchGit { + name = "pinned-lazygit"; + url = "https://github.com/NixOS/nixpkgs/"; + rev = "785eec1b92a0a4b3246f1307a9325a7e5024fef5"; + }) defaultOpts).lazygit; }; } ) diff --git a/common/users/homeModules/zsh.nix b/common/users/homeModules/zsh.nix index 438266a..e1251fb 100644 --- a/common/users/homeModules/zsh.nix +++ b/common/users/homeModules/zsh.nix @@ -38,7 +38,6 @@ source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - eval "$(${pkgs.nh}/bin/nh completions --shell=zsh)" setopt globstarshort eval "$(${pkgs.docker}/bin/docker completion zsh)" # *c*d into *n*ew *d*irectory diff --git a/flake.lock b/flake.lock index 6d17d83..c5cb574 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -169,7 +169,6 @@ } }, "flake-compat_4": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -202,6 +201,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -244,27 +264,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "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": { @@ -332,16 +331,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -353,16 +352,16 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -374,11 +373,11 @@ ] }, "locked": { - "lastModified": 1745593878, - "narHash": "sha256-Rq5qNnUWuhQTqzXDcminu7Z1FPSB1wUaKIEfPTyZkAs=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "542078066b1a99cdc5d5fce1365f98b847ca0b5a", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -395,16 +394,16 @@ ] }, "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -478,11 +477,11 @@ ] }, "locked": { - "lastModified": 1745120797, - "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -501,11 +500,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745545091, - "narHash": "sha256-300Y7RoU/wefVDmit6b89HvhBk6h8l1t9VVDo0diEK4=", + "lastModified": 1748050179, + "narHash": "sha256-KsVuuGQ95hlpY75+3Gkg/6kaneeQx4OWI9L6bOOl+s4=", "owner": "kaylorben", "repo": "nixcord", - "rev": "f5dd48df2e39d2b2cf9b5bad20997e88704f6a5e", + "rev": "63f4662a3940cf25451e215276f51ca415dbdf37", "type": "github" }, "original": { @@ -522,11 +521,11 @@ ] }, "locked": { - "lastModified": 1744290088, - "narHash": "sha256-/X9XVEl0EiyisNbF5srrxXRSVoRqdwExuqyspYqqEjQ=", + "lastModified": 1746453552, + "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "60b4904a1390ac4c89e93d95f6ed928975e525ed", + "rev": "be618645aa0adf461f778500172b6896d5ab2d01", "type": "github" }, "original": { @@ -568,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -600,16 +599,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1745487689, - "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -646,6 +645,32 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "owner": "nix-community", + "repo": "NUR", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -712,11 +737,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -733,29 +758,32 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], + "nur": "nur", "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744152965, - "narHash": "sha256-LWUeN1+bH3k46fwtIv0bNgtmkqB0UduyX7T2i+230n0=", + "lastModified": 1748029503, + "narHash": "sha256-qHewVAhQ2kaZLHcO9lDzMeAGDFmbDd36kls7bi7HgMQ=", "owner": "danth", "repo": "stylix", - "rev": "8748db082ca15d32243c86e5d785d5dfc8a65719", + "rev": "df93f602dd8c84e7bd067654cc2f6422d5868496", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -839,28 +867,43 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", "type": "github" } }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -869,6 +912,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -889,6 +948,28 @@ "repo": "treefmt-nix", "type": "github" } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 86c419f..6bf6af7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; sops-nix = { url = "github:Mic92/sops-nix"; }; @@ -14,11 +14,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-24.11"; + url = "github:danth/stylix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager-unstable = {