Compare commits

...

7 Commits

9 changed files with 33 additions and 86 deletions

View File

@ -1,49 +0,0 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1748665073,
"narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "282e1e029cb6ab4811114fc85110613d72771dea",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1748437600,
"narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View File

@ -6,16 +6,15 @@
};
outputs = { self, nixpkgs, home-manager }: {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
home-manager.nixosModules.home-manager
{
./hosts/vm/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.h = ./home.nix;
}
home-manager.users.h = ./hosts/vm/home.nix;
}
];
};
};

View File

@ -1,18 +1,18 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
{
system.stateVersion = "25.05";
imports =
[
./modules/bootloader.nix
./modules/hardware-configuration.nix # Include the results of the hardware scan.
./modules/networking.nix
./modules/users.nix
./modules/audio.nix
./modules/printing.nix
./modules/localization.nix
./modules/x.nix
./hard.nix
../../modules/bootloader.nix
../../modules/networking.nix
../../modules/users.nix
../../modules/audio.nix
../../modules/printing.nix
../../modules/localization.nix
../../modules/x.nix
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -26,7 +26,7 @@
services.spice-vdagentd.enable = true;
services.openssh = {
enable = false;
enable = true;
startWhenNeeded = true;
settings = {
## hardening

View File

@ -6,5 +6,7 @@
home.username = "h";
home.homeDirectory = "/home/h";
home.file.".inputrc".source = ./dots/.inputrc;
programs.home-manager.enable = true;
}

View File

@ -1,7 +1,6 @@
{ ... }:
{
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
boot.loader.grub.useOSProber = true;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
}

View File

@ -1,19 +1,10 @@
{ ... }:
{
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
networking.hostName = "nixos";
networking.wireless = { iwd = { enable = true; }; };
networking.firewall = {
enable = true;
allowedTCPPorts = [ 22 ];
};
}

View File

@ -4,6 +4,7 @@
users.users.h = {
isNormalUser = true;
description = "h";
extraGroups = [ "wheel" "networkmanager" ];
extraGroups = [ "wheel" ];
initialPassword = "h";
};
}

View File

@ -1,10 +1,14 @@
{ ... }:
{
services.xserver.windowManager.xmonad = {
enable = true;
enableContribAndExtras = true;
config = builtins.readFile ../dots/.xmonad/xmonad.hs;
};
services.xserver = {
enable = true;
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
xkb.layout = "us";
xkb.variant = "";
};