Skip to content

Commit

Permalink
📦 Added manix
Browse files Browse the repository at this point in the history
Also added sudo to make nh works with lix
  • Loading branch information
theobori committed Dec 23, 2024
1 parent e294d7f commit 71b62fc
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 4 deletions.
20 changes: 20 additions & 0 deletions modules/home/cli/programs/manix/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
pkgs,
config,
lib,
namespace,
...
}:
let
inherit (lib) mkIf;
inherit (lib.${namespace}) mkBoolOpt;

cfg = config.${namespace}.cli.programs.manix;
in
{
options.${namespace}.cli.programs.manix = {
enable = mkBoolOpt false "Whether or not to enable manix.";
};

config = mkIf cfg.enable { home.packages = with pkgs; [ manix ]; };
}
1 change: 1 addition & 0 deletions modules/home/roles/common/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ in
killall = enabled;
file-tools = enabled;
xclip = enabled;
manix = enabled;
};
};

Expand Down
8 changes: 4 additions & 4 deletions modules/nixos/security/doas/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ in

config = mkIf cfg.enable {
# Disable sudo
security.sudo.enable = false;
# security.sudo.enable = false;

# Enable and configure `doas`
security.doas = {
Expand All @@ -32,8 +32,8 @@ in
};

# Add an alias to the shell for backward-compat and convenience
environment.shellAliases = {
sudo = "doas";
};
# environment.shellAliases = {
# sudo = "doas";
# };
};
}
19 changes: 19 additions & 0 deletions modules/nixos/security/sudo/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
config,
lib,
namespace,
...
}:
let
inherit (lib) mkIf;
inherit (lib.${namespace}) mkBoolOpt enabled;

cfg = config.${namespace}.security.sudo;
in
{
options.${namespace}.security.sudo = {
enable = mkBoolOpt false "Whether or not to replace sudo with sudo.";
};

config = mkIf cfg.enable { security.sudo = enabled; };
}
1 change: 1 addition & 0 deletions systems/x86_64-linux/laptop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ in
${namespace} = {
boot.plymouth = enabled;
security.doas = enabled;
security.sudo = enabled;

desktops.plasma6 = enabled;
display-managers.sddm = enabled;
Expand Down
1 change: 1 addition & 0 deletions systems/x86_64-linux/rob/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ in

${namespace} = {
boot.plymouth = enabled;
security.sudo = enabled;
security.doas = enabled;

desktops.plasma6 = enabled;
Expand Down
1 change: 1 addition & 0 deletions systems/x86_64-linux/vm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ in
${namespace} = {
security = {
doas = enabled;
sudo = enabled;
};

desktops = {
Expand Down

0 comments on commit 71b62fc

Please sign in to comment.