Sk7Str1p3/nixos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fix some minor formattng issues and linter warnings

Browse source
This commit is contained in:
Sk7Str1p3 2026-05-13 18:24:38 +03:00
parent 92d7a96e2f
commit 09cb1886dc
No known key found for this signature in database
GPG key ID: 4DD995933D06D43B
13 changed files with 497 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.envrc
View file

@ -1,2 +1,2 @@
use flake .#nix use flake .#nix
use flake .#SkyOS use flake .#SkyOS

4
.sops.yaml
View file

@ -6,7 +6,7 @@ keys:
creation_rules: creation_rules:
- path_regex: 'users/[^/]+/about\.json$' - path_regex: 'users/[^/]+/about\.json$'
encrypted_regex: '^realName$' encrypted_regex: "^realName$"
age: age:
- *eval - *eval
- path_regex: 'users/[^/]+/face\.png$' - path_regex: 'users/[^/]+/face\.png$'
@ -15,4 +15,4 @@ creation_rules:
- path_regex: '^users/Sk7Str1p3/.*\.(enc|yaml)$' - path_regex: '^users/Sk7Str1p3/.*\.(enc|yaml)$'
age: age:
- *Sk7Str1p3 - *Sk7Str1p3
- *root - *root

2
devShells/nix/default.nix
View file

@ -4,7 +4,7 @@
Many nix projects have their own devshell, Many nix projects have their own devshell,
but they don't install most necessary tools. but they don't install most necessary tools.
*/ */
pkgs: rec { pkgs: {
/** /**
nix language server nix language server
*/ */

1
devShells/nix/flake.nix
View file

@ -6,7 +6,6 @@
outputs = outputs =
{ {
self,
nixpkgs, nixpkgs,
utils, utils,
}: }:

4
docs/docgen.nix
View file

@ -85,7 +85,7 @@ stdenvNoCC.mkDerivation {
--file "${file}" > "src/${mdPath}" --file "${file}" > "src/${mdPath}"
''; '';
summaryLine = "${indent}- [${title}](${mdPath})"; summaryLine = "${indent}- [${title}](${mdPath})";
sortKey = builtins.toString order + mdPath; sortKey = toString order + mdPath;
} }
) nixFiles ) nixFiles
); );
@ -113,7 +113,7 @@ stdenvNoCC.mkDerivation {
${nixdocScripts} ${nixdocScripts}
cat > src/SUMMARY.md <<EOF cat > src/SUMMARY.md <<EOF
${summaryContent} ${summaryContent}
EOF EOF
''; '';

2
docs/src/404.md
View file

@ -1,3 +1,3 @@
# 404(( # 404((
This URL is invalid, sorry. This URL is invalid, sorry.

2
docs/src/evalSecrets.md
View file

@ -6,4 +6,4 @@ To handle this, __currently__ i use strange approach: I manually encrypt files w
[git-agecrypt](https://github.com/vlaci/git-agecrypt) wasn't suitable for me. [git-agecrypt](https://github.com/vlaci/git-agecrypt) wasn't suitable for me.
In future, i will replace it with my own implementation of transparent git encryption based on sops. In future, i will replace it with my own implementation of transparent git encryption based on sops.
Also, this used only for secrets which may be safely left in world-readable store. For more sensitive secrets I use `sops-nix`, which decrypts secrets only at runtime. Also, this used only for secrets which may be safely left in world-readable store. For more sensitive secrets I use `sops-nix`, which decrypts secrets only at runtime.

852
docs/theme/catppuccin.css vendored
View file

File diff suppressed because it is too large Load diff

2
flake/default.nix
View file

@ -22,4 +22,4 @@
flake-file.inputs = import ./inputs; flake-file.inputs = import ./inputs;
flake-file.outputs = "inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } ./flake"; flake-file.outputs = "inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } ./flake";
flake-file.description = "A very basic flake"; flake-file.description = "A very basic flake";
} }

35
users/Sk7Str1p3/about.json
View file

