steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

24
nix/home-manager/configuration/graphical-fullblown.nix
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

4
nix/home-manager/programs/neovim.nix
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";
};
};

78
nix/home-manager/programs/vscode/default.nix
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";

85
nix/os/devices/srv0-dmz0/configuration.nix
View file

@ -125,91 +125,6 @@ in
containers = { };
# sops.secrets.holochain-nomad-agent-ca = {
# sopsFile = ../../../../secrets/holochain-infra/nomad.yaml;
# owner = config.users.extraUsers.nomad.name;
# group = config.users.groups.nomad.name;
# };
# sops.secrets.holochain-global-nomad-client-cert = {
# sopsFile = ../../../../secrets/holochain-infra/nomad.yaml;
# owner = config.users.extraUsers.nomad.name;
# group = config.users.groups.nomad.name;
# };
# sops.secrets.holochain-global-client-nomad-key = {
# sopsFile = ../../../../secrets/holochain-infra/nomad.yaml;
# owner = config.users.extraUsers.nomad.name;
# group = config.users.groups.nomad.name;
# };
# services.nomad = {
# enable = true;
# package = packages'.nomad;
# enableDocker = false;
# dropPrivileges = false;
# extraPackages = [
# pkgs.coreutils
# pkgs.nix
# pkgs.bash
# pkgs.gitFull
# pkgs.cacert
# ];
# settings = {
# server.enabled = false;
# client = {
# enabled = true;
# server_join = {
# retry_join = [
# "infra.holochain.org"
# ];
# retry_interval = "60s";
# };
# node_class = "testing";
# meta = {
# inherit (pkgs.targetPlatform) system;
# features = builtins.concatStringsSep "," [
# "poc-1"
# "poc-2"
# "ipv4-nat"
# "nix"
# "nixos"
# "holoport"
# ];
# machine_type = "baremetal";
# };
# };
# tls = {
# http = true;
# rpc = true;
# ca_file = config.sops.secrets.holochain-nomad-agent-ca.path;
# cert_file = config.sops.secrets.holochain-global-nomad-client-cert.path;
# key_file = config.sops.secrets.holochain-global-client-nomad-key.path;
# verify_server_hostname = true;
# verify_https_client = true;
# };
# plugin.raw_exec.config.enabled = true;
# };
# };
# users.extraUsers.nomad.isNormalUser = true;
# users.extraUsers.nomad.isSystemUser = false;
# users.extraUsers.nomad.group = "nomad";
# users.extraUsers.nomad.home = config.services.nomad.settings.data_dir;
# users.extraUsers.nomad.createHome = true;
# users.groups.nomad.members = ["nomad"];
# systemd.services.nomad.serviceConfig.User = "nomad";
# systemd.services.nomad.serviceConfig.Group = "nomad";
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave

3
nix/os/devices/steveej-x13s/configuration.nix
View file

