mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some conf

Browse Source
This commit is contained in:
mjallen18
2024-03-07 09:54:11 -06:00
parent 71f8ab78ae
commit cd2a7c7f94
4 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
flake.lock generated
View File

@@ -53,11 +53,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1709456193, "lastModified": 1709671057,
"narHash": "sha256-D5mZ3wX/ZTzD8ipb9qGwytH2i38atFIoY7vhcbtamBA=", "narHash": "sha256-XeLk+BiqAZRsII3MSDdAIIVKIr5vK5bRMAsAvBGKnO4=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "abc26396a79890f65379fead25fe06769dd116d3", "rev": "70b0b2722d25eed713c66fb1b533777d4f10ae9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,11 +113,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708926554, "lastModified": 1709522437,
"narHash": "sha256-NRfhf/+Scj23L6HysGoFT9+CQmegHCec91OxKFeSg+0=", "narHash": "sha256-mS0tYjN3B2cLfF+p8m/0YAMNOEQSx/HJT6BOy/XcOLw=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "ca281b21db6640890828d2b6db743e9db33cc012", "rev": "b527ec46661a9a5efe22aa83eeb9fbbe37c41850",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -188,12 +188,12 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1706768574, "lastModified": 1709274179,
"narHash": "sha256-4o6TMpzBHO659EiJTzd/EGQGUDdbgwKwhqf3u6b23U8=", "narHash": "sha256-O6EC6QELBLHzhdzBOJj0chx8AOcd4nDRECIagfT5Nd0=",
"rev": "668102037129923cd0fc239d864fce71eabdc6a3", "rev": "4be608f4f81d351aacca01b21ffd91028c23cc22",
"revCount": 1762, "revCount": 1791,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1762%2Brev-668102037129923cd0fc239d864fce71eabdc6a3/018d63bb-6455-7a2f-98c6-74a36b8216a4/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1791%2Brev-4be608f4f81d351aacca01b21ffd91028c23cc22/018df913-b6d3-756c-b05c-358eca6e487d/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -353,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709485962, "lastModified": 1709731606,
"narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=", "narHash": "sha256-VS17VGD5s4ijFh5mEzpWWgTPujaCvHxuG5L5FyMG3L0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d579633ff9915a8f4058d5c439281097e92380a8", "rev": "8d9fde0fba21425729905f795fe72c2840a20442",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -390,11 +390,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709142038, "lastModified": 1709295149,
"narHash": "sha256-ZjP808isgLwuiqxSU1CYFyafm5GF80aYw1CXJbnVsgs=", "narHash": "sha256-+blV8vKyvh3gYnUFYTOu2yuWxEEBqwS7hfLm6qdpoe4=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "b83751a057acbb5f989193773841217ddc93d1f8", "rev": "0ef51034dcc8b65b8be72eedd0d5db7d426ea054",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -416,11 +416,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1709157367, "lastModified": 1709486703,
"narHash": "sha256-PK/2Q4f5xZvqCj2sETsfL1AdazMYnaowACn34f6GV58=", "narHash": "sha256-AIDAnQja0/2YsZb6Rxa//gH9uV0QmVs/vsVXj2DAd7s=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "e8f01ce19acd99c06ced9656eebfd0f8f5910a2a", "rev": "415ae5c0f9ed4d45df564a4aca6d327485a445bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -480,11 +480,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709185909, "lastModified": 1709481412,
"narHash": "sha256-nmEqyuUisbdy/ZaWi/9lCwVtpU+lG2GXZWQYcKC7vl8=", "narHash": "sha256-QDRnTQQ9+4LIm+yhG7vFVs/NH3511nYLUW6PQXSamAw=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "28977d1d3fd7883a7f757a1ba4e636bdacf9d0be", "rev": "2750b2038bed5495bcdfeacc7be25267d15ceab1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -564,12 +564,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709237383, "lastModified": 1709479366,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"revCount": 590113, "revCount": 591063,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.590113%2Brev-1536926ef5621b09bba54035ae2bb6d806d72ac8/018df9f0-47ef-778e-b2d9-de8f1e70489d/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.591063%2Brev-b8697e57f10292a6165a20f03d2f42920dfaf973/018e0b39-3c52-71b1-81e1-d90220875f22/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -610,11 +610,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709237383, "lastModified": 1709479366,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -669,11 +669,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706735270, "lastModified": 1709219524,
"narHash": "sha256-IJk+UitcJsxzMQWm9pa1ZbJBriQ4ginXOlPyVq+Cu40=", "narHash": "sha256-8HHRXm4kYQLdUohNDUuCC3Rge7fXrtkjBUf0GERxrkM=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "42cb1a2bd79af321b0cc503d2960b73f34e2f92b", "rev": "9efa23c4dacee88b93540632eb3d88c5dfebfe17",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
hosts/default.nix
View File

@@ -18,8 +18,6 @@ in {
# Enable non free # Enable non free
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
services.fstrim.enable = lib.mkDefault true;
# Hardware configs # Hardware configs
hardware = { hardware = {
# Bluetooth # Bluetooth
@@ -39,6 +37,10 @@ in {
# Enable firmware updates # Enable firmware updates
fwupd.enable = true; fwupd.enable = true;
fstrim.enable = lib.mkDefault true;
pcscd.enable = true;
# Enable CUPS to print documents. # Enable CUPS to print documents.
printing.enable = true; printing.enable = true;
@@ -71,5 +73,15 @@ in {
programs = { programs = {
fish.enable = true; fish.enable = true;
gnupg.agent = {
enable = true;
pinentryFlavor = "curses";
enableSSHSupport = true;
};
}; };
environment.systemPackages = with pkgs; [
pinentry-curses
];
} }

3
hosts/nas/configuration.nix
View File

@@ -287,6 +287,9 @@ in {
ninja ninja
nodejs-18_x nodejs-18_x
nut nut
protonvpn-cli
protonmail-bridge
pass
]; ];
}; };

4
modules/samba/default.nix
View File

@@ -44,8 +44,7 @@ in {
nameValuePair "${name}" { nameValuePair "${name}" {
path = share.sharePath; path = share.sharePath;
public = if share.enableTimeMachine then false else share.public; public = if share.enableTimeMachine then false else share.public;
private = private = if !share.public || share.enableTimeMachine then "yes" else "no";
if !share.public || share.enableTimeMachine then "yes" else "no";
browseable = if share.browseable then "yes" else "no"; browseable = if share.browseable then "yes" else "no";
writable = "yes"; writable = "yes";
"read only" = if share.readOnly then "yes" else "no"; "read only" = if share.readOnly then "yes" else "no";
@@ -57,6 +56,7 @@ in {
if share.enableTimeMachine then "yes" else "no"; if share.enableTimeMachine then "yes" else "no";
"vfs objects" = "catia fruit streams_xattr"; "vfs objects" = "catia fruit streams_xattr";
"fruit:time machine max size" = share.timeMachineMaxSize; "fruit:time machine max size" = share.timeMachineMaxSize;
"force user" = "admin";
}; };
in mapAttrs' make cfg.shares; in mapAttrs' make cfg.shares;
}; };