From bc416515011a608f64550c8d3d7f737c8bd3bac8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:43:04 +0100 Subject: [PATCH] Simplification refactor --- flake.nix | 35 +------------------------------- modules/home-manager/default.nix | 6 ------ modules/nixos/default.nix | 6 ------ overlays/default.nix | 23 --------------------- pkgs/default.nix | 5 ----- 5 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 modules/home-manager/default.nix delete mode 100644 modules/nixos/default.nix delete mode 100644 overlays/default.nix delete mode 100644 pkgs/default.nix diff --git a/flake.nix b/flake.nix index c9a0573..0663bf6 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,6 @@ extest.url = "github:chaorace/extest-nix"; # 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 = { @@ -30,36 +26,7 @@ ... } @ inputs: let inherit (self) outputs; - # Supported systems for your flake packages, shell, etc. - # systems = [ - # "aarch64-linux" - # "armv7l-linux" - # "i686-linux" - # "x86_64-linux" - # "aarch64-darwin" - # "armv7l-darwin" - # "x86_64-darwin" - # ]; - # # This is a function that generates an attribute by calling a function you - # # pass to it, with each system as an argument - # forAllSystems = nixpkgs.lib.genAttrs systems; in { - # Your custom packages - # Acessible through 'nix build', 'nix shell', etc - # packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # # Formatter for your nix files, available through 'nix fmt' - # # Other options beside 'alejandra' include 'nixpkgs-fmt' - # formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - - # 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; - # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { @@ -116,7 +83,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix - #sops-nix.nixosModules.sops + sops-nix.nixosModules.sops ]; }; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix deleted file mode 100644 index 45aae31..0000000 --- a/modules/home-manager/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix deleted file mode 100644 index 8605069..0000000 --- a/modules/nixos/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index a13ea3c..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file defines overlays -{inputs, ...}: { - # 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 { - # ... - # }); - }; - - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 3d9e23c..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Custom packages, that can be defined similarly to ones from nixpkgs -# You can build them using 'nix build .#example' -pkgs: { - # example = pkgs.callPackage ./example { }; -}