changes
This commit is contained in:
parent
561039afae
commit
8d9c36d0e5
9 changed files with 6 additions and 49 deletions
20
flake.nix
20
flake.nix
|
@ -100,32 +100,12 @@
|
||||||
|
|
||||||
default = colmena.packages.${system}.colmena;
|
default = colmena.packages.${system}.colmena;
|
||||||
|
|
||||||
iso = nixos-generators.nixosGenerate {
|
|
||||||
inherit system pkgs;
|
|
||||||
format = "install-iso";
|
|
||||||
modules = [ (import ./nixos/templates/iso.nix) ];
|
|
||||||
};
|
|
||||||
|
|
||||||
iso-graphical = nixos-generators.nixosGenerate {
|
|
||||||
inherit system pkgs;
|
|
||||||
format = "install-iso";
|
|
||||||
modules = [ (import ./nixos/templates/iso-graphical.nix) ];
|
|
||||||
};
|
|
||||||
|
|
||||||
proxmox-lxc = nixos-generators.nixosGenerate {
|
proxmox-lxc = nixos-generators.nixosGenerate {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
format = "proxmox-lxc";
|
format = "proxmox-lxc";
|
||||||
modules = util.base_imports
|
modules = util.base_imports
|
||||||
++ [ (import ./nixos/templates/proxmox-lxc.nix) ];
|
++ [ (import ./nixos/templates/proxmox-lxc.nix) ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Broken
|
|
||||||
# proxmox-vm = nixos-generators.nixosGenerate {
|
|
||||||
# inherit system pkgs;
|
|
||||||
# format = "proxmox";
|
|
||||||
# modules = util.base_imports
|
|
||||||
# ++ [ (import ./nixos/templates/proxmox-vm.nix) ];
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use by running `nix develop`
|
# Use by running `nix develop`
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hardware.keyboard.qmk.enable = true;
|
||||||
|
|
||||||
# Enable my config for the gnome desktop environment
|
# Enable my config for the gnome desktop environment
|
||||||
services.v.gnome.enable = true;
|
services.v.gnome.enable = true;
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ in {
|
||||||
btop
|
btop
|
||||||
calibre
|
calibre
|
||||||
celluloid
|
celluloid
|
||||||
|
chromium
|
||||||
element-desktop
|
element-desktop
|
||||||
fusee-launcher
|
fusee-launcher
|
||||||
gcc
|
gcc
|
||||||
|
@ -29,6 +30,7 @@ in {
|
||||||
tex
|
tex
|
||||||
unzip
|
unzip
|
||||||
yt-dlp
|
yt-dlp
|
||||||
|
qmk
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable my own hm modules
|
# Enable my own hm modules
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
services.udev.packages = with pkgs; [
|
services.udev.packages = with pkgs; [
|
||||||
android-udev-rules
|
android-udev-rules
|
||||||
logitech-udev-rules
|
logitech-udev-rules
|
||||||
qmk-udev-rules
|
|
||||||
wooting-udev-rules
|
wooting-udev-rules
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
fqdn = "mail.0x76.dev";
|
fqdn = "mail.0x76.dev";
|
||||||
domains = [ "0x76.dev" "meowy.tech" ];
|
domains = [ "0x76.dev" "meowy.tech" ];
|
||||||
certificateScheme = 3;
|
certificateScheme = "acme-nginx";
|
||||||
|
|
||||||
loginAccounts = {
|
loginAccounts = {
|
||||||
# People
|
# People
|
||||||
|
|
|
@ -237,7 +237,6 @@ in {
|
||||||
services.udev.packages = with pkgs; [
|
services.udev.packages = with pkgs; [
|
||||||
android-udev-rules
|
android-udev-rules
|
||||||
logitech-udev-rules
|
logitech-udev-rules
|
||||||
qmk-udev-rules
|
|
||||||
wooting-udev-rules
|
wooting-udev-rules
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
{ pkgs, modulesPath, lib, ... }: {
|
|
||||||
imports = [
|
|
||||||
"${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
# use the latest Linux kernel
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ git ];
|
|
||||||
|
|
||||||
# Needed for https://github.com/NixOS/nixpkgs/issues/58959
|
|
||||||
boot.supportedFilesystems = lib.mkForce [ "btrfs" "ext4" ];
|
|
||||||
}
|
|
|
@ -1,12 +0,0 @@
|
||||||
{ pkgs, modulesPath, lib, ... }: {
|
|
||||||
imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
|
|
||||||
|
|
||||||
# use the latest Linux kernel
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ git ];
|
|
||||||
|
|
||||||
# Needed for https://github.com/NixOS/nixpkgs/issues/58959
|
|
||||||
boot.supportedFilesystems =
|
|
||||||
lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
|
|
||||||
}
|
|
|
@ -2,7 +2,7 @@
|
||||||
imports = [ ../common/common.nix ../common/generic-vm.nix ];
|
imports = [ ../common/common.nix ../common/generic-vm.nix ];
|
||||||
|
|
||||||
proxmox.qemuConf = {
|
proxmox.qemuConf = {
|
||||||
virtio0 = "local-zsfs:vm-9999-disk-0";
|
virtio0 = "local-zfs:vm-9999-disk-0";
|
||||||
cores = 1;
|
cores = 1;
|
||||||
memory = 1024;
|
memory = 1024;
|
||||||
bios = "ovmf";
|
bios = "ovmf";
|
||||||
|
|
Loading…
Reference in a new issue