diff --git a/.drone.yml b/.drone.yml
index 3b63dc6f..f683f2af 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -82,8 +82,82 @@ steps:
       password:
         from_secret: matrix_password
       template: "Upstreaming {{ build.status }} [{{ build.branch }}#{{ truncate build.commit 8 }}]({{ build.link }}) by {{ build.author }}. [Pull requests](https://git.b12f.io/pub-solar/os/pulls)"
+
+trigger:
+  event:
+    - cron
+
+---
+kind: pipeline
+type: docker
+name: Check
+
+steps:
+  - name: "Check"
+    image: docker.nix-community.org/nixpkgs/nix-flakes:latest
+    when:
+      event:
+        - pull_request
+        - tag
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose"
+    commands:
+      - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
+      - nix $$NIX_FLAGS flake check
+      - nix $$NIX_FLAGS build ".#nixosConfigurations.PubSolarOS.config.system.build.toplevel"
+      - nix $$NIX_FLAGS develop --command echo OK
+      - nix $$NIX_FLAGS develop --command bud --help
+
+---
+kind: pipeline
+type: docker
+name: Publish ISO
+
+steps:
+  - name: "Build ISO"
+    image: docker.nix-community.org/nixpkgs/nix-flakes:latest
+    volumes:
+      - name: file-exchange
+        path: /var/nix/iso-cache
+    commands:
+      - |
+        nix --print-build-logs --verbose \
+          develop --command \
+            bud build bootstrap bootstrapIso
+      - cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/
+
+  - name: "Publish ISO"
+    image: appleboy/drone-scp
+    volumes:
+      - name: file-exchange
+        path: /var/nix/iso-cache
+    settings:
+      host:
+        from_secret: ssh_host
+      user:
+        from_secret: ssh_user
+      port:
+        from_secret: ssh_port
+      key:
+        from_secret: ssh_key
+      target: /var/www/pub.solar
+      source:
+        - /var/nix/iso-cache/*.iso
+      strip_components: 3
+
+depends_on:
+  - Check
+
+trigger:
+  event:
+    - tag
+
+volumes:
+  - name: file-exchange
+    temp: {}
+
 ---
 kind: signature
-hmac: 07d9a95e8f577483d753e9eea76229ffe0c369ecd642bfc364ae183f662d2167
+hmac: e806a6980afdc1bf451be231db1a61e7917822a1f78afe3f2136eadfd632d521
 
 ...
diff --git a/.gitignore b/.gitignore
index b8cac1af..37acdb01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ doi
 pkgs/_sources/.shake*
 
 tags
-/owners
\ No newline at end of file
+/owners
diff --git a/flake.lock b/flake.lock
index 1e79ce16..8fc8adf4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -87,11 +87,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1650920635,
-        "narHash": "sha256-csLLku/jHa7oTPAEJCQhFfyGYstD7jmJJV+3MiOyA+E=",
+        "lastModified": 1650976225,
+        "narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "1a387b8b3e4d65d7e65ae3fd85ac62b7c114c9c8",
+        "rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "darwin_2": {
+      "inputs": {
+        "nixpkgs": [
+          "digga",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1650976225,
+        "narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0",
         "type": "github"
       },
       "original": {
@@ -123,12 +144,19 @@
       }
     },
     "devshell": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "digga",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1637575296,
-        "narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=",
+        "lastModified": 1650389807,
+        "narHash": "sha256-GFRBdHMJ/T/ifaE2GS58RWpxyufH0LqI3oGS6oWAnHk=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618",
+        "rev": "5a53bbf3eb4c908d83884d725a86b3a3bde35979",
         "type": "github"
       },
       "original": {
@@ -140,6 +168,7 @@
     "digga": {
       "inputs": {
         "blank": "blank",
+        "darwin": "darwin_2",
         "deploy": [
           "deploy"
         ],
@@ -155,14 +184,15 @@
         ],
         "nixpkgs": [
           "nixos"
-        ]
+        ],
+        "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1650465041,
-        "narHash": "sha256-rAvwIjzHUBd2wBR0psWe2EtJr7w046TIOXZcSjLD2qg=",
+        "lastModified": 1651210705,
+        "narHash": "sha256-2RzKrjEnWDhsBQ4Et2gm2LjV5pXyszeqV1xNe+LtNT8=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "d60f27f697d7bb8038f85917030ca706a99eea49",
+        "rev": "0ffa2dff5ede12a03ca83fbc514972f94cf18f42",
         "type": "github"
       },
       "original": {
@@ -190,11 +220,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1641205782,
-        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
         "type": "github"
       },
       "original": {
@@ -236,14 +266,14 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils_2"
+        "flake-utils": "flake-utils_3"
       },
       "locked": {
-        "lastModified": 1639385028,
-        "narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=",
+        "lastModified": 1647259887,
+        "narHash": "sha256-yEkMbEHVO9qydluQ3uHGWX1PkfZhgDKxnd1rhZYZ72w=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "be1be083af014720c14f3b574f57b6173b4915d0",
+        "rev": "06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46",
         "type": "github"
       },
       "original": {
@@ -254,11 +284,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1638122382,
-        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "lastModified": 1642700792,
+        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
         "type": "github"
       },
       "original": {
@@ -283,6 +313,21 @@
       }
     },
     "flake-utils_4": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_5": {
       "locked": {
         "lastModified": 1649676176,
         "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
@@ -304,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650841545,
-        "narHash": "sha256-AF3fk+p/mHbdtyrI3kpms+MoMVOdGIBGJ+7LT7WWdaU=",
+        "lastModified": 1651007218,
+        "narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "236c6ec21420e44c38ec76de4fc3335bec1859b5",
+        "rev": "d14adb99f3fb562ec74ad18c032efc154b438034",
         "type": "github"
       },
       "original": {
@@ -320,11 +365,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1638198142,
-        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "lastModified": 1650701402,
+        "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a308775674e178495767df90c419425474582a1",
+        "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
         "type": "github"
       },
       "original": {
@@ -336,11 +381,11 @@
     },
     "latest_2": {
       "locked": {
-        "lastModified": 1650831523,
-        "narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=",
+        "lastModified": 1651007983,
+        "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0",
+        "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936",
         "type": "github"
       },
       "original": {
@@ -372,7 +417,7 @@
     },
     "nix-dram": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "latest"
         ]
@@ -408,11 +453,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1650830814,
-        "narHash": "sha256-P7vGsHdS19eHVUJt4BeQA4JfauL2nOpEcnYKIbX76YM=",
+        "lastModified": 1651093906,
+        "narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c254b8c915ac912ae9ee9dc74eac555ccbf33795",
+        "rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49",
         "type": "github"
       },
       "original": {
@@ -428,11 +473,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1650388175,
-        "narHash": "sha256-auVEdcVtIIuBnoygUXedJewfmsf/2gSMwCrAcq/QNhM=",
+        "lastModified": 1650997411,
+        "narHash": "sha256-r4a3qsSv5UTtx+pxTUEdOphBkwTx1+AAVog3c457A0M=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "b0326ae4f0761b9b482b8472975b3a8e86940ce2",
+        "rev": "3cdf22c79bc80910e2b610cd59fcb8408354ddbc",
         "type": "github"
       },
       "original": {
@@ -472,6 +517,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1650726686,
+        "narHash": "sha256-hE5PCqQlsdgWH3AUTwesvjZWs5ZUZ8SjMS5cnFB6W54=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3c0f57e36ed0cf9947281e3b31f1bebb7ce5d4a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1637186689,
@@ -504,7 +565,7 @@
     "nvfetcher": {
       "inputs": {
         "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
         "nixpkgs": [
           "nixos"
         ]
diff --git a/flake.nix b/flake.nix
index 862e78c3..e9b91fc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,8 @@
 
         channelsConfig = { allowUnfree = true; };
 
+        supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
+
         channels = {
           nixos = {
             imports = [ (digga.lib.importOverlays ./overlays) ];
@@ -110,16 +112,17 @@
           imports = [ (digga.lib.importHosts ./hosts) ];
           hosts = {
             /* set host specific properties here */
