diff --git a/flake.lock b/flake.lock
index f6a8edfc..54282a0f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -103,8 +103,7 @@
     "darwin_2": {
       "inputs": {
         "nixpkgs": [
-          "digga",
-          "nixpkgs"
+          "nixos"
         ]
       },
       "locked": {
@@ -489,11 +488,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1660291411,
-        "narHash": "sha256-9UfJMJeCl+T/DrOJMd1vLCoV8U3V7f9Qrv/QyH0Nn28=",
+        "lastModified": 1660407119,
+        "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "78f56d8ec2c67a1f80f2de649ca9aadc284f65b6",
+        "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
         "type": "github"
       },
       "original": {
@@ -552,10 +551,12 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
-        "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
-        "type": "path"
+        "lastModified": 1660402527,
+        "narHash": "sha256-NaVgRe4YNy+sERQkHZsgkEdOXaLdEuJ9vsRbTRmZAEo=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "3b4628b63abb5555bf8116ddb973c348163b3278",
+        "type": "github"
       },
       "original": {
         "id": "nur",
diff --git a/flake.nix b/flake.nix
index f18df6df..cfb22fb8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -122,6 +122,9 @@
               iso = base ++ [ base-user graphical pub-solar-iso ];
               pubsolaros = [ core full-install base-user users.root ];
               anonymous = [ pubsolaros users.pub-solar ];
+
+              vlalentim = pubsolaros ++ [ users.vlalentim social ];
+              soup-solar = vlalentim ++ [ graphical ];
             };
           };
         };
@@ -137,6 +140,7 @@
           };
           users = {
             pub-solar = { suites, ... }: { imports = suites.base; };
+            vlalentim = { suites, ... }: { imports = suites.base; };
           }; # digga.lib.importers.rakeLeaves ./users/hm;
         };
 
diff --git a/hosts/soup-solar/configuration.nix b/hosts/soup-solar/configuration.nix
new file mode 100644
index 00000000..c6c10f6e
--- /dev/null
+++ b/hosts/soup-solar/configuration.nix
@@ -0,0 +1,89 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+  
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Set your time zone.
+  # time.timeZone = "Europe/Amsterdam";
+
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
+  networking.useDHCP = false;
+  networking.interfaces.enp0s31f6.useDHCP = true;
+  networking.interfaces.wlp2s0.useDHCP = true;
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  # i18n.defaultLocale = "en_US.UTF-8";
+  # console = {
+  #   font = "Lat2-Terminus16";
+  #   keyMap = "us";
+  # };
+
+  # Enable the X11 windowing system.
+  # services.xserver.enable = true;
+
+
+  
+
+  # Configure keymap in X11
+  # services.xserver.layout = "us";
+  # services.xserver.xkbOptions = "eurosign:e";
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable sound.
+  # sound.enable = true;
+  # hardware.pulseaudio.enable = true;
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+   services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "21.05"; # Did you read the comment?
+
+}
+
diff --git a/hosts/soup-solar/default.nix b/hosts/soup-solar/default.nix
new file mode 100644
index 00000000..c3f360df
--- /dev/null
+++ b/hosts/soup-solar/default.nix
@@ -0,0 +1,6 @@
+{ suites, ... }:
+{
+  imports = [
+    ./soup-solar.nix
+  ] ++ suites.soup-solar;
+}
diff --git a/hosts/soup-solar/hardware-configuration.nix b/hosts/soup-solar/hardware-configuration.nix
new file mode 100644
index 00000000..effa938f
--- /dev/null
+++ b/hosts/soup-solar/hardware-configuration.nix
@@ -0,0 +1,31 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "uas" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/2acc4621-a3d3-4f12-9e92-86efca3cb5ac";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/7C21-5B9B";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/5925d5fb-ef07-4604-ac36-73c41db8f8a4"; }
+    ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}
diff --git a/hosts/soup-solar/soup-solar.nix b/hosts/soup-solar/soup-solar.nix
new file mode 100644
index 00000000..44b28fc1
--- /dev/null
+++ b/hosts/soup-solar/soup-solar.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, lib, self, ... }:
+{
+  imports = [
+    ./configuration.nix
+  ];
+
+  config = {
+    hardware.cpu.intel.updateMicrocode = true;
+    pub-solar.x-os.disk-encryption-active = false;
+  };
+}
diff --git a/users/vlalentim/default.nix b/users/vlalentim/default.nix
new file mode 100644
index 00000000..e2691980
--- /dev/null
+++ b/users/vlalentim/default.nix
@@ -0,0 +1,17 @@
+{ config, hmUsers, pkgs, lib, ... }:
+{
+  imports = [
+    ./home.nix
+  ];
+   config = {
+    home-manager.users = { inherit (hmUsers) vlalentim; };
+    pub-solar = {
+      user = {
+        name = "vlalentim";
+        password = "$6$EW8BtlSbBNNhdmZy$CKgHd4zy4GRxqfpn5DEyJm5XWQ4Bv7b1G.f0NhJUzn8b5WRn9YVroiLLpwvp8V6APzlSlayN7jrmdkb2beC2X/";
+        fullName = "vlalentim";
+        email = "poodleofdeath@gmx.net";
+      };
+    };
+  };
+}
diff --git a/users/vlalentim/home.nix b/users/vlalentim/home.nix
new file mode 100644
index 00000000..69738c9e
--- /dev/null
+++ b/users/vlalentim/home.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, self, ... }:
+with lib;
+let
+  psCfg = config.pub-solar;
+  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
+in
+{
+  home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        "git.b12f.io" = {
+          hostname = "git.b12f.io";
+          user = "git";
+          port = 2222;
+        };
+      };
+    };
+  };
+}