From 6e9043132f00865d253faf7dc14e85da2bb2d9fb Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 13 Feb 2024 00:08:01 +0100 Subject: [PATCH] modieifed nix config --- flake.lock | 74 ++++++++++++++++++++++++++----- flake.nix | 16 ++++++- home-manager/modules/machine.nix | 9 +--- home-manager/modules/packages.nix | 2 +- nix.nix | 27 +++++++++++ nixos/common.nix | 9 ++-- 6 files changed, 109 insertions(+), 28 deletions(-) create mode 100644 nix.nix diff --git a/flake.lock b/flake.lock index 800e657..0a0600f 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1707004164, - "narHash": "sha256-9Hr8onWtvLk5A8vCEkaE9kxA0D7PR62povFokM1oL5Q=", + "lastModified": 1707653290, + "narHash": "sha256-BZoeaofvEPuf2pw+k6VoRDiE/E5/3w7z0jrKfQCiXco=", "owner": "cachix", "repo": "devenv", - "rev": "0e68853bb27981a4ffd7a7225b59ed84f7180fc7", + "rev": "91a572c9866b92294aec152b65fa06c4dad7816f", "type": "github" }, "original": { @@ -75,6 +75,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -104,11 +119,11 @@ ] }, "locked": { - "lastModified": 1707467182, - "narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", + "lastModified": 1707683400, + "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", + "rev": "21b078306a2ab68748abf72650db313d646cf2ca", "type": "github" }, "original": { @@ -198,6 +213,25 @@ "type": "github" } }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1685908677, + "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", + "owner": "guibou", + "repo": "nixGL", + "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", + "type": "github" + }, + "original": { + "owner": "guibou", + "repo": "nixGL", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1678875422, @@ -265,7 +299,7 @@ "nixpkgs-update": { "inputs": { "mmdoc": "mmdoc", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1703122623, @@ -299,11 +333,26 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1660551188, + "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { @@ -313,7 +362,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1672428209, "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", @@ -361,7 +410,8 @@ "devenv": "devenv", "home-manager": "home-manager", "nix-software-center": "nix-software-center", - "nixpkgs": "nixpkgs_3", + "nixgl": "nixgl", + "nixpkgs": "nixpkgs_4", "nixpkgs-update": "nixpkgs-update" } }, diff --git a/flake.nix b/flake.nix index 6419e54..19e8793 100644 --- a/flake.nix +++ b/flake.nix @@ -16,14 +16,26 @@ devenv.url = "github:cachix/devenv"; dagger.url = "github:dagger/nix"; dagger.inputs.nixpkgs.follows = "nixpkgs"; + nixgl.url = "github:guibou/nixGL"; }; - outputs = { self, nixpkgs, home-manager, ... }@inputs: + outputs = { self, nixpkgs, home-manager, nixgl, ... }@inputs: let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = import nixpkgs { + system = "${system}"; + overlays = [ nixgl.overlay ]; + }; in { + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix index 7815260..2e263cb 100644 --- a/home-manager/modules/machine.nix +++ b/home-manager/modules/machine.nix @@ -20,6 +20,7 @@ with lib; ./../programs/firefox.nix ./../programs/chromium.nix ./../programs/mpv.nix + ./../../nix.nix ./packages.nix ]; @@ -130,14 +131,6 @@ with lib; programs.home-manager.enable = true; - nix = { - package = mkDefault pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - sandbox = relaxed - ''; - }; - gtk = { enable = config.machine.isGnome; theme = { diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 65d3a98..a8c11eb 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -16,7 +16,7 @@ with lib; home.packages = with pkgs; [ up rbenv - cargo-update + # cargo-update htop rustc cargo diff --git a/nix.nix b/nix.nix new file mode 100644 index 0000000..2f54662 --- /dev/null +++ b/nix.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, ... }: + +{ + nix = { + package = lib.mkDefault pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes + sandbox = relaxed + ''; + settings = { + trusted-users = [ + "root" + "thilo" + ]; + trusted-substituters = [ + "https://nix-community.cachix.org" + "https://nixpkgs-update.cachix.org" + "https://devenv.cachix.org" + ]; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + ]; + }; + }; +} \ No newline at end of file diff --git a/nixos/common.nix b/nixos/common.nix index 962a7b3..031cf5b 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -6,6 +6,10 @@ }: { + imports = [ + ./../nix.nix + ]; + nix = { # This will add each flake input as a registry # To make nix3 commands consistent with your flake @@ -14,11 +18,6 @@ # This will additionally add your inputs to the system's legacy channels # Making legacy nix commands consistent as well, awesome! nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - experimental-features = [ "nix-command" "flakes" ]; - trusted-users = [ "root" "thilo" ]; - }; }; nixpkgs = {