test: this is not working :,(
This commit is contained in:
parent
2fa8c8c00b
commit
d100c2449f
7 changed files with 25 additions and 38 deletions
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
homeManagerModules = import ./modules/home-manager;
|
homeManagerModules = import ./modules/home-manager;
|
||||||
|
|
||||||
#overlays = import ./overlays { inherit inputs outputs; };
|
overlays = import ./overlays { inherit inputs outputs; };
|
||||||
|
|
||||||
packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
|
packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
|
||||||
devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
|
devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,4 @@
|
||||||
|
|
||||||
colorscheme = inputs.nix-colors.colorSchemes.everforest;
|
colorscheme = inputs.nix-colors.colorSchemes.everforest;
|
||||||
|
|
||||||
home.username = "ooks";
|
}
|
||||||
home.homeDirectory = "/home/ooks";
|
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
./starship.nix
|
./starship.nix
|
||||||
./joshuto
|
./joshuto
|
||||||
./helix
|
./helix
|
||||||
# ./live-buds-cli.nix
|
./live-buds-cli.nix
|
||||||
];
|
];
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
bc # Calculator
|
bc # Calculator
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ in
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config = {
|
||||||
#overlays = builtins.attrValues outputs.overlays;
|
overlays = builtins.attrValues outputs.overlays;
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
allowUnfreePredicate = (_: true);
|
allowUnfreePredicate = (_: true);
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
|
|
@ -38,8 +38,11 @@ in
|
||||||
homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
||||||
stateVersion = lib.mkDefault "22.05";
|
stateVersion = lib.mkDefault "22.05";
|
||||||
sessionPath = [ "$HOME/.local/bin" ];
|
sessionPath = [ "$HOME/.local/bin" ];
|
||||||
|
sessionVariables = {
|
||||||
|
FLAKE = "$HOME/.dotfiles/nix";
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
colorscheme = lib.mkDefault colorSchemes.everforest;
|
colorscheme = lib.mkDefault colorSchemes.everforest;
|
||||||
home.file.".colorscheme".text = config.colorscheme.slug;
|
home.file.".colorscheme".text = config.colorscheme.slug;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
# # A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file
|
|
||||||
# # This is useful to avoid using channels when using legacy nix commands
|
|
||||||
let lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
|
|
||||||
in
|
|
||||||
import (fetchTarball {
|
|
||||||
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
|
|
||||||
sha256 = lock.narHash;
|
|
||||||
})
|
|
||||||
|
|
@ -1,24 +1,19 @@
|
||||||
# This file defines overlays
|
{ outputs, inputs }:
|
||||||
{ inputs, ... }:
|
|
||||||
{
|
{
|
||||||
# This one brings our custom packages from the 'pkgs' directory
|
# For every flake input, aliases 'pkgs.inputs.${flake}' to
|
||||||
additions = final: _prev: import ../pkgs { pkgs = final; };
|
# 'inputs.${flake}.packages.${pkgs.system}' or
|
||||||
|
# 'inputs.${flake}.legacyPackages.${pkgs.system}'
|
||||||
# This one contains whatever you want to overlay
|
flake-inputs = final: _: {
|
||||||
# You can change versions, add patches, set compilation flags, anything really.
|
inputs = builtins.mapAttrs
|
||||||
# https://nixos.wiki/wiki/Overlays
|
(_: flake: let
|
||||||
modifications = final: prev: {
|
legacyPackages = ((flake.legacyPackages or {}).${final.system} or {});
|
||||||
# example = prev.example.overrideAttrs (oldAttrs: rec {
|
packages = ((flake.packages or {}).${final.system} or {});
|
||||||
# ...
|
in
|
||||||
# });
|
if legacyPackages != {} then legacyPackages else packages
|
||||||
|
)
|
||||||
|
inputs;
|
||||||
};
|
};
|
||||||
|
|
||||||
# When applied, the unstable nixpkgs set (declared in the flake inputs) will
|
# Adds my custom packages
|
||||||
# be accessible through 'pkgs.unstable'
|
additions = final: prev: import ../pkgs { pkgs = final; };
|
||||||
unstable-packages = final: _prev: {
|
}
|
||||||
unstable = import inputs.nixpkgs-unstable {
|
|
||||||
system = final.system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
home-manager.extraSpecialArgs = { inherit inputs outputs; };
|
home-manager.extraSpecialArgs = { inherit inputs outputs; };
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
overlays = builtins.attrValues outputs.overlays;
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue