From 71f5a86c55be59decee3bcde1eeb7f44076eb495 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Thu, 31 Oct 2024 22:39:16 +0300 Subject: [PATCH] system: Update --- flake.lock | 49 +++++++++++++++++------------------ flake.nix | 17 ++++++++++-- home-manager/modules/zsh.nix | 2 +- home-manager/packages/art.nix | 4 +-- nixos/packages.nix | 1 - 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 25d3ef4..87d9257 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1729677762, - "narHash": "sha256-VEIm59u86TOkn97VEBJwcNA0ijlHElLREUVj938sMfg=", + "lastModified": 1730143163, + "narHash": "sha256-AQkTDx/NdygkXYXMCoobkmm7dCMa0brLGm7HsilDSMs=", "owner": "ayugram-port", "repo": "ayugram-desktop", - "rev": "8c76ffe734960551b155130b3236c0ac0110aee6", + "rev": "fe9d7b06e2d03cc8e8ab13290794882d11aff1d7", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1729459288, - "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -233,11 +233,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729307008, - "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -249,11 +249,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1729357638, - "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", "type": "github" }, "original": { @@ -281,27 +281,26 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1730753233, + "narHash": "sha256-sx9hc41qp+tnJmyUW9vy8tXOPKhgxkU45b6zQgBlEEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "4dbaa0433d9d9784b6553543e24c5bac60087113", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -344,11 +343,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1729394972, - "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", + "lastModified": 1730746162, + "narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", + "rev": "59d6988329626132eaf107761643f55eb979eef1", "type": "github" }, "original": { @@ -374,11 +373,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1729380793, - "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", + "lastModified": 1729963473, + "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", "owner": "danth", "repo": "stylix", - "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", + "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e39117e..6c542a5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; sops-nix.url = "github:Mic92/sops-nix"; stylix.url = "github:danth/stylix"; @@ -66,7 +66,13 @@ homeConfigurations = { sweetbread = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { + inherit inputs; + pkgs-stable = import nixpkgs-stable { + inherit system; + config.allowUnfree = true; + }; + }; modules = [ ./home-manager/users/sweetbread/home.nix inputs.sops-nix.homeManagerModules.sops @@ -77,6 +83,13 @@ chest = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; + extraSpecialArgs = { + inherit inputs; + pkgs-stable = import nixpkgs-stable { + inherit system; + config.allowUnfree = true; + }; + }; modules = [ ./home-manager/users/chest/home.nix inputs.sops-nix.homeManagerModules.sops diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix index 11bac56..fa7af50 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -57,7 +57,7 @@ flakeDir = "~/nix"; in { rb = "nh os switch ${flakeDir}"; - upd = "nix flake update ${flakeDir}"; + upd = "nix flake update --flake ${flakeDir}"; upg = "sudo nixos-rebuild switch --upgrade --flake ${flakeDir}"; hms = "nh home switch ${flakeDir}"; diff --git a/home-manager/packages/art.nix b/home-manager/packages/art.nix index 1ab21b1..267e945 100644 --- a/home-manager/packages/art.nix +++ b/home-manager/packages/art.nix @@ -1,5 +1,5 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ +{ pkgs-stable, ... }: { + home.packages = with pkgs-stable; [ blender ]; } diff --git a/nixos/packages.nix b/nixos/packages.nix index 6b570ae..0c32217 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -59,7 +59,6 @@ pamixer # GPU stuff - rocm-opencl-icd glaxnimate # Other