diff --git a/hosts/buzzard/default.nix b/hosts/buzzard/default.nix index 9ef3bcf..b95d159 100644 --- a/hosts/buzzard/default.nix +++ b/hosts/buzzard/default.nix @@ -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"; diff --git a/hosts/common/default.nix b/hosts/common/default.nix index c16614b..68ea675 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -85,6 +85,4 @@ with pkgs; networking = { networkmanager.enable = true; }; - - programs.zsh.enable = true; } diff --git a/hosts/gitea/pkgs/gitea/build.nix b/hosts/gitea/pkgs/gitea/build.nix new file mode 100644 index 0000000..633f330 --- /dev/null +++ b/hosts/gitea/pkgs/gitea/build.nix @@ -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; + }; +} diff --git a/hosts/gitea/pkgs/gitea/default.nix b/hosts/gitea/pkgs/gitea/default.nix new file mode 100644 index 0000000..c554920 --- /dev/null +++ b/hosts/gitea/pkgs/gitea/default.nix @@ -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"; +}) \ No newline at end of file diff --git a/hosts/gitea/pkgs/gitea/node.nix b/hosts/gitea/pkgs/gitea/node.nix new file mode 100644 index 0000000..7f14fa9 --- /dev/null +++ b/hosts/gitea/pkgs/gitea/node.nix @@ -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 + ''; +} \ No newline at end of file diff --git a/hosts/gitea/services/gitea.nix b/hosts/gitea/services/gitea.nix index 94495ca..14e9bc8 100644 --- a/hosts/gitea/services/gitea.nix +++ b/hosts/gitea/services/gitea.nix @@ -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"; diff --git a/users/carsten/conf/direnv.nix b/users/carsten/conf/direnv.nix index 8bdb06a..ad6ab1b 100644 --- a/users/carsten/conf/direnv.nix +++ b/users/carsten/conf/direnv.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - config.programs.zsh.initExtra = '' - eval "$(direnv hook zsh)" + config.programs.bash.initExtra = '' + eval "$(direnv hook bash)" ''; } diff --git a/users/carsten/conf/gnome.nix b/users/carsten/conf/gnome.nix index 1747281..aa785a1 100644 --- a/users/carsten/conf/gnome.nix +++ b/users/carsten/conf/gnome.nix @@ -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" = { diff --git a/users/carsten/default.nix b/users/carsten/default.nix index e906e75..28ed1b2 100644 --- a/users/carsten/default.nix +++ b/users/carsten/default.nix @@ -14,7 +14,7 @@ "vboxusers" # VirtualBox "docker" # Containers ]; - shell = pkgs.zsh; + shell = pkgs.bash; packages = [ ]; }; diff --git a/users/carsten/pkgs/default.nix b/users/carsten/pkgs/default.nix index 005f7c4..3ea7344 100644 --- a/users/carsten/pkgs/default.nix +++ b/users/carsten/pkgs/default.nix @@ -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";