Merge remote-tracking branch 'origin'

nix/systems/default.nix

@@ -12,7 +12,7 @@
     ./security.nix
     ./simon.nix
     ./sound.nix
-    ./virt-manager.nix
+    ./virtualisation.nix
   ];
 
   # system state version

nix/systems/itclt75/hardware-configuration.nix

@@ -12,32 +12,29 @@
     devices = {
 
       # encrypted root
-      "luks-057d6954-2fbe-4566-a0b9-cc7b8a9f9fd8" = {
+      "luks-78011bc3-67ab-49d6-89f5-be5f50a6c013" = {
-        device = "/dev/disk/by-uuid/057d6954-2fbe-4566-a0b9-cc7b8a9f9fd8";
+        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
+  # swap
   swapDevices = [ {
-    device = "/dev/disk/by-uuid/e4772fc5-e676-48e4-9c35-3934e9a178b1"; 
+    device = "/swapfile";
+    size   = 16384;
   } ];
 
   # networking

nix/systems/packages.nix

@@ -4,16 +4,27 @@
   nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs; [
 
-    # fonts
+    # system
-    font-awesome
+    btop
-    jetbrains-mono
+    easyeffects
-    ubuntu_font_family
+    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
+    # fonts
-    easyeffects
+    font-awesome
-    fwupd
+    jetbrains-mono
-    intel-gpu-tools
+    ubuntu_font_family
-    killall
-    radeontop
-    pciutils
-    powertop
-    solaar
-    spice-vdagent
-    sshfs
-    wl-clipboard
 
-    # usability
+    # browsers
+    unstable.firefox
+    unstable.google-chrome
+    unstable.microsoft-edge
+
+    # general cli utilities
     bat
-    btop
-    unstable.bitwarden
     unstable.clipse 
     cmatrix
-    dnsutils
+    distrobox
-    fastfetch
-    firefox
     git
-    gimp
-    unstable.google-chrome
-    htop
-    kitty
-    meld
-    mpv
-    unstable.multiviewer-for-f1
-    unstable.microsoft-edge
-    nextcloud-client
     screen
-    unstable.spotify
+    podman
-    unstable.vscode
+    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

nix/systems/virt-manager.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, ... }: {
-
-  # setup virt-manager
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
-
-}

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;
+    };
+  };
+}