-            NixOS = { };
+            PubSolarOS = { };
           };
           importables = rec {
             profiles = digga.lib.rakeLeaves ./profiles // {
               users = digga.lib.rakeLeaves ./users;
             };
             suites = with profiles; rec {
-              base = [ core users.nixos users.root ];
-              pubsolaros = [ core base-user users.root ];
-              anonymous = [ pubsolaros users.nixos ];
+              base = [ core users.pub-solar users.root ];
+              iso = base ++ [ base-user graphical pub-solar-iso ];
+              pubsolaros = [ core full-install base-user users.root ];
+              anonymous = [ pubsolaros users.pub-solar ];
             };
           };
         };
@@ -134,7 +137,7 @@
             };
           };
           users = {
-            nixos = { suites, ... }: { imports = suites.base; };
+            pub-solar = { suites, ... }: { imports = suites.base; };
           }; # digga.lib.importers.rakeLeaves ./users/hm;
         };
 
diff --git a/hosts/PubSolarOS.nix b/hosts/PubSolarOS.nix
index 3b084119..70cf7a08 100644
--- a/hosts/PubSolarOS.nix
+++ b/hosts/PubSolarOS.nix
@@ -1,7 +1,10 @@
 { suites, ... }:
 {
   ### root password is empty by default ###
-  imports = suites.base;
+  ### default password: pub-solar, optional: add your SSH keys
+  imports =
+    suites.iso
+  ;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/hosts/bootstrap.nix b/hosts/bootstrap.nix
index d491855d..c6d8f105 100644
--- a/hosts/bootstrap.nix
+++ b/hosts/bootstrap.nix
@@ -8,7 +8,10 @@
     # profiles.networking
     profiles.core
     profiles.users.root # make sure to configure ssh keys
-    profiles.users.nixos
+    profiles.users.pub-solar
+    profiles.base-user
+    profiles.graphical
+    profiles.pub-solar-iso
   ];
 
   boot.loader.systemd-boot.enable = true;
diff --git a/lib/compat/nixos/default.nix b/lib/compat/nixos/default.nix
index e4e0e68a..83f05f9f 100644
--- a/lib/compat/nixos/default.nix
+++ b/lib/compat/nixos/default.nix
@@ -2,7 +2,7 @@
 let
   inherit (default.inputs.nixos) lib;
 
-  host = configs.${hostname} or configs.NixOS;
+  host = configs.${hostname} or configs.PubSolarOS;
   configs = default.nixosConfigurations;
   default = (import ../.).defaultNix;
   hostname = lib.fileContents /etc/hostname;
diff --git a/modules/audio/default.nix b/modules/audio/default.nix
index 51ec0b7e..fcceefd3 100644
--- a/modules/audio/default.nix
+++ b/modules/audio/default.nix
@@ -8,6 +8,8 @@ in
 {
   options.pub-solar.audio = {
     enable = mkEnableOption "Life in highs and lows";
+    mopidy.enable = mkEnableOption "Life with mopidy";
+    bluetooth.enable = mkEnableOption "Life with bluetooth";
   };
 
   config = mkIf cfg.enable {
@@ -43,7 +45,7 @@ in
       config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
 
       # Bluetooth configuration for pipewire
-      media-session.config.bluez-monitor.rules = [
+      media-session.config.bluez-monitor.rules = mkIf cfg.bluetooth.enable [
         {
           # Matches all cards
           matches = [{ "device.name" = "~bluez_card.*"; }];
@@ -70,10 +72,10 @@ in
     };
 
     # Enable bluetooth
-    hardware.bluetooth.enable = true;
-    services.blueman.enable = true;
+    hardware.bluetooth.enable = mkIf cfg.bluetooth.enable true;
+    services.blueman.enable = mkIf cfg.bluetooth.enable true;
 
     # Enable audio server & client
-    services.mopidy = import ./mopidy.nix pkgs;
+    services.mopidy = mkIf cfg.mopidy.enable ((import ./mopidy.nix) pkgs);
   };
 }
diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix
index 8e9c5ee9..712787aa 100644
--- a/modules/crypto/default.nix
+++ b/modules/crypto/default.nix
@@ -30,7 +30,7 @@ in
       };
 
       home.packages = [
-        gnome3.seahorse
+        gnome.seahorse
         keepassxc
         libsecret
         qMasterPassword
diff --git a/modules/devops/default.nix b/modules/devops/default.nix
index 04f886a0..9c0d9a9e 100644
--- a/modules/devops/default.nix
+++ b/modules/devops/default.nix
@@ -15,7 +15,8 @@ in
         drone-cli
         nmap
         pgcli
-        python38Packages.ansible
+        ansible
+        ansible-lint
         restic
         shellcheck
         terraform_0_15
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index bbf8f59d..d38b4d1a 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -26,6 +26,11 @@ in
         default = { };
       };
     };
