Switch back to bash and switch gitea to fork

main
Carsten Kragelund 2023-05-06 02:24:41 +02:00
parent 1befec8d93
commit 5749c7cc3c
Signed by: nyx
GPG Key ID: CADDADEEC9F753C0
10 changed files with 103 additions and 31 deletions

@ -13,9 +13,13 @@
wsl = {
enable = true;
wslConf.automount.root = "/mnt";
defaultUser = config.users.users.carsten.name;
defaultUser = "carsten";
startMenuLaunchers = true;
};
services.openssh = {
enable = true;
permitRootLogin = "yes";
};
graphical = false;
nix.settings.build-cores = 12;
networking.hostName = "buzzard";

@ -85,6 +85,4 @@ with pkgs;
networking = {
networkmanager.enable = true;
};
programs.zsh.enable = true;
}

@ -0,0 +1,48 @@
{ pkgs, ... }:
let
nodeNix = (import ./node.nix { inherit pkgs; });
nodeEnv = (pkgs.callPackage (nodeNix + "/default.nix") { });
in
pkgs.buildGoModule rec {
pname = "gitea-build";
version = "1.19.3-nyx";
vendorHash = "sha256-gfHyssQrY5r3rQAzonM3Rv/BDIYGEY/PiOZEyoGGeiw=";
src = pkgs.fetchgit {
url = "https://github.com/nyxkrage/gitea";
rev = "1.19.3";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nativeBuildInputs = [
pkgs.gnumake
pkgs.go
pkgs.nodejs
pkgs.nodePackages.npm
pkgs.git
];
buildPhase = ''
ln -s ${nodeEnv.nodeDependencies}/lib/node_modules ./node_modules
export PATH="${nodeEnv.nodeDependencies}/bin:$PATH"
TAGS="bindata" VERSION="${version}" make frontend vendor generate release-sources
'';
installPhase = ''
mkdir -p $out
cp dist/release/gitea-src-${version}.tar.gz $out
'';
outputs = [ "out" ];
enableParallelBuilding = false;
meta = with pkgs.lib; {
description = "Build helper for Gitea";
homepage = "https://gitea.com/";
license = licenses.mit;
maintainers = with maintainers; [ nyxkrage ];
platforms = platforms.all;
};
}

@ -0,0 +1,6 @@
{ pkgs, ... }: pkgs.unstable.gitea.overrideAttrs (old: rec {
pname = "gitea";
version = "1.19.3-nyx";
src = "${import ./build.nix { inherit pkgs; }}/gitea-src-${version}.tar.gz";
})

@ -0,0 +1,24 @@
{ pkgs, ... }:
pkgs.stdenv.mkDerivation rec {
pname = "gitea-node-env";
version = "1.19.3-nyx";
src = pkgs.fetchgit {
url = "https://github.com/nyxkrage/gitea";
rev = "1.19.3";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nativeBuildInputs = [ pkgs.node2nix ];
buildPhase = ''
mkdir nix
node2nix -i ${src}/package.json -l ${src}/package-lock.json
sed -r -i 's/src = .+?nix\/store.+?;/src = fetchgit { url = "https:\/\/github.com\/nyxkrage\/gitea"; rev = "1.19.3"; hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY\/+cT8rkXxv4="; };/' node-packages.nix
'';
installPhase = ''
mkdir $out
cp *.nix $out
'';
}

@ -2,7 +2,7 @@
services.gitea = rec {
enable = true;
appName = "Init System: Gitea";
package = pkgs.unstable.gitea;
package = import ../pkgs/gitea { inherit pkgs; };
database = {
type = "postgres";
host = "unix:///var/run/postgresql/";
@ -21,6 +21,9 @@
REGISTER_EMAIL_CONFIRM = true;
ENABLE_CAPTCHA = true;
};
ui = {
THEMES = "gitea,arc-green,catppuccin-latte-sky";
};
mailer = {
ENABLED = true;
SMTP_ADDR = "mail.pid1.sh";

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
{
config.programs.zsh.initExtra = ''
eval "$(direnv hook zsh)"
config.programs.bash.initExtra = ''
eval "$(direnv hook bash)"
'';
}

@ -7,7 +7,7 @@
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
color-scheme = "prefer-light";
enable-hot-corners = false;
};
"org/gnome/shell" = {

@ -14,7 +14,7 @@
"vboxusers" # VirtualBox
"docker" # Containers
];
shell = pkgs.zsh;
shell = pkgs.bash;
packages = [ ];
};

@ -1,27 +1,5 @@
{ pkgs, config, osConfig, lib, ... }: {
programs.zsh = {
enable = true;
dotDir = ".config/zsh";
history = {
size = 10000;
path = "${config.xdg.dataHome}/zsh/zsh_history";
};
initExtra = ''
PROMPT='%2~ %# '
### ctrl+arrows
bindkey "\e[1;5C" forward-word
bindkey "\e[1;5D" backward-word
### ctrl+delete
bindkey "\e[3;5~" kill-word
### ctrl+backspace
bindkey '^H' backward-kill-word
### ctrl+shift+delete
bindkey "\e[3;6~" kill-line
'';
};
programs.bash.enable = true;
programs.emacs = {
enable = true;
@ -34,6 +12,17 @@
];
};
programs.neovim = {
enable = true;
plugins = with pkgs.vimPlugins; [
catppuccin-nvim
];
extraConfig = ''
set number relativenumber
colorscheme catppuccin-latte
'';
};
programs.gpg = {
enable = true;
homedir = "${config.xdg.dataHome}/gnupg";