Merge branch 'main' of codeberg.org:muon/home

flake.lock

@@ -5,11 +5,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1746562888,
+        "lastModified": 1755819240,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1748383148,
+        "lastModified": 1756083905,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808",
         "type": "github"
       },
       "original": {
@@ -138,11 +138,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754487366,
+        "lastModified": 1756770412,
-        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751413152,
+        "lastModified": 1756770412,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1748710831,
+        "lastModified": 1756659871,
-        "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
+        "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
+        "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1751792365,
+        "lastModified": 1756819007,
-        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
         "type": "github"
       },
       "original": {
@@ -410,11 +410,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751906969,
+        "lastModified": 1756961635,
-        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
+        "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
+        "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370",
         "type": "github"
       },
       "original": {
@@ -614,11 +614,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1750770351,
+        "lastModified": 1754779259,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502",
         "type": "github"
       },
       "original": {
@@ -630,11 +630,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1751159871,
+        "lastModified": 1754788770,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "rev": "fb2175accef8935f6955503ec9dd3c973eec385c",
         "type": "github"
       },
       "original": {
@@ -646,11 +646,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1751158968,
+        "lastModified": 1755613540,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0",
         "type": "github"
       },
       "original": {

hosts/muon/configuration.nix

@@ -10,7 +10,7 @@
   cfg = config.mods;
 in {
   # Hardware
-  imports = [./hardware-configuration.nix];
+  imports = [./hardware-configuration.nix ./openrgb.nix];
 
   environment.systemPackages = with inputs.nix-alien.packages.${system}; [
     nix-alien
@@ -19,9 +19,8 @@ in {
     pkgs.godot
     pkgs.rustdesk-flutter
     pkgs.motion
-    pkgs.linuxPackages.v4l2loopback
-    pkgs.v4l-utils
     pkgs.qmk
+    pkgs.gnumeric
   ];
 
   # System

hosts/muon/hardware-configuration.nix

@@ -1,15 +1,19 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
-    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
+  boot.kernelModules = ["kvm-intel"];
   virtualisation.libvirtd.enable = true;
-  boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
   boot.supportedFilesystems = ["zfs" "ntfs" "btrfs"];
 
   fileSystems."/" = {
@@ -18,10 +22,8 @@
   };
 
   boot.initrd.luks.devices = {
-    "luks-root".device =
+    "luks-root".device = "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260";
-      "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260";
+    "luks-swap".device = "/dev/disk/by-uuid/0418acfc-792c-43f4-a887-cc8bb51fa7c3";
-    "luks-swap".device =
-      "/dev/disk/by-uuid/0418acfc-792c-43f4-a887-cc8bb51fa7c3";
   };
 
   fileSystems."/mnt/bulk" = {

hosts/muon/openrgb.nix

@@ -0,0 +1,29 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  no-rgb = pkgs.writeScriptBin "no-rgb" ''
+    #!/bin/sh
+    NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | grep -E '^[0-9]+: ' | wc -l)
+
+    for i in $(seq 0 $(($NUM_DEVICES - 1))); do
+      ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode static --color 000000
+    done
+  '';
+in {
+  config = {
+    services.udev.packages = [pkgs.openrgb];
+    boot.kernelModules = ["i2c-dev"];
+    hardware.i2c.enable = true;
+
+    systemd.services.no-rgb = {
+      description = "no-rgb";
+      serviceConfig = {
+        ExecStart = "${no-rgb}/bin/no-rgb";
+        Type = "oneshot";
+      };
+      wantedBy = ["multi-user.target"];
+    };
+  };
+}

modules/home/desktop/development.nix

@@ -1,9 +1,14 @@
-{ pkgs, lib, config, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
   options.mods.desktop.development.enable =
     lib.mkEnableOption "enables gui development tools";
 
   config = lib.mkIf config.mods.desktop.development.enable {
-    home.packages = with pkgs; [ i3-swallow ];
+    # home.packages = with pkgs; [ i3-swallow ];
 
     programs.qutebrowser = {
       enable = true;
@@ -14,16 +19,14 @@
           default_page = "https://online.bonjourr.fr/";
           start_pages = "https://online.bonjourr.fr/";
         };
-        editor.command =
+        editor.command = ["alacritty" "-e" "hx" "{file}:{line}:{column}"];
-          [ "swallow" "alacritty" "-e" "hx" "{file}:{line}:{column}" ];
       };
 
       searchEngines = {
         DEFAULT = "https://search.muon.host/?q={}";
         np = "https://search.nixos.org/packages?channel=unstable&query={}";
         no = "https://search.nixos.org/options?channel=unstable&query={}";
-        hm =
+        hm = "https://home-manager-options.extranix.com/?release=master&query={}";
-          "https://home-manager-options.extranix.com/?release=master&query={}";
       };
 
       extraConfig = ''

modules/home/desktop/productivity.nix

@@ -1,6 +1,13 @@
-{ pkgs, lib, config, osConfig, ... }:
+{
-let color = config.lib.stylix.colors.withHashtag;
+  pkgs,
-in with lib; {
+  lib,
+  config,
+  osConfig,
+  ...
+}: let
+  color = config.lib.stylix.colors.withHashtag;
+in
+  with lib; {
     options.mods.desktop.productivity.enable =
       lib.mkEnableOption "enables gui productivity tools";
 
@@ -25,7 +32,6 @@ in with lib; {
         # file management
         libsForQt5.breeze-icons
         libsForQt5.qt5ct
-      libsForQt5.dolphin
 
         # documents
         texliveFull

modules/home/terminal/shell.nix

@@ -1,12 +1,20 @@
-{ pkgs, lib, config, ... }:
+{
-let
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   cfg = config.mods.terminal;
 
   aliases = with lib; {
     la = "ls -lah";
     xc = "${getExe pkgs.xclip} -selection clipboard";
+    ".." = "cd ..";
+    "..." = "cd ../..";
+    "...." = "cd ../..";
+    "....." = "cd ../../..";
+    "......" = "cd ../../../..";
   };
-
 in {
   options.mods.terminal = {zsh.enable = lib.mkEnableOption "enables zsh";};
 
@@ -35,11 +43,13 @@ in {
 
       shellAliases = aliases;
 
-      plugins = with pkgs; [{
+      plugins = with pkgs; [
+        {
           name = "zsh-vi-mode";
           src = zsh-vi-mode;
           file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
-      }];
+        }
+      ];
     };
   };
 }