xin/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: xin:f905f051a0c719b944288fbee64cb62e38b496a8
Branches Tags
xin:master
xin:deploy
xin:testing-weilite
xin:testing-raspite
xin:testing-calcite
xin:next
xin:deploy-comin-eval
..
compare: xin:90788e61a278230cbfce3c97b33b595e7df9b423
Branches Tags
xin:deploy
xin:testing-weilite
xin:testing-raspite
xin:testing-calcite
xin:next
xin:deploy-comin-eval
xin:master

No commits in common. "f905f051a0c719b944288fbee64cb62e38b496a8" and "90788e61a278230cbfce3c97b33b595e7df9b423" have entirely different histories.
f905f051a0 ... 90788e61a2

7 changed files with 57 additions and 80 deletions
Show stats Expand all files Collapse all files

78
flake.lock generated
View file

@ -116,11 +116,11 @@
}, },
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1726952185, "lastModified": 1725509983,
"narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,11 +285,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1710146030,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +433,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727111745, "lastModified": 1725694918,
"narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "21c021862fa696c8199934e2153214ab57150cb6", "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +476,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1726036828,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "8a1671642826633586d12ac3158e463c7a50a112",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -540,11 +540,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726975622, "lastModified": 1725161148,
"narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=", "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417", "rev": "32058e9138248874773630c846563b1a78ee7a5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -564,11 +564,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727142313, "lastModified": 1725672853,
"narHash": "sha256-uEkvjrMOmQiGMw2m7iAHZDE82Wt+i3P65+dFmgpBbAM=", "narHash": "sha256-z1O6dzCJ27OZpF680tZL0mQphQETdg4DTryvhFOpZyA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "487e99ffa42d57de53eba5ca4b60cd95fb442c42", "rev": "efd33fc8e5a149dd48d86ca6003b51ab3ce4ae21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -579,11 +579,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1727040444, "lastModified": 1725477728,
"narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1726969270, "lastModified": 1725407940,
"narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,11 +639,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1725762081, "lastModified": 1721524707,
"narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -655,11 +655,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1727147895, "lastModified": 1726296585,
"narHash": "sha256-2YZYrtEqQlPT77i6F3PSfA6pHeC62Q94u+c5N26BbNo=", "narHash": "sha256-inm7AIEqfgF4wXkhWB2M5IfmdITSF90xpeDDSU3DfNc=",
"owner": "xinyangli", "owner": "xinyangli",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1b7b0516e42e87d04944092f04e85a393f12e3a8", "rev": "8539edfb09c674994303141378df4ab33cd765ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,11 +671,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725194671, "lastModified": 1726042813,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "rev": "159be5db480d1df880a0135ca0bfed84c2f88353",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -713,11 +713,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1727146799, "lastModified": 1725687722,
"narHash": "sha256-EgTExhm77mFu0dNkl4A9LaVYwZYcx62hIG1Q7IJbzzg=", "narHash": "sha256-LPv282y5okYk8ebiBsEbDXy2WykwdBPpAthjKSmTfNI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "819ed7a5b7dfec428810dfa1403d4fcb5cad44f3", "rev": "ff7f8143f33751c4f37caec678ed1eb63006c0d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -774,11 +774,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1726524647, "lastModified": 1725540166,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "rev": "d9d781523a1463965cd1e1333a306e70d9feff07",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/xin/calcite.nix
View file

@ -27,7 +27,7 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
betterbird # betterbird
remmina remmina
]; ];

18
machines/massicot/default.nix
View file

@ -1,5 +1,7 @@
{ {
inputs, inputs,
config,
libs,
pkgs, pkgs,
... ...
}: }:
@ -49,6 +51,13 @@
efiSupport = true; efiSupport = true;
configurationLimit = 5; configurationLimit = 5;
}; };
#
# fileSystems."/mnt/storage" = {
# device = "//u380335-sub1.your-storagebox.de/u380335-sub1";
# fsType = "cifs";
# options = [ "credentials=${config.sops.secrets.storage_box_mount.path}" ];
# };
#
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cifs-utils cifs-utils
git git
@ -60,11 +69,14 @@
hostName = "massicot"; hostName = "massicot";
}; };
commonSettings = { custom.kanidm-client = {
auth.enable = true; enable = true;
nix = { uri = "https://auth.xinyang.life/";
asSSHAuth = {
enable = true; enable = true;
allowedGroups = [ "linux_users" ];
}; };
sudoers = [ "xin@auth.xinyang.life" ];
}; };
security.sudo = { security.sudo = {

3
machines/massicot/kanidm-provision.nix
View file

@ -139,8 +139,7 @@
originUrl = [ originUrl = [
"http://localhost/" "http://localhost/"
"http://127.0.0.1/" "http://127.0.0.1/"
# TODO: Should allow mobile redirect url not ending with / "oc://android.owncloud.com"
# "oc://android.owncloud.com"
]; ];
basicSecretFile = config.sops.secrets."kanidm/ocis_android_secret".path; basicSecretFile = config.sops.secrets."kanidm/ocis_android_secret".path;
preferShortUsername = true; preferShortUsername = true;

3
machines/weilite/default.nix
View file

@ -17,7 +17,6 @@
networking.hostName = "weilite"; networking.hostName = "weilite";
commonSettings = { commonSettings = {
auth.enable = true; auth.enable = true;
autoupgrade.enable = true;
nix = { nix = {
enable = true; enable = true;
enableMirrors = true; enableMirrors = true;
@ -158,7 +157,7 @@
repo = "github.com/caddy-dns/cloudflare"; repo = "github.com/caddy-dns/cloudflare";
version = "89f16b99c18ef49c8bb470a82f895bce01cbaece"; version = "89f16b99c18ef49c8bb470a82f895bce01cbaece";
} }
{ {
repo = "github.com/caddy-dns/dnspod"; repo = "github.com/caddy-dns/dnspod";
version = "1fd4ce87e919f47db5fa029c31ae74b9737a58af"; version = "1fd4ce87e919f47db5fa029c31ae74b9737a58af";
} }

32
modules/nixos/common-settings/autoupgrade.nix
View file

@ -1,32 +0,0 @@
{
config,
lib,
...
}:
let
inherit (lib)
mkIf
mkEnableOption
mkOption
types
;
cfg = config.commonSettings.autoupgrade;
in
{
options.commonSettings.autoupgrade = {
enable = mkEnableOption "auto upgrade with nixos-rebuild";
flake = mkOption {
type = types.str;
default = "github:xinyangli/nixos-config/deploy";
};
};
config = mkIf cfg.enable {
system.autoUpgrade = {
enable = true;
flake = cfg.flake;
};
};
}

1
modules/nixos/default.nix
View file

@ -1,7 +1,6 @@
{ {
imports = [ imports = [
./common-settings/auth.nix ./common-settings/auth.nix
./common-settings/autoupgrade.nix
./common-settings/nix-conf.nix ./common-settings/nix-conf.nix
./restic.nix ./restic.nix
./vaultwarden.nix ./vaultwarden.nix