From 4adaac1edd98fb3040658750c7b94e243f75c65c Mon Sep 17 00:00:00 2001 From: Tyler Date: Tue, 29 Apr 2025 22:19:08 -0400 Subject: [PATCH] update nixos stable to unstable in prep for 25.05 (#21) * update nixos stable to unstable in prep for 25.05 * update flake.lock --- dot_config/flake/flake.lock | 52 +++++++++---------- dot_config/flake/flake.nix | 2 +- dot_config/flake/home/stylix.nix | 8 +-- .../flake/machines/wash/configuration.nix | 2 +- dot_config/flake/machines/wash/home.nix | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index 20ed3d9..997401e 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -75,11 +75,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1744456153, - "narHash": "sha256-xTaAboh9p0Mz0UEgcKe+B1zVKoRFG7RQR+gf7ypMQVA=", + "lastModified": 1745924915, + "narHash": "sha256-RuMUtaplJkaAtqkdG1+cD3trqmO2ykKqfK+3+HXPUVA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "a76a451a2c97aa37a7741bdf8244ad91205776b8", + "rev": "329a9d639f0418cce05937a823f43b2b64191653", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1744498625, - "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", + "lastModified": 1745977079, + "narHash": "sha256-eEOmrgpenIs+JwuCdqgEYly6sdz8vbCQVgvo8dk3DZM=", "owner": "nix-community", "repo": "home-manager", - "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", + "rev": "84d262115e10ad321ef01cd85903d0f5c3ec113f", "type": "github" }, "original": { @@ -432,7 +432,7 @@ "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" }, "original": { "type": "tarball", @@ -460,11 +460,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1745794561, + "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "type": "github" }, "original": { @@ -492,11 +492,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1745742390, + "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -555,16 +555,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -607,11 +607,11 @@ ] }, "locked": { - "lastModified": 1744425163, - "narHash": "sha256-iFcqIbyY25uhtRrQal5vFTxt0q59vDf++nY8du5hof4=", + "lastModified": 1745894113, + "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4bb0b6dfc5bafa8b4e8dbe1170f051c437b2cb79", + "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed", "type": "github" }, "original": { @@ -660,11 +660,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1744152965, - "narHash": "sha256-LWUeN1+bH3k46fwtIv0bNgtmkqB0UduyX7T2i+230n0=", + "lastModified": 1745893500, + "narHash": "sha256-MXkFfYmufV7UA1/UY3Hw/+bBv9gNvR4vqJi6wEu3yJA=", "owner": "danth", "repo": "stylix", - "rev": "8748db082ca15d32243c86e5d785d5dfc8a65719", + "rev": "eb8366e23f7f4c779711965371c20da1279d9c20", "type": "github" }, "original": { diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 1b1cbe9..e171a3e 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -3,7 +3,7 @@ inputs = { # nixpkgs.follows = "nixos-cosmic/nixpkgs-stable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; diff --git a/dot_config/flake/home/stylix.nix b/dot_config/flake/home/stylix.nix index 8e7ec0f..f90bd2f 100644 --- a/dot_config/flake/home/stylix.nix +++ b/dot_config/flake/home/stylix.nix @@ -9,10 +9,10 @@ in { base16Scheme = theme; - fonts.monospace = { - name = "JetBrainsMono Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}; - }; + # fonts.monospace = { + # name = "JetBrainsMono Nerd Font"; + # package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}; + # }; enable = true; autoEnable = false; diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index e8ee9f5..6b9fa95 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -145,7 +145,7 @@ ]; fonts.packages = with pkgs; [ - nerdfonts + # nerdfonts ]; programs.nix-ld.enable = true; diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 824b148..3159299 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { imports = [ - ../../home/stylix.nix + # ../../home/stylix.nix ../../home/common.nix ../../home/darkman.nix