clean up flake and reset neovim plugin versions

This commit is contained in:
Noah Masur
2023-07-01 20:22:03 -06:00
parent 5348cbdf61
commit 1cf5f46adf
12 changed files with 70 additions and 89 deletions

View File

@ -6,14 +6,12 @@
{ inputs, globals, overlays, ... }:
with inputs;
nixpkgs.lib.nixosSystem {
inputs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = { };
modules = [
(removeAttrs globals [ "mail.server" ])
home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
../../modules/common
../../modules/nixos
{
@ -23,7 +21,7 @@ nixpkgs.lib.nixosSystem {
server = true;
networking.hostName = "flame";
imports = [ (nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
fileSystems."/" = {

View File

@ -3,9 +3,7 @@
{ inputs, globals, overlays, ... }:
with inputs;
nixpkgs.lib.nixosSystem {
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { };
modules = [
@ -13,20 +11,18 @@ nixpkgs.lib.nixosSystem {
../../modules/nixos
../../modules/wsl
globals
wsl.nixosModules.wsl
home-manager.nixosModules.home-manager
inputs.wsl.nixosModules.wsl
inputs.home-manager.nixosModules.home-manager
{
networking.hostName = "hydra";
nixpkgs.overlays = overlays;
# Set registry to flake packages, used for nix X commands
nix.registry.nixpkgs.flake = nixpkgs;
identityFile = "/home/${globals.user}/.ssh/id_ed25519";
gui.enable = false;
theme = {
colors = (import ../../colorscheme/gruvbox).dark;
dark = true;
};
passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
passwordHash = inputs.nixpkgs.lib.fileContents ../../password.sha512;
wsl = {
enable = true;
wslConf.automount.root = "/mnt";

View File

@ -3,9 +3,7 @@
{ inputs, globals, overlays, ... }:
with inputs;
darwin.lib.darwinSystem {
inputs.darwin.lib.darwinSystem {
system = "x86_64-darwin";
specialArgs = { };
modules = [
@ -16,9 +14,9 @@ darwin.lib.darwinSystem {
gitName = "Noah-Masur_1701";
gitEmail = "${user}@take2games.com";
})
home-manager.darwinModules.home-manager
inputs.home-manager.darwinModules.home-manager
{
nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
networking.hostName = "lookingglass";
identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
gui.enable = true;

View File

@ -3,15 +3,13 @@
{ inputs, globals, overlays, ... }:
with inputs;
nixpkgs.lib.nixosSystem {
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { };
modules = [
globals
home-manager.nixosModules.home-manager
disko.nixosModules.disko
inputs.home-manager.nixosModules.home-manager
inputs.disko.nixosModules.disko
../../modules/common
../../modules/nixos
{

View File

@ -3,17 +3,15 @@
{ inputs, globals, overlays, ... }:
with inputs;
nixpkgs.lib.nixosSystem {
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
globals
home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
../../modules/common
../../modules/nixos
{
nixpkgs.overlays = [ nur.overlay ] ++ overlays;
nixpkgs.overlays = overlays;
# Hardware
physical = true;
@ -55,7 +53,7 @@ nixpkgs.lib.nixosSystem {
# Must be prepared ahead
identityFile = "/home/${globals.user}/.ssh/id_ed25519";
passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
passwordHash = inputs.nixpkgs.lib.fileContents ../../password.sha512;
# Theming
gui.enable = true;
@ -63,8 +61,8 @@ nixpkgs.lib.nixosSystem {
colors = (import ../../colorscheme/gruvbox-dark).dark;
dark = true;
};
wallpaper = "${wallpapers}/gruvbox/road.jpg";
gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";
wallpaper = "${inputs.wallpapers}/gruvbox/road.jpg";
gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
# Programs and services
charm.enable = true;