Compare commits

..

No commits in common. "d44db3a5695bb61f909f9528280859cb157e3ba0" and "559ff04e1ce407ce514549938394267f26e51d6e" have entirely different histories.

5 changed files with 34 additions and 32 deletions

View file

@ -9,11 +9,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706896869, "lastModified": 1706639353,
"narHash": "sha256-LY1DdEXJxm8jYAysyFPa/NfvGz1LbyZ+oLabTHE75dg=", "narHash": "sha256-cz8BwNBylRALeyD3X1fhfpt2G6rekxyvHFpNiY2X0qk=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "374255dd5856465b30d4c90d5882b150fa6c47de", "rev": "f6b541dbedcc3ae719dd3d1d0f889f2ca8e0f7d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706798041, "lastModified": 1706473109,
"narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", "rev": "d634c3abafa454551f2083b054cd95c3f287be61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1706887853, "lastModified": 1705321974,
"narHash": "sha256-f3KdHCL4CUdn29+75DP/usoZUl2N4gz9whsm5EDu7X8=", "narHash": "sha256-2YOkmPz8qH2GbIy+928Vy+yHQdZ6uzoXY72eDiaPkds=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "4391c13d2cb3f20dbb8e66885bcc952a01b2e292", "rev": "eea2585fbb3e36f4211b8e2bf0da5d42ec35050f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,11 +331,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1706917928, "lastModified": 1706747148,
"narHash": "sha256-7Bb08yC8ZISs/Zd3AAePryxEOjXLe+d2ibvcWvBNdYs=", "narHash": "sha256-fOwHK+cjfYL5vo8epmbSefChzlsQx6QLjch2xezx1Rc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a41139ccbf7f9d9517ec50b1f988d220946d90d7", "rev": "6eeeacfaf67dd0f915b438bb3a93cfc89db06b09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -411,11 +411,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1706732774, "lastModified": 1706550542,
"narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -450,11 +450,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1706870624, "lastModified": 1706539542,
"narHash": "sha256-73pux7f82JcIamAsQSMy/coTJQIZt0CvMMXNwZ11qGY=", "narHash": "sha256-Zbd9/0iTDNwf6ePvKkISvSMK6S7kmfsPzyG5f57sVA8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "079c03228c20c9cf49ab4dda2aa65fc27233fc53", "rev": "37d124e94603f821b56072794c4800ad10252fd7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -66,7 +66,7 @@ let
pkgs-stable.libreoffice-fresh # Office editing pkgs-stable.libreoffice-fresh # Office editing
makemkv # blue-ray + dvd -> mkv makemkv # blue-ray + dvd -> mkv
qalculate-gtk # unit-friendly calculator qalculate-gtk # unit-friendly calculator
pkgs-stable.qlcplus # LED xlr control program qlcplus # LED xlr control program
signal-desktop # secure messaging service signal-desktop # secure messaging service
pkgs-stable.vscodium # when vim and emacs (somehow) isn't enough pkgs-stable.vscodium # when vim and emacs (somehow) isn't enough
obs-studio # for video recording and virtual camera obs-studio # for video recording and virtual camera

View file

@ -12,7 +12,7 @@
autoUpdateApps.enable = true; autoUpdateApps.enable = true;
settings = { extraOptions = {
preview_max_x = 2048; preview_max_x = 2048;
preview_max_y = 2048; preview_max_y = 2048;
jpeg_quality = 50; jpeg_quality = 50;
@ -25,15 +25,6 @@
"OC\\Preview\\MP4" "OC\\Preview\\MP4"
"OC\\Preview\\MOVIE" "OC\\Preview\\MOVIE"
]; ];
defaultPhoneRegion = "US";
overwriteProtocol = "https";
extraTrustedDomains = [
"10.0.0.183"
"files.nickiel.net"
];
trustedProxies = [
"files.nickiel.net"
];
}; };
database.createLocally = false; database.createLocally = false;
@ -49,6 +40,17 @@
adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password"; adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password";
adminuser = "admin"; adminuser = "admin";
}; };
extraOptions = {
defaultPhoneRegion = "US";
overwriteProtocol = "https";
extraTrustedDomains = [
"10.0.0.183"
"files.nickiel.net"
];
trustedProxies = [
"files.nickiel.net"
];
};
}; };
services.postgresql = { services.postgresql = {

View file

@ -19,8 +19,8 @@
services.xserver = { services.xserver = {
enable = true; enable = true;
xkb.layout = "us"; layout = "us";
xkb.options = "caps:super"; xkbOptions = "caps:super";
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
displayManager.defaultSession = "plasma"; displayManager.defaultSession = "plasma";

View file

@ -16,7 +16,7 @@ in
sync_frequency = "20m"; sync_frequency = "20m";
sync_address = if (hostname == "Alaska") then "http://127.0.0.1:8910" sync_address = if (hostname == "Alaska") then "http://127.0.0.1:8910"
else "https://atuin.nickiel.net"; else "https://atuin.nickiel.net";
filter_mode = "host"; #"global" | "host" | "session" | "directory" filter_mode = "session"; #"global" | "host" | "session" | "directory"
inline_height = 10; inline_height = 10;
show_preview = true; show_preview = true;
show_help = true; show_help = true;