feat(flake,stevee-x13s): bump to 24.11

This commit is contained in:
steveej 2024-11-24 16:09:58 +01:00
parent 9f191484f9
commit b782ec6f1d
10 changed files with 349 additions and 475 deletions

View file

@ -11,6 +11,10 @@ let
pkgsUnstable =
pkgs.pkgsUnstable
or (import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config overlays; });
pkgsLogseq =
pkgs.pkgsLogseq
or (import repoFlake.inputs.nixpkgs-logseq { inherit (pkgs) system config overlays; });
in
{
imports = [
@ -143,7 +147,7 @@ in
# freerdp
# Audio/Video Players
ffmpeg
# ffmpeg
vlc
# v4l-utils
# audacity
@ -246,24 +250,8 @@ in
# libretro.snes9x2010
# retroarchFull
(pkgs.logseq.overrideAttrs (
attrs:
lib.attrsets.recursiveUpdate attrs (
lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
src = repoFlake.inputs.logseq_0_10_9_aarch64_appimage;
meta.platforms = [ "aarch64-linux" ];
}
)
))
# (
# pkgsUnstable.callPackage (repoFlake + "/nix/pkgs/logseq")
# (lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
# overrideSrc = repoFlake.inputs.logseq_0_10_9_aarch64_appimage;
# })
# )
pkgsLogseq.logseq
])
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [ ])
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
pkgsUnstable.ledger-live-desktop

View file

@ -21,8 +21,8 @@
airline = {
enable = true;
settings = {
powerline_fonts = true;
skip_empty_sections = true;
powerline_fonts = 1;
skip_empty_sections = 1;
theme = "papercolor";
};
};

View file

@ -13,49 +13,47 @@ in
enable = true;
package = pkgsVscodium.vscodium;
extensions =
(
with pkgsVscodium.vscode-extensions;
with pkgsVscodium.vscode-extensions;
[
eamodio.gitlens
mkhl.direnv
tomoki1207.pdf
vscodevim.vim
# bbenoist.nix
jnoortheen.nix-ide
ms-vscode.theme-tomorrowkit
nonylene.dark-molokai-theme
ms-python.vscode-pylance
# TODO: these are not in nixpkgs
# fredwangwang.vscode-hcl-format
# hashicorp.hcl
# mindaro-dev.file-downloader
# ms-vscode.remote-explorer
# TODO: not compatible with vscodium
# ms-vscode-remote.remote-ssh
]
++ (
let
extensions = repoFlake.inputs.nix-vscode-extensions.extensions.${pkgs.system};
in
with extensions.vscode-marketplace;
with extensions.vscode-marketplace-release;
[
eamodio.gitlens
mkhl.direnv
tomoki1207.pdf
vscodevim.vim
tamasfe.even-better-toml
# bbenoist.nix
jnoortheen.nix-ide
serayuzgur.crates
rust-lang.rust-analyzer
swellaby.vscode-rust-test-adapter
ms-vscode.theme-tomorrowkit
nonylene.dark-molokai-theme
ms-python.vscode-pylance
# TODO: these are not in nixpkgs
# fredwangwang.vscode-hcl-format
# hashicorp.hcl
# mindaro-dev.file-downloader
# ms-vscode.remote-explorer
# TODO: not compatible with vscodium
# ms-vscode-remote.remote-ssh
golang.go
jeff-hykin.better-go-syntax
]
++ (
let
extensions = repoFlake.inputs.nix-vscode-extensions.extensions.${pkgs.system};
in
with extensions.vscode-marketplace;
with extensions.vscode-marketplace-release;
[
tamasfe.even-better-toml
serayuzgur.crates
rust-lang.rust-analyzer
swellaby.vscode-rust-test-adapter
golang.go
jeff-hykin.better-go-syntax
]
)
)
++ (
let
@ -79,7 +77,7 @@ in
buildInputs = [
pkgs.nix
pkgs.cacert
repoFlake.inputs.nix4vscode.packages.${pkgs.stdenv.system}.default
(pkgs.callPackage "${repoFlake.inputs.nix4vscode.outPath}/nix/package.nix" { })
# pkgs.strace
];
# outputHashAlgo = "sha256";