many changes and more modularizing

This commit is contained in:
2024-12-12 22:30:24 +01:00
parent df50e70f3e
commit c96c24f864
109 changed files with 20900 additions and 278 deletions

View File

@@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{ config, lib, pkgs, ... }:
let
unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) {
config = { allowUnfree = true; };
@@ -12,6 +12,8 @@ let
in {
nixpkgs.config.allowUnfree = true;
security.pki.certificates = [ "/home/dominik/.local/share/mkcert/rootCA.pem" ];
imports =
[ # Include the results of the hardware scan.
"${impermanence}/nixos.nix"
@@ -151,7 +153,6 @@ in {
};
networking.hostName = "nb-01"; # Define your hostname.
networking.resolvconf.enable = true;
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
networking.extraHosts = ''
77.119.230.30 vpn.cloonar.com
@@ -229,6 +230,7 @@ in {
"10.42.96.0/20"
# wohnservice-wien
"10.254.240.0/24"
"10.254.235.0/24"
# epicenter.works
"10.14.0.0/16"
"10.25.0.0/16" ];
@@ -242,6 +244,45 @@ in {
};
};
# networking.networkmanager.insertNameservers = [ "9.9.9.9" "149.112.112.11" "2620:fe::fe" "2620:fe::9" ];
# services.avahi.enable = false;
# networking.resolvconf.enable = lib.mkForce false;
# services.resolved = {
# enable = true;
# dnssec = "true";
# domains = [ "~." ];
# fallbackDns = [ "9.9.9.9" "149.112.112.11" "2620:fe::fe" "2620:fe::9" ];
# dnsovertls = "true";
# };
# networking.wg-quick.interfaces = {
# wg0 = {
# address = [ "10.42.98.201/32" ];
# privateKeyFile = config.sops.secrets.wg-cloonar-key.path;
#
# postUp = ''
# ${pkgs.systemd}/bin/resolvectl dns wg0 10.42.97.1
# ${pkgs.systemd}/bin/resolvectl domain wg0 cloonar.com
# ${pkgs.systemd}/bin/resolvectl dnsovertls wg0 true
# '';
#
# peers = [
# {
# publicKey = "TKQVDmBnf9av46kQxLQSBDhAeaK8r1zh8zpU64zuc1Q=";
# allowedIPs = [
# "10.42.96.0/20"
# # wohnservice-wien
# "10.254.240.0/24"
# # epicenter.works
# "10.14.0.0/16"
# "10.25.0.0/16"
# ];
# endpoint = "vpn.cloonar.com:51822";
# persistentKeepalive = 25;
# }
# ];
# };
# };
nix = {
settings.auto-optimise-store = true;
@@ -259,6 +300,11 @@ in {
'';
};
services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
[org.gnome.desktop.interface]
cursor-size=24
'';
}

View File

@@ -0,0 +1,13 @@
self: super: {
vimPlugins = super.vimPlugins // {
chatgpt-nvim = super.vimUtils.buildVimPlugin {
pname = "chatgpt-nvim";
version = "1.0.0";
src = super.fetchgit {
url = "https://git.cloonar.com/Cloonar/chatgpt.vim.git";
rev = "9a9868c991d2c9d0d2f5bc4c065a839f79c8daa1";
sha256 = "sha256-ip+VFMJJWNaoSOyY2nLNVLEb3h37akUdk0du5u81dvc=";
};
};
};
}

View File

View File

@@ -1,6 +1,9 @@
{ pkgs, ... }:
{
environment.variables = { EDITOR = "vim"; };
nixpkgs.overlays = [
(import ./chatgpt.nix)
];
environment.systemPackages = with pkgs; [
nodePackages.typescript-language-server
@@ -11,6 +14,8 @@
gopls
lazygit
ripgrep
lua
luaPackages.lyaml
(neovim.override {
vimAlias = true;
configure = {
@@ -19,6 +24,7 @@
bigfile-nvim
bufferline-nvim
catppuccin-nvim
chatgpt-nvim
cmp-buffer
cmp-nvim-lsp
cmp-path
@@ -66,6 +72,7 @@
luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
"init"
"keymappings"
"chatgpt"
"copilot"
"icons"
"lspconfig"
@@ -86,6 +93,7 @@
EOF
'';
};
extraLuaPackages = luaPackages: [ luaPackages.lyaml ];
}
)];
}

View File

@@ -0,0 +1,7 @@
self: super: {
neovim = super.neovim.override {
luaPackages = super.luaPackages // {
lyaml = super.luaPackages.lyaml;
};
};
}

