nixos/.sops.yaml

@@ -1,10 +1,13 @@
 keys:
-  - &Tibo-NixFatDesk age1fva6s64s884z0q2w7de024sp69ucvqu0pg9shrhhqsn3ewlpjfpsh6md7y
+  - &tdpeuter age1fva6s64s884z0q2w7de024sp69ucvqu0pg9shrhhqsn3ewlpjfpsh6md7y
-  - &Tibo-NixTop age1qzutny0mqpcccqw6myyfntu6wcskruu9ghzvt6r4te7afkqwnguq05ex37
+
+  - &server_H4G0 age1d4gvqz3anf082ja6xt03hnkzazfum80um9t45m4rerl4n3va2yuqgnsg03
 
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
     key_groups:
     - age:
-      - *Tibo-NixFatDesk
+      - *tdpeuter
-      - *Tibo-NixTop
+
+      - *server_H4G0
+

nixos/flake.lock

@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759143472,
+        "lastModified": 1758589230,
-        "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
+        "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
+        "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1759036355,
+        "lastModified": 1758690382,
-        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759188042,
+        "lastModified": 1758425756,
-        "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=",
+        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d",
+        "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
         "type": "github"
       },
       "original": {
@@ -265,11 +265,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759205174,
+        "lastModified": 1758859571,
-        "narHash": "sha256-LMfGQsy3OibEqr3WtLCOqUVdOy5/6DJKWHV8h+1Vapk=",
+        "narHash": "sha256-/DPe2RNgIzTBHm1tLUF31YswssT7Uz+HJI6VIkmHN6w=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "afd770119e0f9fbb085665738f3fa4c28ff42f78",
+        "rev": "58e5a7b019aa1584ca46e909b011c1f6a91081f0",
         "type": "github"
       },
       "original": {

nixos/modules/desktop/default.nix

@@ -4,7 +4,5 @@
     ./hyprland
     ./plasma
     ./sway
-
-    ./waybar
   ];
 }

nixos/modules/desktop/hyprland/default.nix

@@ -11,7 +11,6 @@ in {
         # Hint Electron apps to use wayland
         NIXOS_OZONE_WL = "1";
 
-        ASSETS_DIR = ../../../../assets;
         SCRIPT_DIR = ../../../../scripts;
       };
 
@@ -20,6 +19,7 @@ in {
         dunst
         libnotify
         swaybg
+        waybar
         waycorner
         playerctl
         wlsunset
@@ -27,7 +27,7 @@ in {
         wl-mirror # Mirror an output
         wdisplays # Tool to configure displays
 
-        swaylock
+        swaylock-effects
 
         glib
 
@@ -40,12 +40,14 @@ in {
       ];
     };
 
-    programs.hyprland = {
+    programs = {
+      hyprland = {
         enable = true;
         xwayland.enable = true;
       };
 
-    security.polkit.enable = true;
+      waybar.enable = true;
+    };
 
     services = {
       dbus.enable = true;
@@ -53,8 +55,6 @@ in {
       gnome.gnome-keyring.enable = true;
       xserver.videoDrivers = [ "nvidia" ];
     };
-
-    sisyphus.desktop.waybar.enable = true;
   };
 }
 

nixos/modules/desktop/sway/default.nix

@@ -82,6 +82,7 @@ in {
       playerctl
       swaybg
       swaylock-effects
+      waybar
       wlsunset
       waycorner
 
@@ -95,7 +96,6 @@ in {
     ]);
 
     environment.sessionVariables = {
-      ASSETS_DIR = ../../../../assets;
       SCRIPT_DIR = ../../../../scripts;
     };
 
@@ -130,18 +130,18 @@ in {
       xdgOpenUsePortal = true;
     };
   
-    programs.sway = {
+    programs = {
+      sway = {
         enable = true;
         package = pkgs.swayfx;
         wrapperFeatures.gtk = true;
       };
 
-    sisyphus = {
+      waybar.enable = true;
-      desktop.waybar.enable = true;
+    };
 
-      users.wantedGroups = [
+    sisyphus.users.wantedGroups = [
       config.users.groups.video.name # Brightnessctl
     ];
   };
-  };
 }

nixos/modules/desktop/waybar/default.nix

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.sisyphus.desktop.waybar;
-in {
-  options.sisyphus.desktop.waybar.enable = lib.mkEnableOption "Waybar";
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      libnotify
-      playerctl
-      jq
-      j4-dmenu-desktop
-    ];
-
-    programs.waybar.enable = true;
-  };
-}

nixos/modules/programs/sops/default.nix

