From 5deefd1aac1abb0a67dd2afdb9bc92077dc3a3e5 Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon@simoncor.net>
Date: Thu, 28 Mar 2024 11:46:26 +0100
Subject: [PATCH 1/3] [packages] organized packages

---
 nix/systems/packages.nix | 81 ++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/nix/systems/packages.nix b/nix/systems/packages.nix
index 59414b9..be37992 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,39 @@
     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
+    git
     screen
-    unstable.spotify
-    unstable.vscode
     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

From 1c396fef1cb4f29e5dea713ad3fa71cc45d67172 Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon@simoncor.net>
Date: Thu, 28 Mar 2024 16:26:01 +0100
Subject: [PATCH 2/3] [packages] add podman

---
 nix/systems/default.nix        |  2 +-
 nix/systems/packages.nix       |  3 +++
 nix/systems/virt-manager.nix   |  7 -------
 nix/systems/virtualisation.nix | 21 +++++++++++++++++++++
 4 files changed, 25 insertions(+), 8 deletions(-)
 delete mode 100644 nix/systems/virt-manager.nix
 create mode 100644 nix/systems/virtualisation.nix

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/packages.nix b/nix/systems/packages.nix
index be37992..e2f6f87 100644
--- a/nix/systems/packages.nix
+++ b/nix/systems/packages.nix
@@ -51,8 +51,11 @@
     bat
     unstable.clipse 
     cmatrix
+    distrobox
     git
     screen
+    podman
+    podman-compose
     vim
     wget
 
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;
+    };
+  };
+}

From 87a0152737a0e1febe05fd5564da58d744f39887 Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon@simoncor.net>
Date: Fri, 29 Mar 2024 12:11:47 +0100
Subject: [PATCH 3/3] [systems] updated luks device for itclt75

---
 .../itclt75/hardware-configuration.nix        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

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;