cityseventeen: change font from anakron to kirsch

flake.lock

@@ -24,7 +24,7 @@
       "inputs": {
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1740194653,
@@ -40,6 +40,33 @@
         "type": "github"
       }
     },
+    "bited-utils": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-parts": [
+          "kirsch",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "kirsch",
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1745040072,
+        "narHash": "sha256-taSmUS6ruZCxIGnBGCB3LqVHf03wrLwH914IEruer+E=",
+        "owner": "molarmanful",
+        "repo": "bited-utils",
+        "rev": "e57c98bf4dc07bd52df3c5c51347d41f680dedbd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "molarmanful",
+        "repo": "bited-utils",
+        "type": "github"
+      }
+    },
     "chaotic": {
       "inputs": {
         "fenix": "fenix",
@@ -49,11 +76,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1744662018,
+        "lastModified": 1745114215,
-        "narHash": "sha256-xfHUAfPVYp+zD0sOg9KMNEHBj8O06G7xHgDgNQ2Q1lw=",
+        "narHash": "sha256-zyWOGf4xefpjcuPFHkWADYioyZ/XJcwyTMoj3/sfcQ0=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "6318c913eb1b29236050bbb0202d957c6ae97191",
+        "rev": "85b088ad128e6609f3a672f0e0cd1c76b058227c",
         "type": "github"
       },
       "original": {
@@ -63,23 +90,21 @@
         "type": "github"
       }
     },
-    "disko": {
+    "devshell": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1744145203,
+        "lastModified": 1741473158,
-        "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=",
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
-        "owner": "nix-community",
+        "owner": "numtide",
-        "repo": "disko",
+        "repo": "devshell",
-        "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "numtide",
-        "repo": "disko",
+        "repo": "devshell",
         "type": "github"
       }
     },
@@ -114,11 +139,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1744618085,
+        "lastModified": 1745044353,
-        "narHash": "sha256-+VdhZsIiIDtyOL88c4U/Os1PsCMLOCyScIeWL4hxJRM=",
+        "narHash": "sha256-OoGR5ppBq2nlbGDkCrg4slQ4gU5joYbc9GnQz4R6EOQ=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "a85d390a5607188dca2dbc39b5b37571651d69ce",
+        "rev": "936f22bba519112ec47aa17a9b3304c8a3dabe54",
         "type": "github"
       },
       "original": {
@@ -231,7 +256,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -320,11 +345,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744659400,
+        "lastModified": 1745071558,
-        "narHash": "sha256-q0wwsR/hvOjj1G8ogdudX5cU0IE/Vgvgjo9g9OpQv5U=",
+        "narHash": "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5a096a8822cb98584c5dc4f2616dcd5ed394bfd7",
+        "rev": "9676e8a52a177d80c8a42f66566362a6d74ecf78",
         "type": "github"
       },
       "original": {
@@ -342,11 +367,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744648917,
+        "lastModified": 1745044299,
-        "narHash": "sha256-xtBc0YMCP/x3+3iqnfdd4d9qEHvxQsGHamhhlegsGFE=",
+        "narHash": "sha256-/A/xjRjJY9CGcgOHQ5kTxV7VIJxac86i6NQ5CejMzZc=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "66c4c9dccd26330ebb0e91aa6ba89ca8835dfdc5",
+        "rev": "c7ff1a4578eb11ef84288941aa23e385b6fde635",
         "type": "github"
       },
       "original": {
@@ -355,6 +380,32 @@
         "type": "github"
       }
     },