@@ -14,8 +14,8 @@ in {
       # Add secrets.yml to the Nix Store.
       defaultSopsFile = ../../../secrets/secrets.yaml;
       age = {
-        # Don't derive age keys from SSH keys.
+        # Automatically import SSH keys as age keys.
-        sshKeyPaths = [ ];
+        sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
         # Use an age key that is expected to already be in the filesystem.
         # You will need to place this file manually.
         keyFile = "/var/lib/sops-nix/key.txt";

nixos/secrets/HomeLab.yaml

@@ -2,36 +2,26 @@ HomeLab:
     Gitea:
         ssh: ENC[AES256_GCM,data:+H9qhfOg5WlTB7pihvbJ9omY/zLTAADe8KzI4fbdZ7NuaM0auC95AIQqhwNNCZNglg9UGOVL662pY7dNhbQ/2iCLPHSPgFFXf3fx1moRRcYYQzoJxsgxp19FZQeGNJ0qfRf72xYbZQZKslyHQmcqDieoVTyhaLqTfgC8MQ/UZofw/ortmgME7z51rGV5sXXMjxpJpHz9JxiPwQEL0ABWDAeCqBVBzlqqwdmfKEdkcR4l3USHfH1iNF5XQ5V26I+UGDOyoixt1c/BXzD9xzKI7MUDoRz+qfC6C62LIlEgqZY5tWg+tVZnqobakxwH6d8pXtQ7vaIREEP0LqQMkrNcK8X+cDRteToQ1fcxtN1V+JfZSa9pVC+iGgvmSZ00q4bnOgTmgO9IZ80TvOR4bHpRhjM5l4JMbLBv2jqY1zeUx/5L3WNuYIm9sL5mWXkV/RAD8WCemNSWdKbGsvByEUeiFcxczL/vQ6y3fi+ntmXUgeXVy5zVNkNlYbqd+DemBmwZQb9D1T5T97i2ChciYb3/ON1NObja/bt0PTQa,iv:hIbwsPcDSfgDItlvFFy0vCjuQWvgoQHBH60v8nTVTNg=,tag:1T/TdTEy98TfgMzYAxfHKA==,type:str]
     Hugo:
-        ssh: ENC[AES256_GCM,data:y233CFIH7/n4EGEd2D7MuoprcMV9A8DaiV9JYZ6sr5j+hZnGr8sIAm9/55Bi2cD74sBZcE+tjOz+V2aJ2llKgcdS84ZmXMPh6KQ2QYRYuGdBLeztl8foKdimToblBapebTVO7Rc2mdhg7sZtC/TKSIJnG3R3lRfRdKaxNjaRS51epl7VZKGhLBjZoZqMXOezY7lvNBvF3hFfMh5el5I5Te/yQbbp0a7DkAvA+c1nG9bo9FN0h3VJJTzcuHqvGHI736VosLe8UGirMkX9mBwB8ZV4+2Vp7ZsSHnX5or/MzuYexT0zeLbTNHfj64d2W2/LKDkxNc35Sw7NvxwsVj3k2UHC2jEgus2z0AdMFszEFXh+Eu9wK8yX4ebzUut+OHNPuxvIk+ORxYr3OdVkOhhWHLinu/skNg0u5OdUXo/0p1876+gpcnOVC5UrUflwrtKGQgNk+ovWWjSfcQMh+gI6GYXzksX3YdMEriYZt4Z8lev2od/i7q48cV4W3Lo6TDDttipynxQus6K+J3oBKRirLHylRA5gusqUOVzC,iv:thw9OUnA02qe6aMuLTwy+q/a6isB375/k7JixPEy960=,tag:s95FtFRmPG0Up2oVuQyXsg==,type:str]
+        ssh: ENC[AES256_GCM,data:Tfuba25e4hJ8Ovl1IdVtDvg0L0sCc9sYTXstRg89IAUzwv/1u8mxdj9ka6ZKaSQr2QUaNWs0BoPV36O4bI2hTwoqhUarhXXZNnJKHtd8xBu/+kfMSOMGa5qD9V9m3L5OFdt+gdwhJxemeQNkvN0Vhsu4DJFPZRPmGflJ2HVRYaRW4AsI+JPqiWSEeKz40f3PQPJ2h26gF+pADmPwtEfcUGZdGnJXUsiYMC0aBEWWxyAgBgj5W+Nbe+OCopEX1qyRcR8qO+LONjuC0b5hcGeOXjWj/d1FnBfxDHeoxRGhNCo8TUk0ap1mpSAttdr55/C51duQfeV09Iow4nzUR2H0jmzojUAjKXXCkBsK6yjIKxW+4+4OKCC9ERz5mDmu5Z+4aFM7CpSquCAnDVFw1Uq9MJqAnSz6AGh29J4LUwMnVNtf+gQwzGyl/C9wE/Svm0UAwP19h6hLcM1rp6bV4xjfSXNDspUkz4Xr3RdPpTI1PemtMZIq8fP64q0FlFZeV62ctl9hCtDVRDo3fG3FUM08fa0OfJpVYjSEAOfC,iv:T8z+P5++cES9Co9d/2tcU0PbxZZM/5x63tcxIjBeQ0I=,tag:AjsulFme64/xEPjgZQFtow==,type:str]
     Nextcloud:
         ssh: ENC[AES256_GCM,data:aVqa57u9hIOquP367EDj2rlyQWRe3EZv8l5cC+yQQKCri2bN5IFSq8qNemOIcU9ycBnxIyK6gLerJYQQcgzIIARmnfDpbJ9w+EeUL5yvPVJN6FM7oBeaL9mzYRl8aDKr22LhL9YiKAT1nKHESmTb3TZRvuvWJTGzCMRV85ROGxZYVUgG6BjuHEzuTsc4fy3NVPIl7/4ZjPgNNYx+UNsV5xwTejveB/sGblVrHOO74LZXzUWRlQNun5nM3MY3GALzfrPrVIAyGNu37CGachtwxaPOj7vUKZmD/e+XajYVKRJ3v33jrUeI0dDmhuwJj3taoFik6suAyiK3RlDdeWoERR8vqduiyxJnVMs6mNkigzkVtifpwZyQ8vNyG7w1JNPygMYgQzjN43lGVml8cx1lZvcoBzQabjWxcNzhV8gXxoGKvAwUV7ELB6l00rUH+EeI0uU8/IFm9kwmZq42ciM/bRGSGXzo2PYG2OHOiDe5b0nrIlajaRKd+vuuzTtFFU9EwH0GPzERRaoxVK+h9tzcco/REITCE+CVlHSx,iv:bb1X95HK5tT7EJpqqgMOUxw5VO5MuzoYxkPIzR5sEqU=,tag:y2LKHm7czwyuHp7Ea8KiYw==,type:str]
-    NixOS:
-        admin:
-            ssh: ENC[AES256_GCM,data:rAn/H2CtK2dkES2UIJrZbEP/3rqLgJsy5rortmdqoCthQ41IxztiaH1VtdaVDtw5j0qu49RJ59KkmYpOQXC2okAgLeqcb+J9iwrwspfKd+/I186a4gHZ2l+hGpmr3Vbs6K/UoCY67uygZhznBuwKeW4EjYJgGS7zInJFmMvcMV1rP/t4VoW+5oxptQNCrzoRukIG6NiAOcqU1GtvBfL5PxLaTWUEcZMYuo6sY/9VuEWgkZP1bmhBPUIv9D5yJo94KQr0YOaX4lz2pwd+K0cdD8d0Lh8B5YplA1NDCUnBbuDXfH0aSUAm7DCm6Y/E2UECEMRLuwfyEoe/yaHh8iCGveI//FkmiIKNY1SmTkjM2Fdfk6QaVDF8sG2CWdX21H3senfeM6jSow7JLY1LDvC2WxO4YIJEi14Y7zEpIZinWimyAhihPvMLnwd3taOhE59NrTOQKQS3tyFX+5tO3LtBrpn+Tm/B7WO49EkRn1LXN8CWkFnEEGXgxfNRg91C967nHaNpDMssGjfVG20WwYAtMKXzrNyzSEJbZglQ,iv:vY/8yyO0eLzpdho9aPUH9WGQ8Cp5LA+5RckjzDgYMMY=,tag:Jar1qVS/c1rQ8f3qpYqJdA==,type:str]
-    Roxanne:
-        ghost:
-            ssh: ENC[AES256_GCM,data:hkgVUVyCLANeYB4bcCTLB/F6eAbg7J4eN8y+VVzBfkcgnpDmXmghBihreQVT7OIwRrHIH1ok2vuH8vgXb38tuplUD5I8e0Gqy3EqpOGagsO8lss4aIg2lRwZ9WazJknvo4OaGc34jrwcZicesnaxK6g+GX2r2N4caGKMuOZ2i1mLKBwOcEtL6l3REKrGkExd3mYJX1Yqs7sMbGLNpfemDghv646zvxDRwPby49qIPA8OtGR+DBMZTTEviNqamJaFbs7YX+K77J1NHK59u6UfzU6hEjTBEYIjkFDzGATAZAopCsjOHcAA0alejHK4QZZt3e8unVsLICNK08ZCyEzwSXQ/wpUh3ccGcLit2t1LYZT4PqqG8+6ooaQYso67Wral0pdsTsrF0mGNfsZm76MDV9puP5B+IInanHz+2mCHbdmTi6rg9t8Q6mpFqrUbrwxMn2Ns1proBXBCqK/sFjC/bVIyMHUVOh6GYcKaVTv8ecB9ZEjp5dZ4VeStqTMT+xqS7dXBAJzGytLwXT/JaQelIE0w47aBaGy63Pqy,iv:WuAGU+ru8xLp2LXK12x/ueCH0XDxA0zGUt7+HWUdVMo=,tag:UqUMD/jSdTXOkf0kyMqwHA==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age1fva6s64s884z0q2w7de024sp69ucvqu0pg9shrhhqsn3ewlpjfpsh6md7y
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlL05vZHk2T1B6OHArUXlj
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYWWFUdnpERVlkK29TQ09k
-            bEZWV0dUeVN0M3ZpeHdKcGlKV1RWYmRLM0FjCm9PLzBZTFo3RjhZTEhYMDBSN2Nj
+            SnJMVm5rUEV6S0huSzJ2YjFFQ3pNR0pmZWprClZEVDloeDE2ODNkMVVJTUtqaENz
-            aithQ2hpZXVCSngxcVBvQ2hKRzFXUEEKLS0tIE5rL0NHb1llRmlSQXVUeU8rVmNY
+            ZzhwTTA4V2xOeW55WGtPZU5FWElQNDAKLS0tIFh5ZWtmZHRBWTAvM3ZwY3pKQ0R6
-            aEZHdDFEWUdxMzRVVjFhQWZmS04wRkkKrD2CiwdNcbK9s64omQ7xSA29J48HwIHa
+            aDNUbFlhWWVoOWpjVlV1VTVJejlSMjQK6wCeCRdHY5oyTX6/R1U5AOGJyp0exi1A
-            ickyL/uorYhXmBKhqdvNq/j1Nb88LR9ti55Z7eecJNbyJb4OTtgzXQ==
+            dWPUMfkKBBBkrR+G6ougd8o3FwFf+yfb5RhaTxxqjit6p2RyMjR64w==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1qzutny0mqpcccqw6myyfntu6wcskruu9ghzvt6r4te7afkqwnguq05ex37
+    lastmodified: "2024-10-20T07:58:57Z"
-          enc: |
+    mac: ENC[AES256_GCM,data:mmFgjE7rp7fXmPOnETGamHR3kUAguFCNNTQcEnD+uM4xeSp3QcB2g8tkKYaJAjkWWqKRSm9/Iu1NWOr9GWyu4O1h7ppWSvpKawWki6cHpqBl8JOwbx/SZi5bzU1lBtoJyT6hD1aCu9ENOMUkpPY3rKcYwbsRMJpKYsbXymPikcQ=,iv:kPB6ds8c4yc/w7Ny1d3DTyztQF4yTr0NyKgIHEzIKAg=,tag:VTpXRb5HaWDjVB52K7mByw==,type:str]
-            -----BEGIN AGE ENCRYPTED FILE-----
+    pgp: []
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBOWNXQ1BsekdoS3BCdHA4
-            YTJJRHJBTEJ1bmhkWktSamYyRk1TUmovZ2trCnBXbUZQZFBndmU3VzJHVjczZGtY
-            ZkJDY3RzSEhXQVlLL0g1QTYxSC9CZGMKLS0tIGFBZnNlWmZjZFdkdGZvaHA5ZjMw
-            NFRtOFIybnFPWm1idFY0WEVqVGxOK1UKiJDByqKv/i/l9dvOplDyzDORU3ulhSwi
-            6xyEqmyNQpIkiS6TLZZYrBlQMDYqZ2gj1HhdIUssWJCf5Ho8KVDjJQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-10-04T19:40:06Z"
-    mac: ENC[AES256_GCM,data:V/0QsMR9nuoK7Tgj9UVxcsWM5llHlpMj+K0IgN3ZdqFQptOpasq+xVBBnSpNOarNFXB7t2ZCkzLMWptl/6fNH9Cye2qf8GjplHLGTB9x8t2u2XMwJf4BwCjOgxhiKo5jqFmjnFE2mX2EeZmHXv3G8gPwW+1cVttQQ4s7REo3Hww=,iv:AY0RSvevoSscdjl44iGEvWzcb664285csg1h0Hpixn4=,tag:yebUKx6Ssa6sB9HbNlLmUw==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.8.1

nixos/secrets/UGent.yaml

@@ -5,27 +5,24 @@ UGent:
         ssh: ENC[AES256_GCM,data:A4ir0yvCgIVJCl4C5fB4+WhJVj6Go9XWfjw1/lOaWr2rP+tVNnjGuv/d47z55Gxose5keYX2wRMet/M2Re18+5ckFTyfT4YkcHtQCyBGbmwYmIzxcaxinNsCuOelEdNnFnYW2ha0aJ8Q5Xjfpec1YqDrCT/Add3qGRzBizQJ1FajbyhxJOKLYvUrYvLZ8+XE8SUndvjQnVig3ArUm2hDFsEMm4ClZ4T+EwcIuWrS8ia7ZoqlQhglEtlSEczE65a6hQAFeXE64YC3s8kWlRGhRqJQXjB5g/UTkOht3Vrw2cNzrz90tR9vhooOEBEI6d8F8RJGkdyUe5zod1eKnE/lwOFhhTbzrGrYzX4oUrDIL+Dx9+R9mQchv9qSau1JtKDvzkYmqVVgTC6wE98gTRSBw78f0MKO27FA3diC/k3t+mwsKVRjcvlTUcbRcFAxjq/U5TbOq5jOgA41dI9KE/+bnJoLRh81m/sq9EqMTp90wDKn+jjCn7lGcGDwtaaTlbLIGIw5u9pcfD4UyvJZamnS96JAhsDUqk+fxb05,iv:jPCdaC7CahKrj3tvzZTs1ZI/3+zuCCqIdXp3vo9l/iY=,tag:DeUdWEZHpsB1AMD2AQuiTg==,type:str]
     SubGit:
         ssh: ENC[AES256_GCM,data:hJAle4DHJNvX569reclBG5rEdWsjAyV2TtHYMiPfky/dMKJkYgT4+T0doLfUn1O6at77kJGPmwUEvmK819DUuvHtNY7c6angV7iLygJ/ThI1FIFOKH+NxEsI3scoT0VDDybHpgice/fcJL1tMcvE74+dWOnZ2r4pxcMJEFHUPVVWcl9/stJLn78OonsyWpj8PglcnYFOfZ6THIe3lyNBxRp7XEweuwjacthGzOzNu3Z95zcCAnAokFVZ570glJNhjJVNEmPHZkHOcGiGNNM4JNbR11v+dOYtac942t/mmmWwAzbznuu8ZLupYWjdg/f07ftkPAwFwCoXblZ3708Lvf6uOt/CPeWvEII2Haf1Cr5w+U6TAt14zzL73xCSQqwz1TfkcmD+bJplmtcpSP/KX8/BRK7qr6Ec5T9ecbraRB7zDBg0X2x51DSHLrA7UIhpI9JNaOArU5UOVYTWwuzFiGG61elJMcPZ5vWEVrTCocfa4INPo4B2MkFbbsYf6xnY1L3Wc9LQjkff6aCqYnQaXZ/WfPWepf9YvYG1,iv:0Bm1r0FuJJKKmcbTiPL36rb5FaMZfOO7Mx8pXU2FSfg=,tag:0ShoJPJUx37mEAus+mhPmw==,type:str]
+    Dwengo: ENC[AES256_GCM,data:3lsZJ5ztkGOfHFQNr54xs9evSTEAs9XHJhg6Krvz3fkT8CaGSiRW5HTCfANGhQ3wJ8kHVziwopQCJ8s93gaipAuEu5k/hYj5wYhOn6x8oDJxftMJC94JDL4eYGIXbx9GSPIy+loftfYIZcfmi6o1lQdiqRdC207Cs+p0ZTB7JSvales16IpgYKoTCRLUytd9cBrezD9gVEngW1b4wHGzai4OOTSunlOVVAgapAKsN+swN7QtMt00607Ns6gCoQDV76qAbM+6EN8PlIKwbyy9UneeTXOf0wtQpb2TM1zrVR7LOqNyXT+DUlrBLpOpYK8tPCP8y5m9DMLixrhbAXMT6pIp2XSbmcfcsuMGLJE2ev/c6PxmbjqiCGEYPC3HdAgUpNDtOMixnHEoXnMUPDJeE0MXbSFMRmzNGo7pc5gOoCFmCkV9NVQXERR6m04Bn3czRQVHfoVIc4ciPdiXpOqF8ocTnqZj7HRW8dvZz9V50ViHwOVqWLJ2a/QUMdagXlaK7zPrxPETKz47iMoMfVaUE8ePg2L5sEZHja62,iv:s/+JYSkZudTr4MnTclpNV7i5VGUlqFhdvovcFt+inSQ=,tag:4Ge0ZOc6qNObQrzS0K0WDA==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age1fva6s64s884z0q2w7de024sp69ucvqu0pg9shrhhqsn3ewlpjfpsh6md7y
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpb0dlWE5PNllnME1jQWE4
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYWWFUdnpERVlkK29TQ09k
-            cHFzWkR4ZzNaWlR0WDJ4c1hEdlJGN0FISWlZCmNNdVRtL080QzgwQTZtTGpVRkxW
+            SnJMVm5rUEV6S0huSzJ2YjFFQ3pNR0pmZWprClZEVDloeDE2ODNkMVVJTUtqaENz
-            dkdvYXdQNUlhYWQrYlNDR2JISXdpdkkKLS0tIEpIU20rK3F3WGpBS1g3NmJqYWRX
+            ZzhwTTA4V2xOeW55WGtPZU5FWElQNDAKLS0tIFh5ZWtmZHRBWTAvM3ZwY3pKQ0R6
-            SWlNbFZ0NTJJZ09Wd3JzK1hscjJoS2MK4GU8ndim80CaOjgvMwVlgIq/1VQIylSZ
+            aDNUbFlhWWVoOWpjVlV1VTVJejlSMjQK6wCeCRdHY5oyTX6/R1U5AOGJyp0exi1A
-            EJl15zUFaDiDZUCcZE8TkJQ/rbGDSiq7KlWyFe48Q3UC86jfF88qCg==
+            dWPUMfkKBBBkrR+G6ougd8o3FwFf+yfb5RhaTxxqjit6p2RyMjR64w==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1qzutny0mqpcccqw6myyfntu6wcskruu9ghzvt6r4te7afkqwnguq05ex37
+    lastmodified: "2025-02-21T19:36:01Z"
-          enc: |
+    mac: ENC[AES256_GCM,data:NMxbxf7/UwR9akbbLgKeSLIkk+dS/an2pGzZUSbe1AJenCVFO/fiRCC5BF6xJVpFSpag/dLwo/tS64JmJ36Vqn2sQGmqn26HPXsjAgyUdpp3+anXIVOGvNHF3oCM8gEUk9+W2FsOqKuejpD7HK/IsVJEZZLbThkUS1BiptOWk84=,iv:xNBBjWADFF5itg45KnmNbZG5RN0KRpaph7iMGhf1KZg=,tag:FrDSAbvo/7QHH0g5Ik8ATw==,type:str]
-            -----BEGIN AGE ENCRYPTED FILE-----
+    pgp: []
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYNjkzeHloK3hKUTJaMTdr
-            NUdiZ2JGZitqN1k0WCtEODU4R2MrTmUzR1hrCmNJL0Y4ZEpLN0l6ZmhGWEM5UktG
-            ck1PUnFSSVNCRUd5Sm9kSXNmVW5jZDQKLS0tIHpHWVBVNFNBSlUvZldJVGowUEtZ
-            S05HZ0FiSVlkUjRRV01TbjlpVFlkQWcK7jAqOYd9EDT93xpVgtpKl03EO6oHmGRR
-            iK9j2y7j1YSghPKDBrC5eKy9+IP/EFEBGygcokqT7C6Nscu80YhVbg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-10-06T14:01:15Z"
-    mac: ENC[AES256_GCM,data:bWo5DGCt5cK02Lf61yKFDZLLaMmcWyba+03CZ35EnGz7Hoc1sl3qTmgJfNz8EKDeXTIkk33DdnI/kZ2nX7vsZ/QgOhFQWzWRYe1cxqiWyd0wnUlwdoeeFrBP3uOTHXAOVe6q77S3qChzBP3J+5OijztvdOVEOKFmFPSCgyA029Q=,iv:6DSp63IrtYyaFxkaify/JZDXpB76AaGGW/OcPTKBbvk=,tag:sPKddpcx60JFZ4VEGD1tnQ==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.9.2

nixos/secrets/personal.yaml

@@ -3,26 +3,22 @@ GitHub:
 Gitea:
     ssh: ENC[AES256_GCM,data:8eyuycMkBVMHfzaGeGs+0RA4vCpaAUTjCwiplUamypEk9BDYqxe+69O6OjJAGaPnmH4kpsb/WVd5sU6HNUogBuzDQhCrv2B6NadcmnV+fH3MHfAWvDy7R68PUkwcywWVOo65SONckjKVa0Y+8IeeJh9zpr36qCbbs+zPC4XTk+Y5R4vK/ocmSJSmwqVK1SfGGwOjFoJvHVI6jdXh//vgKaITqmyZV7N3OU9EiQp1FmNKwFf/x70w2LGATrNBcexwNy20ZYd6ewiAfJxFHR6Svfc2P5X2nlv99W5t1eU5QEGUcalcslsW/VkmFC3agN3Yry2EMIlfTlm0hm4+ryDGWEvgyUC0dLA8Ao0TLaaqig9HzBRP1h6aORe0lDwzTUg6WltrIu0s7hFwD4YLi1qP5lY99hvrDIRbTEg6AY6X4b32YFlyOXy0YDetv90+QyEcwANWO9MXz2S9hxuQmjOXMCVYMaiMLVUkG+mShbQuxTiFQt/7D83yOBSRLugx/aU318NKvUDlCt7wpZbMI3gBia4nUYLoLcXRKcAZ,iv:uc1ZtGdcolLrpQgS5n5LEAwBt0vMmkj2OuTXcn8sQ7A=,tag:F2ofcj0zEBgxwukMUd7+uw==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age1fva6s64s884z0q2w7de024sp69ucvqu0pg9shrhhqsn3ewlpjfpsh6md7y
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwSDRZQ0pVNWhmdFo1UDVv
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYWWFUdnpERVlkK29TQ09k
-            MFlrZEFtNjlpZ3pBU0VrdkFpR2x4WGxUZ0RRClJad1JPYWhFTWd1N2ZKQWsrSjFj
+            SnJMVm5rUEV6S0huSzJ2YjFFQ3pNR0pmZWprClZEVDloeDE2ODNkMVVJTUtqaENz
-            YXREaGRrbE15MEdpblJtcTk2cFk1eGsKLS0tIHE2ZTd3R1gwQ3E1VzkvZTZoZjBW
+            ZzhwTTA4V2xOeW55WGtPZU5FWElQNDAKLS0tIFh5ZWtmZHRBWTAvM3ZwY3pKQ0R6
-            aTRLcFJ6NkpJRjkyenVxeFRLVmgwMjQK47HRKyg1SxWABZHCdVdIaPEKoSiWIOO/
+            aDNUbFlhWWVoOWpjVlV1VTVJejlSMjQK6wCeCRdHY5oyTX6/R1U5AOGJyp0exi1A
-            OYu/1owbUwTh1KouUb4tgNmVBOkERJ9i3lEjWLHUWrlCAUImc9dG4g==
+            dWPUMfkKBBBkrR+G6ougd8o3FwFf+yfb5RhaTxxqjit6p2RyMjR64w==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1qzutny0mqpcccqw6myyfntu6wcskruu9ghzvt6r4te7afkqwnguq05ex37
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBVDZtU2g4dmFXTlNIMFBs
-            OFBpS2RXRzFwTVdJazQrSldwWUFtdCs0U1ZFCmxRdy9yY3VIWU4zenc4eVNEVUZv
-            VUlyT29JekNTS3RIMktmS2RGNU5GMTgKLS0tIEhvM2RkcUs0SE5uSXFxc3dvSXhP
-            WmViM05IMHFPckNic1hHY2ZlTEMrYkkK+66rYqbGQucqQch4Tx9jONR9OIXdjMUd
-            q/fGLCoSluHuCOkUWr/wUgvF5dWAHftYj9JjDB/9vpp4Q0WClLDszw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-10-19T12:24:38Z"
     mac: ENC[AES256_GCM,data:g15gV0H0rlzoeN5Z/Zkgh/8ya9GSrWDVP9oqdVz3m4obmquCLDIygsPaYpRXmfOtPSgvX2KzZ08sNLfcBZSh7eH2Ws7xcezWOntOcmAQNz5LvemqP7YuwtivMK/P4qrkME+LQPkSrSUR+rT99Zj+RQXisy91Cq9NbVBj6uQH7+I=,iv:W+oDp5Dun0g35BFprOmgfI0LoPME3HpPuuniCKA32Kc=,tag:CUU74HZuRNedyI3txn9D+g==,type:str]
+    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

nixos/secrets/secrets.yaml

@@ -9,26 +9,22 @@ example_booleans:
     - ENC[AES256_GCM,data:Ul7fKA==,iv:U51FhTsWwkbhUWGsO8D+bl2mLdTIfapIB+OGJEOAiRA=,tag:9NJLKp8s2TSKLyXwM8OncA==,type:bool]
     - ENC[AES256_GCM,data:LVU1a90=,iv:1X1qV+8iIe1i5hIrqyB3tJew9hsHjJHlATmkEmwRA0Y=,tag:ko/5OwmJH/6HKPsvbkoRpw==,type:bool]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age1fva6s64s884z0q2w7de024sp69ucvqu0pg9shrhhqsn3ewlpjfpsh6md7y
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4KzMrV2dpWFQyQUQyV050
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3ekx1bzluY0ZhYmhnRmhW
-            elVhN0dUeTRodG1kNHZ0VEVmTUI1QjhidFJnClhJU0tVY0tmMkFaMDZkMDJOKzV1
+            b3pzM2RlKzFrREpMK3RNU1MweldNRXJ5NjE4CmNRbnFvbk1EN0V0ZWJiVzFmL3Jt
-            NVJiSERtR0VZR3VBOGVJbGk3cUxTMzAKLS0tIGhvMmIyOWQwVlhXRzYwampTeG5V
+            N1Vpb3NEdXFzdzU4MjN1elp1RWZ5THcKLS0tIDR4cTFJNVFveEdxaEYvZndKbURa
-            UDVWQnE4NDY5cFF3RnpxcjhMY2N0VUUK+B24C0CT5b82DJSdKotX4iPhzWxnYsn6
+            UHpaNENhL3c1K3RXc05hUmdNZVBpT2MKwBj4+Gb7giVJIoPWiwY3tvugEAexXy6Q
-            kS7Ut9uy5OwcB+p6erlbLMEUVmmSNw89KBrowT0Ui1d3AfyGAN4rqQ==
+            YTWgZQZk96r5aF2mBjRCFCc7prj85PsUN/UXOPjPLVAFG3lwS0Eaog==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1qzutny0mqpcccqw6myyfntu6wcskruu9ghzvt6r4te7afkqwnguq05ex37
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwTjh4NDRYZGM1VHRZWGor
-            MmhFWDNvMjI4UUVPbnorNnpabGNZY1BuMVdrCisvZ0U5SXRPM3IzNlZvZEpWZktz
-            b2FJemtNVHU0WUI4M0U1L2tWR3g1MEUKLS0tIGczTmVubzcwVjg5NDdQdEllWEFw
-            TWRIRE5WSGRCbncvWlpEMmdWOW5kb00Kq79O2C4aYmZmrq+rbyMtwmEqkqL9epn/
-            pw2dxXmYt95qu3x/BxjoN8RFZhabFp9xHkZ1kqJe9FGmBtAmoWXjWA==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-09-10T20:20:18Z"
     mac: ENC[AES256_GCM,data:yfmYEo8pdlG3tu4Fabwde57igIvpt4UuhQqStVlV36rvPnv9dc42+6iduu+heuQ2OAVw0jk6/o6SWJpcms2DReOAMGDOgt+zV3TgJym52YdMcjTNJTo+4loULhvaWyN9ZdPJjSYKEoSgOZi+oMx4BpwreQEaPaYUxcbTqrWCUa8=,iv:Mb81sBxibRxSaC2kgakhy2pyEmW0MDobF+lHF7cny5E=,tag:DCqTWSnf5Gv5YfAGSEC2yw==,type:str]
+    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3

nixos/users/tdpeuter/default.nix

@@ -35,26 +35,25 @@ in {
       shell = pkgs.zsh;
 
       packages = (with pkgs; [
-        bitwarden-desktop
+        cmdtime               # Zsh plugin
+        icosystem             # Personal icon theme
+        nextcloud-client
+        spotify-adblock
         brave                 # Internet browser
         chafa                 # Terminal image viewer
-        cmdtime               # Zsh plugin
         duf                   # Df alternative
         feishin               # Jellyfin music client
         foot
         fzf
         gh                    # GitHub CLI tool
         glow                  # Terminal Markdown renderer
-        icosystem             # Personal icon theme
         jellyfin-media-player
         libreoffice-fresh     # Office tools
         librewolf             # Internet browser
         mpv                   # Media player
-        nextcloud-client
         nsxiv                 # Lightweight image viewer
         qalculate-gtk         # Calculator
         spotify
-        spotify-adblock
         unzip
         vifm                  # File manager
         zathura               # PDF viewer

nixos/users/tdpeuter/secrets.nix

@@ -24,6 +24,7 @@ in {
         };
       in {
         "UGent/HPC/ssh" = UGent;
+        "UGent/Dwengo" = UGent;
 
         # Git authentication
         "Gitea/ssh" = personal;
@@ -32,15 +33,9 @@ in {
         "UGent/SubGit/ssh" = UGent;
 
         # HomeLab
-
-        # Physical hosts
-        "HomeLab/Hugo/ssh" = HomeLab;
-        "HomeLab/Roxanne/ghost/ssh" = HomeLab;
-
-        # Virtual hosts
         "HomeLab/Gitea/ssh" = HomeLab;
+        "HomeLab/Hugo/ssh" = HomeLab;
         "HomeLab/Nextcloud/ssh" = HomeLab;
-        "HomeLab/NixOS/admin/ssh" = HomeLab;
       });
   };
 }

scripts/toggle-tailscale.sh

@@ -19,24 +19,15 @@ while getopts ":g" option; do
             if [ "${current_state}" == "${STOPPED_MSG}" ]; then
                 state='disconnected'
                 tooltip='Connect tailnet'
-
-                printf '{"alt": "%s", "tooltip": "%s", "class": "%s" }' \
-                    "${state}" "${tooltip}" "${state}"
             else
                 state='connected'
                 tooltip="${status:='Disconnect tailnet'}"
-
-                printf '{"alt": "%s", "tooltip": "<tt>%q</tt>", "class": "%s" }' \
-                    "${state}" "${tooltip}" "${state}"
             fi
 
+            printf '{"alt": "%s", "tooltip": "%q", "class": "%s" }' \
+                "${state}" "${tooltip}" "${state}"
             exit 0
             ;;
-
-        *)
-            echo 'Invalid option'
-            exit 1
-            ;;
     esac
 done
 

stow/hyprland/.config/hypr/hyprland.conf

@@ -266,7 +266,7 @@ $right = l
 
 $term = foot
 $menu = j4-dmenu-desktop --dmenu="rofi -dmenu -i" --no-generic --usage-log="/home/tdpeuter/.local/state/dmenu.log" --term=$term
-$lock = swaylock --daemonize
+$lock = swaylock
 
 source = /home/tdpeuter/.config/hypr/input-output.conf
 source = /home/tdpeuter/.config/hypr/keybinds.conf

stow/hyprland/.config/hypr/modes.conf

@@ -19,16 +19,16 @@ bind =         , Return, submap, reset
 submap = reset
 
 # Launcher
-$mode_launcher = Launch (f)irefox, (t)hunderbird, (l)ogseq.
+$mode_launcher = Launch (f)irefox, (t)hunderbird.
 bind = $flag, O, submap, $mode_launcher
 submap = $mode_launcher
 
 bind = , F, exec,   firefox
 bind = , F, submap, reset
-bind = , L, exec,   logseq
-bind = , L, submap, reset
 bind = , T, exec,   thunderbird
 bind = , T, submap, reset
+bind = , Z, exec,   zen
+bind = , Z, submap, reset
 
 bind = $flag, O, submap, reset
 bind = , Escape, submap, reset

stow/ssh/.ssh/config

@@ -4,6 +4,12 @@ Host HPC
     IdentitiesOnly yes
     IdentityFile /run/secrets/UGent/HPC/ssh
 
+Host Dwengo
+    User tibo
+    HostName sel2-1.ugent.be
+    IdentitiesOnly yes
+    IdentityFile /run/secrets/UGent/Dwengo
+
 # Git authentication
 Host git.depeuter.dev
     User git
@@ -31,41 +37,20 @@ Host subgit.ugent.be
     CanonicalizeHostname yes # Ignore capitalization
 
 # HomeLab
-
-# Physical hosts
-Host Hugo
-    User admin
-    HostName 192.168.0.11
-    IdentitiesOnly yes
-    IdentityFile /run/secrets/HomeLab/Hugo/ssh
-
-Host Roxanne
-    User ghost
-    Hostname 192.168.0.13
-    IdentitiesOnly yes
-    IdentityFile /run/secrets/HomeLab/Roxanne/ghost/ssh
-
-# Virtual hosts
 Host Gitea
     User admin
     HostName 192.168.0.24
     IdentitiesOnly yes
     IdentityFile /run/secrets/HomeLab/Gitea/ssh
 
+Host Hugo
+    User admin
+    HostName 192.168.0.11
+    IdentitiesOnly yes
+    IdentityFile /run/secrets/HomeLab/Hugo/ssh
+
 Host Nextcloud
     User administrator
     Hostname 192.168.0.14
     IdentitiesOnly yes
     IdentityFile /run/secrets/HomeLab/Nextcloud/ssh
-
-Host Development
-    User admin
-    Hostname 192.168.0.91
-    IdentitiesOnly yes
-    IdentityFile /run/secrets/HomeLab/NixOS/admin/ssh
-
-Host Testing
-    User admin
-    Hostname 192.168.0.92
-    IdentitiesOnly yes
-    IdentityFile /run/secrets/HomeLab/Nixos/admin/ssh

stow/swaylock/.config/swaylock/config

@@ -2,23 +2,21 @@
 # .config/swaylock/config
 # 
 
-#indicator
+indicator
-#indicator-radius=200
+indicator-radius=200
-#
-#clock
-#datestr=%A, %B %d %Y
-#
-#show-failed-attempts
-#
-#screenshots
-#effect-pixelate=10
-#effect-vignette=0.75:0 # Darken the whole screen.
-#fade-in=0.25
-#
-#grace=7 # Allow to unlock without password for duration
-#grace-no-mouse
 
-image=${ASSETS_DIR}/bluescreen.png
+clock
+datestr=%A, %B %d %Y
+
+show-failed-attempts
+
+screenshots
+effect-pixelate=10
+effect-vignette=0.75:0 # Darken the whole screen.
+fade-in=0.25
+
+grace=7 # Allow to unlock without password for duration
+grace-no-mouse
 
 # Styling
 

stow/waybar/.config/waybar/modules.json

@@ -90,21 +90,21 @@
         "format": "\uf09c", /*  */
         "tooltip": true,
         "tooltip-format": "Lock device",
-        "on-click": "swaylock --daemonize"
+        "on-click": "swaylock -f"
     },
 
     "custom/system-sleep": {
         "format": "\uf186", /*  */
         "tooltip": true,
         "tooltip-format": "Put device to sleep",
-        "on-click": "swaylock --daemonize; systemctl suspend"
+        "on-click": "swaylock -f; systemctl suspend"
     },
 
     "custom/system-hibernate": {
         "format": "\uf2dc", /*  */
         "tooltip": true,
         "tooltip-format": "Hibernate device",
-        "on-click": "swaylock --daemonize; systemctl hibernate"
+        "on-click": "swaylock -f; systemctl hibernate"
     },
 
     "custom/system-reboot": {
@@ -122,10 +122,9 @@
     },
 
     "custom/toggle-light-dark": {
-        "exec": "bash ${SCRIPT_DIR}/toggle-light-dark.sh -g",
+        "exec": "sleep 1 && bash ~/projects/sisyphus/scripts/toggle-light-dark.sh -g",
-        "interval": 60,
         "return-type": "json",
-        "on-click": "bash ${SCRIPT_DIR}/toggle-light-dark.sh",
+        "on-click": "bash ~/projects/sisyphus/scripts/toggle-light-dark.sh",
         "format": "{icon}",
         "format-icons": {
             "default": "\uf185",
@@ -135,23 +134,21 @@
     },
 
     "custom/toggle-notifications": {
-        "exec": "bash ${SCRIPT_DIR}/toggle-notifications.sh -g",
+        "exec": "sleep 6 && bash ~/projects/sisyphus/scripts/toggle-notifications.sh -g",
-        "interval": 60,
         "return-type": "json",
-        "on-click": "bash ${SCRIPT_DIR}/toggle-notifications.sh",
+        "on-click": "bash ~/projects/sisyphus/scripts/toggle-notifications.sh",
-        "format": "{icon}",
+        "format": "NOTIS {icon}",
         "format-icons": {
-            "normal": "\uf0f3", /*  */
+            "normal": "NRML",
-            "paused": "\uf1f6"  /*  */
+            "paused": "PAISED"
         },
         "tooltip": true
     },
 
     "custom/toggle-tailscale": {
-        "exec": "bash ${SCRIPT_DIR}/toggle-tailscale.sh -g",
+        "exec": "sleep 2 && bash ~/projects/sisyphus/scripts/toggle-tailscale.sh -g",
-        "interval": 60,
         "return-type": "json",
-        "on-click": "bash ${SCRIPT_DIR}/toggle-tailscale.sh",
+        "on-click": "bash ~/projects/sisyphus/scripts/toggle-tailscale.sh",
         "format": "{icon}",
         "format-icons": {
             "disconnected": "\ue50b",

stow/waybar/.config/waybar/style.css

@@ -62,6 +62,7 @@ window#waybar {
     opacity: 0.6;
 }
 
+
 #mpris.Feishin {
     background: linear-gradient(45deg, rgba(170,92,195,1) 100%, rgba(0,164,220,1) 0%);
 }

stow/zsh/.zshrc

@@ -51,7 +51,7 @@ fi
 alias cp='cp -i'
 alias df='df -h'
 alias free='free -m'
-alias gs='git status --short'
+alias gs='git status'
 alias hgrep='history | grep'
 alias ll='ls -la'
 alias mkdir='mkdir -pv'