From 38b6c47b4a42bbdf534f6c75c507b0ccdaeac6e0 Mon Sep 17 00:00:00 2001 From: Nicole Date: Sun, 22 Feb 2026 20:30:48 +0100 Subject: [PATCH] Update --- etc/nixos/configuration.nix | 13 +- etc/nixos/flake.lock | 270 ++++++++++----------------------- etc/nixos/flake.nix | 11 +- etc/nixos/modules/desktop.nix | 36 ++--- etc/nixos/modules/logitech.nix | 11 +- etc/nixos/modules/nvidia.nix | 16 +- etc/nixos/modules/programs.nix | 22 ++- 7 files changed, 151 insertions(+), 228 deletions(-) diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 371d16c..8738112 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -87,7 +87,12 @@ in #░▀░▀░▀▀▀░░▀░░▀░▀░▀▀▀░▀░▀░▀░▀ networking.hostName = "nixos"; - networking.networkmanager.enable = true; + networking.networkmanager = { + enable = true; + plugins = with pkgs; [ + networkmanager-openvpn + ]; + }; time.timeZone = "Europe/Rome"; services.printing.enable = true; services.avahi = { @@ -138,6 +143,12 @@ in packages = with pkgs; []; }; + services.cron = { + enable = true; + systemCronJobs = [ + "" + ]; + }; #░█░█░█▀█░█▀▀░█▀▄░█▀▀░█▀▀ #░█░█░█░█░█▀▀░█▀▄░█▀▀░█▀▀ diff --git a/etc/nixos/flake.lock b/etc/nixos/flake.lock index b829256..4bdf204 100644 --- a/etc/nixos/flake.lock +++ b/etc/nixos/flake.lock @@ -18,42 +18,21 @@ "type": "github" } }, - "flake-parts_2": { + "flake-utils": { "inputs": { - "nixpkgs-lib": [ - "nix-citizen", - "nixpkgs" - ] + "systems": "systems_2" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, @@ -66,11 +45,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1770260812, - "narHash": "sha256-qK9Jjux6ZT6SQHpmm8rGeAVnsnuXvYK5XFU7Rlkit/I=", + "lastModified": 1771499264, + "narHash": "sha256-6dUvcEAYGRyrYJJuoJev2JY/vKWIpFGACwENkUlyxy8=", "owner": "DreamMaoMao", "repo": "mango", - "rev": "8e898417a75bc48cdc79409dba2b415f692d7ea6", + "rev": "2f12f46919a3e224156f6c83e07aeff1f48b72e2", "type": "github" }, "original": { @@ -109,11 +88,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770271466, - "narHash": "sha256-Pyc3p/V7ruQplnU31r+umLSNlSGwOOoHzhWfzfLmiiw=", + "lastModified": 1771514840, + "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "76e1d271485b00a5d98aeb1dd76408594741c039", + "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56", "type": "github" }, "original": { @@ -142,11 +121,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770092965, - "narHash": "sha256-++K1ftjwPqMJzIO8t2GsdkYQzC2LLA5A1w21Uo+SLz4=", + "lastModified": 1771305475, + "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=", "owner": "YaLTeR", "repo": "niri", - "rev": "189917c93329c86ac2ddd89f459c26a028d590ba", + "rev": "a2a52911757cb3b497db9407592f9b4c439571ea", "type": "github" }, "original": { @@ -155,31 +134,6 @@ "type": "github" } }, - "nix-citizen": { - "inputs": { - "flake-parts": "flake-parts_2", - "nix-gaming": [ - "nix-gaming" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1769832985, - "narHash": "sha256-PKONM6JUGWviRsv3tZWj72HE0aeHKcHTrzTskj58MRM=", - "owner": "LovingMelody", - "repo": "nix-citizen", - "rev": "47823c1ea4c53153dabd43f08b26f3c67c557542", - "type": "github" - }, - "original": { - "owner": "LovingMelody", - "repo": "nix-citizen", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1768656715, @@ -195,46 +149,6 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1769914377, - "narHash": "sha256-8wH3ZYNs36V0A3f/ikraqdoVE++BfnXg9Ql8nAuUkHw=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "f7d17740ed90663b11ae907d33b3fed9fc9e15a9", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "nix-citizen", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737420293, - "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1766902085, @@ -266,28 +180,13 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1770136044, - "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", + "lastModified": 1771419570, + "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", + "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", "type": "github" }, "original": { @@ -299,11 +198,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -315,43 +214,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1769740369, - "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1770136044, - "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", + "lastModified": 1771419570, + "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", + "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", "type": "github" }, "original": { @@ -369,11 +236,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1769415282, - "narHash": "sha256-Z24dmKqI5jxTzsgqxAqtSF2KZ9UcUo/tACc9n8ufnZU=", + "lastModified": 1771131227, + "narHash": "sha256-YuWhXw8zeVyCqhXcVurmK4EtyDtTeQxCKSFxe3iz2Tg=", "owner": "icewind1991", "repo": "nvidia-patch-nixos", - "rev": "0fe336d3ee63b0055af5ecead3610272ae90fd9c", + "rev": "0117e5b5e0fa6f8bb1e3f673544e1838027aeafb", "type": "github" }, "original": { @@ -387,12 +254,11 @@ "mango": "mango", "musnix": "musnix", "niri": "niri", - "nix-citizen": "nix-citizen", "nix-flatpak": "nix-flatpak", - "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", - "nvidia-patch": "nvidia-patch" + "nvidia-patch": "nvidia-patch", + "solaar": "solaar" } }, "scenefx": { @@ -416,6 +282,28 @@ "type": "github" } }, + "solaar": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1767894877, + "narHash": "sha256-DB9vEEnEYilGUaHCljMRzT1embzD7uEjJugzRJgiLos=", + "owner": "Svenum", + "repo": "Solaar-Flake", + "rev": "f5cac914bdeeecac7fca07e99c8fee18336f5bd5", + "type": "github" + }, + "original": { + "owner": "Svenum", + "ref": "main", + "repo": "Solaar-Flake", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -446,30 +334,9 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nix-citizen", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769515380, - "narHash": "sha256-CWWK3PaQ7zhr+Jcf5zyaTR2cfRBXPo09H7+5nWApL8s=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "9911802c2822def2eec3d22e2cafd1619ede94a5", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -485,6 +352,25 @@ "type": "github" } }, + "utils_2": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1738591040, + "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -505,11 +391,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770167989, - "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=", + "lastModified": 1771195969, + "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4", + "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", "type": "github" }, "original": { diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index 7c7c92c..edb379c 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -10,9 +10,6 @@ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-citizen.url = "github:LovingMelody/nix-citizen"; - nix-gaming.url = "github:fufexan/nix-gaming"; - nix-citizen.inputs.nix-gaming.follows = "nix-gaming"; #opencode.url = "github:sst/opencode"; mango = { url = "github:DreamMaoMao/mango"; @@ -23,9 +20,14 @@ url = "github:icewind1991/nvidia-patch-nixos"; inputs.nixpkgs.follows = "nixpkgs"; }; + solaar = { + #url = "https://flakehub.com/f/Svenum/Solaar-Flake/*.tar.gz"; # For latest stable version + url = "github:Svenum/Solaar-Flake/main"; # Uncomment line for latest unstable version + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, niri, mango, musnix, nvidia-patch, ... } @inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, niri, mango, musnix, nvidia-patch, solaar, ... } @inputs: let system = "x86_64-linux"; @@ -55,6 +57,7 @@ mango.nixosModules.mango musnix.nixosModules.musnix {nixpkgs.overlays = [inputs.nvidia-patch.overlays.default];} + solaar.nixosModules.default ./configuration.nix ]; diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix index 7b0b670..912dd3a 100644 --- a/etc/nixos/modules/desktop.nix +++ b/etc/nixos/modules/desktop.nix @@ -77,25 +77,25 @@ #}; # GNOME - #services.desktopManager.gnome.enable = true; - #environment.gnome.excludePackages = with pkgs; [ - # baobab # disk usage analyzer - # cheese # photo booth - # eog # image viewer - # epiphany # web browser - # gedit # text editor - # simple-scan # document scanner - # totem # video player - # yelp # help viewer - # evince # document viewer - # file-roller # archive manager - # geary # email client - # seahorse # password manager + services.desktopManager.gnome.enable = true; + environment.gnome.excludePackages = with pkgs; [ + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser + gedit # text editor + simple-scan # document scanner + totem # video player + yelp # help viewer + evince # document viewer + file-roller # archive manager + geary # email client + seahorse # password manager - # gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts - # gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-photos gnome-screenshot - # gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections - #]; + gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts + gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-photos gnome-screenshot + gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections + ]; environment.sessionVariables = { WLR_NO_HARDWARE_CURSOR = "1"; diff --git a/etc/nixos/modules/logitech.nix b/etc/nixos/modules/logitech.nix index 9f2802b..e0c5b87 100644 --- a/etc/nixos/modules/logitech.nix +++ b/etc/nixos/modules/logitech.nix @@ -1,5 +1,12 @@ { config, pkgs, ... }: { - hardware.logitech.wireless.enable = true; - hardware.logitech.wireless.enableGraphical = true; + #hardware.logitech.wireless.enable = true; + #hardware.logitech.wireless.enableGraphical = true; + services.solaar = { + enable = true; # Enable the service + # package = pkgs.solaar; # The package to use + # window = "hide"; # Show the window on startup (show, *hide*, only [window only]) + # batteryIcons = "regular"; # Which battery icons to use (*regular*, symbolic, solaar) + # extraArgs = ""; # Extra arguments to pass to solaar on startup + }; } diff --git a/etc/nixos/modules/nvidia.nix b/etc/nixos/modules/nvidia.nix index c8f036a..f1c2e06 100644 --- a/etc/nixos/modules/nvidia.nix +++ b/etc/nixos/modules/nvidia.nix @@ -26,9 +26,15 @@ in powerManagement.enable = false; powerManagement.finegrained = false; nvidiaSettings = false; - package = pkgs.nvidia-patch.patch-nvenc (pkgs.nvidia-patch.patch-fbc package); - + #package = pkgs.nvidia-patch.patch-nvenc (pkgs.nvidia-patch.patch-fbc package); + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "590.48.01"; + sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok="; + openSha256 = "sha256-hECHfguzwduEfPo5pCDjWE/MjtRDhINVr4b1awFdP44="; + usePersistenced = false; + useSettings = false; + }; #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { @@ -53,9 +59,9 @@ in environment = { sessionVariables = { #"__EGL_VENDOR_LIBRARY_FILENAMES" = "${config.hardware.nvidia.package}/share/glvnd/egl_vendor.d/10_nvidia.json"; - "__GLX_VENDOR_LIBRARY_NAME" = "nvidia"; - "__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS" = "/run/opengl-driver/share/egl/egl_external_platform.d"; - "LIBEGL_DRIVERS_PATH" = "/run/opengl-driver/lib/egl"; + #"__GLX_VENDOR_LIBRARY_NAME" = "nvidia"; + #"__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS" = "/run/opengl-driver/share/egl/egl_external_platform.d"; + #"LIBEGL_DRIVERS_PATH" = "/run/opengl-driver/lib/egl"; "CUDA_CACHE_PATH" = "/home/nicole/.cache/nv"; }; #etc."nvidia/nvidia-application-profiles-rc.d/50-limit-free-buffer-pool.json".source = ./50-limit-free-buffer-pool.json; diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix index c23d291..945b0d5 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -24,6 +24,7 @@ cowsay starship cava + vulkan-tools # FILES # gvfs @@ -61,7 +62,8 @@ rofi libnotify wayvnc - xwayland-satellite + #xwayland-satellite + (callPackage ./pkgs/xwayland-satellite/default.nix {}) xwayland-run # OFFICE # @@ -74,7 +76,7 @@ # MEDIA EDITING # pinta - davinci-resolve + pkgs-unstable.davinci-resolve # MEDIA # ffmpeg @@ -89,8 +91,11 @@ element-desktop wasistlos vesktop - geary - tutanota-desktop + #geary + #mailspring + pkgs-unstable.thunderbird + #tutanota-desktop + pkgs-unstable.protonmail-desktop teams-for-linux qbittorrent sunshine @@ -117,6 +122,7 @@ pkgs-unstable.protonplus gdlauncher-carbon adwsteamgtk + lug-helper # OTHERS # seahorse @@ -164,13 +170,17 @@ # qjackctl alsa-utils #vital - (callPackage ./pkgs/vital-stable/default.nix {}) + (callPackage ./pkgs/vital-stable/default.nix {}) # WINE # wineWowPackages.stable #wineWowPackages.waylandFull #wineWowPackages.staging winetricks + + # CAD&3D # + orca-slicer + #freecad ]; # Enable Flaktpak @@ -185,9 +195,9 @@ "com.anydesk.Anydesk" "com.github.iwalton3.jellyfin-media-player" "com.sweethome3d.Sweethome3d" + "com.tutanota.Tutanota" ]; - services.hardware.openrgb.enable = true; virtualisation.docker.rootless = {