Ittihadyya/adyya-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated lockfile, added fluffychat to apps, added/moved various comments.
Some checks are pending
/ Check formatting (push) Waiting to run
Details

Browse source
This commit is contained in:
Ittihadyya 2025-01-17 16:12:10 +02:00
parent 911fde7430
commit b7bec87784
6 changed files with 76 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps.mod.nix
View file

@ -42,6 +42,11 @@
( (
{pkgs, ...}: { {pkgs, ...}: {
users.users.emv.extraGroups = ["video"]; users.users.emv.extraGroups = ["video"];
nixpkgs.config.permittedInsecurePackages = [
"fluffychat-linux-1.23.0" # it uses an insecure implementation of olm. but the devs are allegedly trying to move to vodozemac (which is an implementation that is not (at least publically announced as) insecure) . Using it instead of element because 1) i don't think the vulnerability is very relevant to our current threat model (as far as we're aware, it requires network or even hardware access, at which point you can already beat me with a baseball bat) and 2) out of the desktop clients, this seems to be one of the only ones with proper multi-account support??
"olm-3.2.16" # tbh i still find it funny that a cryptographic library with a vuln known for several years before this is still used.
# "Note that these are not cryptographically secure implementations. They have no resistence to side-channel attacks and should not be used in contexts that need cryptographically secure implementations. These algorithms are not optimized for speed or space. They are primarily designed to be easy to read, although some basic optimization techniques have been employed."
];
} }
) )
]; ];
@ -55,6 +60,7 @@
signal-desktop signal-desktop
discord discord
element-desktop element-desktop
fluffychat
obsidian obsidian
mumble mumble
# calibre # still borked apparently, what the hell # still!!! # calibre # still borked apparently, what the hell # still!!!

125
flake.lock
View file

