tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Compare commits

base: tristan:5d19a2d3039add846e0a5f43baec3b22c422c839
Branches Tags
tristan:zenix/master
tristan:alpine/master
tristan:framework/master
..
compare: tristan:50a827335dd0135905fb98ec779b84bc84bbe804
Branches Tags
tristan:alpine/master
tristan:zenix/master
tristan:framework/master

No commits in common. "5d19a2d3039add846e0a5f43baec3b22c422c839" and "50a827335dd0135905fb98ec779b84bc84bbe804" have entirely different histories.
5d19a2d303 ... 50a827335d

12 changed files with 70 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

72
flake.lock generated
View file

@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779506708, "lastModified": 1772633058,
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1777848538, "lastModified": 1767232402,
"narHash": "sha256-Dj51C0NWsglqRrCpdmMr2nFiYacFOid1Tor4H9yG2HY=", "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "8548782f0d1d0928daa3fffde8a008f72219a3f3", "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,11 +303,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1779622619, "lastModified": 1772884214,
"narHash": "sha256-CoyW4Uy3DEpI252S6vTV6/UeQ+6wsIHvi94ggC1Ev/E=", "narHash": "sha256-nl1U1E9Kk9ZmxWdqcwBuFaljxknbrwq8/bY+utQSajk=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "f9e8b871f11137d4b9e15296ea134522dc7a7cb4", "rev": "3fc5b3670ef77356173ca5f1fa5015e01204bc33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779374863, "lastModified": 1772873827,
"narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", "narHash": "sha256-T1igKylw0ZX8+yws4dWbkrSc+hZ1bmsM+Tjs4lxMYgo=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", "rev": "8f75d171b6017ed34043b1255ec4ffc374bf6ab0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1777268161, "lastModified": 1766902085,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +367,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1779467186, "lastModified": 1772822230,
"narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +383,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1779467186, "lastModified": 1772822230,
"narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1778443072, "lastModified": 1772542754,
"narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777944972, "lastModified": 1772944399,
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,11 +538,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1778680496, "lastModified": 1771788390,
"narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=", "narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "fc5bec2e44678eeaa221d566d447a0257a884737", "rev": "ebb238f14d6f930068be4718472da3105fd5d3bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -698,11 +698,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779591853, "lastModified": 1772429643,
"narHash": "sha256-osTG6d7BfV5CchHjETh3jcmZwDYrHpNcpAIyh1KyIs0=", "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3273a0fccd71da21c6362c74f3b1d1c0a89ff3ba", "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -716,11 +716,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1778822459, "lastModified": 1772685307,
"narHash": "sha256-hJlFMK7Es783KU/mhLEGC+xim/EqBMVdbsWgthquo6Y=", "narHash": "sha256-5xthZHeqwBeXNhnRIlxnCuaZLky0SZ6vQsxtd+eqhTU=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "90d4d395e2be09b2d314816dadd34660528c4ee4", "rev": "dc92d88524ee83308795bc90f6a9f1d965265aaa",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View file

@ -54,23 +54,11 @@
./nixos/programs/personal.nix ./nixos/programs/personal.nix
./nixos/services/musnix.nix ./nixos/services/musnix.nix
./nixos/workstation.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-modules = [
./home/programs/graphical.nix ./home/programs/graphical.nix
./home/programs/gamer.nix ./home/programs/gamer.nix
./home/programs/personal/. ./home/programs/personal/.
# ./home/programs/xr.nix
]; ];
}; };

1
home/default.nix
View file

@ -16,6 +16,7 @@
home.homeDirectory = "/home/${config.home.username}"; home.homeDirectory = "/home/${config.home.username}";
xdg.userDirs.enable = true; xdg.userDirs.enable = true;
xdg.mimeApps.enable = true;
manual.html.enable = true; manual.html.enable = true;

2
home/desktop/hyprland/default.nix
View file

@ -16,7 +16,7 @@ in {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
configPackages = [pkgs.hyprland]; configPackages = [pkgs.hyprland];
extraPortals = [pkgs.xdg-desktop-portal-gtk]; extraPortals = [pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr];
}; };
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {

4
home/programs/gamer.nix
View file

@ -2,7 +2,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
# Games # Games
airshipper airshipper
# luanti luanti
superTuxKart superTuxKart
xonotic xonotic
@ -11,7 +11,7 @@
gamescope gamescope
gamemode gamemode
mangohud mangohud
bs-manager # BeatSaberModManager - out of date: https://github.com/NixOS/nixpkgs/pull/339370
protontricks protontricks
protonup-qt protonup-qt
oversteer oversteer

2
home/programs/graphical.nix
View file

@ -32,7 +32,6 @@
inputs.zen-browser.packages.x86_64-linux.default inputs.zen-browser.packages.x86_64-linux.default
brave brave
# grayjay
]; ];
programs.obs-studio = { programs.obs-studio = {
@ -55,4 +54,5 @@
"file:///$HOME/Downloads" "file:///$HOME/Downloads"
]; ];
}; };
} }

