diff --git a/flake.lock b/flake.lock index 65d7d19..f2abeec 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1719917903, - "narHash": "sha256-UJpEzS99Y/j1QiwpDaB5JLhK85AKBqJ/8jaEiIrEG8Q=", + "lastModified": 1720211568, + "narHash": "sha256-Uph6rcbiuOD6bGEySonDFozdO+mznTug08x27WG4BIg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "55d7639b1e6aa6ed8ca5ab196b8acd1890d2fc38", + "rev": "ce7e02b20fe45425bbdbebc6fe0fdcc018c9efc6", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1720167195, - "narHash": "sha256-boNcIIJ48pLI/5z54lZj4eYklpwBMPzLaN/Z5KE1Ftg=", + "lastModified": 1720340348, + "narHash": "sha256-TaXRmx6xIfCsXAHNuqR/ue0S7AZhk8sRABFkl1ZpBjU=", "owner": "AtaraxiaSjel", "repo": "nur", - "rev": "7dfc7fd56c1a584b2d012868540d7a330e119932", + "rev": "64a64ef6ca9f4c2681737c3c4896ac7c1ec85452", "type": "github" }, "original": { @@ -48,11 +48,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717279440, - "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", + "lastModified": 1720542474, + "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", "owner": "zhaofengli", "repo": "attic", - "rev": "717cc95983cdc357bc347d70be20ced21f935843", + "rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719457243, - "narHash": "sha256-5rOWwMAp/suWVKGavhfdyLsF2mA7Fv2DQWXlt7S+QWA=", + "lastModified": 1720472194, + "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", "owner": "catppuccin", "repo": "nix", - "rev": "53967ef237edd38a5b5cc5441e9b6a44b9554977", + "rev": "d75d5803852fb0833767dc969a4581ac13204e22", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1716179347, - "narHash": "sha256-DPiP4yLRcPgWgrnCC/tRp5vUk9teZIfsCT2r8jr1V8A=", + "lastModified": 1720295990, + "narHash": "sha256-n3Bv8EXdJ2su6UE5+oX15JDwAeQ222CigWlVJ5NYms4=", "owner": "catppuccin", "repo": "vscode", - "rev": "b7a8806f7532a091b0170f281dbc7f35c3fc7761", + "rev": "08de0d9d44de6693d1379e40a48be797a4fb4715", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1719323427, - "narHash": "sha256-f4ppP2MBPJzkuy/q+PIfyyTWX9OzqgPV1XSphX71tdA=", + "lastModified": 1720853497, + "narHash": "sha256-xneFQ+RrIcyCb+MnKQPJx55qEEDr0xh5X6Ne3VcnV20=", "owner": "cachix", "repo": "devenv", - "rev": "f810f8d8cb4e674d7e635107510bcbbabaa755a3", + "rev": "7f569a0f2473b9f6000fd9e4c32511fd1b0d37c1", "type": "github" }, "original": { @@ -280,11 +280,11 @@ ] }, "locked": { - "lastModified": 1719451710, - "narHash": "sha256-h+bFEQHQ46pBkEsOXbxmmY6QNPPGrgpDbNlHtAKG49M=", + "lastModified": 1720661479, + "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", "owner": "nix-community", "repo": "disko", - "rev": "8767dbf5d723b1b6834f4d09b217da7c31580d58", + "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -716,11 +716,11 @@ ] }, "locked": { - "lastModified": 1719438532, - "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -854,11 +854,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719811093, - "narHash": "sha256-gzws5lCl2MErxg7oPUleb/knGc3BaRuk8IO00ePvD2I=", + "lastModified": 1720437044, + "narHash": "sha256-udTqlDLoHvKwdDSaavE34JLkPmR9P+CRqWag/ICbvLg=", "owner": "nix-community", "repo": "nix-direnv", - "rev": "8ab6637a2f7c3240a089f2e0cf5dcefd483252c6", + "rev": "4fabc9b64413a59de8bda6850d0c7f7df6a1d040", "type": "github" }, "original": { @@ -955,11 +955,11 @@ ] }, "locked": { - "lastModified": 1719451583, - "narHash": "sha256-2FHGp9cH5q42yVdYAfLjMCYJgr+VYfMW4LYmCOptlpg=", + "lastModified": 1720834061, + "narHash": "sha256-xKk5ZrmxKwy+tCQpGLKW5FCdBr0eR2uK5p6RRWn3+Z0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4157bcc67488e09407f5edc130ebf62c1a1a1433", + "rev": "9492c970422e20e7476f3e05dea4976921f79b26", "type": "github" }, "original": { @@ -1017,11 +1017,11 @@ }, "nixlib": { "locked": { - "lastModified": 1719103869, - "narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -1038,11 +1038,11 @@ ] }, "locked": { - "lastModified": 1719450236, - "narHash": "sha256-fh0l6pLvuTrTBakFMQfK7lwpjvWd5i+CFyVs8TMzPNo=", + "lastModified": 1720859326, + "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "1867f28f87fcf4e817f165003aff967a5280aaab", + "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", "type": "github" }, "original": { @@ -1069,14 +1069,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs-lib_2": { @@ -1093,11 +1093,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1719483014, - "narHash": "sha256-A7z3iygqdSgs659vGIH2b66oM6lbXw1j9yXwV+JzmRY=", + "lastModified": 1720864136, + "narHash": "sha256-kT2m8+wmDk+8Fpvk7K891pIk7CyTi7RprQltx/n9kE0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3d2469feee46b3ca1aca909f4257c53186f310b", + "rev": "239de4a6e556671f8ca32f77a3d6e81801321dd1", "type": "github" }, "original": { @@ -1189,11 +1189,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1720691131, + "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", "type": "github" }, "original": { @@ -1205,16 +1205,16 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1719099622, - "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", + "lastModified": 1720282526, + "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", + "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -1253,11 +1253,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { @@ -1269,11 +1269,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1718276985, - "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -1481,11 +1481,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -1503,11 +1503,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1720027132, - "narHash": "sha256-m43jwtM+55DRKdjMmRnE2T5jR+nuohnv/fRQ62EkXek=", + "lastModified": 1720840326, + "narHash": "sha256-r6ex6T8ktE2ZvYWFcM2W8UIxraVzIGRxlzToEBa584I=", "owner": "AtaraxiaSjel", "repo": "PrismLauncher", - "rev": "589701fe1e3ccbc9c18462909b21dd5d1ef60610", + "rev": "c308dfb326ff40e1dce05cd4e0d61b7eae1f3c15", "type": "github" }, "original": { @@ -1555,11 +1555,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1719268571, - "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", + "lastModified": 1720479166, + "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", + "rev": "67035a355b1d52d2d238501f8cc1a18706979760", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5c4f314..e917ed9 100644 --- a/flake.nix +++ b/flake.nix @@ -155,7 +155,6 @@ shared-patches = patchesPath [ ]; unstable-patches = shared-patches ++ patchesPath [ - "jaxlib.patch" "netbird-24.11.patch" "onlyoffice.patch" "vaultwarden.patch" diff --git a/machines/AMD-Workstation/boot.nix b/machines/AMD-Workstation/boot.nix index bd8e22d..e84e5c4 100644 --- a/machines/AMD-Workstation/boot.nix +++ b/machines/AMD-Workstation/boot.nix @@ -31,8 +31,8 @@ in { enableCryptodisk = true; useOSProber = false; zfsSupport = true; - gfxmodeEfi = "2560x1440"; # efiInstallAsRemovable = true; - # theme = pkgs.; + gfxmodeEfi = "2560x1440"; + # efiInstallAsRemovable = true; }; systemd-boot.enable = lib.mkForce false; efi.canTouchEfiVariables = true; diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix index b486e9c..a7878fe 100644 --- a/machines/AMD-Workstation/default.nix +++ b/machines/AMD-Workstation/default.nix @@ -14,7 +14,7 @@ customProfiles.hoyo customProfiles.minecraft customProfiles.nicotine - customProfiles.sunshine + # customProfiles.sunshine customProfiles.wine-games customProfiles.ollama diff --git a/patches/onlyoffice.patch b/patches/onlyoffice.patch index 4ac3079..afa39df 100644 --- a/patches/onlyoffice.patch +++ b/patches/onlyoffice.patch @@ -1,16 +1,16 @@ diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix -index 343ca80c9fc2..a10e19d8b98c 100644 +index 0d0e01d4f..9a403285e 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix -@@ -79,113 +79,6 @@ in +@@ -77,113 +77,6 @@ in config = lib.mkIf cfg.enable { services = { - nginx = { -- enable = mkDefault true; +- enable = lib.mkDefault true; - # misses text/csv, font/ttf, application/x-font-ttf, application/rtf, application/wasm -- recommendedGzipSettings = mkDefault true; -- recommendedProxySettings = mkDefault true; +- recommendedGzipSettings = lib.mkDefault true; +- recommendedProxySettings = lib.mkDefault true; - - upstreams = { - # /etc/nginx/includes/http-common.conf diff --git a/patches/zen-kernels.patch b/patches/zen-kernels.patch index 0ef7698..fbd2d1d 100644 --- a/patches/zen-kernels.patch +++ b/patches/zen-kernels.patch @@ -6,10 +6,10 @@ index 9d1566216..c3113eb5c 100644 }; # ./update-zen.py lqx lqxVariant = { -- version = "6.9.5"; #lqx +- version = "6.9.8"; #lqx + version = "6.8.11"; #lqx suffix = "lqx1"; #lqx -- sha256 = "0r3pgjfyza3vkvp7kw1s7sn1gf4hxq6r6qs5wvv76gmff7s399yz"; #lqx +- sha256 = "1r5ld2xibr0qkwi1yy7h746sclsmd8cq68z0zdpbbn2qrgyx302k"; #lqx + sha256 = "1dj4znir4wp6jqs680dcxn8z6p02d518993rmrx54ch04jyy5brj"; #lqx isLqx = true; }; diff --git a/profiles/applications/email.nix b/profiles/applications/email.nix index 6604628..c675199 100644 --- a/profiles/applications/email.nix +++ b/profiles/applications/email.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: { home-manager.users.${config.mainuser} = { - home.packages = [ pkgs.gnome.geary ]; + home.packages = [ pkgs.geary ]; }; defaultApplications.mail = { - cmd = "${pkgs.gnome.geary}/bin/geary"; + cmd = "${pkgs.geary}/bin/geary"; desktop = "geary"; }; diff --git a/profiles/applications/packages.nix b/profiles/applications/packages.nix index f136596..ea75c08 100644 --- a/profiles/applications/packages.nix +++ b/profiles/applications/packages.nix @@ -105,7 +105,7 @@ with config.deviceSpecific; { desktop = "pcmanfm"; }; monitor = { - cmd = "${pkgs.gnome.gnome-system-monitor}/bin/gnome-system-monitor"; + cmd = "${pkgs.gnome-system-monitor}/bin/gnome-system-monitor"; desktop = "gnome-system-monitor"; }; torrent = { diff --git a/profiles/overlay.nix b/profiles/overlay.nix index 7211e7c..10b8de2 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -24,6 +24,7 @@ with lib; { nix-alien = inputs.nix-alien.packages.${system}.nix-alien; nix-fast-build = inputs.nix-fast-build.packages.${system}.default; nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update; + open-webui = master.open-webui; prismlauncher = inputs.prismlauncher.packages.${system}.prismlauncher.override { jdks = [ pkgs.temurin-bin ]; }; diff --git a/profiles/workspace/print-scan.nix b/profiles/workspace/print-scan.nix index c3ecce6..cf421b9 100644 --- a/profiles/workspace/print-scan.nix +++ b/profiles/workspace/print-scan.nix @@ -12,5 +12,5 @@ pkgs.system-config-printer ]; - environment.systemPackages = [ pkgs.gnome.simple-scan ]; + environment.systemPackages = [ pkgs.simple-scan ]; }