diff --git a/flake.lock b/flake.lock index a3cdf718..a9ed9294 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1718735234, - "narHash": "sha256-Cae9qS/2A6bI2d9rKPWO1FOZoC2HmmFmYL21eU5AVWc=", + "lastModified": 1719327247, + "narHash": "sha256-/fgUkcTVzxRVJdSlHdZqO7zGifMge5sJnJhaOwskmVs=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "a56097c0eecef74b52218dcd77a21d516e6aaefc", + "rev": "b5058cc8e073fab0130bad71c6f062b89abe7106", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719104749, - "narHash": "sha256-ZYRhOs5Qm3KzTl0sZg3XVD9zAQf2yDM9E2NHyFMPv8I=", + "lastModified": 1719457243, + "narHash": "sha256-5rOWwMAp/suWVKGavhfdyLsF2mA7Fv2DQWXlt7S+QWA=", "owner": "catppuccin", "repo": "nix", - "rev": "2fb16f2d6ffb2759f14fbcbd1f1e242f5fb662c7", + "rev": "53967ef237edd38a5b5cc5441e9b6a44b9554977", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719438532, + "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1718662658, - "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -391,11 +391,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -494,11 +494,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719042662, - "narHash": "sha256-xwj8hxu02myIPkNsch/v2NbxuRmuvlcphrbYPECE49c=", + "lastModified": 1719500677, + "narHash": "sha256-r9KuhKw1uWfFKgUqn+HQjdkh3j+1L+5JLSVrfkO67p8=", "owner": "nix-community", "repo": "nixvim", - "rev": "49452662b7b4dd2467cbac19e0f9820d570d8976", + "rev": "35e837c10b767c3dbf580f3cade5084f376f7c70", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "oldNixpkgs": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1719234068, + "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "90bd1b26e23760742fdcb6152369919098f05417", "type": "github" }, "original": { @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1719243788, + "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "type": "github" }, "original": { diff --git a/modules/desktop/gaming/games.nix b/modules/desktop/gaming/games.nix index 9223606a..15337fd2 100644 --- a/modules/desktop/gaming/games.nix +++ b/modules/desktop/gaming/games.nix @@ -5,11 +5,15 @@ let cfg = config.modules.desktop.gaming.games; gamingCfg = config.modules.desktop.gaming; + fixedMindustry = unstable.mindustry.override { + gradle = unstable.gradle_7; + }; + games = with unstable; [ # Games osu-lazer # osu!lazer airshipper # Veloren - mindustry # Mindustry + fixedMindustry # Mindustry xivlauncher # FF XIV ]; in diff --git a/modules/desktop/submodules/qt.nix b/modules/desktop/submodules/qt.nix index c4406b01..9dfd060c 100644 --- a/modules/desktop/submodules/qt.nix +++ b/modules/desktop/submodules/qt.nix @@ -13,14 +13,14 @@ with lib.my; home = { packages = with pkgs; [ kdePackages.qt6ct libsForQt5.qt5ct ]; sessionVariables = { - QT_QPA_PLATFORMTHEME = "qt5ct"; + QT_QPA_PLATFORMTHEME = "kvantum"; QT_QPA_PLATFORM = "xcb"; }; }; qt = { enable = true; - platformTheme.name = "qtct"; + platformTheme.name = "kvantum"; style = { name = "kvantum"; catppuccin = { diff --git a/modules/agenix.nix b/modules/secrets.nix similarity index 99% rename from modules/agenix.nix rename to modules/secrets.nix index 5e5d1d28..ca353069 100644 --- a/modules/agenix.nix +++ b/modules/secrets.nix @@ -66,6 +66,7 @@ in done ''; + age.secrets = attrsets.mapAttrs' (n: _: { diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix index 133ddde7..5db858a5 100644 --- a/modules/services/syncthing.nix +++ b/modules/services/syncthing.nix @@ -5,8 +5,10 @@ let cfg = config.modules.services.syncthing; homeDir = config.home-manager.users.wittano.home.homeDirectory; - encryptedConfig = - builtins.fromJSON (builtins.readFile config.age.secrets.syncthing.path); + encryptedConfig = trivial.pipe config.age.secrets.syncthing.path [ + builtins.readFile + builtins.fromJSON + ]; in { options = { @@ -18,7 +20,7 @@ in config = mkIf (cfg.enable) { services.syncthing = { - enable = builtins.pathExists config.age.secrets.syncthing.path; + enable = true; systemService = true; dataDir = "${homeDir}/.cache/syncthing"; configDir = "${homeDir}/.config/syncthing";