diff --git a/.gitignore b/.gitignore
index 5305ca3..b03c22e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 **/*~
-**/#*.*#
-**/.#*.*
+**/\#*\#
+**/.\#*
 
 **/.pre-commit-config.yaml
 **/result
diff --git a/flake.lock b/flake.lock
index e7249eb..b4bea93 100644
--- a/flake.lock
+++ b/flake.lock
@@ -47,11 +47,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1743630992,
-        "narHash": "sha256-4QKnn7sHskureX2DvKcvxR4tbjauSoCPVQJ+I8PAAUg=",
+        "lastModified": 1744300958,
+        "narHash": "sha256-ijCSbAFTvMkjHKivrhCVxti3lPELwFKvV4Gv4BPSRrg=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "421cce2410fe9f0a71c717e1e28d37eb4ddd0283",
+        "rev": "72d8607e498dc1fe463ae5bfec8b590a138fd1db",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "nixpkgs": ["nixpkgs"]
       },
       "locked": {
-        "lastModified": 1743598667,
-        "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
+        "lastModified": 1744145203,
+        "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
+        "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1741485571,
-        "narHash": "sha256-fpm1ZTfGfMG36c4G3HSwmbd09zU3egmM0dfgDxkT3h4=",
+        "lastModified": 1743991507,
+        "narHash": "sha256-sRyA1LOsRSeF8W2drXEuGU2U+actcYEKdk1f+2kDKb8=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "db37ae9cd947031ad83288dec514233ffd262ffd",
+        "rev": "ac8af15c5f586879c08cd257b69749f791d94e68",
         "type": "github"
       },
       "original": {
@@ -314,11 +314,11 @@
         "nixpkgs": ["chaotic", "nixpkgs"]
       },
       "locked": {
-        "lastModified": 1743527271,
-        "narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=",
+        "lastModified": 1744172174,
+        "narHash": "sha256-Ud0ClYf8YHhbYmg1piPJx2iuYOh62HQiRzDObD2gzsk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9",
+        "rev": "4040c5779ce56d36805bc7a83e072f0f894eae7d",
         "type": "github"
       },
       "original": {
@@ -333,11 +333,11 @@
         "nixpkgs": ["chaotic", "nixpkgs"]
       },
       "locked": {
-        "lastModified": 1743144043,
-        "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=",
+        "lastModified": 1744117730,
+        "narHash": "sha256-kcxkKeBYyhy3BT5wfGmMo6kNo3XM5R7h/bu5fLdbnG4=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24",
+        "rev": "92a01193c13d5ef9085899e22715c6e5f2590af8",
         "type": "github"
       },
       "original": {
@@ -402,11 +402,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743448293,
-        "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
+        "lastModified": 1744098102,
+        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
+        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1741332913,
-        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
+        "lastModified": 1743813633,
+        "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
+        "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
         "type": "github"
       },
       "original": {
@@ -474,11 +474,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1743583204,
-        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
+        "lastModified": 1744098102,
+        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
+        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
         "type": "github"
       },
       "original": {
@@ -587,11 +587,11 @@
         "nixpkgs": ["nixpkgs"]
       },
       "locked": {
-        "lastModified": 1743532009,
-        "narHash": "sha256-yRZifkvaNiPuDguFRubAeUqVsfsEAaT1201Ck1P0p2w=",
+        "lastModified": 1744309196,
+        "narHash": "sha256-GFRGL+EohGlGdsWNSBpNFm2rsfNt9vwmK7Y7ppV88og=",
         "ref": "main",
-        "rev": "cd8e902b57b31dd78aa8fda1b40cde3862184aa1",
-        "revCount": 108,
+        "rev": "4306f9c70d30a385975b60e75e4b001ebebb07e8",
+        "revCount": 117,
         "type": "git",
         "url": "https://copeberg.org/amadaluzia/pankomacs.git"
       },
diff --git a/hosts/cityseventeen/apps.nix b/hosts/cityseventeen/apps.nix
index 572cd69..dfe7015 100644
--- a/hosts/cityseventeen/apps.nix
+++ b/hosts/cityseventeen/apps.nix
@@ -16,12 +16,10 @@
     programs = {
       swaybg = {
         enable = true;
-        wallpaper = inputs.wallpkgs.wallpapers.tokyo-night.tokyo_night-05.path;
-      };
-      waybar = {
-        enable = true;
-        package = pkgs.waybar;
+        wallpaper = inputs.wallpkgs.wallpapers.rose-pine.rose_pine-02.path;
       };
+      waybar.enable = true;
+      mako.enable = true;
       direnv.enable = true;
       openssh.enable = true;
     };
