Compare commits

..

No commits in common. "bfa17953a805b4d253e07d14a7692af664d077e8" and "8a0e1758deef6ed38d4c8a6aa64a26fcb075b9eb" have entirely different histories.

9 changed files with 86 additions and 33 deletions

View File

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

49
flake.lock Normal file
View File

@ -0,0 +1,49 @@
{
"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,14 +6,15 @@
}; };
outputs = { self, nixpkgs, home-manager }: { outputs = { self, nixpkgs, home-manager }: {
nixosConfigurations.vm = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/vm/configuration.nix ./configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.h = ./hosts/vm/home.nix; home-manager.users.h = ./home.nix;
} }
]; ];
}; };

View File

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

View File

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

View File

@ -1,10 +1,19 @@
{ ... }: { ... }:
{ {
networking.hostName = "nixos"; networking.hostName = "nixos"; # Define your hostname.
networking.wireless = { iwd = { enable = true; }; }; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.firewall = {
enable = true; # Configure network proxy if necessary
allowedTCPPorts = [ 22 ]; # 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;
} }

View File

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

View File

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