diff --git a/nix/systems/default.nix b/nix/systems/default.nix index fc103b9..ede4f10 100644 --- a/nix/systems/default.nix +++ b/nix/systems/default.nix @@ -12,7 +12,7 @@ ./security.nix ./simon.nix ./sound.nix - ./virt-manager.nix + ./virtualisation.nix ]; # system state version diff --git a/nix/systems/itclt75/hardware-configuration.nix b/nix/systems/itclt75/hardware-configuration.nix index 6924242..dcd533c 100644 --- a/nix/systems/itclt75/hardware-configuration.nix +++ b/nix/systems/itclt75/hardware-configuration.nix @@ -11,34 +11,31 @@ boot.initrd.luks = { devices = { - # encrypted root - "luks-057d6954-2fbe-4566-a0b9-cc7b8a9f9fd8" = { - device = "/dev/disk/by-uuid/057d6954-2fbe-4566-a0b9-cc7b8a9f9fd8"; - }; + # encrypted root + "luks-78011bc3-67ab-49d6-89f5-be5f50a6c013" = { + device = "/dev/disk/by-uuid/78011bc3-67ab-49d6-89f5-be5f50a6c013"; - # encrypted swap - "luks-4dcf40dc-d12c-43e4-8727-687451750f90" = { - device = "/dev/disk/by-uuid/4dcf40dc-d12c-43e4-8727-687451750f90"; }; }; }; # filesystems - boot fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5180-0B5A"; + device = "/dev/disk/by-label/BOOT"; fsType = "vfat"; }; # filesystems - root fileSystems."/" = { - device = "/dev/disk/by-uuid/ad8f83d1-3c00-49cc-90eb-8679d6600ddc"; + device = "/dev/disk/by-label/root"; fsType = "ext4"; }; - # swap device - swapDevices = [{ - device = "/dev/disk/by-uuid/e4772fc5-e676-48e4-9c35-3934e9a178b1"; - }]; + # swap + swapDevices = [ { + device = "/swapfile"; + size = 16384; + } ]; # networking networking.useDHCP = lib.mkDefault true; diff --git a/nix/systems/packages.nix b/nix/systems/packages.nix index 59414b9..e2f6f87 100644 --- a/nix/systems/packages.nix +++ b/nix/systems/packages.nix @@ -3,17 +3,28 @@ # packages nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - - # fonts - font-awesome - jetbrains-mono - ubuntu_font_family + + # system + btop + easyeffects + fastfetch + fwupd + htop + intel-gpu-tools + killall + radeontop + pciutils + powertop + solaar + spice-vdagent + sshfs + wl-clipboard # hyprland adwaita-qt brightnessctl - unstable.grimblast grim + unstable.grimblast imagemagick jq lxappearance-gtk2 @@ -26,43 +37,42 @@ wofi xfce.xfce4-settings - # system - easyeffects - fwupd - intel-gpu-tools - killall - radeontop - pciutils - powertop - solaar - spice-vdagent - sshfs - wl-clipboard + # fonts + font-awesome + jetbrains-mono + ubuntu_font_family - # usability - bat - btop - unstable.bitwarden - unstable.clipse - cmatrix - dnsutils - fastfetch - firefox - git - gimp + # browsers + unstable.firefox unstable.google-chrome - htop - kitty - meld - mpv - unstable.multiviewer-for-f1 unstable.microsoft-edge - nextcloud-client + + # general cli utilities + bat + unstable.clipse + cmatrix + distrobox + git screen - unstable.spotify - unstable.vscode + podman + podman-compose vim wget + + # general gui utilities + unstable.bitwarden + gimp + meld + nextcloud-client + unstable.vscode + + # multimedia + mpv + unstable.multiviewer-for-f1 + unstable.spotify + + # dns utilities + dnsutils whois # office diff --git a/nix/systems/virt-manager.nix b/nix/systems/virt-manager.nix deleted file mode 100644 index 0e53922..0000000 --- a/nix/systems/virt-manager.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: { - - # setup virt-manager - virtualisation.libvirtd.enable = true; - programs.virt-manager.enable = true; - -} diff --git a/nix/systems/virtualisation.nix b/nix/systems/virtualisation.nix new file mode 100644 index 0000000..20cc2c6 --- /dev/null +++ b/nix/systems/virtualisation.nix @@ -0,0 +1,21 @@ +{ config, pkgs, ... }: { + + # setup virt-manager + programs.virt-manager.enable = true; + + # virtualistation + virtualisation = { + + # libvirtd + libvirtd = { + enable = true; + }; + + # podman + podman = { + enable = true; + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; + }; + }; +}