@ -1,21 +1,18 @@
{ {
"extraGroups": [ "extraGroups": ["wheel", "networkmanager"],
"wheel", "shell": "nushell",
"networkmanager" "realName": "ENC[AES256_GCM,data:KBIRbQWsz6n1nAZ2rtGfCdSoQiTrRchpqA==,iv:mD0Rx4GHSJcQhPCa4fxZgYgqYkwzaRQVe50I+bgML04=,tag:ZcrOoRAVOoUKPktL5Dpi/g==,type:str]",
], "session": "co:niri",
"shell": "nushell", "sops": {
"realName": "ENC[AES256_GCM,data:KBIRbQWsz6n1nAZ2rtGfCdSoQiTrRchpqA==,iv:mD0Rx4GHSJcQhPCa4fxZgYgqYkwzaRQVe50I+bgML04=,tag:ZcrOoRAVOoUKPktL5Dpi/g==,type:str]", "age": [
"session": "co:niri", {
"sops": { "recipient": "age180qx2rwyelak4wtdljcy9eqxkskfcfk4fvq26nuqqz8rtjdyyyzqlr8dt8",
"age": [ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Skp6cGdweFBaZUM2eXRC\nTHExSmtCZU53OXZWZDl3VFFMb1FSdFhkaUhnCnhiSUNQSkZZQ2htTTVxd1Nleitq\nSVV4WmFrdXNUVVU5L0RONHpMUlB2UDgKLS0tIE9UTC9qeEQ0MFlSUFhwdW9NeXYw\nelVGZ0ZYUzFoVXdibmpjTyt1ZHYxaTgKnD3m3Ceq0OT27s2OAWF+gLh5f6Xv3cpp\n28Q3JLG+FpYlBaszOdsWInouCf50tYItWHhQU3gmkhrJsA9gljOAOw==\n-----END AGE ENCRYPTED FILE-----\n"
{ }
"recipient": "age180qx2rwyelak4wtdljcy9eqxkskfcfk4fvq26nuqqz8rtjdyyyzqlr8dt8", ],
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Skp6cGdweFBaZUM2eXRC\nTHExSmtCZU53OXZWZDl3VFFMb1FSdFhkaUhnCnhiSUNQSkZZQ2htTTVxd1Nleitq\nSVV4WmFrdXNUVVU5L0RONHpMUlB2UDgKLS0tIE9UTC9qeEQ0MFlSUFhwdW9NeXYw\nelVGZ0ZYUzFoVXdibmpjTyt1ZHYxaTgKnD3m3Ceq0OT27s2OAWF+gLh5f6Xv3cpp\n28Q3JLG+FpYlBaszOdsWInouCf50tYItWHhQU3gmkhrJsA9gljOAOw==\n-----END AGE ENCRYPTED FILE-----\n" "lastmodified": "2026-05-07T15:31:42Z",
} "mac": "ENC[AES256_GCM,data:ouXlr7xwQj05RtKc1VKByybKSuXtLk9UXxnE7JSofmVdXzPc7k4atejrWyrWa6weJonpPMldnuyXBiy2RzIHLF8nyvbyCik8o5r4pJ7LlgCHvxM5B2itN/nWCR8Ave9ijBrMk1HQLE4wodUstehnigwkmfMn6phsQEnWY9vYV2c=,iv:vX1/zN+RUDvJnrnMC/KFDKRkWJdFNd12MdH32Y4nNlY=,tag:3aP34p6oaAX8luIUc7eilA==,type:str]",
], "encrypted_regex": "^realName$",
"lastmodified": "2026-05-07T15:31:42Z", "version": "3.12.1"
"mac": "ENC[AES256_GCM,data:ouXlr7xwQj05RtKc1VKByybKSuXtLk9UXxnE7JSofmVdXzPc7k4atejrWyrWa6weJonpPMldnuyXBiy2RzIHLF8nyvbyCik8o5r4pJ7LlgCHvxM5B2itN/nWCR8Ave9ijBrMk1HQLE4wodUstehnigwkmfMn6phsQEnWY9vYV2c=,iv:vX1/zN+RUDvJnrnMC/KFDKRkWJdFNd12MdH32Y4nNlY=,tag:3aP34p6oaAX8luIUc7eilA==,type:str]", }
"encrypted_regex": "^realName$",
"version": "3.12.1"
}
} }