diff --git a/hosts/cityseventeen/default.nix b/hosts/cityseventeen/default.nix
index c89d466..a237823 100644
--- a/hosts/cityseventeen/default.nix
+++ b/hosts/cityseventeen/default.nix
@@ -5,13 +5,12 @@
 }:
 {
   imports = [
-    ./users/arturm
+    ./users
+    ./services
     ./hardware.nix
     ./theme.nix
     ./apps.nix
     ./fonts.nix
-    ./forgejo.nix
-    ./jellyfin.nix
   ];
 
   config = {
@@ -41,6 +40,7 @@
 
     services = {
       xserver = {
+        enable = true;
         xkb = {
           layout = "us";
           options = "eurosign:e,ctrl:nocaps";
@@ -49,6 +49,7 @@
           enable = true;
           wayland = true;
         };
+        windowManager.windowmaker.enable = true;
       };
 
       udev.packages = [
diff --git a/hosts/cityseventeen/services/default.nix b/hosts/cityseventeen/services/default.nix
new file mode 100644
index 0000000..be87893
--- /dev/null
+++ b/hosts/cityseventeen/services/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./znc.nix
+    ./forgejo.nix
+    ./jellyfin.nix
+  ];
+}
diff --git a/hosts/cityseventeen/forgejo.nix b/hosts/cityseventeen/services/forgejo.nix
similarity index 100%
rename from hosts/cityseventeen/forgejo.nix
rename to hosts/cityseventeen/services/forgejo.nix
diff --git a/hosts/cityseventeen/jellyfin.nix b/hosts/cityseventeen/services/jellyfin.nix
similarity index 100%
rename from hosts/cityseventeen/jellyfin.nix
rename to hosts/cityseventeen/services/jellyfin.nix
diff --git a/hosts/cityseventeen/services/znc.nix b/hosts/cityseventeen/services/znc.nix
new file mode 100644
index 0000000..0ff8b61
--- /dev/null
+++ b/hosts/cityseventeen/services/znc.nix
@@ -0,0 +1,114 @@
+{ lib, ... }:
+{
+  services.znc = {
+    enable = true;
+    useLegacyConfig = false;
+    mutable = true;
+    config = {
+      Listener.l = {
+        AllowIRC = true;
+        AllowWeb = true;
+        IPv4 = true;
+        IPv6 = true;
+        Port = 5000;
+        SSL = false;
+        URIPrefix = "/";
+      };
+      User.amadaluzia = {
+        Admin = true;
+        Allow = "*";
+        AltNick = "amadaluzia_";
+        AppendTimestamp = false;
+        AuthOnlyViaModule = false;
+        AutoClearChanBuffer = true;
+        AutoClearQueryBuffer = true;
+        ChanBufferSize = 50;
+        DenyLoadMod = false;
+        DenySetBindHost = false;
+        Ident = "amadaluzia";
+        JoinTries = 10;
+        LoadModule = [
+          "chansaver"
+          "controlpanel"
+        ];
+        MaxJoins = 0;
+        MaxNetworks = 1;
+        MaxQueryBuffers = 50;
+        MultiClients = true;
+        Nick = "amadaluzia";
+        NoTrafficTimeout = 180;
+        PrependTimestamp = true;
+        QueryBufferSize = 50;
+        QuitMsg = "Hi, this is Paul Allen. I'm being called away to London for a few days. Meredith, I'll call you when I get back. Hasta la vista, baby.";
+        RealName = "Artur Manuel";
+        StatusPrefix = "*";
+        TimestampFormat = "[%H:%M:%S]";
+
+        Network = {
+          ATL = {
+            FloodBurst = 9;
+            FloodRate = "2.00";
+            IRCConnectEnabled = true;
+            JoinDelay = 0;
+            LoadModule = [ "simple_away" ];
+            Server = "irc.atl.chat +6697";
+            TrustAllCerts = false;
+            TrustPKI = true;
+
+            Chan = {
+              "#general" = { };
+              "#linux" = { };
+              "#support" = { };
+            };
+          };
+
+          libera = {
+            FloodBurst = 9;
+            FloodRate = "2.00";
+            IRCConnectEnabled = true;
+            JoinDelay = 0;
+            LoadModule = "simple_away";
+            Server = "irc.libera.chat +6697";
+            TrustAllCerts = false;
+            TrustPKI = true;
+            Chan = lib.genAttrs [
+              "##programming"
+              "##rust"
+              "#linux"
+              "#kernel"
+              "#osdev"
+              "#nixos"
+              "#gentoo"
+              "#gentoo-chat"
+              "#archlinux"
+              "#archlinux-offtopic"
+              "#debian"
+              "#voidlinux"
+              "#opensuse"
+              "#opensuse-factory"
+              "#openbsd"
+              "#openbsd-social"
+              "#freebsd"
+              "#go-nuts"
+              "#zig"
+              "#C++"
+              "#C++-general"
+              "#haskell"
+              "#nim"
+              "#lisp"
+              "#esolangs"
+              "#emacs"
+              "#emacs-social"
+              "#nicotine+"
+            ] (_: { });
+          };
+        };
+        Pass.password = {
+          Hash = "15767453f2fa83a2ed1c7a1870ea8f154aa2e8b1910fd221471b4e548cd2bede";
+          Method = "SHA256";
+          Salt = "16*z9hcv07WI,m))lZD0";
+        };
+      };
+    };
+  };
+}
diff --git a/hosts/cityseventeen/theme.nix b/hosts/cityseventeen/theme.nix
index 464dae8..c9ddc04 100644
--- a/hosts/cityseventeen/theme.nix
+++ b/hosts/cityseventeen/theme.nix
@@ -5,16 +5,16 @@
 let
   themes = {
     gtk = {
-      name = "Tokyonight-Dark";
-      package = pkgs.tokyonight-gtk-theme;
+      name = "rose-pine";
+      package = pkgs.rose-pine-gtk-theme;
     };
     icons = {
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
     cursor = {
-      name = "Simp1e-Tokyo-Night";
-      package = pkgs.simp1e-cursors;
+      name = "BreezeX-RosePine-Linux";
+      package = pkgs.rose-pine-cursor;
     };
   };
 in
diff --git a/hosts/cityseventeen/users/arturm/configs/foot/foot.ini b/hosts/cityseventeen/users/arturm/configs/foot/foot.ini
index 21becc0..d5ea0c1 100644
--- a/hosts/cityseventeen/users/arturm/configs/foot/foot.ini
+++ b/hosts/cityseventeen/users/arturm/configs/foot/foot.ini
@@ -1,29 +1,29 @@
 [main]
 pad=12x12
-font=monospace:size=16.5
+font=monospace:size=13
 
 [colors]
-foreground=a9b1d6
-background=1a1b26
-regular0=16161e # black
-regular1=c0caf5 # red
-regular2=9ece6a # green
-regular3=0db9d7 # yellow
-regular4=2ac3de # blue
-regular5=bb9af7 # magenta
-regular6=b4f9f8 # cyan
-regular7=cbccd1 # white
-bright0=2f3549 # bright black
-bright1=c0caf5 # bright red
-bright2=9ece6a # bright green
-bright3=0db9d7 # bright yellow
-bright4=2ac3de # bright blue
-bright5=bb9af7 # bright magenta
-bright6=b4f9f8 # bright cyan
-bright7=d5d6db # bright white
-16=a9b1d6
-17=f7768e
-18=16161e
-19=2f3549
-20=787c99
-21=cbccd1
\ No newline at end of file
+foreground=e0def4
+background=191724
+regular0=1f1d2e # black
+regular1=eb6f92 # red
+regular2=31748f # green
+regular3=ebbcba # yellow
+regular4=c4a7e7 # blue
+regular5=f6c177 # magenta
+regular6=9ccfd8 # cyan
+regular7=e0def4 # white
+bright0=26233a # bright black
+bright1=eb6f92 # bright red
+bright2=31748f # bright green
+bright3=ebbcba # bright yellow
+bright4=c4a7e7 # bright blue
+bright5=f6c177 # bright magenta
+bright6=9ccfd8 # bright cyan
+bright7=524f67 # bright white
+16=f6c177
+17=524f67
+18=1f1d2e
+19=26233a
+20=908caa
+21=e0def4
\ No newline at end of file
diff --git a/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini b/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini
index 5a5b527..511c364 100644
--- a/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini
+++ b/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini
@@ -1,11 +1,11 @@
 # output=<not set>
-font=Monospace:size=16
+font=Monospace:size=13
 # dpi-aware=auto
 # use-bold=no
-# prompt="> "
+prompt="󰴈 "
 # placeholder=
 # icon-theme=hicolor
-# icons-enabled=yes
+icons-enabled=no
 # hide-before-typing=no
 # fields=filename,name,generic
 # password-character=*
@@ -16,14 +16,14 @@ font=Monospace:size=16
 # delayed-filter-ms=300
 # delayed-filter-limit=20000
 # show-actions=no
-# terminal=$TERMINAL -e  # Note: you cannot actually use environment variables here
+terminal=foot -e  # Note: you cannot actually use environment variables here
 # launch-prefix=<not set>
 # list-executables-in-path=no
 
 # anchor=center
 # x-margin=0
 # y-margin=0
-# lines=15
+lines=10
 # width=30
 # tabs=8
 # horizontal-pad=40
@@ -45,13 +45,13 @@ font=Monospace:size=16
 # match-workers=<number of logical CPUs>
 
 [colors]
-background=1A1B26ff
-text=A9B1D6ff
-match=2AC3DEff
-selection=444B6Aff
-selection-text=CBCCD1ff
-selection-match=2AC3DEff
-border=A9B1D6ff
+background=191724ff
+text=e0def4ff
+match=9ccfd8ff
+selection=26233aff
+selection-text=908caaff
+selection-match=ebbcbaff
+border=9ccfd8ff
 
 [border]
 width=1
diff --git a/hosts/cityseventeen/users/arturm/configs/git/gitconfig b/hosts/cityseventeen/users/arturm/configs/git/gitconfig
index 73dded2..0b6a5d6 100644
--- a/hosts/cityseventeen/users/arturm/configs/git/gitconfig
+++ b/hosts/cityseventeen/users/arturm/configs/git/gitconfig
@@ -1,110 +1,110 @@
 [alias]
-a=add
-aa=add .
-aliases=! f(){ TOP=$(expr $(grep -n "^\\\\[alias" ~/.gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n "^\\\\[" ~/.gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM=$(expr $LINE_NUMBER - 2 ) && break; done; sed -n "${TOP},${BOTTOM}p" ~/.gitconfig; }; f | sed -e 's|^  ||'
-ap=add -p
-b=! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'
-bD=branch -D
-ba=branch -a
-bc=branch -c
-bd=branch -d
-br=branch -r
-c=! git commit --verbose; git push
-ca=! git c --amend
-cf=! git commit --verbose; git push --force
-ch=switch -C
-change=switch -C
-cl=clone
-cm=commit -m
-co=checkout 
-cp=cherry-pick  ; usually abusive; sometimes necessary
-create=! git bc
-d=diff
-dc=diff --cached
-ds=diff --stat
-expire=! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now
-f=fetch
-fe=fetch
-filelog=log --patch
-find=! git ls-files | grep -i
-fl=log --patch
-fp=fetch --prune ; removes branches not in upstream
-gr=grep -Ii
-grep=grep -Ii
-greproot=! git grr
-grr=! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f
-invert=revert
-l=log --oneline --graph --decorate --parents
-lasttag=describe --tags --abbrev=0
-ll=log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
-lref=log --oneline --graph --decorate --parents --reflog
-ls=log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
-lt=describe --tags --abbrev=0
-mailmap=! f(){ printf \"$(git config user.name) <$(git config user.email)> <${1}>\" > mailmap; git filter-repo --force --mailmap mailmap; }; f
-one=log -1  ; no input displays HEAD
-pd=push -d
-pf=push --force
-pl=pull
-pp=pull --prune ; removes branches not in upstream
-pr=pull --rebase ; rebases commits onto upstream
-ps=push
-pt=! f(){ git push $1 tag $2; }; f
-r=rebase
-ra=rebase --skip
-rc=rebase --continue
-re=restore
-ref=reflog
-ri=rebase --interactive
-rm=rm -r
-rmf=! git rm --force
-rq=rebase --quit
-rs=rebase --abort
-sh=show
-st=status
-sw=switch   ; new checkout - only switching branch w/o restoring worktree
-sync=! git fe upstream; git rebase upstream/main; git push
-t=tag
-td=tag --delete
-un=restore --staged --worktree
-uncommit=switch -C
-undo=restore --staged --worktree
-undo-specific=! f(){ git restore --source=\"$1\" $2; }; f
-undo-stage=restore
-undo-unstaged=restore
-undo-work=restore --staged --worktree
-undo-wt=restore --staged --worktree
-unstage=restore --staged
-wa=! f(){ git worktree add ../$1 $1; }; f
-wc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone $1 $BRANCH; }; f
-wcreate=! git wc
-wmv=worktree move
-wnew=! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f
-wr=worktree remove
-wrm=! git wr
-wsc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f
-wshallow=! git wsc
+a = "add"
+aa = "add ."
+aliases = "! f(){ TOP=$(expr $(grep -n "^\\\\[alias" ~/.gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n "^\\\\[" ~/.gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM= $(expr $LINE_NUMBER - 2 ) && break; done; sed -n "${TOP},${BOTTOM}p" ~/.gitconfig; }; f | sed -e 's|^  ||'"
+ap = "add -p"
+b = "! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'"
+bD = "branch -D"
+ba = "branch -a"
+bc = "branch -c"
+bd = "branch -d"
+br = "branch -r"
+c = "! git commit --verbose; git push"
+ca = "! git c --amend"
+cf = "! git commit --verbose; git push --force"
+ch = "switch -C"
+change = "switch -C"
+cl = "clone"
+cm = "commit -m"
+co = "checkout "
+cp = "cherry-pick  ; usually abusive; sometimes necessary"
+create = "! git bc"
+d = "diff"
+dc = "diff --cached"
+ds = "diff --stat"
+expire = "! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now"
+f = "fetch"
+fe = "fetch"
+filelog = "log --patch"
+find = "! git ls-files | grep -i"
+fl = "log --patch"
+fp = "fetch --prune ; removes branches not in upstream"
+gr = "grep -Ii"
+grep = "grep -Ii"
+greproot = "! git grr"
+grr = "! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f"
+invert = "revert"
+l = "log --oneline --graph --decorate --parents"
+lasttag = "describe --tags --abbrev=0"
+ll = "log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat"
+lref = "log --oneline --graph --decorate --parents --reflog"
+ls = "log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short"
+lt = "describe --tags --abbrev=0"
+mailmap = "! f(){ printf \"$(git config user.name) <$(git config user.email)> <${1}>\" > mailmap; git filter-repo --force --mailmap mailmap; }; f"
+one = "log -1  ; no input displays HEAD"
+pd = "push -d"
+pf = "push --force"
+pl = "pull"
+pp = "pull --prune ; removes branches not in upstream"
+pr = "pull --rebase ; rebases commits onto upstream"
+ps = "push"
+pt = "! f(){ git push $1 tag $2; }; f"
+r = "rebase"
+ra = "rebase --skip"
+rc = "rebase --continue"
+re = "restore"
+ref = "reflog"
+ri = "rebase --interactive"
+rm = "rm -r"
+rmf = "! git rm --force"
+rq = "rebase --quit"
+rs = "rebase --abort"
+sh = "show"
+st = "status"
+sw = "switch   ; new checkout - only switching branch w/o restoring worktree"
+sync = "! git fe upstream; git rebase upstream/main; git push"
+t = "tag"
+td = "tag --delete"
+un = "restore --staged --worktree"
+uncommit = "switch -C"
+undo = "restore --staged --worktree"
+undo-specific = "! f(){ git restore --source=\"$1\" $2; }; f"
+undo-stage = "restore"
+undo-unstaged = "restore"
+undo-work = "restore --staged --worktree"
+undo-wt = "restore --staged --worktree"
+unstage = "restore --staged"
+wa = "! f(){ git worktree add ../$1 $1; }; f"
+wc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone $1 $BRANCH; }; f"
+wcreate = "! git wc"
+wmv = "worktree move"
+wnew = "! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f"
+wr = "worktree remove"
+wrm = "! git wr"
+wsc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f"
+wshallow = "! git wsc"
 
 [branch]
-autosetuprebase=always
+autosetuprebase = "always"
 
 [color]
-branch=auto
-diff=auto
-status=auto
+branch = "auto"
+diff = "auto"
+status = "auto"
 
 [commit]
-gpgsign=true
+gpgsign = "true"
 
 [gpg]
-format=ssh
+format = "ssh"
 
 [user]
-email=amad@atl.tools
-name=Artur Manuel
-signingKey=~/.ssh/id_ed25519.pub
+email = "amad@atl.tools"
+name = "Artur Manuel"
+signingKey = "~/.ssh/id_ed25519.pub"
 
 [init]
 defaultBranch = "main"
 
 [credential]
-helper = "git-credential-libsecret"
\ No newline at end of file
+helper ="git-credential-libsecret"
\ No newline at end of file
diff --git a/hosts/cityseventeen/users/arturm/configs/mako/config b/hosts/cityseventeen/users/arturm/configs/mako/config
index 470fc74..c2fe7aa 100644
--- a/hosts/cityseventeen/users/arturm/configs/mako/config
+++ b/hosts/cityseventeen/users/arturm/configs/mako/config
@@ -1,7 +1,10 @@
-font=monospace 15
+font=monospace 13
 width=450
 height=220
-text-color=#A9B1D6ff
-background-color=#16161Eff
-border-color=#0DB9D7ff
-border-size=1
\ No newline at end of file
+text-color=#e0def4ff
+background-color=#191724ff
+border-color=#9ccfd8ff
+border-size=1
+
+[mode=do-not-disturb]
+invisible=1
\ No newline at end of file
diff --git a/hosts/cityseventeen/users/arturm/configs/niri/config.kdl b/hosts/cityseventeen/users/arturm/configs/niri/config.kdl
index 8beeef7..d5e6323 100644
--- a/hosts/cityseventeen/users/arturm/configs/niri/config.kdl
+++ b/hosts/cityseventeen/users/arturm/configs/niri/config.kdl
@@ -190,8 +190,8 @@ layout {
         // off
 
         width 1
-        active-color "#b4f9f8"
-        inactive-color "#16161e"
+        active-color "#9ccfd8"
+        inactive-color "#191724"
 
         // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
         // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
@@ -518,6 +518,6 @@ binds {
 }
 
 cursor {
-    xcursor-theme "Simp1e-Tokyo-Night"
+    xcursor-theme "BreezeX-RosePine-Linux"
     xcursor-size 24
-}
+}
\ No newline at end of file
diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py
index 2d88006..812c99c 100644
--- a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py
+++ b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py
@@ -2,26 +2,26 @@ from theme import load_theme
 
 config.load_autoconfig()
 
-tokyo_night = {
-    "base00": "#1a1b26",
-    "base01": "#16161e",
-    "base02": "#2f3549",
-    "base03": "#444b6a",
-    "base04": "#787c99",
-    "base05": "#a9b1d6",
-    "base06": "#cbccd1",
-    "base07": "#d5d6db",
-    "base08": "#c0caf5",
-    "base09": "#a9b1d6",
-    "base0A": "#0db9d7",
-    "base0B": "#9ece6a",
-    "base0C": "#b4f9f8",
-    "base0D": "#2ac3de",
-    "base0E": "#bb9af7",
-    "base0F": "#f7768e",
+theme = {
+    "base00": "#191724",
+    "base01": "#1f1d2e",
+    "base02": "#26233a",
+    "base03": "#6e6a86",
+    "base04": "#908caa",
+    "base05": "#e0def4",
+    "base06": "#e0def4",
+    "base07": "#524f67",
+    "base08": "#eb6f92",
+    "base09": "#f6c177",
+    "base0A": "#ebbcba",
+    "base0B": "#31748f",
+    "base0C": "#9ccfd8",
+    "base0D": "#c4a7e7",
+    "base0E": "#f6c177",
+    "base0F": "#524f67",
 }
 
-load_theme(c, tokyo_night)
+load_theme(c, theme)
 
 c.colors.webpage.preferred_color_scheme = "dark"
 c.tabs.position = "top"
diff --git a/hosts/cityseventeen/users/arturm/configs/waybar/style.css b/hosts/cityseventeen/users/arturm/configs/waybar/style.css
index 6d35c30..c8cb0f2 100644
--- a/hosts/cityseventeen/users/arturm/configs/waybar/style.css
+++ b/hosts/cityseventeen/users/arturm/configs/waybar/style.css
@@ -1,24 +1,24 @@
-@define-color base00 #1A1B26;
-@define-color base01 #16161E;
-@define-color base02 #2F3549;
-@define-color base03 #444B6A;
-@define-color base04 #787C99;
-@define-color base05 #A9B1D6;
-@define-color base06 #CBCCD1;
-@define-color base07 #D5D6DB;
-@define-color base08 #C0CAF5;
-@define-color base09 #A9B1D6;
-@define-color base0A #0DB9D7;
-@define-color base0B #9ECE6A;
-@define-color base0C #B4F9F8;
-@define-color base0D #2AC3DE;
-@define-color base0E #BB9AF7;
-@define-color base0F #F7768E;
+@define-color base00 #191724;
+@define-color base01 #1f1d2e;
+@define-color base02 #26233a;
+@define-color base03 #6e6a86;
+@define-color base04 #908caa;
+@define-color base05 #e0def4;
+@define-color base06 #e0def4;
+@define-color base07 #524f67;
+@define-color base08 #eb6f92;
+@define-color base09 #f6c177;
+@define-color base0A #ebbcba;
+@define-color base0B #31748f;
+@define-color base0C #9ccfd8;
+@define-color base0D #c4a7e7;
+@define-color base0E #f6c177;
+@define-color base0F #524f67;
 
 * {
     color: @base05;
     font-family: monospace;
-    font-size: 17px;
+    font-size: 15px;
     border-radius: 0px;
     border: none;
 }
@@ -36,3 +36,7 @@ window#waybar {
     color: @base0D;
     font-size: 24px;
 }
+
+button {
+    padding: 8px 12px;
+}
diff --git a/hosts/cityseventeen/users/arturm/default.nix b/hosts/cityseventeen/users/arturm/default.nix
index 2fde903..90f5fdc 100644
--- a/hosts/cityseventeen/users/arturm/default.nix
+++ b/hosts/cityseventeen/users/arturm/default.nix
@@ -17,7 +17,7 @@
       "L+ %h/.config/waybar - - - - ${./configs/waybar}"
       "L+ %h/.face.icon - - - - ${./.face.icon}"
       "L+ %h/.gitconfig - - - - ${./configs/git/gitconfig}"
-      "L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
+      # "L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
     ];
     packages = builtins.attrValues {
       inherit (pkgs)
@@ -31,16 +31,15 @@
         nautilus
         librewolf
         playerctl
-        geary
+        evolution
         qutebrowser
-        mako
         gh
         fuzzel
         foot
         signal-desktop
         dino
         polari
-        vesktop
+        # vesktop
         ;
       inherit (inputs.hetch.packages.${pkgs.system}) hetch;
     };
diff --git a/hosts/cityseventeen/users/default.nix b/hosts/cityseventeen/users/default.nix
new file mode 100644
index 0000000..c76e5da
--- /dev/null
+++ b/hosts/cityseventeen/users/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./arturm
+  ];
+}
diff --git a/hosts/shared/default.nix b/hosts/shared/default.nix
index c27faae..2e5709f 100644
--- a/hosts/shared/default.nix
+++ b/hosts/shared/default.nix
@@ -1,7 +1,7 @@
-{ lib, ... }:
+{ ... }:
+let
+  listFiles = dir: builtins.attrNames (builtins.readDir dir);
+in
 {
-  imports = lib.pipe (builtins.readDir ./.) [
-    (lib.filterAttrs (n: _v: n != "default.nix" && lib.last (lib.stringToCharacters n) != "~"))
-    (lib.mapAttrsToList (n: _v: ./${n}))
-  ];
+  imports = map (n: ./${n}) (builtins.filter (n: n != "default.nix") (listFiles ./.));
 }
diff --git a/hosts/shared/mako.nix b/hosts/shared/mako.nix
new file mode 100644
index 0000000..9bad420
--- /dev/null
+++ b/hosts/shared/mako.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.alqueva.programs.mako;
+
+  inherit (lib.options) mkEnableOption mkPackageOption;
+  inherit (lib.modules) mkIf;
+in
+{
+  options.alqueva.programs.mako = {
+    enable = mkEnableOption "mako";
+    package = mkPackageOption pkgs "mako" { };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    systemd.packages = [ cfg.package ];
+  };
+}