2 Commits

Author SHA1 Message Date
8cc3e626bd [nixpkgs] 23.11 -> 24.05 2024-06-25 14:15:34 +02:00
cb1e896ee8 [lucia] rm samba till i have time to set it up properly 2024-06-25 14:12:23 +02:00
3 changed files with 64 additions and 64 deletions

32
flake.lock generated
View File

@@ -99,11 +99,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1718548414, "lastModified": 1719145664,
"narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -131,11 +131,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1718478900, "lastModified": 1719099622,
"narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c884223af91820615a6146af1ae1fea25c107005", "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -147,11 +147,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1718318537, "lastModified": 1719075281,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -163,16 +163,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718447546, "lastModified": 1719145550,
"narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "842253bf992c3a7157b67600c2857193f126563a", "rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -199,11 +199,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1718506969, "lastModified": 1719268571,
"narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -4,7 +4,7 @@
inputs = { inputs = {
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -100,54 +100,54 @@ in
enable = true; enable = true;
}; };
samba = { #samba = {
enable = true; # enable = true;
securityType = "user"; # securityType = "user";
openFirewall = true; # openFirewall = true;
extraConfig = '' # extraConfig = ''
workgroup = WORKGROUP # workgroup = maloinfra
server string = smbmalo # server string = smbmalo
netbios name = smbmalo # netbios name = smbmalo
security = user # security = user
#use sendfile = yes # #use sendfile = yes
#max protocol = smb2 # max protocol = smb2
# note: localhost is the ipv6 localhost ::1 # # note: localhost is the ipv6 localhost ::1
hosts allow = 192.168.0. 127.0.0.1 localhost # hosts allow = 192.168.1. 127.0.0.1 localhost
hosts deny = 0.0.0.0/0 # hosts deny = 0.0.0.0/0
guest account = nobody # guest account = nobody
map to guest = bad user # map to guest = bad user
''; # '';
shares = { # shares = {
zines = { # zines = {
comment = "malobeo Zines"; # comment = "malobeo Zines";
path = "/var/sambaShares/zines"; # path = "/var/sambaShares/zines";
browseable = "yes"; # browseable = "yes";
"read only" = "no"; # "read only" = "no";
"guest ok" = "yes"; # "guest ok" = "yes";
"create mask" = "0644"; # "create mask" = "0644";
"directory mask" = "0755"; # "directory mask" = "0755";
#"force user" = "username"; # #"force user" = "username";
#"force group" = "groupname"; # #"force group" = "groupname";
"write list" = "malobeo"; # "write list" = "malobeo";
"read list" = "guest nobody"; # "read list" = "guest nobody";
}; # };
#private = { # #private = {
# path = "/mnt/Shares/Private"; # # path = "/mnt/Shares/Private";
# browseable = "yes"; # # browseable = "yes";
# "read only" = "no"; # # "read only" = "no";
# "guest ok" = "no"; # # "guest ok" = "no";
# "create mask" = "0644"; # # "create mask" = "0644";
# "directory mask" = "0755"; # # "directory mask" = "0755";
# "force user" = "username"; # # "force user" = "username";
# "force group" = "groupname"; # # "force group" = "groupname";
#}; # #};
}; # };
}; #};
samba-wsdd = { #samba-wsdd = {
enable = true; # enable = true;
openFirewall = true; # openFirewall = true;
}; #};
hedgedoc = { hedgedoc = {
enable = true; enable = true;