From 1db3202ba637d218728501cb830954f82e8d3375 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 8 Oct 2020 22:12:22 +0200
Subject: [PATCH 1/4] update starship config

---
 dotfiles/starship.toml | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/dotfiles/starship.toml b/dotfiles/starship.toml
index 3597f1f..383e9c7 100644
--- a/dotfiles/starship.toml
+++ b/dotfiles/starship.toml
@@ -1,28 +1,33 @@
 add_newline = false
 
-prompt_order = [
-    "username",
-    "hostname",
-    "kubernetes",
-    "directory",
-    "git_branch",
-    "git_commit",
-    "git_state",
-    "git_status",
-    "nix_shell",
-    "cmd_duration",
-    "custom",
-    "line_break",
-    "jobs",
-    "battery",
-    "character",
-]
+format = """
+$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

From f8922c1cbd3626873b1cd5ad1ef5c84dfe19fa0e Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 8 Oct 2020 22:14:59 +0200
Subject: [PATCH 2/4] use unstable syncthing

---
 roles/desktop.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index 74d4640..6add57b 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -111,10 +111,11 @@ in {
 
   services.syncthing = {
     enable = true;
+    dataDir = "/home/stefan";
     openDefaultPorts = true;
+    package = unstable.syncthing;
     user = "stefan";
     group = "users";
-    dataDir = "/home/stefan";
   };
 
   services.avahi.enable = true;

From 3fb358bacca55e426cdbdbb3e8c2d1172fc9b7d6 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 8 Oct 2020 22:19:45 +0200
Subject: [PATCH 3/4] initial discovery configuration

---
 hardware/x220-discovery.nix | 46 +++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 hardware/x220-discovery.nix

diff --git a/hardware/x220-discovery.nix b/hardware/x220-discovery.nix
new file mode 100644
index 0000000..7082acf
--- /dev/null
+++ b/hardware/x220-discovery.nix
@@ -0,0 +1,46 @@
+# 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;
+
+}

From 9308bc4aba9141ff287516bd27e3c6bbafbae56b Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Fri, 9 Oct 2020 10:08:10 +0200
Subject: [PATCH 4/4] scale lockscreen

---
 dotfiles/sway/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 5bbabee..fa5ea3b 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
+bindsym $mod+z exec swaylock -t -i /home/stefan/Downloads/bg.jpg --scaling=fill
 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