2 Commits

5 changed files with 28 additions and 31 deletions

18
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1734829460, "lastModified": 1736643958,
"narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734915500, "lastModified": 1736730523,
"narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -38,11 +38,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1736701207,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -37,6 +37,7 @@
modules = [ modules = [
./modules ./modules
./hosts/common.nix ./hosts/common.nix
./hosts/vm/proxmox.nix
./hosts/vm ./hosts/vm
]; ];
format = "proxmox"; format = "proxmox";

View File

@@ -240,8 +240,9 @@
helix helix
jetbrains-toolbox # or maybe do invidual ones? jetbrains-toolbox # or maybe do invidual ones?
# jetbrains.rust-rover # jetbrains.rust-rover
# jetbrains.pycharm-professional jetbrains.clion
# jetbrains.webstorm jetbrains.pycharm-professional
jetbrains.webstorm
android-studio android-studio
mediainfo mediainfo
micro micro
@@ -275,6 +276,7 @@
# services.openssh.enable = true; # services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
# networking.nftables.enable = true;
networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowedTCPPorts = [ 8080 ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.

View File

@@ -9,15 +9,7 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
# ./hardware-configuration-vm.nix # ./hardware-configuration-vm.nix
]; ];
mods.kb-input.enable = true; mods.kb-input.enable = false;
# boot.kernelParams = [ "console=tty0" ];
proxmox.qemuConf.bios = "ovmf";
proxmox.qemuExtraConf = {
machine = "q35";
# efidisk0 = "local-lvm:vm-9999-disk-1";
cpu = "host";
};
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@@ -28,7 +20,6 @@
"sysrq_always_enabled=1" "sysrq_always_enabled=1"
]; ];
# boot.loader.timeout = lib.mkForce 3;
boot.loader.systemd-boot.configurationLimit = 5; boot.loader.systemd-boot.configurationLimit = 5;
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
@@ -58,7 +49,7 @@
# VM services # VM services
services.cloud-init.enable = true; services.cloud-init.enable = true;
services.cloud-init.network.enable = false; # services.cloud-init.network.enable = false;
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true; services.spice-vdagentd.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
@@ -89,7 +80,6 @@
programs.firefox.enable = true; programs.firefox.enable = true;
programs.fish.enable = true; programs.fish.enable = true;
programs.git.enable = true; programs.git.enable = true;
programs.lazygit.enable = true;
programs.neovim.enable = true; programs.neovim.enable = true;
programs.bat.enable = true; programs.bat.enable = true;
@@ -112,9 +102,7 @@
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
darkman
dust dust
efibootmgr
eza eza
fastfetch fastfetch
fd fd
@@ -123,18 +111,13 @@
kdePackages.filelight kdePackages.filelight
kdePackages.kate kdePackages.kate
kdePackages.yakuake kdePackages.yakuake
gnumake ldns
helix
mediainfo
micro micro
mpv mpv
ripgrep ripgrep
starship starship
tealdeer tealdeer
tela-circle-icon-theme
waypipe
whois whois
yt-dlp
zfs zfs
]; ];

11
hosts/vm/proxmox.nix Normal file
View File

@@ -0,0 +1,11 @@
{ ... }:
{
# boot.kernelParams = [ "console=tty0" ];
proxmox.qemuConf.bios = "ovmf";
proxmox.qemuExtraConf = {
machine = "q35";
# efidisk0 = "local-lvm:vm-9999-disk-1";
cpu = "host";
};
}