From c2a246295bb9868c1e28aab68964eda5ea8dce5c Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 21 Feb 2024 20:33:50 -0600 Subject: [PATCH] Beeeeeeef is back for dinner --- modules/home-manager/common.nix | 8 +++---- modules/nixos/common.nix | 10 ++++----- nixos/beefcake.nix | 37 +++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index 2b2f00e..408ee14 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -100,9 +100,9 @@ # TODO: regular cron or something? programs.nix-index = { enable = true; - enableFishIntegration = true; - }; - # maybe we can share somehow so things for nix-y systems and non-nix-y systems alike - # am I going to _have_ non-nix systems anymore? + enableBashIntegration = config.programs.bash.enable; + enableFishIntegration = config.programs.fish.enable; + enableZshIntegration = config.programs.zsh.enable; + }; } diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 5fe8a73..44ca581 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -297,11 +297,11 @@ in { }; }; - # TODO: regular cron or something? - programs.nix-index = { - enable = true; - enableFishIntegration = true; - }; + # # TODO: regular cron or something? + # programs.nix-index = { + # enable = true; + # # enableFishIntegration = true; + # }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix index 54b74fd..513c49f 100644 --- a/nixos/beefcake.nix +++ b/nixos/beefcake.nix @@ -556,13 +556,18 @@ in { # listenPort = 6767; # }; - services.samba-wsdd.enable = true; + services.samba-wsdd = { + enable = true; + }; services.samba = { enable = true; openFirewall = true; securityType = "user"; - package = pkgs.sambaFull; + + # not needed since I don't think I use printer sharing? + # https://nixos.wiki/wiki/Samba#Printer_sharing + # package = pkgs.sambaFull; # broken last I checked in nixpkgs? extraConfig = '' workgroup = WORKGROUP @@ -576,10 +581,10 @@ in { hosts deny = 0.0.0.0/0 guest account = nobody map to guest = bad user - load printers = yes - printing = cups - printcap name = cups ''; + # load printers = yes + # printing = cups + # printcap name = cups shares = { libre = { path = "/storage/libre"; @@ -621,17 +626,17 @@ in { "force user" = "daniel"; "force group" = "users"; }; - printers = { - comment = "All Printers"; - path = "/var/spool/samba"; - public = "yes"; - browseable = "yes"; - # to allow user 'guest account' to print. - "guest ok" = "yes"; - writable = "no"; - printable = "yes"; - "create mode" = 0700; - }; + # printers = { + # comment = "All Printers"; + # path = "/var/spool/samba"; + # public = "yes"; + # browseable = "yes"; + # # to allow user 'guest account' to print. + # "guest ok" = "yes"; + # writable = "no"; + # printable = "yes"; + # "create mode" = 0700; + # }; }; };