remove home manager input, auto save formatted

This commit is contained in:
2026-02-14 16:04:10 -06:00
parent c4155cb3c6
commit ccd1207372
2 changed files with 61 additions and 37 deletions
+16 -5
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = [ ]; imports = [ ];
@@ -117,7 +122,10 @@
users.users.roy = { users.users.roy = {
isNormalUser = true; isNormalUser = true;
hashedPassword = "$y$j9T$4yOAv6R7Xtn23XmhSSC8g.$T1CckfWgxjEyZshjBzcaMO9WidP.q..OG7LwtXFTw12"; hashedPassword = "$y$j9T$4yOAv6R7Xtn23XmhSSC8g.$T1CckfWgxjEyZshjBzcaMO9WidP.q..OG7LwtXFTw12";
extraGroups = [ "wheel" "networkmanager" ]; extraGroups = [
"wheel"
"networkmanager"
];
shell = pkgs.fish; shell = pkgs.fish;
}; };
@@ -126,13 +134,17 @@
zfs rollback -r zroot/root@blank zfs rollback -r zroot/root@blank
''; '';
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# Declare system wide pkgs # Declare system wide pkgs
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gimp
alacritty alacritty
gimp
neofetch
rose-pine-hyprcursor rose-pine-hyprcursor
vim vim
wget wget
@@ -222,4 +234,3 @@
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }
+40 -27
View File
@@ -18,8 +18,8 @@
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
# implement at some point (So I can push repo public) # implement at some point (So I can push repo public)
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
firefox-addons = { firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
@@ -27,31 +27,44 @@
}; };
}; };
outputs = { self, nixpkgs, nixvim, home-manager, disko, impermanence, sops-nix, firefox-addons }@inputs: { outputs =
{
self,
nixpkgs,
nixvim,
home-manager,
disko,
impermanence,
sops-nix,
firefox-addons,
}@inputs:
{
nixosConfigurations.default = nixpkgs.lib.nixosSystem { nixosConfigurations.default = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix
./disk-config.nix ./disk-config.nix
disko.nixosModules.disko disko.nixosModules.disko
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
home-manager.useGlobalPkgs = true; {
home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.useUserPackages = true;
home-manager.users.roy = { ... }: { home-manager.extraSpecialArgs = { inherit inputs; };
imports = [ home-manager.users.roy =
./home.nix { ... }:
nixvim.homeModules.nixvim {
impermanence.homeManagerModules.impermanence imports = [
sops-nix.homeManagerModules.sops ./home.nix
]; nixvim.homeModules.nixvim
}; sops-nix.homeManagerModules.sops
} ];
]; };
}
];
};
}; };
};
} }