View File

@@ -6,6 +6,7 @@
# font for window titles and bar
font pango:Source Sans Pro 14
seat * xcursor_theme Adwaita 24
# use win key
set $mod Mod4
@@ -311,7 +312,7 @@ exec mako --default-timeout=5000
# wallpaper
# output eDP-1 scale 2 scale_filter linear
output eDP-1 mode 1680x1050
output eDP-1 mode 2880x1920 scale 2
output eDP-1 bg #282a36 solid_color
output eDP-1 bg ~/.wallpaper.png center
output DP-4 bg #282a36 solid_color

View File

@@ -43,6 +43,8 @@ in {
./thunderbird.nix
];
environment.variables.XCURSOR_SIZE = "24";
hardware.opengl.extraPackages = [ pkgs.amdvlk ];
environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";

View File

@@ -15,25 +15,8 @@ let
};
in
{
# nixpkgs.overlays = [
# (self: super:
# {
# thunderbird-bin-unwrapped = super.thunderbird-bin-unwrapped.overrideAttrs ( old: rec {
# version = "112.0b7";
# name = "thunderbird-bin";
# src = super.fetchurl {
# url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/linux-x86_64/en-US/thunderbird-${version}.tar.bz2";
# sha256 = "30d23df34834096a79261439d5ea6d78d44921f0218893f100596ee6296cd806";
# };
# });
# }
# )
# ];
environment.systemPackages = [
# (import ../../pkgs/thunderbird.nix)
pkgs.thunderbird
# pkgs.thunderbird-bin-unwrapped
thunderbirdWorkDesktopItem
thunderbirdCloonarDesktopItem
];

View File

@@ -1,3 +1,5 @@
/home/dominik/projects/cloonar/chatgpt.vim
/home/dominik/projects/cloonar/typo3-basic
/home/dominik/projects/cloonar/renovate-config
/home/dominik/projects/cloonar/bento
/home/dominik/projects/cloonar/freescout
@@ -24,3 +26,4 @@
/home/dominik/projects/epicenter.works/spenden.akvorrat.at
/home/dominik/projects/epicenter.works/dearmep-website
/home/dominik/projects/epicenter.works/padexporter
/home/dominik/projects/cloonar/lena-schilling-website

View File

@@ -14,7 +14,7 @@ let
"calendar.ui.version" = 3;
"calendar.timezone.local" = "Europe/Vienna";
"calendar.week.start" = 1;
"layout.css.devPixelsPerPx" = "0.75";
"layout.css.devPixelsPerPx" = "1.5";
};
thunderbirdCalendarPersonal = {
@@ -70,7 +70,7 @@ let
"signon.rememberSignons" = false;
"identity.sync.tokenserver.uri" = "https://sync.cloonar.com:5000/token/1.0/sync/1.5";
# "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"layout.css.devPixelsPerPx" = "0.75";
"layout.css.devPixelsPerPx" = "1.5";
"media.ffmpeg.vaapi.enabled" = true;
"media.ffmpeg.vaapi-drm-display.enabled" = true;
"gfx.webrender.all" = true;
@@ -536,6 +536,8 @@ in
set +eu
ssh-keygen -R git.cloonar.com
ssh-keyscan git.cloonar.com >> ~/.ssh/known_hosts
git clone gitea@git.cloonar.com:dominik.polakovics/typo3-basic.git ${persistHome}/cloonar/typo3-basic 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/chatgpt.vim.git ${persistHome}/cloonar/chatgpt.vim 2>/dev/null
git clone gitea@git.cloonar.com:renovate/renovate-config.git ${persistHome}/cloonar/renovate-config 2>/dev/null
git clone git@github.com:dpolakovics/bento.git ${persistHome}/cloonar/bento 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/freescout.git ${persistHome}/projects/cloonar/freescout 2>/dev/null
@@ -554,6 +556,7 @@ in
git clone gitea@git.cloonar.com:Cloonar/korean-skin.care.git ${persistHome}/projects/cloonar/korean-skin.care 2>/dev/null
git clone gitea@git.cloonar.com:myhidden.life/web.git ${persistHome}/projects/myhidden.life/myhidden.life-web 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/soundscape-sync.git ${persistHome}/projects/cloonar/soundscape-sync 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/lena-schilling-website.git ${persistHome}/projects/cloonar/lena-schilling-website 2>/dev/null
git clone gitea@git.cloonar.com:socialgrow.tech/sgt-api.git ${persistHome}/projects/socialgrow.tech/sgt-api 2>/dev/null