9
home/programs/pcmanfm.nix Normal file
View file

@ -0,0 +1,9 @@
{pkgs, ...}: {
home.packages = with pkgs; [
pcmanfm
];
xdg.mimeApps.defaultApplications = {
"inode/directory" = "pcmanfm.desktop";
};
}

4
home/programs/qutebrowser.nix
View file

@ -1,5 +1,9 @@
{ {
home.sessionVariables.BROWSER = "qutebrowser"; home.sessionVariables.BROWSER = "qutebrowser";
xdg.mimeApps.defaultApplications = {
"application/xhtml+xml" = "org.qutebrowser.qutebrowser.desktop";
"text/html" = "org.qutebrowser.qutebrowser.desktop";
};
programs.qutebrowser = { programs.qutebrowser = {
enable = true; enable = true;
searchEngines = { searchEngines = {

2
home/programs/xr.nix
View file

@ -7,7 +7,7 @@
openxr-loader openxr-loader
opencomposite opencomposite
]; ];
# services.monado.enable = true; services.monado.enable = true;
systemd.user.services.monado.environment = { systemd.user.services.monado.environment = {
STEAMVR_LH_ENABLE = "true"; STEAMVR_LH_ENABLE = "true";
XRT_COMPOSITOR_SCALE_PERCENTAGE = "200"; XRT_COMPOSITOR_SCALE_PERCENTAGE = "200";

14
nixos/services/authentik.nix
View file

@ -1,6 +1,7 @@
{config, ...}: let {config, ...}: let
inherit (config) sops; inherit (config) sops;
inherit (sops) templates placeholder; inherit (sops) templates placeholder;
redis_port = "6380";
authentik_port = "8084"; authentik_port = "8084";
postgres = { postgres = {
user = "authentik"; user = "authentik";
@ -9,17 +10,19 @@
}; };
authentik-config = { authentik-config = {
autoStart = true; 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"]; volumes = ["/home/tristan/pods/authentik/media:/media"];
environment = { environment = {
AUTHENTIK_POSTGRESQL__USER = postgres.user; AUTHENTIK_POSTGRESQL__USER = postgres.user;
AUTHENTIK_POSTGRESQL__HOST = "192.168.1.2"; AUTHENTIK_POSTGRESQL__HOST = "192.168.1.2";
AUTHENTIK_POSTGRESQL__PORT = postgres.port; AUTHENTIK_POSTGRESQL__PORT = postgres.port;
AUTHENTIK_REDIS__HOST = "192.168.1.2";
AUTHENTIK_REDIS__PORT = redis_port;
AUTHENTIK_EMAIL__FROM = "Authentik <tristan@tristans.cloud>"; AUTHENTIK_EMAIL__FROM = "Authentik <tristan@tristans.cloud>";
AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME = "false"; AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME = "false";
}; };
environmentFiles = [templates."authentik/environment".path]; environmentFiles = [templates."authentik/environment".path];
dependsOn = ["authentik-postgres"]; dependsOn = ["authentik-redis" "authentik-postgres"];
}; };
in { in {
sops.secrets = { sops.secrets = {
@ -50,6 +53,13 @@ in {
}; };
}; };
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
authentik-redis = {
autoStart = true;
image = "redis:7.2-alpine";
ports = ["${redis_port}:6379"];
volumes = ["authentik-redis:/data"];
};
authentik-server = authentik-server =
authentik-config authentik-config
// { // {

2
nixos/services/grafana.nix
View file

@ -61,7 +61,7 @@ in {
{ {
name = "synapse"; name = "synapse";
url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json";
sha256 = "sha256:1hn05wwv38pi1s2j3bdsfs46jb2wjrz6ji5jq6x1dl89nkvmdfhv"; sha256 = "sha256:1lhhhzjm1rj25gg6dnmgwaxr05f8p2ndrlygdnjqzam7s6y75db3";
} }
]; ];
} }

4
nixos/services/nextcloud.nix
View file

@ -28,7 +28,7 @@ in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
https = true; https = true;
package = pkgs.nextcloud32; package = pkgs.nextcloud31;
hostName = "files.${config.networking.domain}"; hostName = "files.${config.networking.domain}";
configureRedis = true; configureRedis = true;
database.createLocally = true; database.createLocally = true;
@ -83,9 +83,9 @@ in {
previewgenerator previewgenerator
deck deck
news news
oidc_login
recognize recognize
; ;
# inherit (pkgs.nextcloud33.packages.apps) oidc_login;
}; };
maxUploadSize = "5G"; maxUploadSize = "5G";
}; };