diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/default.nix | 1 | ||||
| -rw-r--r-- | modules/foot.nix | 1 | ||||
| -rw-r--r-- | modules/global.nix | 23 | ||||
| -rw-r--r-- | modules/mako.nix | 21 | ||||
| -rw-r--r-- | modules/neovim/default.nix | 7 | ||||
| -rw-r--r-- | modules/sway/default.nix | 10 |
6 files changed, 41 insertions, 22 deletions
diff --git a/modules/default.nix b/modules/default.nix index bb06c36..6afeec0 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,6 +2,7 @@ { imports = [ ./foot.nix + ./mako.nix ./sway ./neovim ./qutebrowser diff --git a/modules/foot.nix b/modules/foot.nix index 4752562..e427c3a 100644 --- a/modules/foot.nix +++ b/modules/foot.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, ... }: let - inherit lib config; cfg = config.modules.foot; in { diff --git a/modules/global.nix b/modules/global.nix index f26be5f..5d88ef2 100644 --- a/modules/global.nix +++ b/modules/global.nix @@ -12,18 +12,21 @@ in description = "Whether nix is running outside of NixOS."; }; wayland = mkEnableOption "Wayland"; + extraPackages = mkOption { + type = with lib.types; listOf package; + description = "List of extra packages to install"; + example = [ pkgs.cowsay pkgs.lolcat ]; + default = []; + }; }; config = { - modules = { - global.wayland = true; - foot.enable = true; + modules = rec { + global = { + wayland = lib.mkDefault true; + }; sway = { - enable = true; - wrapWithNixGL = true; -# package = if cfg.notNixOS then - # (config.lib.nixGL.wrap pkgs.sway) else pkgs.sway; -# package = config.lib.nixGL.wrap pkgs.sway; + wrapWithNixGL = cfg.notNixOS; }; }; @@ -49,9 +52,7 @@ in ++ (lib.optionals cfg.wayland [ wl-clipboard - mako - wmenu - cmatrix + #... ]); }; diff --git a/modules/mako.nix b/modules/mako.nix new file mode 100644 index 0000000..b1d9e40 --- /dev/null +++ b/modules/mako.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.modules.mako; +in +{ + options.modules.mako = { + enable = lib.mkEnableOption "mako"; + }; + + config = { + services.mako = lib.mkIf cfg.enable { + enable = true; + backgroundColor = "#0f0f0fff"; + textColor = "#cacacaff"; + borderColor = "#a39ec4ff"; + borderSize = 1; + defaultTimeout = 20000; + font = "ComicShannsMono Nerd Font Mono 10"; + }; + }; +} diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 775f420..fd77085 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -35,12 +35,6 @@ in tree-sitter-markdown-inline ])) - { - plugin = neorg; - config = lua '' - require("neorg").setup() - ''; - } base16-nvim telescope-nvim telescope-fzf-native-nvim @@ -48,7 +42,6 @@ in extraLuaConfig = '' ${builtins.readFile ./settings.lua} ${builtins.readFile ./keybinds.lua} - require("neorg").setup() ''; }; }; diff --git a/modules/sway/default.nix b/modules/sway/default.nix index d48ef32..fb8efa0 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -6,15 +6,19 @@ in options.modules.sway = { enable = lib.mkEnableOption "sway"; wrapWithNixGL = lib.mkEnableOption "NixGL wrapper"; + terminal = lib.mkOption { + type = lib.types.str; + description = "terminal command"; + }; }; + config = { home.packages = with pkgs; [(writeShellScriptBin "browser" '' swaymsg 'set $PROP newcont:tabbed ; exec qutebrowser --target window' '')]; wayland.windowManager.sway = lib.mkIf cfg.enable { enable = true; -# package = if cfg.wrapWithNixGL then config.lib.nixGL.wrap pkgs.sway else pkgs.sway; - package = config.lib.nixGL.wrap pkgs.sway; + package = if cfg.wrapWithNixGL then config.lib.nixGL.wrap pkgs.sway else pkgs.sway; # package = c # package = pkgs.sway; # package = pkgs.writeShellScriptBin "sway" '' @@ -36,7 +40,7 @@ in size = 10.0; }; - terminal = "foot"; + terminal = "${cfg.terminal}"; menu = "wmenu-run -n 4c4c4c -N 0d0d0d -s 8aac8b -S 0d0d0d -l 10"; defaultWorkspace = "workspace number 1"; |