From a96c69cf083652cd51386ff13fdd9a954ab2f009 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:17:02 -0500 Subject: [PATCH] fix syntax and stable / unstable --- common/users/homeModules/kde.nix | 4 +- common/users/homeModules/media/cli.nix | 4 +- common/users/homeModules/media/gui.nix | 4 +- common/users/homeModules/prisma.nix | 4 +- common/users/homeModules/terminal.nix | 4 +- common/users/meyer-wsl/default.nix | 2 +- common/users/meyer/default.nix | 4 +- common/users/meyer/home.nix | 4 +- flake.lock | 103 +++++++++++-------------- flake.nix | 32 ++++++-- 10 files changed, 84 insertions(+), 81 deletions(-) diff --git a/common/users/homeModules/kde.nix b/common/users/homeModules/kde.nix index 726290e..be9d680 100644 --- a/common/users/homeModules/kde.nix +++ b/common/users/homeModules/kde.nix @@ -7,5 +7,5 @@ libsForQt5.kcolorchooser gnome.gnome-calculator ]; - } -} \ No newline at end of file + }; +} diff --git a/common/users/homeModules/media/cli.nix b/common/users/homeModules/media/cli.nix index 884c0d4..48fb9aa 100644 --- a/common/users/homeModules/media/cli.nix +++ b/common/users/homeModules/media/cli.nix @@ -5,5 +5,5 @@ ffmpeg yt-dlp ]; - } -} \ No newline at end of file + }; +} diff --git a/common/users/homeModules/media/gui.nix b/common/users/homeModules/media/gui.nix index 61f44e2..c740629 100644 --- a/common/users/homeModules/media/gui.nix +++ b/common/users/homeModules/media/gui.nix @@ -7,5 +7,5 @@ inkscape obs-studio ]; - } -} \ No newline at end of file + }; +} diff --git a/common/users/homeModules/prisma.nix b/common/users/homeModules/prisma.nix index 5adbe5a..1892230 100644 --- a/common/users/homeModules/prisma.nix +++ b/common/users/homeModules/prisma.nix @@ -1,4 +1,4 @@ -{pkgs, unstable ? pkgs, ...}: { +{pkgs, unstable, ...}: { home = { packages = with pkgs; [ unstable.prisma @@ -10,4 +10,4 @@ PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node"; }; }; -} \ No newline at end of file +} diff --git a/common/users/homeModules/terminal.nix b/common/users/homeModules/terminal.nix index f834e64..91106e9 100644 --- a/common/users/homeModules/terminal.nix +++ b/common/users/homeModules/terminal.nix @@ -14,5 +14,5 @@ target = "./.config/kitty"; }; }; - } -} \ No newline at end of file + }; +} diff --git a/common/users/meyer-wsl/default.nix b/common/users/meyer-wsl/default.nix index e4a900c..46251b0 100644 --- a/common/users/meyer-wsl/default.nix +++ b/common/users/meyer-wsl/default.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, stable ? pkgs, unstable ? pkgs, ... }: +{ pkgs, inputs, stable, unstable, ... }: let NAME = "meyer"; in diff --git a/common/users/meyer/default.nix b/common/users/meyer/default.nix index 9145206..f434b5b 100644 --- a/common/users/meyer/default.nix +++ b/common/users/meyer/default.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, systemImports, ... }: +{ pkgs, inputs, stable, unstable, ... }: let NAME = "meyer"; in @@ -29,7 +29,7 @@ in }; }; home-manager = { - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs stable unstable; }; users = { "${NAME}" = import ./home.nix; }; diff --git a/common/users/meyer/home.nix b/common/users/meyer/home.nix index 0e4fa0d..5ef97dd 100644 --- a/common/users/meyer/home.nix +++ b/common/users/meyer/home.nix @@ -10,7 +10,7 @@ in { nixpkgs.config.allowUnfreePredicate = (pkg: true); imports = [ - ../homeModules/util.nix + ../homeModules/utils.nix ../homeModules/dev ../homeModules/dev/ide ../homeModules/dev/ide/jb/idea.nix @@ -50,7 +50,7 @@ in { home = { packages = with pkgs; [ pinned.etcher - ] + ]; }; home.shellAliases = { sd = ''lsusb | grep Elgato | grep --perl-regexp "(?<=Device 0{0,10})[1-9]+" --only-matching | xargs printf "usb.device_address eq %s" | copy''; diff --git a/flake.lock b/flake.lock index 37d0635..502a53a 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -423,11 +423,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1729717678, - "narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", + "lastModified": 1731682434, + "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", + "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", "type": "github" }, "original": { @@ -476,11 +476,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -490,22 +490,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730200266, @@ -524,11 +508,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729951556, - "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "type": "github" }, "original": { @@ -572,15 +556,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1732575825, + "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "type": "github" }, "original": { @@ -608,11 +591,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731920923, - "narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=", + "lastModified": 1732608183, + "narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=", "owner": "danth", "repo": "stylix", - "rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b", + "rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334", "type": "github" }, "original": { @@ -719,11 +702,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ca69c0f..891a354 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,8 @@ inputs.nixpkgs.follows = "nix-stable"; }; stylix-stable = { - url = "github:danth/stylix/release-24.05"; - inputs.nixpkgs.follows = "nix-stable"; + url = "github:danth/stylix/release-24.05"; + inputs.nixpkgs.follows = "nix-stable"; }; home-manager-stable = { url = "github:nix-community/home-manager/release-24.05"; @@ -31,8 +31,8 @@ url = "github:sadan4/scripts"; }; stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = @@ -83,11 +83,21 @@ inherit inputs; stable = import nix-stable { inherit system; - config = { allowUnfree = true; }; + config = { + allowUnfree = true; + }; }; }; system = "x86_64-linux"; modules = [ + ( + { pkgs, ... }: + { + _module.args = { + unstable = pkgs; + }; + } + ) ./boxes/desktop/configuration.nix inputs.home-manager.nixosModules.default inputs.nix-index-database.nixosModules.nix-index @@ -104,10 +114,20 @@ }; unstable = import nixpkgs { inherit system; - config = { allowUnfree = true; }; + config = { + allowUnfree = true; + }; }; }; modules = [ + ( + { pkgs, ... }: + { + _module.args = { + stable = pkgs; + }; + } + ) ./boxes/wsl/configuration.nix inputs.home-manager-stable.nixosModules.default nixos-wsl.nixosModules.wsl