From 3256def44cacd28dd4e5fb0bff421068563303b0 Mon Sep 17 00:00:00 2001 From: muon Date: Tue, 2 Sep 2025 20:24:03 +0000 Subject: [PATCH] Update nix --- flake.lock | 52 +++++------ hosts/muon/configuration.nix | 2 - hosts/muon/hardware-configuration.nix | 30 +++--- modules/home/desktop/development.nix | 15 +-- modules/home/desktop/productivity.nix | 130 ++++++++++++++------------ 5 files changed, 118 insertions(+), 111 deletions(-) diff --git a/flake.lock b/flake.lock index f775149..94b9aac 100644 --- a/flake.lock +++ b/flake.lock @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1754924470, - "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", + "lastModified": 1755914636, + "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=", "owner": "nix-community", "repo": "home-manager", - "rev": "67393957c27b4e4c6c48a60108a201413ced7800", + "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752566074, - "narHash": "sha256-hWPv6S5lFn6qOQdSL5Ad/m0mge2ALTC8WEAR7c6YWcE=", + "lastModified": 1755253391, + "narHash": "sha256-8Muat6VcG9HsVNtyeKblnj28nnPZVPCGKh/kP3uUPeU=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "ccf263b7ac5f44f89fd990594b09aa52de3d6585", + "rev": "e62b3ad75e8c9a5e505fc78b9b40eed1178634cb", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1752441837, - "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", + "lastModified": 1754800038, + "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "839e02dece5845be3a322e507a79712b73a96ba2", + "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754726524, - "narHash": "sha256-s4uXZ2D0fbaAu6qFMP/fNSpvVQ7z7F7AalIBhbIGaIE=", + "lastModified": 1755962765, + "narHash": "sha256-WB6WaJvVd5SWviOJT7Ea5nmgVLLu6nuscBqt1DX+PdY=", "owner": "ddogfoodd", "repo": "nixpkgs", - "rev": "01f6508918a7af7583e4da274dc429b5ea831665", + "rev": "0d6b66906da431698d58edeb2c252eba348f9e3a", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754832356, - "narHash": "sha256-CHWUy7FY1icSQnvTNv+9ty6VFjBNDyb3gD8hHhVEZ9Y=", + "lastModified": 1755463179, + "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=", "owner": "NotAShelf", "repo": "nvf", - "rev": "1681ad703470e784156ce3461d92d18492c5baef", + "rev": "03833118267ad32226b014b360692bdce9d6e082", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { @@ -520,12 +520,10 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754851076, - "narHash": "sha256-k3+/24lN6E9BFRhryHocm7314t0Wtku0hgIdEWi15XI=", - "owner": "danth", - "repo": "stylix", - "rev": "afcfed6fd2a51615cd63aa7fa7608d670e7b61e5", - "type": "github" + "lastModified": 1755942655, + "narHash": "sha256-0lgZGPxHdhh4RErvfhNgNIL1zZ3tPdY08vWf7p9FvdU=", + "type": "tarball", + "url": "https://github.com/dbeley/stylix/archive/refs/heads/feat/remove-plasma5.zip" }, "original": { "owner": "danth", diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index a8f1462..6749d45 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -19,8 +19,6 @@ in { pkgs.godot pkgs.rustdesk-flutter pkgs.motion - pkgs.linuxPackages.v4l2loopback - pkgs.v4l-utils pkgs.qmk ]; diff --git a/hosts/muon/hardware-configuration.nix b/hosts/muon/hardware-configuration.nix index 26f6b8a..53fc1fc 100644 --- a/hosts/muon/hardware-configuration.nix +++ b/hosts/muon/hardware-configuration.nix @@ -1,16 +1,20 @@ # 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" "v4l2loopback" ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; virtualisation.libvirtd.enable = true; - boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; - boot.supportedFilesystems = [ "zfs" "ntfs" "btrfs" ]; + boot.supportedFilesystems = ["zfs" "ntfs" "btrfs"]; fileSystems."/" = { device = "/dev/disk/by-uuid/03e49688-cc62-49c9-a906-e2ea87a38891"; @@ -18,10 +22,8 @@ }; 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" = { @@ -32,11 +34,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/modules/home/desktop/development.nix b/modules/home/desktop/development.nix index 55a4315..31a4064 100644 --- a/modules/home/desktop/development.nix +++ b/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 = - [ "swallow" "alacritty" "-e" "hx" "{file}:{line}:{column}" ]; + editor.command = ["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 2aa4902..08ccaed 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -1,80 +1,86 @@ -{ 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 - libsForQt5.dolphin + # file management + libsForQt5.breeze-icons + libsForQt5.qt5ct - # 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; + 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"; + 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.qutebrowser = { + # enable = true; + # }; + }; + }