diff --git a/flake.lock b/flake.lock index e7b3e18..f775149 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1757075491, - "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", + "lastModified": 1754924470, + "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", "owner": "nix-community", "repo": "home-manager", - "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", + "rev": "67393957c27b4e4c6c48a60108a201413ced7800", "type": "github" }, "original": { @@ -260,11 +260,11 @@ }, "mnw": { "locked": { - "lastModified": 1756659871, - "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "owner": "Gerg-L", "repo": "mnw", - "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755253391, - "narHash": "sha256-8Muat6VcG9HsVNtyeKblnj28nnPZVPCGKh/kP3uUPeU=", + "lastModified": 1752566074, + "narHash": "sha256-hWPv6S5lFn6qOQdSL5Ad/m0mge2ALTC8WEAR7c6YWcE=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "e62b3ad75e8c9a5e505fc78b9b40eed1178634cb", + "rev": "ccf263b7ac5f44f89fd990594b09aa52de3d6585", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1754800038, - "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", + "lastModified": 1752441837, + "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", + "rev": "839e02dece5845be3a322e507a79712b73a96ba2", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", - "owner": "nixos", + "lastModified": 1754726524, + "narHash": "sha256-s4uXZ2D0fbaAu6qFMP/fNSpvVQ7z7F7AalIBhbIGaIE=", + "owner": "ddogfoodd", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "01f6508918a7af7583e4da274dc429b5ea831665", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1756819007, - "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757095994, - "narHash": "sha256-AXwM6/7CuQ39iwBqmc6ZNkVcCdFiK4MFRIGQgU6Mkyk=", + "lastModified": 1754832356, + "narHash": "sha256-CHWUy7FY1icSQnvTNv+9ty6VFjBNDyb3gD8hHhVEZ9Y=", "owner": "NotAShelf", "repo": "nvf", - "rev": "fb31022b366ad21951f0352f0cc282cc6a8e9e6f", + "rev": "1681ad703470e784156ce3461d92d18492c5baef", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1754328224, + "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757172691, - "narHash": "sha256-VOn/s24rb+iO6auhmGfT5kyr0ixRK6weBsNCKkGo2yY=", + "lastModified": 1754851076, + "narHash": "sha256-k3+/24lN6E9BFRhryHocm7314t0Wtku0hgIdEWi15XI=", "owner": "danth", "repo": "stylix", - "rev": "9991299fe9aad330fb6b96bb58def37033271177", + "rev": "afcfed6fd2a51615cd63aa7fa7608d670e7b61e5", "type": "github" }, "original": { @@ -614,11 +614,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -630,11 +630,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -646,11 +646,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index 87cacbf..a8f1462 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -10,7 +10,7 @@ cfg = config.mods; in { # Hardware - imports = [./hardware-configuration.nix ./openrgb.nix]; + imports = [./hardware-configuration.nix]; environment.systemPackages = with inputs.nix-alien.packages.${system}; [ nix-alien @@ -19,8 +19,9 @@ in { pkgs.godot pkgs.rustdesk-flutter pkgs.motion + pkgs.linuxPackages.v4l2loopback + pkgs.v4l-utils pkgs.qmk - pkgs.gnumeric ]; # System diff --git a/hosts/muon/hardware-configuration.nix b/hosts/muon/hardware-configuration.nix index 53fc1fc..26f6b8a 100644 --- a/hosts/muon/hardware-configuration.nix +++ b/hosts/muon/hardware-configuration.nix @@ -1,20 +1,16 @@ # 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, - ... -}: { - imports = [(modulesPath + "/installer/scan/not-detected.nix")]; +{ config, lib, pkgs, modulesPath, ... }: { + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" "v4l2loopback" ]; virtualisation.libvirtd.enable = true; - boot.supportedFilesystems = ["zfs" "ntfs" "btrfs"]; + boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; + boot.supportedFilesystems = [ "zfs" "ntfs" "btrfs" ]; fileSystems."/" = { device = "/dev/disk/by-uuid/03e49688-cc62-49c9-a906-e2ea87a38891"; @@ -22,8 +18,10 @@ }; boot.initrd.luks.devices = { - "luks-root".device = "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260"; - "luks-swap".device = "/dev/disk/by-uuid/0418acfc-792c-43f4-a887-cc8bb51fa7c3"; + "luks-root".device = + "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260"; + "luks-swap".device = + "/dev/disk/by-uuid/0418acfc-792c-43f4-a887-cc8bb51fa7c3"; }; fileSystems."/mnt/bulk" = { @@ -34,11 +32,11 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/CCCC-449E"; fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ - {device = "/dev/disk/by-uuid/e7cf209d-386d-41db-8a35-6c9fff014722";} + { device = "/dev/disk/by-uuid/e7cf209d-386d-41db-8a35-6c9fff014722"; } { device = "/var/lib/swapfile"; size = 8 * 1024; diff --git a/hosts/muon/openrgb.nix b/hosts/muon/openrgb.nix deleted file mode 100644 index 2cabf6c..0000000 --- a/hosts/muon/openrgb.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - 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"]; - }; - }; -} diff --git a/modules/home/desktop/development.nix b/modules/home/desktop/development.nix index 31a4064..55a4315 100644 --- a/modules/home/desktop/development.nix +++ b/modules/home/desktop/development.nix @@ -1,14 +1,9 @@ -{ - 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; @@ -19,14 +14,16 @@ default_page = "https://online.bonjourr.fr/"; start_pages = "https://online.bonjourr.fr/"; }; - editor.command = ["alacritty" "-e" "hx" "{file}:{line}:{column}"]; + editor.command = + [ "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 = "https://home-manager-options.extranix.com/?release=master&query={}"; + hm = + "https://home-manager-options.extranix.com/?release=master&query={}"; }; extraConfig = '' diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix index 08ccaed..2aa4902 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -1,86 +1,80 @@ -{ - pkgs, - lib, - config, - osConfig, - ... -}: let - color = config.lib.stylix.colors.withHashtag; -in - with lib; { - options.mods.desktop.productivity.enable = - lib.mkEnableOption "enables gui productivity tools"; +{ pkgs, lib, config, osConfig, ... }: +let color = config.lib.stylix.colors.withHashtag; +in with lib; { + options.mods.desktop.productivity.enable = + lib.mkEnableOption "enables gui productivity tools"; - config = lib.mkIf config.mods.desktop.productivity.enable { - home.packages = with pkgs; [ - # ISO downloader - qbittorrent - xd - biglybt - # transmission_4-gtk + config = lib.mkIf config.mods.desktop.productivity.enable { + home.packages = with pkgs; [ + # ISO downloader + qbittorrent + xd + biglybt + # transmission_4-gtk - # email - thunderbird + # email + thunderbird - # webgl - chromium - mullvad-browser + # webgl + chromium + mullvad-browser - # password manager - bitwarden-desktop + # password manager + bitwarden-desktop - # file management - libsForQt5.breeze-icons - libsForQt5.qt5ct + # file management + libsForQt5.breeze-icons + libsForQt5.qt5ct + libsForQt5.dolphin - # documents - texliveFull - # texstudio + # documents + texliveFull + # texstudio - # 3D - blender - ]; + # 3D + blender + ]; - # qt.platformTheme = "qtct"; + # qt.platformTheme = "qtct"; - home.sessionVariables.BROWSER = "librewolf"; - programs.zsh.sessionVariables.BROWSER = "librewolf"; + home.sessionVariables.BROWSER = "librewolf"; + programs.zsh.sessionVariables.BROWSER = "librewolf"; - services.flameshot = { - enable = false; - settings = { - General = { - disabledTrayIcon = true; - showStartupLaunchMessage = false; - startupLaunch = false; + services.flameshot = { + enable = false; + settings = { + General = { + disabledTrayIcon = true; + showStartupLaunchMessage = false; + startupLaunch = false; - uiColor = color.base01; - contrastUiColor = color.base00; - }; + uiColor = color.base01; + contrastUiColor = color.base00; }; }; - - programs.librewolf = { - enable = false; - settings = { - "webgl.disabled" = true; - "privacy.resistFingerprinting" = true; - "privacy.clearOnShutdown.history" = false; - "privacy.clearOnShutdown.cookies" = false; - "network.cookie.lifetimePolicy" = 0; - }; - }; - - xdg.desktopEntries = lib.mkIf osConfig.mods.i2p.enable { - i2p-browser = { - name = "i2p Browser"; - genericName = "Web Browser"; - exec = "${pkgs.mullvad-browser}/bin/mullvad-browser -p i2p"; - }; - }; - - # programs.qutebrowser = { - # enable = true; - # }; }; - } + + programs.librewolf = { + enable = false; + settings = { + "webgl.disabled" = true; + "privacy.resistFingerprinting" = true; + "privacy.clearOnShutdown.history" = false; + "privacy.clearOnShutdown.cookies" = false; + "network.cookie.lifetimePolicy" = 0; + }; + }; + + xdg.desktopEntries = lib.mkIf osConfig.mods.i2p.enable { + i2p-browser = { + name = "i2p Browser"; + genericName = "Web Browser"; + exec = "${pkgs.mullvad-browser}/bin/mullvad-browser -p i2p"; + }; + }; + + # programs.qutebrowser = { + # enable = true; + # }; + }; +}