diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-08-15 15:15:47 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-08-15 15:15:47 +0200 |
| commit | c164d5597b126654f683c0e0974d5ecf36e0d14e (patch) | |
| tree | b811e65cc5d8b5a0d3662c1bee956d9857a52c97 | |
| parent | 977a2e976ac87a4e994e33c0ccea51cbef3bc30d (diff) | |
| download | nixos-personal-c164d5597b126654f683c0e0974d5ecf36e0d14e.tar.gz nixos-personal-c164d5597b126654f683c0e0974d5ecf36e0d14e.tar.bz2 nixos-personal-c164d5597b126654f683c0e0974d5ecf36e0d14e.zip | |
nixos: move C develop to just devShells
| -rw-r--r-- | devShells/c.nix | 6 | ||||
| -rw-r--r-- | devShells/nuttx.nix | 2 | ||||
| -rw-r--r-- | nixos/machine/gaspode.nix | 25 | ||||
| -rw-r--r-- | nixos/modules/develop.nix | 7 |
4 files changed, 30 insertions, 10 deletions
diff --git a/devShells/c.nix b/devShells/c.nix index 76e653c..5d4278e 100644 --- a/devShells/c.nix +++ b/devShells/c.nix @@ -5,15 +5,15 @@ let in pkgs.mkShell { packages = (with pkgs; [ - clang-tools + clang-tools ctags gcc gdb pkg-config meson ninja bear cmake - cppcheck flawfinder - + valgrind lcov massif-visualizer + cppcheck flawfinder check curl diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix index 612465f..34c1361 100644 --- a/devShells/nuttx.nix +++ b/devShells/nuttx.nix @@ -19,6 +19,8 @@ in pkgs.mkShell { gnumake kconfig-frontends genromfs xxd openocd + + meson ninja bear ]) ++ (with pkgs-cross.buildPackages; [ gcc gdb ]); diff --git a/nixos/machine/gaspode.nix b/nixos/machine/gaspode.nix new file mode 100644 index 0000000..82762f1 --- /dev/null +++ b/nixos/machine/gaspode.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + config = { + + fileSystems = { + "/" = { + device = "/dev/mmcblk0p2"; + options = ["compress=lzo" "subvol=@nix"]; + }; + "/home" = { + device = "/dev/mmcblk0p2"; + options = ["compress=lzo" "subvol=@home"]; + }; + "/boot" = { + device = "/dev/mmcblk0p1"; + }; + }; + + }; + +} diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix index 844081b..fab5733 100644 --- a/nixos/modules/develop.nix +++ b/nixos/modules/develop.nix @@ -29,13 +29,6 @@ in { nix-prefetch-git nix-prefetch-github nix-prefetch-scripts rnix-lsp - # C - clang-tools gcc bear ctags - cppcheck flawfinder - check valgrind - gdb - lcov massif-visualizer - # Shell dash # Posix shell bats |