24
users/Sk7Str1p3/face.png
View file

File diff suppressed because one or more lines are too long

48
users/Sk7Str1p3/password.yaml
View file

@ -1,27 +1,27 @@
#ENC[AES256_GCM,data:HDpYJzYRNAk1,iv:rnwJktkO4bLL1TYH75PBk0jyhYuzUHUX08SzzKE8NnM=,tag:fejDljfvbu6N5YMxlhB+Rw==,type:comment] #ENC[AES256_GCM,data:HDpYJzYRNAk1,iv:rnwJktkO4bLL1TYH75PBk0jyhYuzUHUX08SzzKE8NnM=,tag:fejDljfvbu6N5YMxlhB+Rw==,type:comment]
Sk7Str1p3: Sk7Str1p3:
userPassword: ENC[AES256_GCM,data:2JdVKap/1GRqHmSM9iOO0rB7ykvXpZgoToND6081qWt7NEGkin+WWPQUiOQNKezsckb1ayPA8grhqcVAJraQbctEhkWFTQ+oeA==,iv:ekMPf8mBcHJ1gY4yfbH5yqlci2wiERKXv0XjsbqyzvY=,tag:K0BQ+mZ8BAocNHvhI+jXIw==,type:str] userPassword: ENC[AES256_GCM,data:2JdVKap/1GRqHmSM9iOO0rB7ykvXpZgoToND6081qWt7NEGkin+WWPQUiOQNKezsckb1ayPA8grhqcVAJraQbctEhkWFTQ+oeA==,iv:ekMPf8mBcHJ1gY4yfbH5yqlci2wiERKXv0XjsbqyzvY=,tag:K0BQ+mZ8BAocNHvhI+jXIw==,type:str]
sops: sops:
age: age:
- recipient: age17669qkln533e3plts9f3sfs3u4ra8c92ddcx2yk5fngzm4u0u5ls530vnl - recipient: age17669qkln533e3plts9f3sfs3u4ra8c92ddcx2yk5fngzm4u0u5ls530vnl
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjckZBU2lCeHY4d1k0RU9P YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjckZBU2lCeHY4d1k0RU9P
U3Z2NExodCs3ZGUrcDc4SitZZEs5WU5RRmpZCnVOMDkrbGR1WmhpSGY4MlpjYkNF U3Z2NExodCs3ZGUrcDc4SitZZEs5WU5RRmpZCnVOMDkrbGR1WmhpSGY4MlpjYkNF
UGdZWnB6T2syQUtNMVRjcENRTks1SVUKLS0tIDMyYVVQcjRObnVocCtMeEpjcXlF UGdZWnB6T2syQUtNMVRjcENRTks1SVUKLS0tIDMyYVVQcjRObnVocCtMeEpjcXlF
NVFreTVWMUxHTUlJMVhrcnR6QTMrc2MKcN9ZJQSH0n6EwyKZOtikybv6Xib1SHKK NVFreTVWMUxHTUlJMVhrcnR6QTMrc2MKcN9ZJQSH0n6EwyKZOtikybv6Xib1SHKK
295Qpuv92UNqw7f5DkvUuSuC3bJrDF7IbIFZEl0Zsw1kF4ABZcUbEg== 295Qpuv92UNqw7f5DkvUuSuC3bJrDF7IbIFZEl0Zsw1kF4ABZcUbEg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
- recipient: age1zmp979z20mga9suh4fvhxcp5fa6a66jwxnx9fsd7lh3kj607hg7qz3jpew - recipient: age1zmp979z20mga9suh4fvhxcp5fa6a66jwxnx9fsd7lh3kj607hg7qz3jpew
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIWXdmRjZqK1FQWVp1eXdp YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIWXdmRjZqK1FQWVp1eXdp
VDAzbSsyaTJZOEl4NDI0ZmtZZndHNGlZMGs4ClpwaWFPNzZWdENBMnhHZXU2R3VJ VDAzbSsyaTJZOEl4NDI0ZmtZZndHNGlZMGs4ClpwaWFPNzZWdENBMnhHZXU2R3VJ
T1JOTHIrQnJpaUJzSlE0TDk1VGhkMmsKLS0tIEI4eVBzQU5sMWExOU1Yam9ERmQx T1JOTHIrQnJpaUJzSlE0TDk1VGhkMmsKLS0tIEI4eVBzQU5sMWExOU1Yam9ERmQx
b2xnZ0ZiL0YvdndrNldYeVpMUzdSUFUKj0HnkygZfhi3HLwfKA/gqUm9rYVAy7Hi b2xnZ0ZiL0YvdndrNldYeVpMUzdSUFUKj0HnkygZfhi3HLwfKA/gqUm9rYVAy7Hi
K1WmjMQVib7fvIAE3xyio1pI8GSow+EBOfXpfpIOlm5qX0t1B/DMZw== K1WmjMQVib7fvIAE3xyio1pI8GSow+EBOfXpfpIOlm5qX0t1B/DMZw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2026-05-03T11:52:10Z" lastmodified: "2026-05-03T11:52:10Z"
mac: ENC[AES256_GCM,data:djqxbQRU/bCQBwp9av/ZPKBnVYQpFYaAOZ9i8RYokChkMilDANKBPEJQmKw+U0UgTKEeIN2Ihqd6HYchH7qSawkvl0FiO7vloXmjiHm3izaqbOhcSeWaBnQ/mZV7n4w5rV8uxInJC0EpYK0xqtKengtDXcqHeNOK7GsEh0mUM38=,iv:gCiJ6dgwapFMcsYegzeGqeo3hMQ//xFObTKHz11e9ws=,tag:m5K2mtRP5HO/O8ekzJmJ0Q==,type:str] mac: ENC[AES256_GCM,data:djqxbQRU/bCQBwp9av/ZPKBnVYQpFYaAOZ9i8RYokChkMilDANKBPEJQmKw+U0UgTKEeIN2Ihqd6HYchH7qSawkvl0FiO7vloXmjiHm3izaqbOhcSeWaBnQ/mZV7n4w5rV8uxInJC0EpYK0xqtKengtDXcqHeNOK7GsEh0mUM38=,iv:gCiJ6dgwapFMcsYegzeGqeo3hMQ//xFObTKHz11e9ws=,tag:m5K2mtRP5HO/O8ekzJmJ0Q==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.12.1 version: 3.12.1

8
users/default.nix
View file

@ -32,7 +32,7 @@
pkgs, pkgs,
cfg, cfg,
config, config,
inputs, inputs,
... ...
}: }:
{ {
@ -69,7 +69,7 @@
# Configurure home-manager # Configurure home-manager
home-manager = { home-manager = {
backupFileExtension = "backup-${builtins.toString inputs.self.lastModified}"; backupFileExtension = "backup-${toString inputs.self.lastModified}";
users = lib.mkMerge ( users = lib.mkMerge (
map (user: { map (user: {
@ -100,7 +100,7 @@
"/run/tmpfiles/var/lib/AccountsService/users/${user}".f = { "/run/tmpfiles/var/lib/AccountsService/users/${user}".f = {
argument = "${lib.generators.toINI { } { argument = "${lib.generators.toINI { } {
User = { User = {
Session = builtins.toString ( Session = toString (
builtins.tail ( builtins.tail (
lib.splitString ":" (builtins.fromJSON (builtins.readFile ./${user}/about.json)).session lib.splitString ":" (builtins.fromJSON (builtins.readFile ./${user}/about.json)).session
) )
@ -128,7 +128,7 @@
__session = lib.splitString ":" (builtins.fromJSON (builtins.readFile ./${user}/about.json)) __session = lib.splitString ":" (builtins.fromJSON (builtins.readFile ./${user}/about.json))
.session; .session;
sessionType = (builtins.head __session); sessionType = (builtins.head __session);
session = builtins.toString (builtins.tail __session); session = toString (builtins.tail __session);
in in
assert sessionType == "co" || sessionType == "de"; assert sessionType == "co" || sessionType == "de";
if sessionType == "co" then if sessionType == "co" then