From 5bfa0c640216a5d51fd98135960fa7f0b22eff75 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sun, 11 Jun 2023 07:20:43 +0200 Subject: [PATCH] Move stuff back to stable nixpkgs --- flake.lock | 12 ++++----- home/common-linux.nix | 5 +--- home/common.nix | 37 +++++++++++++++++++++++++- home/fish/fish.nix | 1 - home/kagami-pc-home.nix | 2 -- home/kakoune/kak.nix | 2 +- home/modules/programs/discord.nix | 2 +- modules/cloud/traefik/certs-dumper.nix | 1 - nki-personal-do/configuration.nix | 5 ---- nki-personal-do/gitea.nix | 1 - nki-personal-do/headscale.nix | 1 - nki-personal-do/writefreely.nix | 1 - 12 files changed, 45 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index c98898c..d4105d5 100644 --- a/flake.lock +++ b/flake.lock @@ -282,11 +282,11 @@ "kakoune": { "flake": false, "locked": { - "lastModified": 1682328035, - "narHash": "sha256-vH7xc39HBpMl6At5SSnfda0Qgpo282CcUfM7W2MZOIk=", + "lastModified": 1685850592, + "narHash": "sha256-cNJ27N4JSOrHXSYYJhitrrclNRGCR4typnS5uLGXWX0=", "owner": "mawww", "repo": "kakoune", - "rev": "a4918f934ceb8c36ab398c0c973174ac17fc8600", + "rev": "caf6f6ff7ef336f821b0fef2f4493aa6650e967d", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1683442750, - "narHash": "sha256-IiJ0WWW6OcCrVFl1ijE+gTaP0ChFfV6dNkJR05yStmw=", + "lastModified": 1686398752, + "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb751d65225ec53de9cf3d88acbf08d275882389", + "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", "type": "github" }, "original": { diff --git a/home/common-linux.nix b/home/common-linux.nix index f9e3479..0da4041 100644 --- a/home/common-linux.nix +++ b/home/common-linux.nix @@ -44,10 +44,7 @@ with lib; { services.mpris-proxy.enable = true; # Owncloud - services.owncloud-client = { - enable = true; - package = pkgs.unstable.owncloud-client; - }; + services.owncloud-client.enable = true; }); } diff --git a/home/common.nix b/home/common.nix index 7b78126..9eb4bdf 100644 --- a/home/common.nix +++ b/home/common.nix @@ -1,5 +1,39 @@ { config, pkgs, lib, ... }: +let + texlab = pkgs.rustPlatform.buildRustPackage rec { + pname = "texlab"; + version = "5.7.0"; + + src = pkgs.fetchFromGitHub { + owner = "latex-lsp"; + repo = "texlab"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GvORAPbQOdVpz4yY66b3OObewU98V26cZ6nrJ35nlkg="; + }; + + cargoSha256 = "sha256-b7v3ODOjY5BQCzVqlLCNUOaZS95AvIvyjOeas2XfRjM="; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = with pkgs; [ installShellFiles help2man ]; + + buildInputs = lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ + libiconv + Security + CoreServices + ]); + + # When we cross compile we cannot run the output executable to + # generate the man page + postInstall = '' + # TexLab builds man page separately in CI: + # https://github.com/latex-lsp/texlab/blob/v5.7.0/.github/workflows/publish.yml#L127-L131 + help2man --no-info "$out/bin/texlab" > texlab.1 + installManPage texlab.1 + ''; + }; +in { imports = [ ./kakoune/kak.nix @@ -78,6 +112,8 @@ BAT_THEME = "GitHub"; # Editor EDITOR = "kak"; + # PATH Overrides + PATH = "${config.home.homeDirectory}/.bin/overrides:$PATH"; }; home.sessionPath = [ @@ -142,6 +178,5 @@ jq.enable = true; nushell.enable = true; - nushell.package = pkgs.unstable.nushell; }; } diff --git a/home/fish/fish.nix b/home/fish/fish.nix index ce9cd64..ddd7588 100644 --- a/home/fish/fish.nix +++ b/home/fish/fish.nix @@ -15,7 +15,6 @@ programs.fish = { enable = true; - package = pkgs.unstable.fish; functions = { # Simplify nix usage! nx = { diff --git a/home/kagami-pc-home.nix b/home/kagami-pc-home.nix index 71b22f6..0fe8e5e 100644 --- a/home/kagami-pc-home.nix +++ b/home/kagami-pc-home.nix @@ -62,7 +62,6 @@ }; }; nki.programs.kitty.enable = true; - nki.programs.kitty.package = pkgs.unstable.kitty; # 0.27 fixes crash on sway 1.8 nki.programs.kitty.fontSize = 14; # Yellow light! @@ -80,7 +79,6 @@ # mpd stuff services.mpd.musicDirectory = "${config.home.homeDirectory}/Music"; services.mpd-discord-rpc.enable = true; - services.mpd-discord-rpc.package = pkgs.unstable.mpd-discord-rpc; services.mpd-mpris.enable = true; # ncmpcpp programs.ncmpcpp.enable = true; diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix index c62a0ba..dc5fe67 100644 --- a/home/kakoune/kak.nix +++ b/home/kakoune/kak.nix @@ -3,7 +3,7 @@ let kakounePkg = pkgs.kakoune.override { - kakoune = with lib; pkgs.unstable.gcc11Stdenv.mkDerivation rec { + kakoune = with lib; pkgs.stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; version = "r${builtins.substring 0 6 pkgs.sources.kakoune.rev}"; src = pkgs.sources.kakoune; diff --git a/home/modules/programs/discord.nix b/home/modules/programs/discord.nix index 7b4417c..0b2eb52 100644 --- a/home/modules/programs/discord.nix +++ b/home/modules/programs/discord.nix @@ -10,7 +10,7 @@ in basePackage = mkOption { type = types.package; - default = pkgs.unstable.discord; + default = pkgs.discord; description = "The base Discord package that will get patched"; }; diff --git a/modules/cloud/traefik/certs-dumper.nix b/modules/cloud/traefik/certs-dumper.nix index 1104152..2138c7a 100644 --- a/modules/cloud/traefik/certs-dumper.nix +++ b/modules/cloud/traefik/certs-dumper.nix @@ -9,7 +9,6 @@ in enable = mkEnableOption "Dump certs onto a given directory "; package = mkOption { type = types.package; - default = pkgs.unstable.traefik-certs-dumper; description = "The certs dumper package to use"; }; destination = mkOption { diff --git a/nki-personal-do/configuration.nix b/nki-personal-do/configuration.nix index 3499205..e6c17ab 100644 --- a/nki-personal-do/configuration.nix +++ b/nki-personal-do/configuration.nix @@ -94,7 +94,6 @@ sops.secrets.heisenbridge = { owner = "heisenbridge"; }; sops.secrets.matrix-discord-bridge = { mode = "0644"; }; cloud.conduit.enable = true; - cloud.conduit.package = pkgs.unstable.matrix-conduit; cloud.conduit.instances = { "nkagami" = { host = "m.nkagami.me"; @@ -158,10 +157,6 @@ envFile = config.sops.secrets.youmubot-env.path; }; - # Writefreely on nki - # cloud.writefreely.enable = true; - # cloud.writefreely.package = pkgs.unstable.writefreely; - # Authentik sops.secrets.authentik-env = { }; cloud.authentik.enable = true; diff --git a/nki-personal-do/gitea.nix b/nki-personal-do/gitea.nix index 90d81a5..1e87d85 100644 --- a/nki-personal-do/gitea.nix +++ b/nki-personal-do/gitea.nix @@ -85,7 +85,6 @@ in services.gitea = { enable = true; - package = pkgs.unstable.gitea; inherit user; diff --git a/nki-personal-do/headscale.nix b/nki-personal-do/headscale.nix index b4a9d7c..4570ae4 100644 --- a/nki-personal-do/headscale.nix +++ b/nki-personal-do/headscale.nix @@ -25,7 +25,6 @@ rec { services.headscale = { enable = true; - package = pkgs.unstable.headscale; inherit port; settings = { diff --git a/nki-personal-do/writefreely.nix b/nki-personal-do/writefreely.nix index bfca27a..aac10d9 100644 --- a/nki-personal-do/writefreely.nix +++ b/nki-personal-do/writefreely.nix @@ -24,7 +24,6 @@ in nki.services.writefreely = { inherit host user; enable = true; - package = pkgs.unstable.writefreely; group = user;