update mudl

This commit is contained in:
notgne2 2021-08-14 12:11:14 -07:00
parent 40d249f241
commit 564cbf9f73
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
4 changed files with 26 additions and 34 deletions

View File

@ -12,6 +12,9 @@
url = "gitlab:rycee/nur-expressions";
flake = false;
};
mudl = {
url = "git+ssh://git@git.wizbos.club/notgne2/mudl.git";
};
};
outputs = { self, nixpkgs, ... }@inputs: {
@ -27,7 +30,7 @@
};
homeManagerModules = {
ezpcusr = import ./home-manager/modules/ezpcusr.nix;
ezpcusr = import ./home-manager/modules/ezpcusr.nix inputs;
ezchromium = import ./home-manager/modules/ezchromium.nix;
ezcodium = import ./home-manager/modules/ezcodium.nix;
colors = import ./home-manager/modules/colors.nix inputs;

View File

@ -7,7 +7,7 @@ inputs:
(lib.mkAliasOptionModule [ "ezpcusr" "favFont" ] [ "fonts" "favFont" ])
(lib.mkAliasOptionModule [ "ezpcusr" "waybarCss" ] [ "programs" "waybar" "style" ])
./ezpcusr.nix
(import ./ezpcusr.nix inputs)
./ezcodium.nix
(import ./colors.nix inputs)
./fonts.nix

View File

@ -1,3 +1,4 @@
inputs:
{ config, lib, pkgs, ... }:
with lib;
let
@ -131,26 +132,6 @@ let
)
{ };
# mudl = pnpm2nix.mkPnpmPackage {
# src = builtins.fetchGit {
# url = "https://git.wizbos.club/notgne2/mudl.git";
# rev = "a34af57de345dd6788e2b3cc67c41fe5de62ade6";
# };
# };
mudl =
let
src = builtins.fetchGit {
url = "https://git.wizbos.club/notgne2/mudl.git";
rev = "2c1b6545d2f98f0649e5df03c7d86a8d28bb15e5";
};
in
pkgs.runCommandNoCC "mudl" { } ''
mkdir -p $out/bin
cp ${src}/index.js $out/bin/mudl
chmod +x $out/bin/mudl
'';
rofiMenu =
if cfg.wayland then
"${rofiBin} -show drun -show-icons -run-command 'swaymsg exec -- {cmd}'"
@ -218,14 +199,6 @@ let
${pkgs.xdotool}/bin/xdotool type "''${line::1}"
'';
magicMudl = pkgs.writeScript "magic-mudl" ''
#!${pkgs.bash}/bin/bash
SOURCE=$(${pasteBin})
notify-send "Downloading $SOURCE"
${mudl}/bin/mudl "$SOURCE"
notify-send "Download complete"
'';
configPlace =
if cfg.wayland then
config.wayland.windowManager.sway
@ -376,6 +349,24 @@ let
};
mainConfig = {
programs.direnv = {
enable = true;
nix-direnv = {
enable = true;
enableFlakes = true;
};
stdlib = ''
: ''${XDG_CACHE_HOME:=$HOME/.cache}
declare -A direnv_layout_dirs
direnv_layout_dir() {
echo "''${direnv_layout_dirs[$PWD]:=$(
echo -n "$XDG_CACHE_HOME"/direnv/layouts/
echo -n "$PWD" | shasum | cut -d ' ' -f 1
)}"
}
'';
};
services.keynav.enable = true;
services.clipmenu.enable = true;
@ -518,10 +509,8 @@ let
# needed for fish done stuff
jq
direnv
ezDrv
mudl
inputs.mudl.defaultPackage.${pkgs.system}
bitwarden-cli
kitty

View File

@ -74,6 +74,7 @@ in
withNodeJs = true;
withPython3 = true;
plugins = with pkgs.vimPlugins; [
direnv-vim
fugitive
vim-nix
camelcasemotion
@ -263,7 +264,6 @@ in
home.packages = with pkgs; [
xclip # needed for nvim
direnv
nixpkgs-fmt
neovim-qt
edt