feat(solterra): redo rice

README.md

@@ -17,9 +17,7 @@ A very big lake in Portugal.
 While I think that posting a riced out system will cause people to ignore the
 big warning shouting at them, I feel like showing off. :^)
 
-<video src="/amadaluzia/alqueva/raw/branch/main/media/rice.mp4" controls="">
+![Cool rice I guess](./media/rice.png)
-    <strong>Does your browser not have video tag support?</strong>
-</video>
 
 ### Credits
 

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": ["nixpkgs"]
       },
       "locked": {
-        "lastModified": 1740228693,
+        "lastModified": 1740578800,
-        "narHash": "sha256-LNx8NuSZnvf4owiuJrEHSyOY/5G7KxQelvo6OaKn+VM=",
+        "narHash": "sha256-WBAdFAee2LbGsAK7EYSATXNm0Dxthm48KwE7WLGzc4E=",
         "ref": "refs/heads/master",
-        "rev": "607e6a486d98b695904cd00acd79f16e9351f8b0",
+        "rev": "ed5ab6c568033780999e2bd2cc353f502236053a",
-        "revCount": 4,
+        "revCount": 5,
         "type": "git",
         "url": "https://codeberg.org/amadaluzia/alqages.git"
       },
@@ -47,11 +47,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1740408177,
+        "lastModified": 1740937018,
-        "narHash": "sha256-baFhGvCncDj3zJlDODJESVE83lV5+tGOrvgwQczzp84=",
+        "narHash": "sha256-R4/+Vr4LpQWHwzZoM0fTyKKC1mGNF/NVHzIe6PqkJsY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "62e2d6c89e4310c7cb56ee5f6bbdc280072dd082",
+        "rev": "4ab66e175e54084ca831e2eb3e24fbb048f9cff0",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1740292204,
+        "lastModified": 1740551776,
-        "narHash": "sha256-ZbptkmqaenRhUKsodSEcVzBw+kXZ8DcZpTGutU1HEiI=",
+        "narHash": "sha256-CkcCb2hGSL1owuZpjuNB6UQzlyaXgvuRXmjY6jLqjPc=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "93d59130e3fc121f927c03e406142df8d544b901",
+        "rev": "07a730bc80e8a4106df5b2341aa5602a240ee112",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
         "nixpkgs-lib": ["nixpkgs"]
       },
       "locked": {
-        "lastModified": 1738453229,
+        "lastModified": 1740872218,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
         "nixpkgs": ["nixpkgs"]
       },
       "locked": {
-        "lastModified": 1737465171,
+        "lastModified": 1740915799,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732",
         "type": "github"
       },
       "original": {
@@ -314,11 +314,11 @@
         "nixpkgs": ["chaotic", "nixpkgs"]
       },
       "locked": {
-        "lastModified": 1740318342,
+        "lastModified": 1740494361,
-        "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=",
+        "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca",
+        "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
         "type": "github"
       },
       "original": {
@@ -333,11 +333,11 @@
         "nixpkgs": ["chaotic", "nixpkgs"]
       },
       "locked": {
-        "lastModified": 1740269380,
+        "lastModified": 1740553144,
-        "narHash": "sha256-l+zB5a39MJp4Olc4YxP7GChFXmNZIhoXaiSS6QRXa9o=",
+        "narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "11ba89d13831cb399194310304fffb025081c674",
+        "rev": "14a125ea5c440c57310dc1bb3acf7641078d783a",
         "type": "github"
       },
       "original": {
@@ -402,11 +402,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740367490,
+        "lastModified": 1740828860,
-        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+        "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+        "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
         "type": "github"
       },
       "original": {
@@ -474,11 +474,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1740367490,
+        "lastModified": 1741010256,
-        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
         "type": "github"
       },
       "original": {
@@ -588,11 +588,11 @@
         "parts": "parts"
       },
       "locked": {
-        "lastModified": 1740533699,
+        "lastModified": 1740841259,
-        "narHash": "sha256-peolARY44pIb2AWgSvnybt0DQDDdoZ60XhGTMlKNyiE=",
+        "narHash": "sha256-hAO+msbKCMa/VtXyYf4yOY/XGevat1sOJkk6+WTXFlU=",
         "ref": "main",
-        "rev": "86f5ab3d42a8d7b8acc93591b000aa9e92464eb7",
+        "rev": "4b6be377dd7b9a2d207524d361a24d621521cf7d",
-        "revCount": 91,
+        "revCount": 93,
         "type": "git",
         "url": "https://codeberg.org/amadaluzia/pankomacs.git"
       },
@@ -655,11 +655,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1740259966,
+        "lastModified": 1740470570,
-        "narHash": "sha256-FJU9qiELvmJzNRr7wLFtJUy4bSk1PNqsRB7wOQz6zUE=",
+        "narHash": "sha256-iYjLS4jy/IJScOHZfbQ31vkrS5tl0bjXtzYP4XKA2Pc=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "9df88ff0f65f8de9f73684d2bb96e1b62669d083",
+        "rev": "89255449982473939a4f8ee954512d339225c182",
         "type": "github"
       },
       "original": {

hosts/solterra/default.nix

@@ -37,6 +37,11 @@
         options = "eurosign:e,ctrl:nocaps";
       };
 
