switched from nixvim to nvf, including porting colour scheme over
This commit is contained in:
parent
82268d652a
commit
38ff4ee9a8
4 changed files with 2367 additions and 306 deletions
2442
flake.lock
generated
2442
flake.lock
generated
File diff suppressed because it is too large
Load diff
169
flake.nix
169
flake.nix
|
|
@ -18,8 +18,8 @@
|
|||
flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
|
||||
|
||||
# Nixvim neovim distro for easier nixified configuration
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
nvf = {
|
||||
url = "github:notashelf/nvf";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
disko = {
|
||||
|
|
@ -46,65 +46,64 @@
|
|||
musnix.url = "github:musnix/musnix";
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs-stable,
|
||||
nixpkgs,
|
||||
nixpkgs-master,
|
||||
nur,
|
||||
home-manager,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
overlays = [
|
||||
overlay-stable
|
||||
overlay-master
|
||||
nur.overlays.default
|
||||
];
|
||||
};
|
||||
genericModules = [
|
||||
{
|
||||
nix.registry.nixos.flake = inputs.self;
|
||||
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
|
||||
nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
|
||||
}
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs-stable,
|
||||
nixpkgs,
|
||||
nixpkgs-master,
|
||||
nur,
|
||||
home-manager,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
overlays = [
|
||||
overlay-stable
|
||||
overlay-master
|
||||
nur.overlays.default
|
||||
];
|
||||
genericHomeModule = [
|
||||
{
|
||||
nix.registry.nixos.flake = inputs.self;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
}
|
||||
];
|
||||
# Overlay definitions
|
||||
# nixpkgs-unstable
|
||||
overlay-stable = final: prev: {
|
||||
stable = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
# nixpkgs-master
|
||||
overlay-master = final: prev: {
|
||||
master = import nixpkgs-master {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
|
||||
};
|
||||
genericModules = [
|
||||
{
|
||||
nix.registry.nixos.flake = inputs.self;
|
||||
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
|
||||
nix.nixPath = ["nixpkgs=${nixpkgs.outPath}"];
|
||||
}
|
||||
];
|
||||
genericHomeModule = [
|
||||
{
|
||||
nix.registry.nixos.flake = inputs.self;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
}
|
||||
];
|
||||
# Overlay definitions
|
||||
# nixpkgs-unstable
|
||||
overlay-stable = final: prev: {
|
||||
stable = import nixpkgs-stable {
|
||||
inherit system;
|
||||
inherit pkgs;
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
modules = genericModules ++ [
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
# nixpkgs-master
|
||||
overlay-master = final: prev: {
|
||||
master = import nixpkgs-master {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
in {
|
||||
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
inherit pkgs;
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
modules =
|
||||
genericModules
|
||||
++ [
|
||||
# Import nixos modules here
|
||||
./hosts/gabbielaptop/configuration.nix
|
||||
./modules/nh.nix
|
||||
|
|
@ -114,36 +113,38 @@
|
|||
inputs.aagl.nixosModules.default
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
inputs.musnix.nixosModules.musnix
|
||||
# inputs.stylix.nixosModules.stylix
|
||||
# inputs.home-manager.nixosModules.home-manager
|
||||
# inputs.nixvim.homeManagerModules.nixvim
|
||||
{ nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
|
||||
# { home-manager.users.blue = ./home-manager/home.nix; }
|
||||
# inputs.stylix.nixosModules.stylix
|
||||
# inputs.home-manager.nixosModules.home-manager
|
||||
# inputs.nixvim.homeManagerModules.nixvim
|
||||
{nix.settings = inputs.aagl.nixConfig;} # Setup cachix for aagl projects
|
||||
# { home-manager.users.blue = ./home-manager/home.nix; }
|
||||
];
|
||||
};
|
||||
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
inherit pkgs;
|
||||
modules = genericModules ++ [
|
||||
};
|
||||
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
inherit pkgs;
|
||||
modules =
|
||||
genericModules
|
||||
++ [
|
||||
inputs.disko.nixosModules.disko
|
||||
inputs.satisfactory-server.nixosModules.satisfactory
|
||||
./hosts/biggerpi/configuration.nix
|
||||
./modules/satisfactory-server.nix
|
||||
];
|
||||
};
|
||||
|
||||
# Standalone home-manager config
|
||||
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
# Import home-manager modules here
|
||||
modules = [
|
||||
./home-manager/home.nix
|
||||
inputs.nixvim.homeManagerModules.default
|
||||
inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# Standalone home-manager config
|
||||
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
# Import home-manager modules here
|
||||
modules = [
|
||||
./home-manager/home.nix
|
||||
inputs.nvf.homeManagerModules.default
|
||||
inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
home.username = "blue";
|
||||
home.homeDirectory = "/home/blue";
|
||||
|
||||
|
|
@ -14,12 +12,10 @@
|
|||
./hyprland.nix
|
||||
./waybar.nix
|
||||
./swaync.nix
|
||||
# ./flatpak.nix
|
||||
# ./sober.nix
|
||||
./hyprlock.nix
|
||||
./zsh.nix
|
||||
./eza.nix
|
||||
./nixvim.nix
|
||||
./nvf.nix
|
||||
./nextcloud.nix
|
||||
./git.nix
|
||||
./stylix.nix
|
||||
|
|
|
|||
44
home-manager/nvf.nix
Normal file
44
home-manager/nvf.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{config, ...}: {
|
||||
programs.nvf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
vim = {
|
||||
theme = {
|
||||
enable = true;
|
||||
name = "base16";
|
||||
};
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
lsp = {
|
||||
enable = true;
|
||||
};
|
||||
languages = {
|
||||
rust.enable = true;
|
||||
nix.enable = true;
|
||||
markdown.enable = true;
|
||||
java.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
# Pulls stylix base16 colours into nvf for use in the vim theme.
|
||||
# This works for colours generated from the wallpaper, colours set manually and colours pulled from a base16Scheme yaml file.
|
||||
programs.nvf.settings.vim.theme.base16-colors = {
|
||||
base00 = "${config.lib.stylix.colors.base00}";
|
||||
base01 = "${config.lib.stylix.colors.base01}";
|
||||
base02 = "${config.lib.stylix.colors.base02}";
|
||||
base03 = "${config.lib.stylix.colors.base03}";
|
||||
base04 = "${config.lib.stylix.colors.base04}";
|
||||
base05 = "${config.lib.stylix.colors.base05}";
|
||||
base06 = "${config.lib.stylix.colors.base06}";
|
||||
base07 = "${config.lib.stylix.colors.base07}";
|
||||
base08 = "${config.lib.stylix.colors.base08}";
|
||||
base09 = "${config.lib.stylix.colors.base09}";
|
||||
base0A = "${config.lib.stylix.colors.base0A}";
|
||||
base0B = "${config.lib.stylix.colors.base0B}";
|
||||
base0C = "${config.lib.stylix.colors.base0C}";
|
||||
base0D = "${config.lib.stylix.colors.base0D}";
|
||||
base0E = "${config.lib.stylix.colors.base0E}";
|
||||
base0F = "${config.lib.stylix.colors.base0F}";
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue