chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Update shells a bit

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-03-14 11:39:45 +01:00
parent 1414da9c00
commit 57f21d8d0d
No known key found for this signature in database
GPG key ID: 019E764B7184435A
8 changed files with 98 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flake.lock generated
View file

@ -153,16 +153,15 @@
]
},
"locked": {
"lastModified": 1678737103,
"narHash": "sha256-9rUxd1Rx0bEBZb95fCUHnqWQfLgbACoZv0pyOSXuT40=",
"lastModified": 1678787322,
"narHash": "sha256-aJhChYdaotatK8hK8l12bDelaQvjBuL8QXoStrNN8VM=",
"owner": "chvp",
"repo": "devshell",
"rev": "0168d9deca2cb7e24d58e5356b6dfe3896338d0e",
"rev": "ff366c0283ba7b4702fb7ac471a06a4c91aa9b02",
"type": "github"
},
"original": {
"owner": "chvp",
"ref": "background-services",
"repo": "devshell",
"type": "github"
}

3
flake.nix
View file

@ -33,7 +33,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
devshell = {
url = "github:chvp/devshell/background-services";
url = "github:chvp/devshell";
inputs = {
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
@ -98,6 +98,7 @@
input = nixpkgs;
patches = builtins.map (patch: ./patches + "/${patch}") (builtins.filter (x: x != ".keep") (builtins.attrNames (builtins.readDir ./patches)));
overlaysBuilder = _: [
agenix.overlays.default
accentor.overlays.default
devshell.overlays.default
emacs-overlay.overlay

13
shells/dodona.nix
View file

@ -30,15 +30,22 @@ pkgs.devshell.mkShell {
yarn
];
env = [
{ name = "CC"; value = "cc"; }
{ name = "CPP"; value = "cpp"; }
{ name = "CXX"; value = "c++"; }
{ name = "DATABASE_URL"; value = "mysql2://root:dodona@127.0.0.1:3306/dodona"; }
{ name = "TEST_DATABASE_URL"; value = "mysql2://root:dodona@127.0.0.1:3306/dodona_test"; }
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
commands = [
{
name = "refresh-deps";
category = "general commands";
help = "Install dependencies";
command = ''
yarn install
bundle install
bundle pristine
'';
}
{
name = "memcached";
category = "general commands";

49
shells/gamification2.nix
View file

@ -1,24 +1,23 @@
{ pkgs, inputs }: pkgs.devshell.mkShell {
name = "Gamification 2";
imports = [ "${inputs.devshell}/extra/language/c.nix" ];
packages = with pkgs; [
(pkgs.lowPrio binutils)
findutils
cmake
gnumake
nodejs
postgresql_14
ruby_3_1
yarn
];
env = [
{ name = "NIX_CC"; value = "${pkgs.gcc}"; }
{ name = "PGDATA"; eval = "$PRJ_DATA_DIR/postgres"; }
{ name = "DATABASE_HOST"; eval = "$PGDATA"; }
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
{ name = "PGDATA"; eval = "$PRJ_DATA_DIR/postgres"; }
];
commands = [
{
name = "refresh-deps";
category = "general commands";
help = "Install dependencies";
command = ''
yarn install
bundle install
bundle pristine
'';
}
{
name = "pg:setup";
category = "database";
@ -36,15 +35,7 @@
help = "Start postgres instance";
command = ''
[ ! -d $PGDATA ] && pg:setup
pg_ctl -D $PGDATA -U postgres start -l log/postgres.log
'';
}
{
name = "pg:stop";
category = "database";
help = "Stop postgres instance";
command = ''
pg_ctl -D $PGDATA -U postgres stop
postgres
'';
}
{
@ -52,10 +43,24 @@
category = "database";
help = "Open database console";
command = ''
psql --host $PGDATA -U postgres
psql --host $PGDATA s
'';
}
];
packages = with pkgs; [
(pkgs.lowPrio binutils)
findutils
cmake
gnumake
nodejs
postgresql_14
ruby_3_1
yarn
];
serviceGroups.server.services = {
web.command = "rails s -p 3000";
postgres.command = "pg:start";
};
language.c = {
compiler = pkgs.gcc;
includes = [ pkgs.zlib pkgs.openssl ];

17
shells/nixos-config.nix
View file

@ -1,10 +1,23 @@
{ pkgs, inputs }: pkgs.devshell.mkShell {
name = "NixOS config";
commands = [
{
name = "format-all";
category = "general commands";
help = "Format all nix files in the project";
command = "find $PRJ_ROOT -type f -name '*.nix' -print0 | xargs -0 nixpkgs-fmt";
}
{
name = "fetchpatch";
category = "general commands";
help = "Fetch a patch from a nixpkgs PR by its ID";
command = "curl -L https://github.com/NixOS/nixpkgs/pull/$1.patch -o $PRJ_ROOT/patches/$1.patch";
}
];
packages = [
pkgs.agenix
# Use nixos-rebuild from flake, since it might be patched
pkgs.nixos-rebuild
pkgs.nixpkgs-fmt
(pkgs.writeShellScriptBin "fetchpatch" "curl -L https://github.com/NixOS/nixpkgs/pull/$1.patch -o patches/$1.patch")
inputs.agenix.packages.${pkgs.system}.default
];
}

4
shells/scriptingtalen-project.nix
View file

@ -1,4 +0,0 @@
{ pkgs, ... }: pkgs.devshell.mkShell {
name = "Scriptingtalen project";
packages = with pkgs; [ (python3.withPackages (ps: with ps; [ beautifulsoup4 requests ])) ];
}

44
shells/tab.nix
View file

@ -1,6 +1,27 @@
{ pkgs, inputs }: pkgs.devshell.mkShell {
name = "Tab";
imports = [ "${inputs.devshell}/extra/language/c.nix" ];
commands = [
{
name = "refresh-deps";
category = "general commands";
help = "Install dependencies";
command = ''
yarn install
bundle install
bundle pristine
'';
}
];
env = [
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
serviceGroups.server.services = {
web.command = "rails s -p 3000";
js.command = "yarn build:dev --watch";
css.command = "yarn build:css --watch";
};
packages = with pkgs; [
(pkgs.lowPrio binutils)
findutils
@ -9,29 +30,6 @@
nodejs
yarn
];
env = [
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
commands = [
{
name = "server-support";
category = "general commands";
help = "Run everything required for a server";
command = ''
bundle install
'';
}
{
name = "server";
category = "general commands";
help = "Run everything";
command = ''
server-support
rails s
'';
}
];
language.c = {
compiler = pkgs.gcc;
includes = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];

46
shells/tap.nix
View file

@ -1,6 +1,22 @@
{ pkgs, inputs }: pkgs.devshell.mkShell {
name = "Tap";
imports = [ "${inputs.devshell}/extra/language/c.nix" ];
commands = [
{
name = "refresh-deps";
category = "general commands";
help = "Install dependencies";
command = ''
yarn install
bundle install
bundle pristine
'';
}
];
env = [
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
packages = with pkgs; [
(pkgs.lowPrio binutils)
imagemagick
@ -11,32 +27,10 @@
nodejs
yarn
];
env = [
{ name = "CC"; value = "cc"; }
{ name = "CPP"; value = "cpp"; }
{ name = "CXX"; value = "c++"; }
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
commands = [
{
name = "server-support";
category = "general commands";
help = "Run everything required for a server";
command = ''
bundle install
'';
}
{
name = "server";
category = "general commands";
help = "Run everything";
command = ''
server-support
rails s
'';
}
];
serviceGroups.server.services.rails = {
name = "server";
command = "rails s -p 3000";
};
language.c = {
compiler = pkgs.gcc;
includes = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];