+      displayManager.sddm = {
+        enable = true;
+        wayland.enable = true;
+      };
+
       udev.packages = [
         pkgs.android-udev-rules
       ];

hosts/solterra/fonts.nix

@@ -1,16 +1,14 @@
-{pkgs, ...}: let
+{pkgs, ...}: {
-  comfy = pkgs.iosevka-comfy;
-in {
   alqueva.system.fonts = {
     names = {
-      sansSerif = ["Iosevka Comfy"];
+      sansSerif = ["Iosevka"];
-      monospace = ["Iosevka Comfy Fixed"];
+      monospace = ["Iosevka"];
       serif = ["IBM Plex Serif"];
       emoji = ["Twitter Color Emoji"];
     };
     packages = {
-      sansSerif = [comfy.comfy];
+      sansSerif = [pkgs.inter];
-      monospace = [comfy.comfy-fixed];
+      monospace = [pkgs.iosevka];
       serif = [pkgs.ibm-plex];
       emoji = [pkgs.twemoji-color-font];
       extra = [

hosts/solterra/users/amadaluzia/configs/niri/config.kdl

@@ -219,7 +219,7 @@ prefer-no-csd
 // You can change the path where screenshots are saved.
 // A ~ at the front will be expanded to the home directory.
 // The path is formatted with strftime(3) to give you the screenshot date and time.
-screenshot-path "~/Afbeeldingen/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+screenshot-path "~/Bilder/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
 
 // You can also set this to null to disable saving screenshots to disk.
 // screenshot-path null
@@ -239,27 +239,6 @@ animations {
 // Find more information on the wiki:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
 
-layer-rule {
-    shadow {
-        on
-        softness 10
-        spread 1
-        draw-behind-window true
-        color "#00000030"
-    }
-}
-
-window-rule {
-    match is-floating=true
-    shadow {
-        on
-        softness 20
-        spread 10
-        draw-behind-window true
-        color "#00000040"
-    }
-}
-
 // Work around WezTerm's initial configure bug
 // by setting an empty default-column-width.
 window-rule {

hosts/solterra/users/amadaluzia/configs/waybar/config.jsonc

@@ -1,15 +1,21 @@
 {
-  "position": "top",
+  "position": "bottom",
   "height": 0,
-  "spacing": 16,
+  "modules-left": ["custom/nixos", "niri/workspaces"],
-  "modules-left": ["mpris"],
+  "modules-center": ["mpris"],
-  "modules-center": ["niri/workspaces"],
+  "modules-right": ["tray", "wireplumber", "clock"],
-  "modules-right": ["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>",
+    "format-stopped": "whitespace",
     "interval": 1,
-    "dynamic-len": 52,
+    "dynamic-len": 64,
     "player-icons": {
       "default": "▶",
       "mpv": "🎵",
@@ -29,4 +35,7 @@
     "on-click": "helvum",
     "format-icons": ["", "", ""],
   },
+  "tray": {
+    "icon-size": 18,
+  },
 }

hosts/solterra/users/amadaluzia/configs/waybar/style.css

@@ -17,37 +17,57 @@
 
 * {
     all: unset;
-    font-size: 15px;
+    color: @base05;
-    color: @base06;
+    min-height: 0px;
 }
 
 window#waybar {
     background: @base00;
+    font-size: 17px;
 }
 
 tooltip {
-    background: @base01;
+    background: @base00;
-}
-
-.modules-left,
-.modules-right {
-    background: @base01;
-    padding: 0px 8px;
-}
-
-.modules-center {
-    background: @base01;
 }
 
 #workspaces button {
+    background: @base00;
     padding: 6px 16px;
-    transition: 0.2s;
+    transition: 0.2s background;
+}
+
+.modules-right label,
+#tray image {
+    padding-right: 12px;
 }
 
 #workspaces button:hover {
-    padding: 6px 24px;
+    background: @base01;
 }
 
 #workspaces button.focused {
     background: @base02;
 }
+
+#custom-nixos {
+    padding: 0px 12px;
+    font-size: 24px;
+    color: @base08;
+}
+
+menu {
+    background: @base00;
+    color: @base05;
+    padding: 5px;
+}
+
+menuitem {
+    background: @base01;
+    margin: 2px;
+    padding: 5px 10px;
+    padding-right: 20px;
+}
+
+menuitem label {
+    font-size: 14px;
+}

hosts/solterra/users/amadaluzia/default.nix

@@ -44,6 +44,7 @@
         foot
         signal-desktop
         dino
+        polari
         ;
       inherit (inputs.hetch.packages.${pkgs.system}) hetch;
       inherit (inputs.gimp-nixpkgs.legacyPackages.${pkgs.system}) gimp;

shells/default.nix

@@ -30,7 +30,21 @@
     };
 
     devShells = {
-      default = config.pre-commit.devShell;
+      default = let
+        inherit (config) pre-commit;
+      in
+        pkgs.mkShell {
+          name = "pre-commit-shell";
+          shellHook = pre-commit.installationScript;
+          packages =
+            pre-commit.settings.enabledPackages
+            ++ [
+              pre-commit.settings.package
+              pkgs.ruff-lsp
+              pkgs.bash-language-server
+              pkgs.vscode-langservers-extracted
+            ];
+        };
       haskell = pkgs.mkShell {
         name = "haskell";
         packages = builtins.attrValues {