diff --git a/dotfiles/starship.toml b/dotfiles/starship.toml
index 383e9c7..3597f1f 100644
--- a/dotfiles/starship.toml
+++ b/dotfiles/starship.toml
@@ -1,33 +1,28 @@
 add_newline = false
 
-format = """
-$username\
-$hostname\
-$kubernetes\
-$directory\
-$git_branch\
-$git_commit\
-$git_state\
-$git_status\
-$nix_shell\
-$cmd_duration\
-$custom\
-$line_break\
-$jobs\
-$battery\
-$character\
-"""
+prompt_order = [
+    "username",
+    "hostname",
+    "kubernetes",
+    "directory",
+    "git_branch",
+    "git_commit",
+    "git_state",
+    "git_status",
+    "nix_shell",
+    "cmd_duration",
+    "custom",
+    "line_break",
+    "jobs",
+    "battery",
+    "character",
+]
 
 [username]
 show_always = true
-format = "[$user]($style)@"
 
 [hostname]
 ssh_only = false
-format = "[$hostname]($style) "
-
-[git_branch]
-format = "[$symbol$branch]($style)"
 
 [character]
 use_symbol_for_status = false
diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index fa5ea3b..5bbabee 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -33,7 +33,7 @@ floating_modifier $mod normal
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 bindsym $mod+Shift+p exec keepassxc
-bindsym $mod+z exec swaylock -t -i /home/stefan/Downloads/bg.jpg --scaling=fill
+bindsym $mod+z exec swaylock -t -i /home/stefan/Downloads/bg.jpg
 bindsym $mod+Up exec light -A 5
 bindsym $mod+Down exec light -U 5
 bindsym Print exec grim -g "$(slurp)" - | wl-copy -t image/png
diff --git a/hardware/x220-discovery.nix b/hardware/x220-discovery.nix
deleted file mode 100644
index 7082acf..0000000
--- a/hardware/x220-discovery.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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, ... }:
-
-let
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in {
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "tank/root/nixos";
-      fsType = "zfs";
-    };
-
-  fileSystems."/home" =
-    { device = "tank/root/home";
-      fsType = "zfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1339-E59C";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-
-  # custom
-  boot.kernelPackages = unstable.linuxPackages_latest;
-  boot.loader.systemd-boot.enable = true;
-  networking.hostId = "ef3a5d57";
-  networking.hostName = "discovery";
-  powerManagement.powertop.enable = true;
-  services.tlp.enable = true;
-
-}
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 6add57b..74d4640 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -111,11 +111,10 @@ in {
 
   services.syncthing = {
     enable = true;
-    dataDir = "/home/stefan";
     openDefaultPorts = true;
-    package = unstable.syncthing;
     user = "stefan";
     group = "users";
+    dataDir = "/home/stefan";
   };
 
   services.avahi.enable = true;