remove dev module and fix scripts

This commit is contained in:
Tristan 2024-01-05 20:11:29 +00:00
parent a93abe6f04
commit 9f0cee2627
8 changed files with 12 additions and 40 deletions

View file

@ -1,32 +0,0 @@
{user, ...}: {
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.roles.dev;
in {
options.roles = {
dev = {
enable = mkEnableOption "editor";
};
};
config = mkIf cfg.enable {
programs.editor.enable = true;
roles.git.enable = true;
programs.terminal.enable = true;
home-manager.users.${user}.imports = [
{
home.packages = with pkgs; [
insomnia
dbeaver
ansible
tig
fx
];
}
];
};
}

View file

@ -8,6 +8,7 @@ with lib; let
editor = config.programs.editor;
pkg = editor.package;
menu = config.programs.menu.package + config.programs.menu.dmenuCommand;
editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
in {
options.programs = {
editor = {
@ -44,8 +45,8 @@ in {
text = ''
code_dir=~/Documents/code
cd $code_dir
repo=$({ ls && echo clone-repo; } | ${menu})
[ -e "$repo" ] && ${pkg}/bin/${pkg.executableName} $repo
repo=$(ls | ${menu})
[ -e "$repo" ] && ${editorCmd} $repo
'';
install = false;
hotkeys = [{key = "C";}];

View file

@ -16,7 +16,6 @@ with lib; {
terminal = true;
};
roles.dev.enable = true;
roles.gamer.enable = true;
i18n.supportedLocales = [

View file

@ -55,7 +55,7 @@ with lib; let
installScripts = scripts: (map scriptToPackage (filter (s: s.install) scripts));
bindScript = script:
concatStrings (
(
map
(
hotkey: "${hotkey.modifier}, ${hotkey.key}, exec, ${scriptExec {inherit script hotkey;}}"
@ -74,7 +74,7 @@ in {
home-manager.users.${user}.imports = [
{
home.packages = installScripts scripts;
wayland.windowManager.hyprland.settings.bind = map bindScript scripts;
wayland.windowManager.hyprland.settings.bind = builtins.concatMap bindScript scripts ;
}
];
};

View file

@ -16,8 +16,6 @@ with lib; {
terminal = false;
};
roles.dev.enable = true;
programs.editor = {
enable = true;
package = pkgs.vscode;