From ccd1207372e5b35020192803d607cccb056bb813 Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Sat, 14 Feb 2026 16:04:10 -0600 Subject: [PATCH] remove home manager input, auto save formatted --- configuration.nix | 27 ++++++++++++------ flake.nix | 71 ++++++++++++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 37 deletions(-) diff --git a/configuration.nix b/configuration.nix index 347d311..eed9b47 100755 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { imports = [ ]; @@ -14,7 +19,7 @@ efiSupport = true; efiInstallAsRemovable = true; mirroredBoots = [ - { + { devices = [ "nodev" ]; path = "/boot"; } @@ -117,7 +122,10 @@ users.users.roy = { isNormalUser = true; hashedPassword = "$y$j9T$4yOAv6R7Xtn23XmhSSC8g.$T1CckfWgxjEyZshjBzcaMO9WidP.q..OG7LwtXFTw12"; - extraGroups = [ "wheel" "networkmanager" ]; + extraGroups = [ + "wheel" + "networkmanager" + ]; shell = pkgs.fish; }; @@ -126,13 +134,17 @@ zfs rollback -r zroot/root@blank ''; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; nixpkgs.config.allowUnfree = true; # Declare system wide pkgs environment.systemPackages = with pkgs; [ - gimp alacritty + gimp + neofetch rose-pine-hyprcursor vim wget @@ -157,8 +169,8 @@ steam = { enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; localNetworkGameTransfers.openFirewall = true; }; }; @@ -222,4 +234,3 @@ system.stateVersion = "24.11"; } - diff --git a/flake.nix b/flake.nix index 0ea2423..ba0fa65 100755 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,8 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixvim = { url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,8 +18,8 @@ impermanence.url = "github:nix-community/impermanence"; # implement at some point (So I can push repo public) sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; 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 { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - ./hardware-configuration.nix - ./disk-config.nix - disko.nixosModules.disko - impermanence.nixosModules.impermanence - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs; }; - home-manager.users.roy = { ... }: { - imports = [ - ./home.nix - nixvim.homeModules.nixvim - impermanence.homeManagerModules.impermanence - sops-nix.homeManagerModules.sops - ]; - }; - } - ]; + nixosConfigurations.default = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./configuration.nix + ./hardware-configuration.nix + ./disk-config.nix + disko.nixosModules.disko + impermanence.nixosModules.impermanence + sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.roy = + { ... }: + { + imports = [ + ./home.nix + nixvim.homeModules.nixvim + sops-nix.homeManagerModules.sops + ]; + }; + } + ]; + }; }; - }; }