@ -61,11 +61,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725860795, "lastModified": 1736852337,
"narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,11 +77,11 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731949548, "lastModified": 1735953590,
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
"rocksdb": "rocksdb" "rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1736435929, "lastModified": 1736969690,
"narHash": "sha256-VIszlm7sNpzmzgM8nisOezoaFOzRyR+WpsLaF2D3BbA=", "narHash": "sha256-HQFweFT52Rkpued7WSq7htFwZ8bFBm0j3iqQESxqgzk=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "7526ba9d6fc4221a338056802f8456733da314d6", "rev": "9ebb39ca4f35789e54b73cd33805943b362819ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +215,11 @@
}, },
"crane_2": { "crane_2": {
"locked": { "locked": {
"lastModified": 1734808813, "lastModified": 1736566337,
"narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +272,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1735799625, "lastModified": 1736836313,
"narHash": "sha256-lFadwWDvVIub11bwfZhsh2WUByf9LOi6yjsSUMmE0xk=", "narHash": "sha256-zdZ7/T6yG0/hzoVOiNpDiR/sW3zR6oSMrfIFJK2BrrE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "a9d84a1545814910cb4ab0515ed6921e8b07ee95", "rev": "056c9393c821a4df356df6ce7f14c722dc8717ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +289,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734969791, "lastModified": 1736899990,
"narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,11 +354,11 @@
"flake-compat_4": { "flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1733328505,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -526,19 +526,14 @@
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"stylix",
"git-hooks",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1735882644,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -616,11 +611,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736508663, "lastModified": 1737120639,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +632,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774425, "lastModified": 1736785676,
"narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +664,11 @@
"liburing": { "liburing": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733603756, "lastModified": 1736719310,
"narHash": "sha256-eTKnZDZ1Ex++v+BI0DBcUBmCXAO/tE8hxK9MiyztZkU=", "narHash": "sha256-Turvx60THwzTiUHb49WV3upUgsPuktr7tVy2Lwu2xJg=",
"owner": "axboe", "owner": "axboe",
"repo": "liburing", "repo": "liburing",
"rev": "c3d5d6270cd5ed48d817fc1e8e95f7c8b222f2ff", "rev": "3124a4619e4daf26b06d48ccf0186a947070c415",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -802,11 +797,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736441705, "lastModified": 1736978406,
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "rev": "b678606690027913f3434dea3864e712b862dde5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -865,11 +860,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1736549401, "lastModified": 1736916166,
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -943,11 +938,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1735685343, "lastModified": 1736817698,
"narHash": "sha256-h1CpBzdJDNtSUb5QMyfFHKHocTTky+4McgQEBQBM+xA=", "narHash": "sha256-1m+JP9RUsbeLVv/tF1DX3Ew9Vl/fatXnlh/g5k3jcSk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "81934660d6e9ea54d2f0cdee821e8533b10c221a", "rev": "2b1fca3296ddd1602d2c4f104a4050e006f4b0cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -975,11 +970,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1736883708,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1007,11 +1002,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1735648875, "lastModified": 1736798957,
"narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=", "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50", "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1055,11 +1050,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735742096, "lastModified": 1736690231,
"narHash": "sha256-q3a80h8Jf8wfmPURUgRR46nQCB3I5fhZ+/swulTF5HY=", "narHash": "sha256-g9gyxX+F6CrkT5gRIMKPnCPom0o9ZDzYnzzeNF86D6Q=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "7e639ee3dda6ed9cecc79d41f6d38235121e483d", "rev": "8364ef299790cb6ec22b9e09e873c97dbe9f2cb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1074,11 +1069,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1736515725, "lastModified": 1737107480,
"narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1107,11 +1102,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736530113, "lastModified": 1736993991,
"narHash": "sha256-a+IUtGdzESNSQEZkW99TXf5js8o4Oy9M4H2am+2ECp4=", "narHash": "sha256-kPDt3QgeIsct9f375LIGmSoZKl7Z4AVzXX+9U0VV5PI=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "f1e003194cb528bbd4eda50b781d1f703611782d", "rev": "a88c4d264a4379b7fe5a9e75ed51bea96f8dd407",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1202,11 +1197,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729501581, "lastModified": 1735737224,
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
fonts.mod.nix
View file

@ -3,6 +3,9 @@
( (
{pkgs, ...}: { {pkgs, ...}: {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
dina-font dina-font
wqy_zenhei # this is so that hanzi doesn't look like pixel art wqy_zenhei # this is so that hanzi doesn't look like pixel art
nerd-fonts.noto nerd-fonts.noto

4
nerd.mod.nix
View file

@ -3,12 +3,12 @@
( (
{pkgs, ...}: { {pkgs, ...}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
geogebra6 # geogebra5 currently does not work? # geogebra6 # geogebra5 currently does not work?
gimp gimp
chemtool chemtool
avogadro2 avogadro2
]; ];
programs.sagemath.enable = true; # programs.sagemath.enable = true;
} }
) )
]; ];

2
services/caddy/Caddyfile
View file

@ -20,7 +20,7 @@ https://collective-conciousness.monster, http://collective-conciousness.monster
Strict-Transport-Security "max-age=31536001; includeSubdomains; preload" Strict-Transport-Security "max-age=31536001; includeSubdomains; preload"
} }
reverse_proxy /_matrix* 10.24.1.4:7893 reverse_proxy /_matrix* 10.24.1.4:7893 # allegedly this might not be needed, but it doesn't seem to hurt so
respond /.well-known/matrix/server "{\"m.server\": \"matrix.collective-conciousness.monster:443\"}" respond /.well-known/matrix/server "{\"m.server\": \"matrix.collective-conciousness.monster:443\"}"
root * /var/www/public root * /var/www/public

8
sway.mod.nix
View file

@ -110,7 +110,7 @@
### TODO : Resize mode and automatic floating ### TODO : Resize mode and automatic floating
assigns = { assigns = {
"1:说" = [{title = "^Signal$|Discord$";}]; "1:说" = [{title = "^Signal$|Discord$|FluffyChat$";}];
"2:main" = [{title = "VSCodium$";}]; "2:main" = [{title = "VSCodium$";}];
"3:browsing" = [{title = "LibreWolf$";}]; "3:browsing" = [{title = "LibreWolf$";}];
"4:misc" = []; "4:misc" = [];
@ -122,12 +122,12 @@
"0:audio" = [{title = "pwvucontrol$|noisetorch$";}]; "0:audio" = [{title = "pwvucontrol$|noisetorch$";}];
}; };
/* /* # commented out as they're automagically handled by stylix
colors = { colors = {
# should probably use a let ... in ... here # should probably use a let ... in ... here
background = "#212121"; background = "#212121";
focused = { focused = {
# border = "#2b83a6"; # test to see if stylix does magic border = "#2b83a6";
background = "#2b83a6"; background = "#2b83a6";
text = "#ffffff"; text = "#ffffff";
indicator = "#dddddd"; indicator = "#dddddd";
@ -232,7 +232,7 @@
workspaceLayout = "tabbed"; workspaceLayout = "tabbed";
}; };
}; };
} }Signal
) )
]; ];
} }