diff --git a/configs/default.nix b/configs/default.nix index 5dd88ae..bfc8afb 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -6,7 +6,6 @@ in imports = [ - # ./mopidy.nix ./alacritty.nix ./bash.nix ./bluetooth.nix @@ -16,7 +15,6 @@ in ./compton.nix ./default.nix ./direnv.nix - # ./home-assistant.nix ./distrobump.nix ./docker.nix ./dunst.nix @@ -41,7 +39,6 @@ in ./redshift.nix ./retiolum.nix ./rofi.nix - ./sncli.nix ./ssh.nix ./sudo.nix ./themes/mac-os.nix @@ -110,20 +107,11 @@ in (import ) (import ) (self: super: { - python3Packages = super.python3Packages.override { - overrides = new: old: { - spotify-cli-linux = new.callPackage {}; - instaloader = new.callPackage {}; - sncli = new.callPackage {}; - }; - }; - writeDashBin = super.writers.writeDashBin; writeDash = super.writers.writeDash; ix = super.callPackage {}; - text2pdf = super.callPackage {}; iolanguage = super.callPackage {}; nix-git = super.callPackage {}; gfs-fonts = super.callPackage { diff --git a/configs/home-assistant.nix b/configs/home-assistant.nix deleted file mode 100644 index 925599f..0000000 --- a/configs/home-assistant.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - services.home-assistant = { - enable = false; - configWritable = true; - lovelaceConfigWritable = true; - }; -} diff --git a/configs/mopidy.nix b/configs/mopidy.nix deleted file mode 100644 index 6cd003f..0000000 --- a/configs/mopidy.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, ... }: -let secrets = import ; -in { - services.mopidy = { - enable = false; - extensionPackages = [ - pkgs.mopidy-gmusic - pkgs.mopidy-iris - pkgs.mopidy-moped - pkgs.mopidy-mopify - pkgs.mopidy-soundcloud - pkgs.mopidy-spotify - pkgs.mopidy-spotify-tunigo - pkgs.mopidy-youtube - ]; - configuration = '' - [mpd] - hostname = :: - - [spotify] - username = ${secrets.spotify.username} - password = ${secrets.spotify.password} - client_id = ${secrets.spotify.clientId} - client_secret = ${secrets.spotify.clientSecret} - - [soundcloud] - auth_token = ${secrets.soundcloud.authToken} - ''; - }; -} diff --git a/configs/packages/default.nix b/configs/packages/default.nix index e794faa..57f56f1 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -45,7 +45,7 @@ ddgr ix # thunderbird - # python3Packages.instaloader + # nur.repos.kmein.python3Packages.instaloader # mtr # my traceroute # FILE MANAGERS ranger @@ -98,7 +98,7 @@ pdfgrep # search in pdf pdftk # pdf toolkit spotify - python3Packages.spotify-cli-linux + nur.repos.kmein.python3Packages.spotify-cli-linux youtubeDL bc # calculator fzf diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix index 173b1f8..1372dbd 100644 --- a/configs/packages/writing.nix +++ b/configs/packages/writing.nix @@ -35,7 +35,7 @@ in texlive.combined.scheme-full (aspellWithDicts (dict: [dict.de dict.en dict.en-computers])) haskellPackages.pandoc-citeproc - text2pdf + nur.repos.kmein.text2pdf libreoffice pandoc # proselint diff --git a/configs/sncli.nix b/configs/sncli.nix deleted file mode 100644 index 2093f59..0000000 --- a/configs/sncli.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, lib, ... }: -let secrets = import ; -in { - environment.systemPackages = [ pkgs.python3Packages.sncli ]; - - home-manager.users.me = { - home.file.".snclirc".text = lib.generators.toINI {} { - sncli = { - cfg_sn_username = secrets.simplenote.username; - cfg_sn_password = secrets.simplenote.password; - }; - }; - }; -} diff --git a/packages/git-quick-stats.nix b/packages/git-quick-stats.nix deleted file mode 100644 index ee18365..0000000 --- a/packages/git-quick-stats.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "git-quick-stats"; - version = "2.0.8"; - src = fetchFromGitHub { - repo = "git-quick-stats"; - owner = "arzzen"; - rev = "${version}"; - sha256 = "1px1sk7b6mjnbclsr1jn33m9k4wd8wqyw4d6w1rgj0ii29lhzmqi"; - }; - installPhase = '' - PREFIX=$out make install - ''; - meta = with stdenv.lib; { - homepage = "https://github.com/arzzen/git-quick-stats"; - description = "Git quick statistics is a simple and efficient way to access various statistics in git repository."; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - license = licenses.mit; - }; -} diff --git a/packages/instaloader.nix b/packages/instaloader.nix deleted file mode 100644 index 3390c9c..0000000 --- a/packages/instaloader.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ buildPythonApplication, fetchPypi, requests }: -let -in buildPythonApplication rec { - pname = "instaloader"; - version = "4.2.4"; - src = fetchPypi { - inherit pname version; - sha256 = "02zqb02idk2pzks7dv42vigcmmpjpfhfdyjp911yr0ix7dy3q0b9"; - }; - propagatedBuildInputs = [ requests ]; - doCheck = false; -} diff --git a/packages/manimlib.nix b/packages/manimlib.nix deleted file mode 100644 index 5b57f10..0000000 --- a/packages/manimlib.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPythonApplication, fetchPypi, argparse, colour, numpy, pillow, scipy, tqdm, opencv, pycairo, pydub }: -buildPythonApplication rec { - pname = "manimlib"; - version = "0.1.5"; - src = fetchPypi { - inherit pname version; - sha256 = "1hrb94zawngn6pm31185sdg91a66y4lwagwcry3k9a3rk8w81f7m"; - }; - propagatedBuildInputs = [ argparse colour numpy pillow scipy tqdm opencv pycairo pydub ]; - doCheck = false; - - meta = with stdenv.lib; { - description = "Animation engine for explanatory math videos"; - homepage = "https://github.com/3b1b/manim"; - license = license.mit; - maintainers = [ maintainers.kmein ]; - }; -} diff --git a/packages/onedrive.nix b/packages/onedrive.nix deleted file mode 100644 index cc13024..0000000 --- a/packages/onedrive.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, dmd, curl, sqlite, fetchFromGitHub }: -stdenv.mkDerivation { - name = "onedrive"; - version = "v1.1.3"; - src = fetchFromGitHub { - owner = "skilion"; - repo = "onedrive"; - rev = "945251f7f2e95ae85001efb6eab85d6176bac75e"; - sha256 = "16iajb61b09gdqly85h6h7ap385ihk0az3mimkj277yc08rv68d0"; - }; - buildInputs = [ dmd curl sqlite ]; -} diff --git a/packages/sncli.nix b/packages/sncli.nix deleted file mode 100644 index fd129eb..0000000 --- a/packages/sncli.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonPackage, buildPythonApplication, fetchPypi, requests, urwid }: -let - Simperium3 = buildPythonPackage rec { - pname = "Simperium3"; - version = "0.1.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1j1w4dji39v44l96qq9kbrxpcjkjmika8065gwy8bf847f9fa76p"; - }; - propagatedBuildInputs = [ requests ]; - }; -in buildPythonApplication rec { - pname = "sncli"; - version = "0.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "18s5a6s2z7k14cbiyfdf98kw92r2hf1xwaavx67dxhadxm18xr4v"; - }; - - propagatedBuildInputs = [ requests urwid Simperium3 ]; -} diff --git a/packages/spotify-cli-linux.nix b/packages/spotify-cli-linux.nix deleted file mode 100644 index 593dd08..0000000 --- a/packages/spotify-cli-linux.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, buildPythonApplication, fetchPypi, pytestrunner, six, beautifulsoup4, requests, dbus-python }: -let - lyricwikia = buildPythonPackage rec { - pname = "lyricwikia"; - version = "0.1.9"; - src = fetchPypi { - inherit pname version; - sha256 = "0sa5wkbgp5bpgkl8hgn7byyz9zj0786647ikf2l0k8m4fimq623y"; - }; - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ six beautifulsoup4 requests ]; - doCheck = false; - }; -in buildPythonApplication rec { - pname = "spotify-cli-linux"; - version = "1.4.2"; - src = fetchPypi { - inherit pname version; - sha256 = "1gxich3v2i4lmh60abbw3mw15399afvvqflv8g6plvvbmvxmbgp0"; - }; - propagatedBuildInputs = [ lyricwikia dbus-python ]; - doCheck = false; -} diff --git a/packages/text2pdf.nix b/packages/text2pdf.nix deleted file mode 100644 index b8c7049..0000000 --- a/packages/text2pdf.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "text2pdf"; - version = "1.1"; - src = fetchurl { - url = "http://www.eprg.org/pdfcorner/text2pdf/text2pdf.c"; - sha256 = "002nyky12vf1paj7az6j6ra7lljwkhqzz238v7fyp7sfgxw0f7d1"; - }; - phases = [ "buildPhase" ]; - buildPhase = '' - mkdir -p $out/bin - gcc -o $out/bin/text2pdf $src - ''; -}