@ -83,7 +83,8 @@
../../snippets/nix-settings.nix
../../snippets/nix-settings-holo-chain.nix
../../snippets/mycelium.nix
../../snippets/obs-studio.nix
# ../../snippets/obs-studio.nix
{
services.openssh.enable = true;

42
nix/os/devices/steveej-x13s/flake.lock generated
View file

@ -28,11 +28,11 @@
]
},
"locked": {
"lastModified": 1731060864,
"narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
"lastModified": 1732284644,
"narHash": "sha256-REGLarOB5McRMmFtOgNihEXXQILY6+2UBAY8lw8CJCI=",
"owner": "nix-community",
"repo": "disko",
"rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
"rev": "abc8baff333ac9dca930fc4921a26a8fc248e442",
"type": "github"
},
"original": {
@ -148,16 +148,16 @@
]
},
"locked": {
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"lastModified": 1732319136,
"narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"rev": "f8831cc700030e11fc91da9ef6270593e6440edc",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
@ -190,11 +190,11 @@
]
},
"locked": {
"lastModified": 1730381857,
"narHash": "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo=",
"lastModified": 1732269459,
"narHash": "sha256-KIn7TfNknBiCoM/RedPqW3Im9X0Iiwig3hHAAhkTDLg=",
"owner": "threefoldtech",
"repo": "mycelium",
"rev": "8a2b564c8e279d4afd0a10058b4481799a7513e1",
"rev": "430ec6b272a4654d0ccbf053bfad8a594eff4016",
"type": "github"
},
"original": {
@ -247,11 +247,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1731793780,
"narHash": "sha256-gOpR24dG7PUktUmlF2nDg0nqvlli7ZC179ngYMpGlfw=",
"lastModified": 1731796298,
"narHash": "sha256-ZjIcp1WskJw+fH5AjrYbb+GoKGsVmPcXsmLFiS6L0NI=",
"ref": "bump",
"rev": "b957608c2a0b7808f17588be2f38d8ddb6321b2f",
"revCount": 118,
"rev": "b78fc5d593e6f7b85f8b1d3585098ac333b5dc76",
"revCount": 119,
"type": "git",
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
},
@ -291,27 +291,27 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730883749,
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
"lastModified": 1731755305,
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github"
},
"original": {

31
nix/os/devices/steveej-x13s/flake.nix
View file

@ -1,7 +1,7 @@
{
inputs = {
nixpkgs.follows = "nixpkgs-stable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
get-flake.url = "github:ursi/get-flake";
@ -10,7 +10,7 @@
home-manager = {
# url = "github:nix-community/home-manager/master";
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -127,24 +127,15 @@
});
};
overlays.default =
_final: previous:
let
inherit (previous.stdenv) system;
pkgsUnstable = import self.inputs.nixpkgs-unstable.outPath {
inherit system;
overlays = [ self.overlays.libcamera ];
};
in
{
inherit pkgsUnstable;
inherit (pkgsUnstable)
libcamera
webkitgtk
webkitgtk_4_1
webkitgtk_6_0
;
};
overlays.default = _final: _previous: {
# inherit pkgsUnstable;
# inherit (pkgsUnstable)
# libcamera
# webkitgtk
# webkitgtk_4_1
# webkitgtk_6_0
# ;
};
nixosConfigurations = {
native = mkNixosConfiguration { system = nativeSystem; };

106
nix/pkgs/logseq/default.nix
View file

@ -1,106 +0,0 @@
{
lib,
stdenv,
fetchurl,
appimageTools,
unzip,
makeWrapper,
# Notice: graphs will not sync without matching upstream's major electron version
# the specific electron version is set at top-level file to preserve override interface.
# whenever updating this package also sync electron version at top-level file.
electron_27,
autoPatchelfHook,
git,
nix-update-script,
overrideSrc ? null,
}:
stdenv.mkDerivation (
finalAttrs:
let
inherit (finalAttrs) pname version src;
in
{
pname = "logseq";
version = "0.10.9";
src =
if overrideSrc != null then
overrideSrc
else
(fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-F3YbqgvL04P0nXaIVkJlCq/z8hUE0M0UutkBs2omuBe=";
name = "${pname}-${version}.AppImage";
});
nativeBuildInputs =
[ makeWrapper ]
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ];
buildInputs = [ stdenv.cc.cc.lib ];
dontUnpack = stdenv.hostPlatform.isLinux;
dontConfigure = true;
dontBuild = true;
installPhase =
''
runHook preInstall
''
+ lib.optionalString stdenv.hostPlatform.isLinux (
let
appimageContents = appimageTools.extract { inherit pname src version; };
in
''
mkdir -p $out/bin $out/share/logseq $out/share/applications
cp -a ${appimageContents}/{locales,resources} $out/share/logseq
cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop
# remove the `git` in `dugite` because we want the `git` in `nixpkgs`
chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git
chmod +w $out/share/logseq/resources/app/node_modules/dugite
rm -rf $out/share/logseq/resources/app/node_modules/dugite/git
chmod -w $out/share/logseq/resources/app/node_modules/dugite
mkdir -p $out/share/pixmaps
ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png
substituteInPlace $out/share/applications/logseq.desktop \
--replace Exec=Logseq Exec=logseq \
--replace Icon=Logseq Icon=logseq
''
)
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications/Logseq.app,bin}
cp -R . $out/Applications/Logseq.app
makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq
''
+ ''
runHook postInstall
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
# set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
makeWrapper ${electron_27}/bin/electron $out/bin/logseq \
--set "LOCAL_GIT_DIRECTORY" ${git} \
--add-flags $out/share/logseq/resources/app \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base";
homepage = "https://github.com/logseq/logseq";
changelog = "https://github.com/logseq/logseq/releases/tag/${version}";
license = lib.licenses.agpl3Plus;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ cheeseecake ];
platforms = [
"x86_64-linux"
"aarch64-linux"
] ++ lib.platforms.darwin;
mainProgram = "logseq";
};
}
)