+    "kirsch": {
+      "inputs": {
+        "bited-utils": "bited-utils",
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1745118045,
+        "narHash": "sha256-c5ppxEk9zBIdWfjSigCp3W/1k0WkOteJicsCt/gWhks=",
+        "owner": "molarmanful",
+        "repo": "kirsch",
+        "rev": "ab53421801bead99c04e85124b5c0059165240ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "molarmanful",
+        "ref": "main",
+        "repo": "kirsch",
+        "type": "github"
+      }
+    },
     "mnw": {
       "locked": {
         "lastModified": 1735150973,
@@ -423,11 +474,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1744932701,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
@@ -495,11 +546,27 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1722073938,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
@@ -509,7 +576,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1715266358,
         "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@@ -525,7 +592,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1737370608,
         "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
@@ -563,9 +630,9 @@
         "flake-utils": "flake-utils",
         "mnw": "mnw",
         "nil": "nil",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "nmd": "nmd",
-        "systems": "systems_2"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1740145445,
@@ -612,11 +679,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744832596,
+        "lastModified": 1745130883,
-        "narHash": "sha256-R/OSvaIpjmWjnoAZF1UUwMI2XSnHmg/mJ0orN4ub7V8=",
+        "narHash": "sha256-HwFPiG5crQqr8cR6UIXqHdeXjoPJip+QgKmiHQhec+g=",
         "ref": "main",
-        "rev": "a7a31dead0277b88e84bb7ee56d13a0fd50336ac",
+        "rev": "1917a8636a0c6eb4992bb675c8dbd804e5efbc0a",
-        "revCount": 122,
+        "revCount": 124,
         "type": "git",
         "url": "https://copeberg.org/amadaluzia/pankomacs.git"
       },
@@ -630,41 +697,24 @@
       "inputs": {
         "alqages": "alqages",
         "chaotic": "chaotic",
-        "disko": "disko",
         "flake-parts": "flake-parts",
         "git-hooks-nix": "git-hooks-nix",
         "hetch": "hetch",
-        "nixpkgs": "nixpkgs_3",
+        "kirsch": "kirsch",
+        "nixpkgs": "nixpkgs_4",
         "painless-neovim": "painless-neovim",
         "pankomacs": "pankomacs",
-        "rosepine-qutebrowser": "rosepine-qutebrowser",
         "wallpkgs": "wallpkgs"
       }
     },
-    "rosepine-qutebrowser": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732097538,
-        "narHash": "sha256-YP+Y00Ag69eO8Xx2adAEVzHYp3DuvfSfHnPh7lUXhss=",
-        "owner": "aalbegr",
-        "repo": "qutebrowser-rose-pine",
-        "rev": "4662474db0fa6b52985f9e9ea9c3eca16a721b5b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aalbegr",
-        "repo": "qutebrowser-rose-pine",
-        "type": "github"
-      }
-    },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1744539868,
+        "lastModified": 1745002274,
-        "narHash": "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=",
+        "narHash": "sha256-W2Na1BK8Kq8eO8mlUmp+NGq7H5CPDpgzaGMpmyBMkas=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "8365cf853e791c93fa8bc924f031f11949bb1a3c",
+        "rev": "a09a5502c3713e4287354b19973ea805d31ebcbc",
         "type": "github"
       },
       "original": {
@@ -698,6 +748,20 @@
       }
     },
     "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "id": "systems",
+        "type": "indirect"
+      }
+    },
+    "systems_2": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -712,7 +776,22 @@
         "type": "github"
       }
     },
