diff --git a/home-manager/roles/daily-driver-programs.nix b/home-manager/roles/daily-driver-programs.nix index 8d40049d..fcf877c6 100644 --- a/home-manager/roles/daily-driver-programs.nix +++ b/home-manager/roles/daily-driver-programs.nix @@ -43,7 +43,7 @@ deluge gmpc vlc - youtubeDL + youtube-dl spotdl ffmpeg syncplay diff --git a/home-manager/roles/desktop-items.nix b/home-manager/roles/desktop-items.nix index c713e85c..87eaeba1 100644 --- a/home-manager/roles/desktop-items.nix +++ b/home-manager/roles/desktop-items.nix @@ -14,7 +14,7 @@ inherit name; desktopName = name; exec = command; - terminal = "true"; + terminal = true; }; superSimpleDesktopItem = name: simpleDesktopItem name name; terminalDesktopItem = name: namedTerminalDesktopItem name name; diff --git a/nix/sources.json b/nix/sources.json index 53b2e837..03ad47d9 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -188,10 +188,10 @@ "homepage": null, "owner": "maralorn", "repo": "taskwarrior-git-backend", - "rev": "e29c4335e2cb10d6c73832dcbdf931fdc6872e94", - "sha256": "0pq2s75mj9dpk5lk7igx88641zs0bihp6yx8l5gipaqy2daydrz6", + "rev": "a2cc4629f158608d89014aee0e134d8d519d3344", + "sha256": "1pai42da31428nh8qrl2x3yhk4fa23fmn8i12wdsy9ng6qwkg8k3", "type": "tarball", - "url": "https://github.com/maralorn/taskwarrior-git-backend/archive/e29c4335e2cb10d6c73832dcbdf931fdc6872e94.tar.gz", + "url": "https://github.com/maralorn/taskwarrior-git-backend/archive/a2cc4629f158608d89014aee0e134d8d519d3344.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "wizards-dialog": { diff --git a/overlays/kassandra/default.nix b/overlays/kassandra/default.nix index 659ee800..d918b5dd 100644 --- a/overlays/kassandra/default.nix +++ b/overlays/kassandra/default.nix @@ -2,11 +2,6 @@ final: prev: let haskellPackages = prev.haskellPackages.extend (self: super: { kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra + "/kassandra") {}; standalone = self.callCabal2nix "standalone" (prev.sources.kassandra + "/standalone") {}; - taskwarrior = self.callHackageDirect { - pkg = "taskwarrior"; - ver = "0.5.0.0"; - sha256 = "sha256-elDUtz0NSG4WHxkyCQ1CunYXWIVRj6EqkKSchPy+c3E="; - } {}; }); in { kassandra = haskellPackages.standalone; diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index 4ba46cd6..13c230ee 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -91,6 +91,7 @@ self: super: { desktop-pkgs = { inherit (self) + dconf lm_sensors xwayland xdg_utils @@ -127,7 +128,6 @@ self: super: { }); inherit (self.gnome) - dconf dconf-editor gnome-tweaks gnome-shell-extensions @@ -136,7 +136,6 @@ self: super: { ; }; home-pkgs = { - inherit (self.pythonPackages) yapf jsbeautifier; inherit (self) go @@ -144,7 +143,6 @@ self: super: { mpc_cli ncmpcpp shfmt - htmlTidy astyle nodejs tasksh