Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92b170e5e8
|
||
|
|
848af4d44b
|
||
|
|
e61289a26e | ||
|
|
28f5f4faa9
|
||
|
|
1007450e19 | ||
|
|
1be2731c53
|
||
|
|
b8d108f173 |
@@ -8,3 +8,7 @@ result-*
|
||||
|
||||
# vim
|
||||
*.swp
|
||||
|
||||
# devenv
|
||||
.devenv*
|
||||
devenv.local.nix
|
||||
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
{
|
||||
"nodes": {
|
||||
"devenv": {
|
||||
"locked": {
|
||||
"dir": "src/modules",
|
||||
"lastModified": 1790701375,
|
||||
"narHash": "sha256-0FpLHIRDYiyo3EMTnMQSobZQknZaa3JuWo6vmMCK76o=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"rev": "fe20b5cba7ab5e93ae73f956a8d3efc50e1753f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "src/modules",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"inputs": {
|
||||
"nixpkgs-src": "nixpkgs-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1789506231,
|
||||
"narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv-nixpkgs",
|
||||
"rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"ref": "rolling",
|
||||
"repo": "devenv-nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1789370336,
|
||||
"narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c7def046b9a883d46974757852106483d741586f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"devenv": "devenv",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
packages = with pkgs; [
|
||||
# issue tracker (git.0x29a.ch)
|
||||
tea
|
||||
|
||||
# nix tooling
|
||||
nixfmt # official formatter (RFC 166 style)
|
||||
statix # lints for nix anti-patterns
|
||||
deadnix # finds unused bindings and arguments
|
||||
nixd # language server
|
||||
nvd # diff system generations
|
||||
];
|
||||
|
||||
scripts = {
|
||||
lint.exec = ''
|
||||
statix check .
|
||||
deadnix --fail .
|
||||
'';
|
||||
fmt.exec = ''
|
||||
nixfmt $(git ls-files '*.nix')
|
||||
'';
|
||||
};
|
||||
|
||||
enterShell = ''
|
||||
echo "nixconfig devenv: tea, lint, fmt"
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
inputs:
|
||||
nixpkgs:
|
||||
url: github:cachix/devenv-nixpkgs/rolling
|
||||
Generated
+15
-15
@@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787559586,
|
||||
"narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
|
||||
"lastModified": 1788450739,
|
||||
"narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
|
||||
"rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -28,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787797243,
|
||||
"narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
|
||||
"lastModified": 1790819692,
|
||||
"narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
|
||||
"rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -43,11 +43,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1787900134,
|
||||
"narHash": "sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7+/Akyoa22pefw=",
|
||||
"lastModified": 1790689126,
|
||||
"narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
|
||||
"rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -66,11 +66,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787862710,
|
||||
"narHash": "sha256-dL1Tv7LekaTWUJxHRckjbupWczDdc3QOgRuVCM+WAvQ=",
|
||||
"lastModified": 1790541651,
|
||||
"narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "8c096abcf376137527c134da4ee210332b08ccc0",
|
||||
"rev": "5980a626794486abad69fca7667f9c11dfbc3bd7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -86,11 +86,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1788099672,
|
||||
"narHash": "sha256-t4Rw5OeULK/WA2Jh9ja615sCs2AmvahkAUx/ymdf2YQ=",
|
||||
"lastModified": 1790718664,
|
||||
"narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "d891007c022a3a1d4484495fe8b350a00deafae9",
|
||||
"rev": "fd9759c892fe5034b682c185695f1bee121cd5b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
../../modules/nixos/claudecode.nix
|
||||
../../modules/nixos/drives.nix
|
||||
../../modules/nixos/gnupg.nix
|
||||
../../modules/nixos/gnuradio.nix
|
||||
../../modules/nixos/graphics.nix
|
||||
../../modules/nixos/greetd.nix
|
||||
../../modules/nixos/locales.nix
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
iotop
|
||||
iftop
|
||||
strace
|
||||
ltrace
|
||||
lsof
|
||||
sysstat
|
||||
lm_sensors
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
# Noctalia v5 shell, managed via its upstream home-manager module.
|
||||
# Noctalia v5 shell, managed via home-manager's built-in programs.noctalia module.
|
||||
# The noctalia flake's homeModules.default is not imported: it redeclares the same
|
||||
# options and its disabledModules path ("programs/noctalia.nix") doesn't match HM's.
|
||||
# See https://docs.noctalia.dev/v5/getting-started/nixos/
|
||||
imports = [ inputs.noctalia.homeModules.default ];
|
||||
|
||||
programs.noctalia = {
|
||||
enable = true;
|
||||
|
||||
# The module's `package` option has no default, so it must be set explicitly.
|
||||
# Use the package from the noctalia flake rather than nixpkgs.
|
||||
package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
|
||||
# settings is rendered to ~/.config/noctalia/config.toml
|
||||
|
||||
+14
-2
@@ -15,7 +15,15 @@ let
|
||||
# on PATH. nixpkgs only *propagates* python3 from the siril derivation (it
|
||||
# isn't on the runtime PATH), so without the --prefix PATH below the GUI
|
||||
# fails with "Python not found in system PATH" and never creates
|
||||
# ~/.local/share/siril/venv. We add the same interpreter siril references.
|
||||
# ~/.local/share/siril/venv.
|
||||
#
|
||||
# We deliberately do NOT put ${pkgs.python3}/bin on PATH directly: `venv`
|
||||
# symlinks bin/python3 to whatever sys.executable was, so the venv would
|
||||
# hard-link a /nix/store hash that gets garbage-collected after the next
|
||||
# python bump, leaving a dangling symlink ("Error finding venv python
|
||||
# path, unable to spawn python"). Instead we go through the stable
|
||||
# /etc/siril/bin/python3 symlink (see environment.etc below), which NixOS
|
||||
# re-points at the current python on every rebuild.
|
||||
#
|
||||
# The VeraLux PyQt6 wheel ships only the built-in Windows/Fusion styles, so
|
||||
# the global QT_STYLE_OVERRIDE=adwaita-dark (inherited from the session) is
|
||||
@@ -26,7 +34,7 @@ let
|
||||
# ignored again (harmless warning + Fusion fallback, no loss of function).
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/siril \
|
||||
--prefix PATH : ${lib.makeBinPath [ pkgs.python3 ]} \
|
||||
--prefix PATH : /etc/siril/bin \
|
||||
--prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [
|
||||
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
|
||||
@@ -62,6 +70,10 @@ in
|
||||
sirilWithPlugins
|
||||
];
|
||||
|
||||
# Stable, GC-safe interpreter path for Siril's venv (see sirilWithPlugins).
|
||||
# Same python as siril itself propagates, so sirilpy's ABI matches.
|
||||
environment.etc."siril/bin/python3".source = "${pkgs.python3}/bin/python3";
|
||||
|
||||
# StarNet++ has no nixpkgs package. Download the StarNet v2 ORT CLI build
|
||||
# (starnet2_linux_*_ORT_x64_cli) from https://www.starnetastro.com/download/
|
||||
# and unzip it to ~/.local/share/siril/starnet/. Then in Siril set
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
ldns
|
||||
lm_sensors
|
||||
lsof
|
||||
ltrace
|
||||
mtr
|
||||
neovim
|
||||
nfs-utils
|
||||
|
||||
Reference in New Issue
Block a user