+    wayland.software-renderer.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Feature flag enabling wlroots software renderer, useful in VMs";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -49,7 +54,7 @@ in
       };
     };
 
-    services.getty.autologinUser = "${psCfg.user.name}";
+    services.getty.autologinUser = mkForce "${psCfg.user.name}";
 
     qt5 = {
       enable = true;
@@ -81,17 +86,20 @@ in
       source-sans-pro
     ];
 
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    home-manager = with pkgs; setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
         alacritty
+        foot
         chromium
         firefox-wayland
 
         flameshot
         libnotify
-        gnome3.adwaita-icon-theme
+        gnome.adwaita-icon-theme
         gnome.eog
-        gnome3.nautilus
+        gnome.nautilus
+        gnome.yelp
+        hicolor-icon-theme
 
         wine
 
@@ -112,7 +120,7 @@ in
         enable = true;
         font.name = "Lato";
         iconTheme = {
-          package = pkgs.papirus-maia-icon-theme;
+          package = pkgs.papirus-icon-theme;
           name = "Papirus-Adapta-Nokto-Maia";
         };
         theme = {
diff --git a/modules/office/default.nix b/modules/office/default.nix
index c1b552b7..204e3ae8 100644
--- a/modules/office/default.nix
+++ b/modules/office/default.nix
@@ -17,7 +17,7 @@ in
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
         libreoffice-fresh
-        gnome3.simple-scan
+        gnome.simple-scan
         # Tools like pdfunite
         poppler_utils
         # tool for annotating PDFs
diff --git a/modules/server/default.nix b/modules/server/default.nix
deleted file mode 100644
index 3821421c..00000000
--- a/modules/server/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib, config, pkgs, ... }:
-with lib;
-let
-  psCfg = config.pub-solar;
-  cfg = config.pub-solar.server;
-in
-{
-  options.pub-solar.server = {
-    enable = mkEnableOption "Enable server options like sshd";
-  };
-
-  config = mkIf cfg.enable {
-    services.openssh = {
-      enable = true;
-      permitRootLogin = "no";
-      passwordAuthentication = false;
-    };
-  };
-}
diff --git a/modules/sway/config/config b/modules/sway/config/config
deleted file mode 100644
index 752a96c5..00000000
--- a/modules/sway/config/config
+++ /dev/null
@@ -1,212 +0,0 @@
-# Default config for sway
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
-
-### Variables
-#
-# Logo key. Use Mod1 for Alt.
-set $mod Mod4
-# Home row direction keys, like vim
-set $left j
-set $down k
-set $up i
-set $right l
-# Your preferred terminal emulator
-set $term alacritty
-# Your preferred application launcher
-# Note: pass the final command to swaymsg so that the resulting window can be opened
-# on the original workspace that the command was run on.
-#set $menu dmenu_path | dmenu | xargs swaymsg exec bemenu-run --no-overlap
-
-default_border pixel 1
-
-### Output configuration
-#
-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
-output * bg ~/.config/wallpaper.jpg fill
-
-### Key bindings
-#
-# Basics:
-#
-    # Start a terminal
-    bindsym $mod+Return exec $term
-
-    # Start a terminal
-    bindsym $mod+Shift+Return exec sh -c '$term --working-directory $(wcwd)'
-
-    # Kill focused window
-    bindsym $mod+Shift+q kill
-
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
-
-    # Reload the configuration file
-    bindsym $mod+Ctrl+r reload
-
-#
-# Moving around:
-#
-    # Move your focus around
-    bindsym $mod+$left focus left
-    bindsym $mod+$down focus down
-    bindsym $mod+$up focus up
-    bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
-
-    # Move the focused window with the same, but add Shift
-    bindsym $mod+Shift+$left move left
-    bindsym $mod+Shift+$down move down
-    bindsym $mod+Shift+$up move up
-    bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
-#
-# Workspaces:
-#
-
-
-    # Workspace names
-    # to display names or symbols instead of plain workspace numbers you can use
-    # something like: set $ws1 1:mail
-    #                 set $ws2 2:
-    set $ws1 1
-    set $ws2 2
-    set $ws3 3
-    set $ws4 4
-    set $ws5 5
-    set $ws6 6
-    set $ws7 7
-    set $ws8 8
-    set $ws9 9
-
-    # Switch to workspace
-    bindsym $mod+1 workspace 1
-    bindsym $mod+2 workspace 2
-    bindsym $mod+3 workspace 3
-    bindsym $mod+4 workspace 4
-    bindsym $mod+5 workspace 5
-    bindsym $mod+6 workspace 6
-    bindsym $mod+7 workspace 7
-    bindsym $mod+8 workspace 8
-    bindsym $mod+9 workspace 9
-    # Move focused container to workspace
-    bindsym $mod+Ctrl+1 move container to workspace $ws1
-    bindsym $mod+Ctrl+2 move container to workspace $ws2
-    bindsym $mod+Ctrl+3 move container to workspace $ws3
-    bindsym $mod+Ctrl+4 move container to workspace $ws4
-    bindsym $mod+Ctrl+5 move container to workspace $ws5
-    bindsym $mod+Ctrl+6 move container to workspace $ws6
-    bindsym $mod+Ctrl+7 move container to workspace $ws7
-    bindsym $mod+Ctrl+8 move container to workspace $ws8
-    bindsym $mod+Ctrl+9 move container to workspace $ws9
-    # Move focused container to workspace and move focus with it
-    bindsym $mod+Shift+1 move container to workspace 1; workspace $ws1
-    bindsym $mod+Shift+2 move container to workspace 2; workspace $ws2
-    bindsym $mod+Shift+3 move container to workspace 3; workspace $ws3
-    bindsym $mod+Shift+4 move container to workspace 4; workspace $ws4
-    bindsym $mod+Shift+5 move container to workspace 5; workspace $ws5
-    bindsym $mod+Shift+6 move container to workspace 6; workspace $ws6
-    bindsym $mod+Shift+7 move container to workspace 7; workspace $ws7
-    bindsym $mod+Shift+8 move container to workspace 8; workspace $ws8
-    bindsym $mod+Shift+9 move container to workspace 9; workspace $ws9
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
-
-    #navigate workspaces next / previous
-    bindsym $mod+Ctrl+Right workspace next
-    bindsym $mod+Ctrl+Left workspace prev
-
-    # workspace back and forth (with/without active container)
-    workspace_auto_back_and_forth yes
-    bindsym $mod+b workspace back_and_forth
-    bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
-
-#
-# Layout stuff:
-#
-    # Configure border style <normal|1pixel|pixel xx|none|pixel>
-    default_border pixel 1
-    default_floating_border normal
-
-    # Hide borders
-    hide_edge_borders none
-
-    # Font for window titles. Will also be used by the bar unless a different font
-    # is used in the bar {} block below.
-    font xft:Hack 16
-
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+h splith; exec notify-send 'tile horizontally'
-    bindsym $mod+v splitv; exec notify-send 'tile vertically'
-
-    # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
-
-    # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
-
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
-
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+t focus mode_toggle
-
-    # Move focus to the parent container
-    bindsym $mod+a focus parent
-    bindsym $mod+d focus child
-#
-# Scratchpad:
-#
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
-
-    # Move the currently focused window to the scratchpad
-    bindsym $mod+Shift+minus move scratchpad
-
-    # Show the next scratchpad window or hide the focused scratchpad window.
-    # If there are multiple scratchpad windows, this command cycles through them.
-    bindsym $mod+minus scratchpad show
-#
-# Resizing containers:
-#
-mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
-    bindsym $left resize shrink width 10px
-    bindsym $down resize grow height 10px
-    bindsym $up resize shrink height 10px
-    bindsym $right resize grow width 10px
-
-    # Ditto, with arrow keys
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
-
-    # Return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-bindsym $mod+r mode "resize"
-
-include ~/.config/sway/config.d/*
diff --git a/modules/sway/config/config.nix b/modules/sway/config/config.nix
new file mode 100644
index 00000000..8e21ec02
--- /dev/null
+++ b/modules/sway/config/config.nix
@@ -0,0 +1,214 @@
+{ config, pkgs, ... }:
+''
+  # Default config for sway
+  #
+  # Copy this to ~/.config/sway/config and edit it to your liking.
+  #
+  # Read `man 5 sway` for a complete reference.
+
+  ### Variables
+  #
+  # Logo key. Use Mod1 for Alt.
+  set $mod Mod4
+  # Home row direction keys, like vim
+  set $left j
+  set $down k
+  set $up i
+  set $right l
+  # Your preferred terminal emulator
+  set $term ${config.pub-solar.sway.terminal}
+  # Your preferred application launcher
+  # Note: pass the final command to swaymsg so that the resulting window can be opened
+  # on the original workspace that the command was run on.
+  #set $menu dmenu_path | dmenu | xargs swaymsg exec bemenu-run --no-overlap
+
+  default_border pixel 1
+
+  ### Output configuration
+  #
+  # Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
+  output * bg ~/.config/wallpaper.jpg fill
+
+  ### Key bindings
+  #
+  # Basics:
+  #
+      # Start a terminal
+      bindsym $mod+Return exec $term
+
+      # Start a terminal
+      bindsym $mod+Shift+Return exec sh -c '$term --working-directory $(wcwd)'
+
+      # Kill focused window
+      bindsym $mod+Shift+q kill
+
+      # Drag floating windows by holding down $mod and left mouse button.
+      # Resize them with right mouse button + $mod.
+      # Despite the name, also works for non-floating windows.
+      # Change normal to inverse to use left mouse button for resizing and right
+      # mouse button for dragging.
+      floating_modifier $mod normal
+
+      # Reload the configuration file
+      bindsym $mod+Ctrl+r reload
+
+  #
+  # Moving around:
+  #
+      # Move your focus around
+      bindsym $mod+$left focus left
+      bindsym $mod+$down focus down
+      bindsym $mod+$up focus up
+      bindsym $mod+$right focus right
+      # Or use $mod+[up|down|left|right]
+      bindsym $mod+Left focus left
+      bindsym $mod+Down focus down
+      bindsym $mod+Up focus up
+      bindsym $mod+Right focus right
+
+      # Move the focused window with the same, but add Shift
+      bindsym $mod+Shift+$left move left
+      bindsym $mod+Shift+$down move down
+      bindsym $mod+Shift+$up move up
+      bindsym $mod+Shift+$right move right
+      # Ditto, with arrow keys
+      bindsym $mod+Shift+Left move left
+      bindsym $mod+Shift+Down move down
+      bindsym $mod+Shift+Up move up
+      bindsym $mod+Shift+Right move right
+  #
+  # Workspaces:
+  #
+
+
+      # Workspace names
+      # to display names or symbols instead of plain workspace numbers you can use
+      # something like: set $ws1 1:mail
+      #                 set $ws2 2:
+      set $ws1 1
+      set $ws2 2
+      set $ws3 3
+      set $ws4 4
+      set $ws5 5
+      set $ws6 6
+      set $ws7 7
+      set $ws8 8
+      set $ws9 9
+
+      # Switch to workspace
+      bindsym $mod+1 workspace 1
+      bindsym $mod+2 workspace 2
+      bindsym $mod+3 workspace 3
+      bindsym $mod+4 workspace 4
+      bindsym $mod+5 workspace 5
+      bindsym $mod+6 workspace 6
+      bindsym $mod+7 workspace 7
+      bindsym $mod+8 workspace 8
+      bindsym $mod+9 workspace 9
+      # Move focused container to workspace
+      bindsym $mod+Ctrl+1 move container to workspace $ws1
+      bindsym $mod+Ctrl+2 move container to workspace $ws2
+      bindsym $mod+Ctrl+3 move container to workspace $ws3
+      bindsym $mod+Ctrl+4 move container to workspace $ws4
+      bindsym $mod+Ctrl+5 move container to workspace $ws5
+      bindsym $mod+Ctrl+6 move container to workspace $ws6
+      bindsym $mod+Ctrl+7 move container to workspace $ws7
+      bindsym $mod+Ctrl+8 move container to workspace $ws8
+      bindsym $mod+Ctrl+9 move container to workspace $ws9
+      # Move focused container to workspace and move focus with it
+      bindsym $mod+Shift+1 move container to workspace 1; workspace $ws1
+      bindsym $mod+Shift+2 move container to workspace 2; workspace $ws2
+      bindsym $mod+Shift+3 move container to workspace 3; workspace $ws3
+      bindsym $mod+Shift+4 move container to workspace 4; workspace $ws4
+      bindsym $mod+Shift+5 move container to workspace 5; workspace $ws5
+      bindsym $mod+Shift+6 move container to workspace 6; workspace $ws6
+      bindsym $mod+Shift+7 move container to workspace 7; workspace $ws7
+      bindsym $mod+Shift+8 move container to workspace 8; workspace $ws8
+      bindsym $mod+Shift+9 move container to workspace 9; workspace $ws9
+      # Note: workspaces can have any name you want, not just numbers.
+      # We just use 1-10 as the default.
+
+      #navigate workspaces next / previous
+      bindsym $mod+Ctrl+Right workspace next
+      bindsym $mod+Ctrl+Left workspace prev
+
+      # workspace back and forth (with/without active container)
+      workspace_auto_back_and_forth yes
+      bindsym $mod+b workspace back_and_forth
+      bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
+
+  #
+  # Layout stuff:
+  #
+      # Configure border style <normal|1pixel|pixel xx|none|pixel>
+      default_border pixel 1
+      default_floating_border normal
+
+      # Hide borders
+      hide_edge_borders none
+
+      # Font for window titles. Will also be used by the bar unless a different font
+      # is used in the bar {} block below.
+      font xft:Hack 16
+
+      # You can "split" the current object of your focus with
+      # $mod+b or $mod+v, for horizontal and vertical splits
+      # respectively.
+      bindsym $mod+h splith; exec notify-send 'tile horizontally'
+      bindsym $mod+v splitv; exec notify-send 'tile vertically'
+
+      # Switch the current container between different layout styles
+      bindsym $mod+s layout stacking
+      bindsym $mod+w layout tabbed
+      bindsym $mod+e layout toggle split
+
+      # Make the current focus fullscreen
+      bindsym $mod+f fullscreen
+
+      # Toggle the current focus between tiling and floating mode
+      bindsym $mod+Shift+space floating toggle
+
+      # Swap focus between the tiling area and the floating area
+      bindsym $mod+t focus mode_toggle
+
+      # Move focus to the parent container
+      bindsym $mod+a focus parent
+      bindsym $mod+d focus child
+  #
+  # Scratchpad:
+  #
+      # Sway has a "scratchpad", which is a bag of holding for windows.
+      # You can send windows there and get them back later.
+
+      # Move the currently focused window to the scratchpad
+      bindsym $mod+Shift+minus move scratchpad
+
+      # Show the next scratchpad window or hide the focused scratchpad window.
+      # If there are multiple scratchpad windows, this command cycles through them.
+      bindsym $mod+minus scratchpad show
+  #
+  # Resizing containers:
+  #
+  mode "resize" {
+      # left will shrink the containers width
+      # right will grow the containers width
+      # up will shrink the containers height
+      # down will grow the containers height
+      bindsym $left resize shrink width 10px
+      bindsym $down resize grow height 10px
+      bindsym $up resize shrink height 10px
+      bindsym $right resize grow width 10px
+
+      # Ditto, with arrow keys
+      bindsym Left resize shrink width 10px
+      bindsym Down resize grow height 10px
+      bindsym Up resize shrink height 10px
+      bindsym Right resize grow width 10px
+
+      # Return to default mode
+      bindsym Return mode "default"
+      bindsym Escape mode "default"
+  }
+  bindsym $mod+r mode "resize"
+
+  include ~/.config/sway/config.d/*''
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index cfc5733c..83f407e4 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -8,6 +8,11 @@ in
   options.pub-solar.sway = {
     enable = mkEnableOption "Life in boxes";
   };
+  options.pub-solar.sway.terminal = mkOption {
+    type = types.nullOr types.str;
+    default = "alacritty";
+    description = "Choose sway's default terminal";
+  };
   options.pub-solar.sway.v4l2loopback.enable = mkOption {
     type = types.bool;
     default = true;
@@ -32,7 +37,17 @@ in
 
       xdg.portal = {
         enable = true;
-        extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ];
+        wlr = {
+          enable = true;
+          settings = {
+            screencast = {
+              max_fps = 30;
+              chooser_type = "simple";
+              chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
+            };
+          };
+        };
+        extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
         gtkUsePortal = true;
       };
 
@@ -76,7 +91,7 @@ in
         systemd.user.services.waybar = import ./waybar.service.nix pkgs;
         systemd.user.targets.sway-session = import ./sway-session.target.nix pkgs;
 
-        xdg.configFile."sway/config".source = ./config/config;
+        xdg.configFile."sway/config".text = import ./config/config.nix { inherit config pkgs; };
         xdg.configFile."sway/config.d/colorscheme.conf".source = ./config/config.d/colorscheme.conf;
         xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf;
         xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf;
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 17262f77..75ca2bd3 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -26,6 +26,7 @@ in
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
         ack
+        asciinema
         ag
         bat
         exa
diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index f7bec47e..13b5fb3d 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -67,9 +67,7 @@ in
     nodePackages.typescript-language-server
     nodePackages.vim-language-server
     nodePackages.vue-language-server
-    nodePackages.vscode-css-languageserver-bin
-    nodePackages.vscode-html-languageserver-bin
-    nodePackages.vscode-json-languageserver-bin
+    nodePackages.vscode-langservers-extracted
     nodePackages.yaml-language-server
     python39Packages.python-lsp-server
     python3Full
@@ -128,6 +126,7 @@ in
     vim-go
     vim-javascript
     vim-json
+    SchemaStore-nvim
     vim-markdown
     vim-nix
     vim-ruby
diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim
index 35c065a6..025d2b5f 100644
--- a/modules/terminal-life/nvim/lsp.vim
+++ b/modules/terminal-life/nvim/lsp.vim
@@ -76,6 +76,9 @@ lua <<EOF
   local capabilities = vim.lsp.protocol.make_client_capabilities()
   capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
 
+  -- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
+  capabilities.textDocument.completion.completionItem.snippetSupport = true
+
   for lsp_key, lsp_settings in pairs({
         'bashls', ------------------------------- Bash
         'ccls', --------------------------------- C / C++ / Objective-C
@@ -100,10 +103,14 @@ lua <<EOF
             }
         },
         ['jsonls'] = { -------------------------- JSON
-            ['cmd'] = {"json-languageserver", "--stdio"}
+            ['settings'] = {
+                ['json'] = {
+                    ['schemas' ] = require('schemastore').json.schemas()
+                }
+            }
         },
         'phpactor', ----------------------------- PHP
-        'pylsp', --------------------------------- Python
+        'pylsp', -------------------------------- Python
         'rnix', --------------------------------- Nix
         'solargraph', --------------------------- Ruby
         'rust_analyzer', ------------------------ Rust
@@ -114,7 +121,6 @@ lua <<EOF
             ['filetypes'] = { "terraform", "hcl", "tf" }
         },
         'tsserver', ----------------------------- Typescript / JavaScript
-        'angularls', ---------------------------- Angular
         'vuels', -------------------------------- Vue
         'svelte', ------------------------------- Svelte
         ['yamlls'] = { -------------------------- YAML
@@ -125,6 +131,7 @@ lua <<EOF
                         ['https://json.schemastore.org/github-action'] = '.github/action.{yml,yaml}',
                         ['https://json.schemastore.org/ansible-stable-2.9'] = 'roles/tasks/*.{yml,yaml}',
                         ['https://json.schemastore.org/drone'] = '*.drone.{yml,yaml}',
+                        ['https://json.schemastore.org/swagger-2.0'] = 'swagger.{yml,yaml}',
                     }
                 }
             }
diff --git a/modules/terminal-life/nvim/plugins.vim b/modules/terminal-life/nvim/plugins.vim
index 193e0e03..87fe1841 100644
--- a/modules/terminal-life/nvim/plugins.vim
+++ b/modules/terminal-life/nvim/plugins.vim
@@ -9,8 +9,10 @@ let g:gutentags_file_list_command = 'git ls-files'
 let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
 
 " Golang
-" Go test shortcut
+" Go test, Def, Decls shortcut
 nmap <Leader>got :GoTest<CR>:botright copen<CR>
+autocmd FileType go nmap gd :GoDef<CR>
+autocmd FileType go nmap gD :GoDecls<CR>
 
 " Go formatting
 autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
index a914a536..2541fdd0 100644
--- a/modules/terminal-life/zsh/default.nix
+++ b/modules/terminal-life/zsh/default.nix
@@ -71,13 +71,14 @@ in
     bindkey '^R' fzf-history-widget
 
     # ArrowUp/Down start searching history with current input
-    autoload -U history-search-end
-    zle -N history-beginning-search-backward-end history-search-end
-    zle -N history-beginning-search-forward-end history-search-end
-    bindkey "^[[A" history-beginning-search-backward-end
-    bindkey "^[[B" history-beginning-search-forward-end
-    bindkey "^P" history-beginning-search-backward-end
-    bindkey "^N" history-beginning-search-forward-end
+    autoload -U up-line-or-beginning-search
+    autoload -U down-line-or-beginning-search
+    zle -N up-line-or-beginning-search
+    zle -N down-line-or-beginning-search
+    bindkey "^[[A" up-line-or-beginning-search
+    bindkey "^[[B" down-line-or-beginning-search
+    bindkey "^P" up-line-or-beginning-search
+    bindkey "^N" down-line-or-beginning-search
 
     # MAKE CTRL+S WORK IN VIM
     stty -ixon
diff --git a/modules/user/default.nix b/modules/user/default.nix
index 79e32eca..2fd5958e 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -21,6 +21,11 @@ in
         type = types.nullOr types.str;
         default = null;
       };
+      publicKeys = mkOption {
+        description = "User SSH public keys";
+        type = types.listOf types.path;
+        default = [ ];
+      };
       fullName = mkOption {
         description = "User full name";
         type = types.nullOr types.str;
diff --git a/modules/virtualisation/default.nix b/modules/virtualisation/default.nix
index 8fc25024..edc402c3 100644
--- a/modules/virtualisation/default.nix
+++ b/modules/virtualisation/default.nix
@@ -20,7 +20,7 @@ in
 
     virtualisation.libvirtd = {
       enable = true;
-      qemuOvmf = true;
+      qemu.ovmf.enable = true;
     };
     users.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] {
       extraGroups = [ "libvirtd" ];
diff --git a/modules/x-os/boot.nix b/modules/x-os/boot.nix
index 51cd5b4b..0633bec4 100644
--- a/modules/x-os/boot.nix
+++ b/modules/x-os/boot.nix
@@ -1,16 +1,22 @@
 { config, pkgs, lib, ... }:
-
+with lib;
 let
   cfg = config.pub-solar.x-os;
 in
 {
+  options.pub-solar.x-os.iso-options.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "Feature flag for iso builds";
+  };
   config = {
     # Enable plymouth for better experience of booting
     boot.plymouth.enable = true;
 
     # Mount / luks device in initrd
     # Allow fstrim to work on it.
-    boot.initrd = {
+    # The ! makes this enabled by default
+    boot.initrd = mkIf (!cfg.iso-options.enable) {
       luks.devices."cryptroot" = {
         allowDiscards = true;
       };
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 098b92e5..9b463e96 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -14,6 +14,7 @@ channels: final: prev: {
     starship
     deploy-rs
 
+    nixUnstable
     neovim-unwrapped
     tdesktop
     xdg-desktop-portal
diff --git a/pkgs/lgcl.nix b/pkgs/lgcl.nix
index 4ef2dac9..1d973e81 100644
--- a/pkgs/lgcl.nix
+++ b/pkgs/lgcl.nix
@@ -1,3 +1,9 @@
-self: with self; ''
-  ${self.looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no
+self: with self;
+let
+  looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
+    meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
+  });
+in
+''
+  ${looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no
 ''
diff --git a/pkgs/ps-signal-desktop.nix b/pkgs/ps-signal-desktop.nix
index c1d3967a..ff615639 100644
--- a/pkgs/ps-signal-desktop.nix
+++ b/pkgs/ps-signal-desktop.nix
@@ -1,3 +1,9 @@
-self: with self; ''
+self: with self;
+let
+  signal-desktop = self.signal-desktop.overrideAttrs (old: {
+    meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
+  });
+in
+''
   exec ${signal-desktop}/bin/signal-desktop --disable-gpu -- "$@"
 ''
diff --git a/profiles/audio/default.nix b/profiles/audio/default.nix
new file mode 100644
index 00000000..22b64af5
--- /dev/null
+++ b/profiles/audio/default.nix
@@ -0,0 +1,6 @@
+{ self, config, lib, pkgs, ... }:
+let inherit (lib) fileContents;
+in
+{
+  pub-solar.audio.enable = true;
+}
diff --git a/profiles/base-user/.config/git/config.nix b/profiles/base-user/.config/git/config.nix
index 53c53a77..2553ec66 100644
--- a/profiles/base-user/.config/git/config.nix
+++ b/profiles/base-user/.config/git/config.nix
@@ -24,6 +24,7 @@ in
 
 [commit]
   gpgsign = true
+  template = ${xdg.configHome}/git/gitmessage
 [tag]
   gpgsign = true
 [init]
diff --git a/profiles/base-user/.config/git/gitmessage.nix b/profiles/base-user/.config/git/gitmessage.nix
new file mode 100644
index 00000000..7f4b1c64
--- /dev/null
+++ b/profiles/base-user/.config/git/gitmessage.nix
@@ -0,0 +1,32 @@
+{ config, pkgs, ... }:
+let
+  user = config.pub-solar.user;
+  xdg = config.home-manager.users."${user.name}".xdg;
+in
+''
+# Title: Summary, imperative, start upper case, don't end with a period
+# No more than 50 chars. #### 50 chars is here:  #
+#
+
+
+# ^ Remember ending with an extra blank line
+# Body: Explain *what* and *why* (not *how*). Include issue number.
+# Wrap at 72 chars. ################################## which is here:  #
+#
+
+
+# ^ Remember ending with an extra blank line
+# At the end: Include Co-authored-by for all contributors.
+#
+Co-authored-by: ${user.fullName} <${user.email}>
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch master
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#       new file:   installation.md
+#
+''
diff --git a/profiles/base-user/.config/waybar/config b/profiles/base-user/.config/waybar/config
index 3ac2f37a..77bb74b8 100644
--- a/profiles/base-user/.config/waybar/config
+++ b/profiles/base-user/.config/waybar/config
@@ -4,7 +4,7 @@
 
   "height": 26, // Waybar height
   "modules-left": ["sway/workspaces", "sway/mode"],
-  "modules-center": ["mpd"],
+  //"modules-center": ["mpd"],
   "modules-right": ["sway/language", "pulseaudio", "network", "idle_inhibitor", "battery", "clock", "tray"],
   "sway/workspaces": {
     "disable-scroll": true
diff --git a/profiles/base-user/default.nix b/profiles/base-user/default.nix
index 80ac262e..8f304794 100644
--- a/profiles/base-user/default.nix
+++ b/profiles/base-user/default.nix
@@ -19,6 +19,7 @@ in
       extraGroups = [ "wheel" "docker" "input" "audio" "networkmanager" "lp" "scanner" ];
       initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
       shell = pkgs.zsh;
+      openssh.authorizedKeys.keyFiles = if psCfg.user.publicKeys != null then psCfg.user.publicKeys else [ ];
     };
   };
 }
diff --git a/profiles/base-user/home.nix b/profiles/base-user/home.nix
index 0736b6d4..1ae6bd36 100644
--- a/profiles/base-user/home.nix
+++ b/profiles/base-user/home.nix
@@ -20,7 +20,7 @@ in
 
     home.packages = with pkgs; [ ];
 
-    fonts.fontconfig.enable = true;
+    fonts.fontconfig.enable = mkForce true;
 
     programs.dircolors.enable = true;
     programs.dircolors.enableZshIntegration = true;
@@ -32,6 +32,7 @@ in
     xdg.mimeApps = import ./mimeapps.nix;
 
     xdg.configFile."git/config".text = import ./.config/git/config.nix { inherit config; inherit pkgs; };
+    xdg.configFile."git/gitmessage".text = import ./.config/git/gitmessage.nix { inherit config; inherit pkgs; };
     xdg.configFile."git/global_gitignore".text = import ./.config/git/global_gitignore.nix { inherit config; inherit pkgs; };
     xdg.configFile."dircolors".source = ./.config/dircolors;
     xdg.configFile."xmodmap".source = ./.config/xmodmap;
diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix
index cc3aa69f..5bbfa8ee 100644
--- a/profiles/base-user/session-variables.nix
+++ b/profiles/base-user/session-variables.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 let
   psCfg = config.pub-solar;
+  wlroots = psCfg.graphical.wayland;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
   variables = {
     XDG_CONFIG_HOME = xdg.configHome;
@@ -15,6 +16,7 @@ let
     ECORE_EVAS_ENGINE = "wayland_egl";
     ELM_ENGINE = "wayland_egl";
     SDL_VIDEODRIVER = "wayland";
+    WLR_RENDERER = if wlroots.software-renderer.enable then "pixman" else "gles2";
 
     EDITOR = "/etc/profiles/per-user/${psCfg.user.name}/bin/nvim";
     VISUAL = "/etc/profiles/per-user/${psCfg.user.name}/bin/nvim";
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index a352a9d5..9348249b 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -10,12 +10,6 @@ in
     pub-solar.audio.enable = true;
     pub-solar.crypto.enable = true;
     pub-solar.devops.enable = true;
-    pub-solar.docker.enable = true;
-    pub-solar.nextcloud.enable = true;
-    pub-solar.office.enable = true;
-    # pub-solar.printing.enable = true; # this is enabled automatically if office is enabled
-    pub-solar.server.enable = true;
-    pub-solar.printing.enable = true;
 
     # This is just a representation of the nix default
     nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
@@ -28,6 +22,7 @@ in
         progress
         dnsutils
         inetutils
+        mtr
         pciutils
         usbutils
         gitFull
@@ -74,6 +69,7 @@ in
         # Build broken, python2.7-PyJWT-2.0.1.drv' failed
         #nixops
         psos
+        nvd
 
         # Fun
         neofetch
@@ -127,7 +123,9 @@ in
     # Service that makes Out of Memory Killer more effective
     services.earlyoom.enable = true;
 
-    boot.kernelPackages = pkgs.linuxPackages_latest;
+    # Use latest LTS linux kernel by default
+    boot.kernelPackages = pkgs.linuxPackages_5_15;
+
     boot.supportedFilesystems = [ "ntfs" ];
   };
 }
diff --git a/profiles/full-install/default.nix b/profiles/full-install/default.nix
new file mode 100644
index 00000000..ba136554
--- /dev/null
+++ b/profiles/full-install/default.nix
@@ -0,0 +1,15 @@
+{ self, config, lib, pkgs, ... }:
+let inherit (lib) fileContents;
+in
+{
+  imports = [ ../cachix ];
+
+  config = {
+    pub-solar.audio.mopidy.enable = true;
+    pub-solar.audio.bluetooth.enable = true;
+    pub-solar.docker.enable = true;
+    pub-solar.nextcloud.enable = true;
+    pub-solar.office.enable = true;
+    # pub-solar.printing.enable = true; # this is enabled automatically if office is enabled
+  };
+}
diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix
index 62acad2f..237a74e5 100644
--- a/profiles/graphical/default.nix
+++ b/profiles/graphical/default.nix
@@ -4,5 +4,4 @@ in
 {
   pub-solar.graphical.enable = true;
   pub-solar.sway.enable = true;
-  pub-solar.social.enable = true;
 }
diff --git a/profiles/pub-solar-iso/default.nix b/profiles/pub-solar-iso/default.nix
new file mode 100644
index 00000000..24b5e1b3
--- /dev/null
+++ b/profiles/pub-solar-iso/default.nix
@@ -0,0 +1,11 @@
+{ self, config, lib, pkgs, ... }:
+let inherit (lib) fileContents;
+in
+{
+  imports = [ ../cachix ];
+  config = {
+    pub-solar.graphical.wayland.software-renderer.enable = true;
+    pub-solar.sway.terminal = "foot";
+    pub-solar.x-os.iso-options.enable = true;
+  };
+}
diff --git a/profiles/social/default.nix b/profiles/social/default.nix
new file mode 100644
index 00000000..cad05d33
--- /dev/null
+++ b/profiles/social/default.nix
@@ -0,0 +1,6 @@
+{ self, config, lib, pkgs, ... }:
+let inherit (lib) fileContents;
+in
+{
+  pub-solar.social.enable = true;
+}
diff --git a/shell/devos.nix b/shell/devos.nix
index 581aee9a..bb9f1744 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -15,6 +15,9 @@ in
   imports = [ "${extraModulesPath}/git/hooks.nix" ];
   git = { inherit hooks; };
 
+  # override for our own welcome
+  devshell.name = pkgs.lib.mkForce "PubSolarOS";
+
   # tempfix: remove when merged https://github.com/numtide/devshell/pull/123
   devshell.startup.load_profiles = pkgs.lib.mkForce (pkgs.lib.noDepEntry ''
     # PATH is devshell's exorbitant privilige:
diff --git a/users/nixos/default.nix b/users/nixos/default.nix
deleted file mode 100644
index 077a52e4..00000000
--- a/users/nixos/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ hmUsers, ... }:
-{
-  home-manager.users = { inherit (hmUsers) nixos; };
-
-  users.users.nixos = {
-    password = "nixos";
-    description = "default";
-    isNormalUser = true;
-    extraGroups = [ "wheel" ];
-  };
-}
diff --git a/users/pub-solar/default.nix b/users/pub-solar/default.nix
new file mode 100644
index 00000000..e80b64dd
--- /dev/null
+++ b/users/pub-solar/default.nix
@@ -0,0 +1,19 @@
+{ hmUsers, ... }:
+{
+  home-manager.users = { inherit (hmUsers) pub-solar; };
+
+  pub-solar = {
+    # These are your personal settings
+    # The only required settings are `name` and `password`,
+    # for convenience, use publicKeys to add your SSH keys
+    # The rest is used for programs like git
+    user = {
+      name = "pub-solar";
+      # default password = pub-solar
+      password = "$6$Kv0BCLU2Jg7GN8Oa$hc2vERKCbZdczFqyHPfgCaleGP.JuOWyd.bfcIsLDNmExGXI6Rnkze.SWzVzVS311KBznN/P4uUYAUADXkVtr.";
+      fullName = "Pub Solar";
+      email = "iso@pub.solar";
+      publicKeys = [ ];
+    };
+  };
+}