From c4ab484bedc8861b662b28ddb784cee5d1c6176d Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Sat, 6 Dec 2025 17:59:01 -0700 Subject: [PATCH] quick fixes --- flake.lock | 60 ++++++++++++++++++++--------------------- flake.nix | 11 ++++++++ home-manager/cobray.nix | 2 +- hosts/configuration.nix | 2 +- hosts/magus.nix | 6 ++--- pkgs/default.nix | 1 - 6 files changed, 46 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 463cee1..c4236fb 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1764370710, - "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", + "lastModified": 1764714051, + "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", + "rev": "a43bedcceced5c21ad36578ed823e6099af78214", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1764974375, - "narHash": "sha256-gclFWbZr77pgomHmO2XAu4EhGTQnnLURDV1LzlAe7XM=", + "lastModified": 1765001413, + "narHash": "sha256-y5u9eN1qB/IWVqYhVm3qsH8FttoU40Ze3DPQLBXMRhg=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "2ddc448150b0576afe528ae5700ac031f94c9547", + "rev": "8ce78e71343b1769b4c87cac9eae3a45510a4c03", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1764952935, - "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1764967410, - "narHash": "sha256-oXxSEEcFCEJ1sbpx/L6CCJYUNTzd/gxKg68GFemxPts=", + "lastModified": 1765024946, + "narHash": "sha256-GkPsL9anbbrmtWMP/O7W2+0WuktiK+4hOx5ziM+DQ3Y=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "222dbe99d0d2d8a61f3b3202f8ef1794b0b081b7", + "rev": "f8d5aad1a1f61e1b6443c27394a38c8c54d39e9e", "type": "github" }, "original": { @@ -404,11 +404,11 @@ ] }, "locked": { - "lastModified": 1764616927, - "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", + "lastModified": 1764812575, + "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", + "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", "type": "github" }, "original": { @@ -535,11 +535,11 @@ ] }, "locked": { - "lastModified": 1764637132, - "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", + "lastModified": 1764962281, + "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "2f2413801beee37303913fc3c964bbe92252a963", + "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", "type": "github" }, "original": { @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1764773840, - "narHash": "sha256-9UcCdwe7vPgEcJJ64JseBQL0ZJZoxp/2iFuvfRI+9zk=", + "lastModified": 1764872015, + "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "3f1997d6aeced318fb141810fded2255da811293", + "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", "type": "github" }, "original": { @@ -608,11 +608,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1764900011, - "narHash": "sha256-iG5HqIzZ12qzTi3xCwBinw/PR0xNlJNXLLQyV2En1OY=", + "lastModified": 1764986018, + "narHash": "sha256-g0T9Jo24QTSdwSqxSCQcy0rpU6TujJsZdWrIeOOevYA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "e1829ce2d33b1e289b3ecca7530dee84da8d9e85", + "rev": "00e02d9896160f4ab9d9a2fe0ec7c009952d67ba", "type": "github" }, "original": { @@ -772,11 +772,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -888,11 +888,11 @@ }, "unstable": { "locked": { - "lastModified": 1764915887, - "narHash": "sha256-CeBCJ9BMsuzVgn8GVfuSRZ6xeau7szzG0Xn6O/OxP9M=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42e29df35be6ef54091d3a3b4e97056ce0a98ce8", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 76af572..2903bb9 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # 25.11 ships with nvidia 580 as stable while 25.05 has 570 as stable. this rollback exists for this reason rollback = { url = "github:NixOS/nixpkgs/nixos-25.05"; }; @@ -111,6 +112,16 @@ lib = nixpkgs.lib; }; in { + packages.${system} = { + inherit + (customPkgs) + minijinja-cli + thorium + rpcs3 + ; + clear-sans = customPkgs.clear-sans.clear-sans; + binary-font = customPkgs.binary-font.binary-clock-font; + }; nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index e1d2ba1..c5dbad3 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -33,7 +33,7 @@ home.username = "${config.theme.user}"; home.homeDirectory = "/home/${config.theme.user}"; - home.stateVersion = "24.11"; + home.stateVersion = "25.11"; programs.home-manager.enable = true; home.enableNixpkgsReleaseCheck = false; xdg.mime.enable = false; diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 69c5f7b..ab0dae9 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -30,5 +30,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.11"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/hosts/magus.nix b/hosts/magus.nix index a957662..6264ddc 100644 --- a/hosts/magus.nix +++ b/hosts/magus.nix @@ -18,6 +18,8 @@ ./modules/docker.nix ./modules/npm.nix ./modules/nixos.nix + ./modules/appimage.nix + ./modules/core.nix ]; system.stateVersion = "25.05"; @@ -28,14 +30,12 @@ }; environment.systemPackages = with pkgs; [ - wget - curl git - htop btop ffmpeg yt-dlp fastfetch + zelliq ]; nix = { diff --git a/pkgs/default.nix b/pkgs/default.nix index b4c3247..b0399b1 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,6 +6,5 @@ binary-font = pkgs.callPackage ./binary-font {}; minijinja-cli = pkgs.callPackage ./minijinja-cli {}; thorium = pkgs.callPackage ./thorium {}; - voicevox = pkgs.callPackage ./voicevox {}; rpcs3 = pkgs.callPackage ./rpcs3 {}; }