diff --git a/flake.lock b/flake.lock index 0e7d2f9..c2f91f5 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1772633058, + "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1777848538, - "narHash": "sha256-Dj51C0NWsglqRrCpdmMr2nFiYacFOid1Tor4H9yG2HY=", + "lastModified": 1767232402, + "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=", "owner": "musnix", "repo": "musnix", - "rev": "8548782f0d1d0928daa3fffde8a008f72219a3f3", + "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1779622619, - "narHash": "sha256-CoyW4Uy3DEpI252S6vTV6/UeQ+6wsIHvi94ggC1Ev/E=", + "lastModified": 1772884214, + "narHash": "sha256-nl1U1E9Kk9ZmxWdqcwBuFaljxknbrwq8/bY+utQSajk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f9e8b871f11137d4b9e15296ea134522dc7a7cb4", + "rev": "3fc5b3670ef77356173ca5f1fa5015e01204bc33", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1779374863, - "narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", + "lastModified": 1772873827, + "narHash": "sha256-T1igKylw0ZX8+yws4dWbkrSc+hZ1bmsM+Tjs4lxMYgo=", "owner": "YaLTeR", "repo": "niri", - "rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", + "rev": "8f75d171b6017ed34043b1255ec4ffc374bf6ab0", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1779467186, - "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779467186, - "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1777944972, - "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", + "lastModified": 1772944399, + "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", + "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1778680496, - "narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=", + "lastModified": 1771788390, + "narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=", "owner": "danth", "repo": "stylix", - "rev": "fc5bec2e44678eeaa221d566d447a0257a884737", + "rev": "ebb238f14d6f930068be4718472da3105fd5d3bf", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1779591853, - "narHash": "sha256-osTG6d7BfV5CchHjETh3jcmZwDYrHpNcpAIyh1KyIs0=", + "lastModified": 1772429643, + "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3273a0fccd71da21c6362c74f3b1d1c0a89ff3ba", + "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1778822459, - "narHash": "sha256-hJlFMK7Es783KU/mhLEGC+xim/EqBMVdbsWgthquo6Y=", + "lastModified": 1772685307, + "narHash": "sha256-5xthZHeqwBeXNhnRIlxnCuaZLky0SZ6vQsxtd+eqhTU=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "90d4d395e2be09b2d314816dadd34660528c4ee4", + "rev": "dc92d88524ee83308795bc90f6a9f1d965265aaa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 019255e..1857f36 100644 --- a/flake.nix +++ b/flake.nix @@ -54,23 +54,11 @@ ./nixos/programs/personal.nix ./nixos/services/musnix.nix ./nixos/workstation.nix - # { - # services.monado = { - # enable = true; - # forceDefaultRuntime = true; - # highPriority = true; - # }; - # systemd.user.services.monado.environment = { - # STEAMVR_LH_ENABLE = "true"; - # # XRT_COMPOSITOR_SCALE_PERCENTAGE = "200"; - # }; - # } ]; home-modules = [ ./home/programs/graphical.nix ./home/programs/gamer.nix ./home/programs/personal/. - # ./home/programs/xr.nix ]; }; diff --git a/home/default.nix b/home/default.nix index ad89225..b68866f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -16,6 +16,7 @@ home.homeDirectory = "/home/${config.home.username}"; xdg.userDirs.enable = true; + xdg.mimeApps.enable = true; manual.html.enable = true; diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 59e6860..53ec0b2 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -16,7 +16,7 @@ in { xdg.portal = { enable = true; configPackages = [pkgs.hyprland]; - extraPortals = [pkgs.xdg-desktop-portal-gtk]; + extraPortals = [pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr]; }; wayland.windowManager.hyprland = { diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix index 1d58030..99e8627 100644 --- a/home/programs/gamer.nix +++ b/home/programs/gamer.nix @@ -2,7 +2,7 @@ home.packages = with pkgs; [ # Games airshipper - # luanti + luanti superTuxKart xonotic @@ -11,7 +11,7 @@ gamescope gamemode mangohud - bs-manager + # BeatSaberModManager - out of date: https://github.com/NixOS/nixpkgs/pull/339370 protontricks protonup-qt oversteer diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 709739e..2fbbb1e 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -32,7 +32,6 @@ inputs.zen-browser.packages.x86_64-linux.default brave - # grayjay ]; programs.obs-studio = { @@ -55,4 +54,5 @@ "file:///$HOME/Downloads" ]; }; + } diff --git a/home/programs/pcmanfm.nix b/home/programs/pcmanfm.nix new file mode 100644 index 0000000..51e6620 --- /dev/null +++ b/home/programs/pcmanfm.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + pcmanfm + ]; + + xdg.mimeApps.defaultApplications = { + "inode/directory" = "pcmanfm.desktop"; + }; +} diff --git a/home/programs/qutebrowser.nix b/home/programs/qutebrowser.nix index 1a947a4..a097dab 100644 --- a/home/programs/qutebrowser.nix +++ b/home/programs/qutebrowser.nix @@ -1,5 +1,9 @@ { home.sessionVariables.BROWSER = "qutebrowser"; + xdg.mimeApps.defaultApplications = { + "application/xhtml+xml" = "org.qutebrowser.qutebrowser.desktop"; + "text/html" = "org.qutebrowser.qutebrowser.desktop"; + }; programs.qutebrowser = { enable = true; searchEngines = { diff --git a/home/programs/xr.nix b/home/programs/xr.nix index f919e32..15414d7 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -7,7 +7,7 @@ openxr-loader opencomposite ]; - # services.monado.enable = true; + services.monado.enable = true; systemd.user.services.monado.environment = { STEAMVR_LH_ENABLE = "true"; XRT_COMPOSITOR_SCALE_PERCENTAGE = "200"; diff --git a/nixos/services/authentik.nix b/nixos/services/authentik.nix index 3ff61f8..186ca42 100644 --- a/nixos/services/authentik.nix +++ b/nixos/services/authentik.nix @@ -1,6 +1,7 @@ {config, ...}: let inherit (config) sops; inherit (sops) templates placeholder; + redis_port = "6380"; authentik_port = "8084"; postgres = { user = "authentik"; @@ -9,17 +10,19 @@ }; authentik-config = { autoStart = true; - image = "ghcr.io/goauthentik/server:2026.2.1"; + image = "ghcr.io/goauthentik/server:2025.8.4"; volumes = ["/home/tristan/pods/authentik/media:/media"]; environment = { AUTHENTIK_POSTGRESQL__USER = postgres.user; AUTHENTIK_POSTGRESQL__HOST = "192.168.1.2"; AUTHENTIK_POSTGRESQL__PORT = postgres.port; + AUTHENTIK_REDIS__HOST = "192.168.1.2"; + AUTHENTIK_REDIS__PORT = redis_port; AUTHENTIK_EMAIL__FROM = "Authentik "; AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME = "false"; }; environmentFiles = [templates."authentik/environment".path]; - dependsOn = ["authentik-postgres"]; + dependsOn = ["authentik-redis" "authentik-postgres"]; }; in { sops.secrets = { @@ -50,6 +53,13 @@ in { }; }; virtualisation.oci-containers.containers = { + authentik-redis = { + autoStart = true; + image = "redis:7.2-alpine"; + ports = ["${redis_port}:6379"]; + volumes = ["authentik-redis:/data"]; + }; + authentik-server = authentik-config // { diff --git a/nixos/services/grafana.nix b/nixos/services/grafana.nix index 3e2b409..7499aca 100644 --- a/nixos/services/grafana.nix +++ b/nixos/services/grafana.nix @@ -61,7 +61,7 @@ in { { name = "synapse"; url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; - sha256 = "sha256:1hn05wwv38pi1s2j3bdsfs46jb2wjrz6ji5jq6x1dl89nkvmdfhv"; + sha256 = "sha256:1lhhhzjm1rj25gg6dnmgwaxr05f8p2ndrlygdnjqzam7s6y75db3"; } ]; } diff --git a/nixos/services/nextcloud.nix b/nixos/services/nextcloud.nix index 1aaf9c8..1d4cdbf 100644 --- a/nixos/services/nextcloud.nix +++ b/nixos/services/nextcloud.nix @@ -28,7 +28,7 @@ in { services.nextcloud = { enable = true; https = true; - package = pkgs.nextcloud32; + package = pkgs.nextcloud31; hostName = "files.${config.networking.domain}"; configureRedis = true; database.createLocally = true; @@ -83,9 +83,9 @@ in { previewgenerator deck news + oidc_login recognize ; - # inherit (pkgs.nextcloud33.packages.apps) oidc_login; }; maxUploadSize = "5G"; };