-    "systems_2": {
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

flake.nix

@@ -1,5 +1,20 @@
 {
   description = "Alqueva is the largest lake in Portugal.";
+  outputs =
+    inputs@{ flake-parts, ... }:
+    flake-parts.lib.mkFlake
+      {
+        inherit inputs;
+      }
+      {
+        systems = [ "x86_64-linux" ];
+        imports = [
+          ./hosts
+          ./shells
+          ./lib
+        ];
+      };
+
   inputs = {
     nixpkgs = {
       type = "github";
@@ -25,12 +40,6 @@
       repo = "git-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    disko = {
-      type = "github";
-      owner = "nix-community";
-      repo = "disko";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     wallpkgs = {
       type = "github";
       owner = "notashelf";
@@ -42,12 +51,6 @@
       ref = "main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    rosepine-qutebrowser = {
-      type = "github";
-      owner = "aalbegr";
-      repo = "qutebrowser-rose-pine";
-      flake = false;
-    };
     painless-neovim = {
       type = "git";
       url = "https://copeberg.org/amadaluzia/painless-neovim.git";
@@ -65,19 +68,15 @@
       url = "https://copeberg.org/amadaluzia/alqages.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    kirsch = {
+      type = "github";
+      owner = "molarmanful";
+      repo = "kirsch";
+      ref = "main";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-parts.follows = "flake-parts";
+      };
     };
-  outputs =
-    inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake
-      {
-        inherit inputs;
-      }
-      {
-        systems = [ "x86_64-linux" ];
-        imports = [
-          ./hosts
-          ./shells
-          ./lib
-        ];
   };
 }

hosts/cityseventeen/fonts.nix

@@ -1,20 +1,25 @@
-{ pkgs, ... }:
+{
+  inputs,
+  system,
+  pkgs,
+  ...
+}:
 {
   alqueva.system.fonts = {
     names = {
-      sansSerif = [ "Anakron" ];
+      sansSerif = [ "kirsch" ];
-      monospace = [ "Anakron" ];
+      monospace = [ "kirsch" ];
-      serif = [ "Anakron" ];
+      serif = [ "kirsch" ];
       emoji = [ "Noto Fonts Color Emoji" ];
     };
     packages = {
-      sansSerif = [ pkgs.anakron ];
+      sansSerif = [ inputs.kirsch.packages.${system}.kirsch ];
-      monospace = [ pkgs.anakron ];
+      monospace = [ inputs.kirsch.packages.${system}.kirsch ];
-      serif = [ pkgs.anakron ];
+      serif = [ inputs.kirsch.packages.${system}.kirsch ];
       emoji = [ pkgs.noto-fonts-color-emoji ];
       extra = [
-        pkgs.noto-fonts
         pkgs.nerd-fonts.symbols-only
+        pkgs.noto-fonts
       ];
     };
     enable = true;

hosts/cityseventeen/users/arturm/configs/foot/foot.ini

@@ -1,6 +1,6 @@
 [main]
 pad=12x12
-font=monospace:size=9
+font=monospace:size=12
 
 [colors]
 foreground=e0def4

hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini

@@ -1,5 +1,5 @@
 # output=<not set>
-font=Monospace:size=12
+font=Monospace:size=24
 # dpi-aware=auto
 # use-bold=no
 prompt="󰴈 "

hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py

@@ -25,7 +25,7 @@ def main():
     c.tabs.indicator.width = 0
     c.tabs.title.format = "{audio}{relative_index} | {current_title}"
 
-    c.fonts.default_size = "9pt"
+    c.fonts.default_size = "12pt"
     c.fonts.default_family = "sans-serif"
 
     c.url.start_pages = "about:blank"

hosts/cityseventeen/users/arturm/configs/waybar/config.jsonc

@@ -6,11 +6,6 @@
   "modules-center": ["niri/workspaces"],
   "modules-right": ["tray", "wireplumber", "clock"],
   "reload_style_on_change": true,
-  "custom/nixos": {
-    "format": "󱄅",
-    "on-click": "rofi -show drun",
-    "tooltip": false,
-  },
   "mpris": {
     "format": "{player_icon} {dynamic}",
     "format-paused": "{status_icon} <i>{dynamic}</i>",

hosts/cityseventeen/users/arturm/configs/waybar/style.css

@@ -18,7 +18,7 @@
 * {
     color: @base05;
     font-family: monospace;
-    font-size: 9pt;
+    font-size: 12pt;
     border-radius: 0px;
     border: none;
 }
@@ -32,11 +32,6 @@ window#waybar {
     padding: 0px 10px;
 }
 
-#custom-nixos {
-    color: @base0D;
-    font-size: 18px;
-}
-
 button {
     padding: 4px 10px;
 }

hosts/cityseventeen/users/arturm/default.nix

@@ -26,7 +26,6 @@
         mpv
         imv
         amberol
-        element-desktop
         nicotine-plus-libadwaita
         nautilus
         librewolf
@@ -38,6 +37,7 @@
         dino
         polari
         showtime
+        fractal
         # vesktop
         ;
       inherit (inputs.hetch.packages.${pkgs.system}) hetch;

hosts/default.nix

@@ -11,14 +11,10 @@ in
     nixosConfigurations = mkHosts {
       cityseventeen = {
         system = "x86_64-linux";
-        extraModules = [
-          inputs.disko.nixosModules.disko
-        ];
       };
       micronix = {
         system = "x86_64-linux";
         extraModules = [
-          inputs.disko.nixosModules.disko
           inputs.chaotic.nixosModules.default
         ];
       };