diff options
-rw-r--r-- | .config/nixpkgs/config.nix | 4 | ||||
-rw-r--r-- | .config/nixpkgs/packages/gmni/default.nix | 21 | ||||
-rw-r--r-- | .config/nixpkgs/packages/literate/default.nix | 23 | ||||
-rw-r--r-- | .config/nixpkgs/packages/luaformatter/default.nix | 23 | ||||
-rw-r--r-- | .vimrc | 1 |
5 files changed, 1 insertions, 71 deletions
diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix index d8e1e90..b060e53 100644 --- a/.config/nixpkgs/config.nix +++ b/.config/nixpkgs/config.nix @@ -62,8 +62,6 @@ in name = "terminal"; paths = [ (callPackage ./packages/chromexup/default.nix {}) - (callPackage ./packages/gmni/default.nix {}) - (callPackage ./packages/literate/default.nix {}) (callPackage ./packages/systemd2nix/default.nix {}) (callPackage ./packages/youtube-dl/default.nix {}) (unstable.pass.withExtensions (ext: with ext; [ pass-import pass-audit pass-otp ])) @@ -409,7 +407,7 @@ in Lua = pkgs.buildEnv { name = "lua"; - paths = [ (callPackage ./packages/luaformatter/default.nix {}) lua5_3 lua53Packages.luacheck ]; + paths = [ lua5_3 lua53Packages.luacheck luaformatter ]; }; Elixir = pkgs.buildEnv { diff --git a/.config/nixpkgs/packages/gmni/default.nix b/.config/nixpkgs/packages/gmni/default.nix deleted file mode 100644 index fea7e14..0000000 --- a/.config/nixpkgs/packages/gmni/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchgit, pkg-config, openssl }: - -stdenv.mkDerivation rec { - pname = "gmni"; - version = "f5d540bc5d0112895376aebe6bf54adb32545d6e"; - url = "https://git.sr.ht/~sircmpwn/gmni"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "0x4bg7mffq7vj9f3dj3s0m7q6f18nrysl68x6dlzk74hj6wsslbc"; - }; - - buildInputs = [ pkg-config openssl ]; - - meta = with lib; { - homepage = url; - license = licenses.gpl3; - description = "A Gemini client"; - }; -} diff --git a/.config/nixpkgs/packages/literate/default.nix b/.config/nixpkgs/packages/literate/default.nix deleted file mode 100644 index f0bdd58..0000000 --- a/.config/nixpkgs/packages/literate/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchgit, dmd, dub }: - -stdenv.mkDerivation rec { - name = "Literate"; - version = "7004dffec0cff3068828514eca72172274fd3f7d"; - - src = fetchgit { - rev = version; - url = "https://github.com/zyedidia/Literate.git"; - sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs"; - }; - - buildInputs = [ dmd dub ]; - - installPhase = "install -D bin/lit $out/bin/lit"; - - meta = with lib; { - description = "A literate programming tool for any language"; - homepage = "http://literate.zbyedidia.webfactional.com/"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/.config/nixpkgs/packages/luaformatter/default.nix b/.config/nixpkgs/packages/luaformatter/default.nix deleted file mode 100644 index 7cfd5ac..0000000 --- a/.config/nixpkgs/packages/luaformatter/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "LuaFormatter"; - version = "1.3.3"; - - src = fetchFromGitHub { - sha256 = "1dfqsh6v8brnwzg3lgi7228lw08qqfy4ghbjyvwn7mr82fy1xcnd"; - rev = version; - repo = pname; - owner = "Koihik"; - fetchSubmodules = true; - }; - - buildInputs = [ cmake ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Code formatter for Lua"; - license = licenses.asl20; - platforms = platforms.linux; - }; -} @@ -300,7 +300,6 @@ augroup AutoCommands autocmd BufWritePost $HOME/.config/chromexup/config.ini exe 'Notify(''chromexup 2>&1'')' autocmd BufWritePost rc.lua exe 'Notify(''awesome -k 2>&1'')' autocmd BufWritePost quotes,*.fortune exe 'Notify(''strfile ' . expand('%') . ''')' - autocmd BufWritePost *.lit exe 'Notify(''lit ' . expand('%') . ' 2>&1 && printf "Literate OK: ' . expand('%') . '"'')' autocmd BufWritePost Xresources exe 'Notify(''xrdb ~/.config/X11/Xresources ' . '2>&1 && printf "Reloading Xresources: ' . expand('%') . '"'')' autocmd BufWritePost *.desktop exe 'Notify(''desktop-file-validate ' . expand('%') . ' 2>&1 && printf "Deskop File OK: ' . expand('%') . '"'')' autocmd BufWritePost *.service exe 'Notify(''systemd-analyze verify --user ' . expand('%') . ' 2>&1 && printf "Systemd Service File OK: ' . expand('%') . '"'')' |