From 15dda05d03b2dc1e1285fec848b617e482aa7012 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Tue, 8 Nov 2022 16:12:00 -0300 Subject: [PATCH] remove multi-nixpkgs template I don't intend to maintain this template, right now. It'll still be available at a separate branch. This reverts commit 7bbdfe484c3cc96352fb141971d85ca379490a78. --- flake.nix | 6 -- multi-nixpkgs/flake.lock | 97 ------------------------------ multi-nixpkgs/flake.nix | 83 ------------------------- multi-nixpkgs/home-manager | 1 - multi-nixpkgs/modules | 1 - multi-nixpkgs/nixos | 1 - multi-nixpkgs/nixpkgs-config.nix | 1 - multi-nixpkgs/overlays/default.nix | 20 ------ multi-nixpkgs/pkgs | 1 - multi-nixpkgs/shell.nix | 1 - 10 files changed, 212 deletions(-) delete mode 100644 multi-nixpkgs/flake.lock delete mode 100644 multi-nixpkgs/flake.nix delete mode 120000 multi-nixpkgs/home-manager delete mode 120000 multi-nixpkgs/modules delete mode 120000 multi-nixpkgs/nixos delete mode 120000 multi-nixpkgs/nixpkgs-config.nix delete mode 100644 multi-nixpkgs/overlays/default.nix delete mode 120000 multi-nixpkgs/pkgs delete mode 120000 multi-nixpkgs/shell.nix diff --git a/flake.nix b/flake.nix index dda8d23..591094b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,12 +16,6 @@ ''; path = ./standard; }; - multi-nixpkgs = { - description = '' - An example, based on the standard flake, on how to use two (or more) nixpkgs versions - ''; - path = ./multi-nixpkgs; - }; }; }; } diff --git a/multi-nixpkgs/flake.lock b/multi-nixpkgs/flake.lock deleted file mode 100644 index a197cb2..0000000 --- a/multi-nixpkgs/flake.lock +++ /dev/null @@ -1,97 +0,0 @@ -{ - "nodes": { - "hardware": { - "locked": { - "lastModified": 1667585378, - "narHash": "sha256-cvOwucrjBaAkaGk3FunG+MQiwiSBeIVTtO5n/YavpC0=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "6b35a59c19ddbbeb229fcd1d3dcd422dcc0fa927", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1667574732, - "narHash": "sha256-73TVk3uSQOja6Q/5OuNcpcqwo6+SMzJPRtYAjU0rBx4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b764068a506c6f70dba998efa0e7fcb99cb4deb2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1667482890, - "narHash": "sha256-pua0jp87iwN7NBY5/ypx0s9L9CG49Ju/NI4wGwurHc4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a2a777538d971c6b01c6e54af89ddd6567c055e8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-master": { - "locked": { - "lastModified": 1667669848, - "narHash": "sha256-nD2dk2A+1zUlUT18ppDFVWwimi26+ultc2QRsulQwQ8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1f3ebb2bd1a353a42e8f833895c26d8415c7b791", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "hardware": "hardware", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master" - } - }, - "utils": { - "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/multi-nixpkgs/flake.nix b/multi-nixpkgs/flake.nix deleted file mode 100644 index 4c415f1..0000000 --- a/multi-nixpkgs/flake.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - description = "Your new nix config"; - - inputs = { - # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-master.url = "github:nixos/nixpkgs/master"; - - # Home manager - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - - # TODO: Add any other flake you might need - hardware.url = "github:nixos/nixos-hardware"; - - # Shameless plug: looking for a way to nixify your themes and make - # everything match nicely? Try nix-colors! - # nix-colors.url = "github:misterio77/nix-colors"; - }; - - outputs = { nixpkgs, home-manager, ... }@inputs: - let - forAllSystems = nixpkgs.lib.genAttrs [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - in - rec { - # Your custom packages - # Acessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in - import ./pkgs { inherit pkgs; } - ); - # Devshell for bootstrapping - # Acessible through 'nix develop' or 'nix-shell' (legacy) - devShells = forAllSystems (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in - import ./shell.nix { inherit pkgs; } - ); - - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays { inherit inputs; }; - # Reusable nixos modules you might want to export - # These are usually stuff you would upstream into nixpkgs - nixosModules = import ./modules/nixos; - # Reusable home-manager modules you might want to export - # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; - - nixosConfigurations = { - # FIXME replace with your hostname - your-hostname = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; # Pass flake inputs to our config - modules = (builtins.attrValues nixosModules) ++ [ - # > Our main nixos configuration file < - ./nixos/configuration.nix - # Our common nixpkgs config (unfree, overlays, etc) - (import ./nixpkgs-config.nix { inherit overlays; }) - ]; - }; - }; - - homeConfigurations = { - # FIXME replace with your username@hostname - "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config - modules = (builtins.attrValues homeManagerModules) ++ [ - # > Our main home-manager configuration file < - ./home-manager/home.nix - # Our common nixpkgs config (unfree, overlays, etc) - (import ./nixpkgs-config.nix { inherit overlays; }) - ]; - }; - }; - }; -} diff --git a/multi-nixpkgs/home-manager b/multi-nixpkgs/home-manager deleted file mode 120000 index e047a58..0000000 --- a/multi-nixpkgs/home-manager +++ /dev/null @@ -1 +0,0 @@ -../standard/home-manager \ No newline at end of file diff --git a/multi-nixpkgs/modules b/multi-nixpkgs/modules deleted file mode 120000 index 3e9a3c5..0000000 --- a/multi-nixpkgs/modules +++ /dev/null @@ -1 +0,0 @@ -../standard/modules \ No newline at end of file diff --git a/multi-nixpkgs/nixos b/multi-nixpkgs/nixos deleted file mode 120000 index d159ef5..0000000 --- a/multi-nixpkgs/nixos +++ /dev/null @@ -1 +0,0 @@ -../standard/nixos \ No newline at end of file diff --git a/multi-nixpkgs/nixpkgs-config.nix b/multi-nixpkgs/nixpkgs-config.nix deleted file mode 120000 index 19056ba..0000000 --- a/multi-nixpkgs/nixpkgs-config.nix +++ /dev/null @@ -1 +0,0 @@ -../standard/nixpkgs-config.nix \ No newline at end of file diff --git a/multi-nixpkgs/overlays/default.nix b/multi-nixpkgs/overlays/default.nix deleted file mode 100644 index f520af5..0000000 --- a/multi-nixpkgs/overlays/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ inputs, ... }: -# This file defines overlays -{ - # Add bleeding edge packages under the 'master' namespace - master = final: _prev: { - master = inputs.nixpkgs-master.legacyPackages.${final.system}; - }; - - # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs { pkgs = final; }; - - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays - modifications = final: prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); - }; -} diff --git a/multi-nixpkgs/pkgs b/multi-nixpkgs/pkgs deleted file mode 120000 index 75370a4..0000000 --- a/multi-nixpkgs/pkgs +++ /dev/null @@ -1 +0,0 @@ -../standard/pkgs \ No newline at end of file diff --git a/multi-nixpkgs/shell.nix b/multi-nixpkgs/shell.nix deleted file mode 120000 index 123d7c8..0000000 --- a/multi-nixpkgs/shell.nix +++ /dev/null @@ -1 +0,0 @@ -../standard/shell.nix \ No newline at end of file