Merge pull request 'feature: pull in the latest updates, fix some errors and add a devenv for this repository' (#80) from chore/update into main
Reviewed-on: #80
This commit was merged in pull request #80.
This commit is contained in:
@@ -8,3 +8,7 @@ result-*
|
|||||||
|
|
||||||
# vim
|
# vim
|
||||||
*.swp
|
*.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
+12
-12
@@ -28,11 +28,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790365885,
|
"lastModified": 1790819692,
|
||||||
"narHash": "sha256-iQ0ebhiVo64NktTnwft9hNxlFu4j5cvljVxyJaEVIP4=",
|
"narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7b4c5ec4bedaf1e062bbc1bcaeddbc6bd242aa1b",
|
"rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -43,11 +43,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790323409,
|
"lastModified": 1790689126,
|
||||||
"narHash": "sha256-VVTPf+Hyd5ebpjBMHmrLMSBIeW6ls48Bqtosj7CNKLA=",
|
"narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e94cb152ed51bd6e24eb4a41f1460252beb52cd2",
|
"rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790359697,
|
"lastModified": 1790541651,
|
||||||
"narHash": "sha256-AIMlxsdXEAiv7KQQ/fcarzqe541iUrT+hCUVS71CrJI=",
|
"narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "4571c7a95787165cc7102d417a0fe4519bf6a995",
|
"rev": "5980a626794486abad69fca7667f9c11dfbc3bd7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -86,11 +86,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790432627,
|
"lastModified": 1790718664,
|
||||||
"narHash": "sha256-iegtG9qBQ3PwY9imebhurqwB61t0Ow0c5BovD8+3WpQ=",
|
"narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=",
|
||||||
"owner": "noctalia-dev",
|
"owner": "noctalia-dev",
|
||||||
"repo": "noctalia-shell",
|
"repo": "noctalia-shell",
|
||||||
"rev": "94712e922116d74381bc67bfc92df70cf4dc76b5",
|
"rev": "fd9759c892fe5034b682c185695f1bee121cd5b3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
../../modules/nixos/claudecode.nix
|
../../modules/nixos/claudecode.nix
|
||||||
../../modules/nixos/drives.nix
|
../../modules/nixos/drives.nix
|
||||||
../../modules/nixos/gnupg.nix
|
../../modules/nixos/gnupg.nix
|
||||||
../../modules/nixos/gnuradio.nix
|
|
||||||
../../modules/nixos/graphics.nix
|
../../modules/nixos/graphics.nix
|
||||||
../../modules/nixos/greetd.nix
|
../../modules/nixos/greetd.nix
|
||||||
../../modules/nixos/locales.nix
|
../../modules/nixos/locales.nix
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
iotop
|
iotop
|
||||||
iftop
|
iftop
|
||||||
strace
|
strace
|
||||||
ltrace
|
|
||||||
lsof
|
lsof
|
||||||
sysstat
|
sysstat
|
||||||
lm_sensors
|
lm_sensors
|
||||||
|
|||||||
@@ -1,14 +1,15 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
{ 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/
|
# See https://docs.noctalia.dev/v5/getting-started/nixos/
|
||||||
imports = [ inputs.noctalia.homeModules.default ];
|
|
||||||
|
|
||||||
programs.noctalia = {
|
programs.noctalia = {
|
||||||
enable = true;
|
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;
|
package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||||
|
|
||||||
# settings is rendered to ~/.config/noctalia/config.toml
|
# settings is rendered to ~/.config/noctalia/config.toml
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
ldns
|
ldns
|
||||||
lm_sensors
|
lm_sensors
|
||||||
lsof
|
lsof
|
||||||
ltrace
|
|
||||||
mtr
|
mtr
|
||||||
neovim
|
neovim
|
||||||
nfs-utils
|
nfs-utils
|
||||||
|
|||||||
Reference in New Issue
Block a user