From 066286944c452ef888a62119e1a4ab05abf9226f Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Thu, 18 Dec 2025 22:08:09 -0700 Subject: [PATCH] 575 update --- flake.lock | 86 ++++++++++++++++++++++++--------------- flake.nix | 2 +- home-manager/cobray.nix | 4 +- hosts/modules/flatpak.nix | 21 ++++++++++ hosts/modules/greeter.nix | 2 +- hosts/modules/nvidia.nix | 11 ++++- hosts/system-packages.nix | 1 + 7 files changed, 90 insertions(+), 37 deletions(-) create mode 100644 hosts/modules/flatpak.nix diff --git a/flake.lock b/flake.lock index 85f7013..b3f1da4 100644 --- a/flake.lock +++ b/flake.lock @@ -44,17 +44,16 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1765560618, - "narHash": "sha256-gZEYrkY/IJHQrackgNwpl0qFnRacBSpmvqa0ljkdieU=", + "lastModified": 1766077125, + "narHash": "sha256-9Mu7WoSb3ZC1EzvrTGdy6E5tVAwksDTm7yI8HhLP6Sk=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "e95f7ce367470424e7636b40a0ba7af42ddcd94e", + "rev": "4aefa0f1f7394332fbbb5f4af9919f10304ead24", "type": "github" }, "original": { "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "e95f7ce367470424e7636b40a0ba7af42ddcd94e", "type": "github" } }, @@ -65,11 +64,11 @@ ] }, "locked": { - "lastModified": 1765583951, - "narHash": "sha256-QDCrQorCAesnsOQJk+cTszazGitf9NDqIEMxzUEtotE=", + "lastModified": 1765838956, + "narHash": "sha256-A3a2ZfvjirX8VIdIPI+nAyukWs6vx4vet3fU0mpr7lU=", "owner": "AvengeMedia", "repo": "dgop", - "rev": "57279532bc932b93df79d866b0663b1753cefda1", + "rev": "0ff697a4e3418966caa714c838fc73f1ef6ba59b", "type": "github" }, "original": { @@ -85,11 +84,11 @@ ] }, "locked": { - "lastModified": 1765688338, - "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=", + "lastModified": 1765794845, + "narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=", "owner": "nix-community", "repo": "disko", - "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8", + "rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9", "type": "github" }, "original": { @@ -170,16 +169,17 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "home-manager": "home-manager", "nixpkgs": "nixpkgs", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1765752037, - "narHash": "sha256-hjqxmMTTiGBBELqnwiomBv8FaowC5MPHMVr+tKQZybU=", + "lastModified": 1765998079, + "narHash": "sha256-X8seot8UGzYFyp94amK5quqzt5c2kWdWScHHAZLPCp0=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "1d7fe9e70d5800de8de6244ebb1d07efb74ec36e", + "rev": "a4cb73db848c733a5fb686038a90abe6d175aabe", "type": "github" }, "original": { @@ -232,15 +232,37 @@ "home-manager": { "inputs": { "nixpkgs": [ + "ghostty", "nixpkgs" ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765980955, + "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", "type": "github" }, "original": { @@ -344,11 +366,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765741609, - "narHash": "sha256-mBDW/2NPaxXw68ledipQYSL6GGU+/CCsObondH22+no=", + "lastModified": 1765999585, + "narHash": "sha256-xMaGK7XS02/Ttno5kUTda7tMV38tMHD/ZJj9sYjfd+o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7ccc57eb7cacded5e7a8835b705bba48963d3cb3", + "rev": "f88deb928a0f7dc02f427473f8c29e8f2bed14a3", "type": "github" }, "original": { @@ -610,11 +632,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1765764448, - "narHash": "sha256-GHM40ltWiRnGYvhcLRaNWXZoyGUOL4FgB0U7muHjn9s=", + "lastModified": 1766023166, + "narHash": "sha256-6p0ez0d4qkqLDKLHliS2kz9CQaftsZT3P48J0aV3zRw=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "7f4e526e0a1badaaea208a0180199d1d26596fa3", + "rev": "f67539f079071f57cf3e2f3e3ca00595d62990f3", "type": "github" }, "original": { @@ -701,11 +723,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { @@ -718,11 +740,11 @@ "nvim-dots": { "flake": false, "locked": { - "lastModified": 1763795441, - "narHash": "sha256-hUP7GJuh5wSunhLCjuxkMRCYZweuQ3SOID3bUeG9zQ4=", + "lastModified": 1766063867, + "narHash": "sha256-S6f72JV5IDkXGs1ESS5nBh8IVIspfACG+pmtUj3JR9c=", "owner": "alsaiduq-lab", "repo": "nvim-dotfiles", - "rev": "26ae0fa8f47057c61632464d10b75599b1c2f1d6", + "rev": "90923ebd939f53176059bfc564429070e4726f4e", "type": "github" }, "original": { @@ -823,7 +845,7 @@ "disko": "disko", "ghostty": "ghostty", "grim-hyprland": "grim-hyprland", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hu-tao-cursor": "hu-tao-cursor", "hyprland": "hyprland", "hyprland-dots": "hyprland-dots", @@ -882,11 +904,11 @@ }, "unstable": { "locked": { - "lastModified": 1765644376, - "narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=", + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a7bfd70..3804af4 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ }; dankMaterialShell = { - url = "github:AvengeMedia/DankMaterialShell/e95f7ce367470424e7636b40a0ba7af42ddcd94e"; + url = "github:AvengeMedia/DankMaterialShell"; inputs.nixpkgs.follows = "nixpkgs"; inputs.dgop.follows = "dgop"; }; diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index aa5b749..e9e30e3 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -28,8 +28,9 @@ ./modules/cava.nix ./modules/rgb.nix ./modules/imagemagick.nix - inputs.dankMaterialShell.homeModules.dankMaterialShell.default + inputs.dankMaterialShell.homeModules.dank-material-shell ./modules/viv.nix + ./modules/godot.nix ]; home.username = "${config.theme.user}"; @@ -45,5 +46,6 @@ voicevox vkbasalt hashcat + libretranslate ]; } diff --git a/hosts/modules/flatpak.nix b/hosts/modules/flatpak.nix new file mode 100644 index 0000000..cab4af7 --- /dev/null +++ b/hosts/modules/flatpak.nix @@ -0,0 +1,21 @@ +{ + config, + pkgs, + lib, + ... +}: { + services.flatpak.enable = true; + + xdg.portal = { + enable = true; + extraPortals = [pkgs.xdg-desktop-portal-gtk]; + }; + + systemd.services.flatpak-repo = { + wantedBy = ["multi-user.target"]; + path = [pkgs.flatpak]; + script = '' + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + ''; + }; +} diff --git a/hosts/modules/greeter.nix b/hosts/modules/greeter.nix index 928658b..6606f2f 100644 --- a/hosts/modules/greeter.nix +++ b/hosts/modules/greeter.nix @@ -7,7 +7,7 @@ inputs.dankMaterialShell.nixosModules.greeter ]; - programs.dankMaterialShell.greeter = { + programs.dank-material-shell.greeter = { enable = true; compositor.name = "hyprland"; configHome = "/home/${config.theme.user}"; diff --git a/hosts/modules/nvidia.nix b/hosts/modules/nvidia.nix index b738099..19034ca 100644 --- a/hosts/modules/nvidia.nix +++ b/hosts/modules/nvidia.nix @@ -6,9 +6,16 @@ services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "575.64.05"; + sha256_64bit = "sha256-hfK1D5EiYcGRegss9+H5dDr/0Aj9wPIJ9NVWP3dNUC0="; + sha256_aarch64 = "sha256-GRE9VEEosbY7TL4HPFoyo0Ac5jgBHsZg9sBKJ4BLhsA="; + openSha256 = "sha256-mcbMVEyRxNyRrohgwWNylu45vIqF+flKHnmt47R//KU="; + settingsSha256 = "sha256-o2zUnYFUQjHOcCrB0w/4L6xI1hVUXLAWgG2Y26BowBE="; + persistencedSha256 = "sha256-2g5z7Pu8u2EiAh5givP5Q1Y4zk4Cbb06W37rf768NFU="; + }; open = true; - modesetting.enable = true; # must be true for Wayland + modesetting.enable = true; powerManagement.enable = false; nvidiaSettings = true; nvidiaPersistenced = true; diff --git a/hosts/system-packages.nix b/hosts/system-packages.nix index 4c34c51..753d7a2 100644 --- a/hosts/system-packages.nix +++ b/hosts/system-packages.nix @@ -33,6 +33,7 @@ ./modules/appimage.nix ./modules/greeter.nix ./modules/go.nix + ./modules/flatpak.nix ]; npm.enable = true; services.udisks2.enable = true;