From f202328221aa61475fe2220696b2fcfc52629a52 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Sun, 10 Nov 2024 22:07:42 +0200 Subject: [PATCH] Update inputs --- defaults/base/default.nix | 2 +- defaults/desktop/office-suite.nix | 1 - flake.lock | 66 +++++++++++++++++++------------ 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/defaults/base/default.nix b/defaults/base/default.nix index 0f6a5ac..8704cb6 100644 --- a/defaults/base/default.nix +++ b/defaults/base/default.nix @@ -70,7 +70,7 @@ in dates = "weekly"; options = "--delete-older-than 60d"; }; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' experimental-features = nix-command flakes ''; diff --git a/defaults/desktop/office-suite.nix b/defaults/desktop/office-suite.nix index ad24c4a..5a212b5 100644 --- a/defaults/desktop/office-suite.nix +++ b/defaults/desktop/office-suite.nix @@ -44,7 +44,6 @@ crimson dejavu_fonts dina-font - dina-font-pcf #doulos-sil # Breaks Font-Awesome cabin camingo-code diff --git a/flake.lock b/flake.lock index 836a9d5..53e0318 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1731232837, + "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", "type": "github" }, "original": { @@ -195,6 +195,7 @@ "flake-root": "flake-root_2", "haskell-flake": "haskell-flake_2", "heist-extra": "heist-extra_2", + "nixos-unified": "nixos-unified", "nixpkgs": [ "nixpkgs-unstable" ], @@ -203,11 +204,11 @@ "unionmount": "unionmount_2" }, "locked": { - "lastModified": 1729202851, - "narHash": "sha256-Kd56DefIoCqt9MhyNkKoJJypcLXlJrSdYn4r5WNFucI=", + "lastModified": 1730155577, + "narHash": "sha256-+Fi0D/SQ0IOeF0heQymY5A7NmJUjvURhkAWGdEYumTE=", "owner": "srid", "repo": "emanote", - "rev": "1953f5aac8a21ea553829a5fbcfb7bf5b792baad", + "rev": "0062302c7580233595d02e0fd9d72a09139cfab4", "type": "github" }, "original": { @@ -320,11 +321,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -493,11 +494,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -536,11 +537,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729333370, - "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -549,6 +550,21 @@ "type": "github" } }, + "nixos-unified": { + "locked": { + "lastModified": 1729549045, + "narHash": "sha256-W0VyC1MueUy6zMzcKZ9Ofnz/03da+SPFCYdbQ3MugfM=", + "owner": "srid", + "repo": "nixos-unified", + "rev": "09752a3c33541b7342416fb968c299c03c3e7e39", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "nixos-unified", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1704842529, @@ -585,14 +601,14 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-stable": { @@ -613,11 +629,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -629,11 +645,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": {