tasko(nixos): batis al HEAD de 25.05

cardano-node estas nuntempe rompita sur 25.05, do aparta enigaĵo necesa
por NixOS 24.11 por tiuj nodoj uzi.

flake.lock

@@ -922,14 +922,15 @@
         "nixpkgs": [
           "nixpkgsUnstable"
         ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable",
+        "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1739756353,
+        "lastModified": 1748862567,
-        "narHash": "sha256-UMRlUlCXyIG9jVgDQtKCyDpgjTIHkadVo0DIOayDH6U=",
+        "narHash": "sha256-tRJfGSRM7VEkTkM0l6n5bwPKjIrs/+OuQDjt4s83iXI=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "0d64f87dff6778231ae0288cca71e78e2ab30752",
+        "rev": "7a665f77eb85b55495d0027dc20701818fd7aa53",
         "type": "github"
       },
       "original": {
@@ -1560,11 +1561,11 @@
     "flake-compat_13": {
       "flake": false,
       "locked": {
-        "lastModified": 1717312683,
+        "lastModified": 1746162366,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+        "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
         "owner": "nix-community",
         "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+        "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
         "type": "github"
       },
       "original": {
@@ -4696,6 +4697,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-24_11": {
+      "locked": {
+        "lastModified": 1748421225,
+        "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-regression": {
       "locked": {
         "lastModified": 1643052045,
@@ -4761,11 +4778,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1739624908,
+        "lastModified": 1748421225,
-        "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
+        "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
+        "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
         "type": "github"
       },
       "original": {
@@ -4873,15 +4890,16 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1741568122,
+        "lastModified": 1749285348,
-        "narHash": "sha256-nShdXNkaoBi4xOpTDe9cSnr86xCeYRLpoLSA3fFXb7w=",
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d98193828b0d5f46013fbfa7cc3b3bfb6266bc0f",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -5277,16 +5295,16 @@
     },
     "nixpkgs_33": {
       "locked": {
-        "lastModified": 1741445498,
+        "lastModified": 1749857119,
-        "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
+        "narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
+        "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -5758,7 +5776,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
         "lastModified": 1726755133,
@@ -5783,12 +5801,34 @@
         "iohkNix": "iohkNix_6",
         "nix": "nix_4",
         "nixpkgs": "nixpkgs_33",
+        "nixpkgs-24_11": "nixpkgs-24_11",
         "nixpkgsUnstable": "nixpkgsUnstable",
         "ragenix": "ragenix",
         "utils": "utils_12"
       }
     },
     "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "cosmicDesktop",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748832016,
+        "narHash": "sha256-TQSaFa1wWJr6GOs+K8lecK4AKKr8k6mwxHIPCOmVkgs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "7ec2ea005b600dac9436a7c5c6b66d960cbfcea2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
       "inputs": {
         "nixpkgs": [
           "ragenix",

flake.nix

@@ -11,8 +11,9 @@
     daedalus.url = github:input-output-hk/daedalus/?ref=6.0.2;
     iohkNix.url = github:input-output-hk/iohk-nix/;
     nix.url = github:NixOS/nix/?ref=2.25.3;
-    nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.11;
+    nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-25.05;
-    nixpkgsUnstable.url = github:NixOS/nixpkgs;
+    nixpkgs-24_11.url = github:NixOS/nixpkgs/?ref=nixos-24.11;
+    nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     ragenix = {
       url = github:yaxitech/ragenix;
       inputs.nixpkgs.follows = "nixpkgs";

hosts/brighde/default.nix

@@ -7,7 +7,6 @@
   imports = [
     ../../hardware/lenovo_yoga7i.nix
     ../../profiles/desktopFiona.nix
-    ../../profiles/desktop_common.nix
   ];
 
   # Use the UEFI boot loader.

modules/profiles/starship/craige.toml

@@ -1,31 +1,16 @@
+"$schema" = 'https://starship.rs/config-schema.json'
+
 # Use the color palette
-palette = "dracula"
+palette = 'one_dark'
 
 [aws]
-style = "bold orange"
+style = "color_orange"
-
-[character]
-error_symbol = "[λ:](bold red)"
-success_symbol = "[λ:](bold green)"
 
 [cmd_duration]
-style = "bold yellow"
+style = "color_yellow"
-
-[directory]
-style = "bold green"
-
-[git_branch]
-style = "bold pink"
-
-[git_status]
-style = "bold red"
 
 [hostname]
-style = "bold purple"
+style = "color_purple"
-
-[username]
-format = "[$user]($style) on "
-style_user = "bold cyan"
 
 # Define Dracula color palette
 [palettes.dracula]
@@ -40,3 +25,239 @@ pink = "#ff79c6"
 purple = "#bd93f9"
 red = "#ff5555"
 yellow = "#f1fa8c"
+
+# Sets the colors of the "one_dark" palette.
+[palettes.one_dark]
+mono0 = '#d7dae0' # terminal white, from the One Dark Pro VSCode theme.
+mono1 = '#abb2bf' # syntax_fg.
+mono2 = '#828997'
+mono3 = '#5c6370'
+mono4 = '#3f4451' # terminal black, from the One Dark Pro VSCode theme.
+color_red0 = '#e06c75'
+color_red1 = '#be5046'
+color_green = '#98c379'
+color_yellow = '#e5c07b'
+color_blue = '#61afef'
+color_purple = '#c678dd'
+color_cyan = '#56b6c2'
+color_orange = '#d19a66'
+syntax_fg = '#abb2bf'
+syntax_bg = '#282c34'
+color_bg2 = '#665c54'
+syntax_gutter = '#647382'
+syntax_accent = '#528cff'
+
+# Module that displays the current OS.
+#[os]
+#disabled = false # Disabled by default
+#style = "color_blue"
+#format = '[ $symbol ]($style)'
+
+# Sets custom symbols for each OS.
+#[os.symbols]
+#NixOS = "󱄅"
+
+# Module that displays the current username.
+[username]
+show_always = false
+style_user = "bold fg:color_red0"
+style_root = "bold italic bg:color_red0 fg:syntax_bg"
+format = '[ $user ]($style)'
+
+# Module that displays the current directory.
+[directory]
+style = "fg:color_orange"
+format = "[ $path ]($style)"
+truncation_length = 3
+truncation_symbol = "…/"
+
+# Sets the custom symbols for directories.
+[directory.substitutions]
+"Documents" = "󰈙 "
+"Downloads" = " "
+"Music" = "󰝚 "
+"Pictures" = " "
+"Developer" = "󰲋 "
+
+# Module that displays the current git branch.
+[git_branch]
+symbol = ""
+style = "fg:color_yellow"
+format = '[[ $symbol $branch ](fg:color_yellow)]($style)'
+
+# Module that displays the current git status.
+[git_status]
+style = "bg:color_green"
+format = '[[($all_status$ahead_behind )](fg:color_yellow)]($style)'
+
+# Language specific modules
+[nodejs]
+symbol = ""
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[c]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[dotnet]
+symbol = "󰪮"
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[rust]
+symbol = ""
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[golang]
+symbol = ""
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[php]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[java]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[kotlin]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[haskell]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[python]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[elixir]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[elm]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[gradle]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[julia]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[nim]
+symbol = "󰆥 "
+style = "bg:color_green"
+format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
+
+[scala]
+symbol = " "
+style = "bg:color_green"
+format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
+
+# Module that displays the docker context.
+[docker_context]
+symbol = " "
+style = "bg:mono3"
+format = '[[ $symbol( $context) ](fg:syntax_fg bg:mono3)]($style)'
+
+# Module that fills the space between the left and right segments.
+[fill]
+symbol = " "
+
+# Module that displays the time.
+#[time]
+#disabled = false # Disabled by default
+#use_12hr = true # Disable for 24h format without seconds
+#style = "bg:mono4"
+#format = '[[ 󰥔 $time ](fg:syntax_fg bg:mono4)]($style)'
+
+# Module that displays the battery level and status.
+[battery]
+format = '[$symbol $percentage ]($style)'
+
+# Battery symbols and colors for each threshold.
+[[battery.display]]
+threshold = 10
+style = "bold bg:mono4 fg:color_red1"
+discharging_symbol = "󰁺"
+charging_symbol = "󰢜"
+
+[[battery.display]]
+threshold = 20
+style = "bold bg:mono4 fg:color_red0"
+discharging_symbol = "󰁻"
+charging_symbol = "󰂆"
+
+[[battery.display]]
+threshold = 30
+style = "bold bg:mono4 fg:color_yellow"
+discharging_symbol = "󰁼"
+charging_symbol = "󰂇"
+
+[[battery.display]]
+threshold = 40
+style = "bold bg:mono4 fg:color_yellow"
+discharging_symbol = "󰁽"
+charging_symbol = "󰂈"
+
+[[battery.display]]
+threshold = 50
+style = "bold bg:mono4 fg:color_yellow"
+discharging_symbol = "󰁾"
+charging_symbol = "󰢝"
+
+[[battery.display]]
+threshold = 60
+style = "bold bg:mono4 fg:color_green"
+discharging_symbol = "󰁿"
+charging_symbol = "󰂉"
+
+[[battery.display]]
+threshold = 70
+style = "bold bg:mono4 fg:color_green"
+discharging_symbol = "󰂀"
+charging_symbol = "󰢞"
+
+[[battery.display]]
+threshold = 80
+style = "bold bg:mono4 fg:color_green"
+discharging_symbol = "󰂁"
+charging_symbol = "󰂊"
+
+[[battery.display]]
+threshold = 90
+style = "bold bg:mono4 fg:color_green"
+discharging_symbol = "󰂂"
+charging_symbol = "󰂋"
+
+[[battery.display]]
+style = "bold bg:mono4 fg:color_green"
+discharging_symbol = "󰁹"
+charging_symbol = "󰂅"
+threshold = 100
+
+# New line character
+[character]
+success_symbol = "[λ:](bold fg:color_green)"
+error_symbol = "[λ:](bold fg:color_red1)"
+vimcmd_symbol = '[󰅁](bold fg:syntax_accent)'
+vimcmd_replace_one_symbol = '[󰅁](bold fg:color_purple)'
+vimcmd_replace_symbol = '[󰅁](bold fg:color_purple)'
+vimcmd_visual_symbol = '[󰅁](bold fg:color_yellow)'

modules/roles/desktop/default.nix

@@ -35,7 +35,11 @@ in {
       xorg.libxcb # X C binding
     ];
     fonts.packages = with pkgs; [
-      nerdfonts # Iconic font aggregator, collection, & patcher
+      atkinson-hyperlegible # Typeface designed to offer greater legibility
+      atkinson-monolegible # Mono variant of the Atkinson Hyperlegible typeface
+      nerd-fonts.fantasque-sans-mono # Wibbly-wobbly handwriting-like fuzziness
+      nerd-fonts.fira-mono # Mozilla typeface, dotted zero
+      nerd-fonts.fira-code # Programming ligatures, extension of Fira Mono font, enlarged operators
     ];
     networking = {
       networkmanager.enable = true; # Enables network support via NetworkManager.

modules/roles/desktopCraige/default.nix

@@ -16,11 +16,13 @@ in {
       ffmpeg-full # record, convert and stream audio and video
       gimp # The GNU Image Manipulation Program
       kdePackages.kasts # Kirigami-based podcast player
+      kitty # The fast, feature-rich, GPU based terminal emulator
       mpd # A flexible, powerful daemon for playing music
       ncmpcpp # A featureful ncurses based MPD client inspired by ncmpc
       nvme-cli # NVM-Express user space tooling for Linux
       pandoc # Conversion between documentation formats
       pavucontrol # PulseAudio Volume Control
+      radio-cli # Simple radio CLI written in rust
       siji # An iconic bitmap font based on Stlarch with additional glyphs
       shared-mime-info # A database of common MIME types
       shotwell # Photo organizer
@@ -29,6 +31,7 @@ in {
       termonad # Terminal emulator configurable in Haskell
       texliveFull # TeX Live environment
       tmate # Instant Terminal Sharing
+      toot # Mastodon CLI interface
       tor-browser-bundle-bin # Tor Browser Bundle built by torproject.org
       tuba # Fediverse client
       unzip # An extraction utility for archives compressed in .zip format

outputs.nix

@@ -6,6 +6,7 @@
   daedalus,
   nix,
   nixpkgs,
+  nixpkgs-24_11,
   nixpkgsUnstable,
   ragenix,
   utils,
@@ -35,6 +36,9 @@ in {
         system = "x86_64-linux";
         overlays = [];
       };
+      nodeNixpkgs = {
+        airgead = import nixpkgs-24_11 {};
+      };
     };
     defaults = {pkgs, ...}: {
       imports = [
@@ -70,8 +74,9 @@ in {
       ];
       deployment = {
         tags = ["active"];
-        targetHost = "10.42.0.124";
+        targetHost = "10.69.0.122";
       };
+      roles.desktop.enable = true;
     };
     ceilidh = {
       imports = [
@@ -112,7 +117,7 @@ in {
       ];
       deployment = {
         tags = ["active" "rPi"];
-        targetHost = "10.42.0.204";
+        targetHost = "10.69.0.204";
       };
     };
     eamhair = {
@@ -122,7 +127,7 @@ in {
       ];
       deployment = {
         tags = ["active" "rPi"];
-        targetHost = "10.42.0.205";
+        targetHost = "10.69.0.205";
       };
       services.toxvpn.localip = "10.37.0.205";
     };
@@ -157,7 +162,10 @@ in {
         hosts/sercanto
         ragenix.nixosModules.default
       ];
-      deployment.targetHost = "10.42.0.180";
+      deployment = {
+        targetHost = "10.69.0.149";
+        tags = ["active"];
+      };
       roles.desktop.enable = true;
       roles.desktopCraige.enable = true;
     };

profiles/neovim.nix

@@ -58,6 +58,7 @@
           set spell spelllang=en_au          " Defaul spell checking language
           set spellfile=~/.vim-spell.en.utf-8.add    " Add the spellfile
           hi clear SpellBad                  " Clear any unwanted default settings
+          hi Comment cterm=italic gui=italic " Enable italic comments
           hi SpellBad cterm=underline        " Set the spell checking highlight style
           hi SpellBad ctermbg=NONE           " Set the spell checking highlight background
           match ErrorMsg '\s\+$'             "

profiles/nextcloud.nix

@@ -39,7 +39,7 @@
       enable = true; # Run regular auto update of all apps installed
       startAt = "01:00:00"; # When to run the update
     };
-    package = pkgs.nextcloud30;
+    package = pkgs.nextcloud31;
     extraApps = with config.services.nextcloud.package.packages.apps; {
       inherit bookmarks calendar contacts deck gpoddersync news notes tasks twofactor_webauthn;
     };