diff --git a/bin/executable_make_certs b/bin/executable_make_certs index 3c0808f..deef043 100644 --- a/bin/executable_make_certs +++ b/bin/executable_make_certs @@ -6,35 +6,36 @@ doms=( 'localhost' 'local3000.localhost' 'djinn1.localhost' - '*.gdpr.localhost' - '*.up123.localhost' - '*.caves.localhost' - '*.eno.localhost' '*.adminer.localhost' - '*.laya-server.localhost' - '*.eshop.localhost' - '*.teastarter.localhost' '*.aikido.localhost' - '*.trailguide.localhost' - '*.mytango.localhost' - '*.invoicing.localhost' - '*.layaweb.localhost' '*.asqix.localhost' - '*.enix.localhost' - '*.statistix.localhost' - '*.booking.localhost' - '*.kotmel.localhost' '*.baterie-grohe.localhost' - '*.zdravotniregistr.cz' + '*.booking-core.localhost' + '*.booking.localhost' + '*.caves.localhost' + '*.enix.localhost' + '*.eno.localhost' + '*.eno-statistix.localhost' + '*.eshop.localhost' + '*.gdpr.localhost' + '*.invoicing.localhost' + '*.jopixel-support.localhost' + '*.kalich.localhost' '*.katalogy.localhost' + '*.kotmel.localhost' + '*.laya-server.localhost' + '*.layaweb.localhost' + '*.mytango.localhost' + '*.nicerice.localhost' + '*.statistix.localhost' + '*.teastarter.localhost' + '*.trailguide.localhost' + '*.up123.localhost' '*.vizit-core.localhost' '*.vizit.localhost' - '*.vizit-virtualni-recepce.localhost' '*.vizitpresentation.localhost' - '*.booking-core.localhost' - '*.nicerice.localhost' - '*.jopixel-support.localhost' - '*.eno-statistix.localhost' + '*.vizit-virtualni-recepce.localhost' + '*.zdravotniregistr.cz' ) mkcert -cert-file $HOME/.config/nginx/ssl/localhost.crt -key-file $HOME/.config/nginx/ssl/localhost.key $doms diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 867de0c..3cb7dc6 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -1768,7 +1768,7 @@ map kitty_mod+g show_last_command_output #: New window -map kitty_mod+enter new_window +map kitty_mod+enter launch --type os-window --cwd=current #:: You can open a new kitty window running an arbitrary program, for #:: example:: diff --git a/dot_config/nginx/nginx.conf.tmpl b/dot_config/nginx/nginx.conf.tmpl index 5b6c260..db8b0e7 100644 --- a/dot_config/nginx/nginx.conf.tmpl +++ b/dot_config/nginx/nginx.conf.tmpl @@ -156,14 +156,14 @@ http { } location /fpm-status { - fastcgi_pass php; + fastcgi_pass unix:/run/user/{{ .chezmoi.uid }}/$php_version-fpm/status.sock; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } location / { fastcgi_hide_header Access-Control-Allow-Origin; - fastcgi_pass $php_version; + fastcgi_pass unix:/run/user/{{ .chezmoi.uid }}/$php_version-fpm/fpm.sock; fastcgi_param SCRIPT_FILENAME $document_root/index.php; fastcgi_param QUERY_STRING $query_string; @@ -171,7 +171,7 @@ http { fastcgi_param CONTENT_TYPE $content_type; fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_param SCRIPT_NAME index.php; + fastcgi_param SCRIPT_NAME $request_uri; fastcgi_param REQUEST_URI $request_uri; fastcgi_param DOCUMENT_URI $document_uri; fastcgi_param DOCUMENT_ROOT $document_root; @@ -179,6 +179,8 @@ http { fastcgi_param REQUEST_SCHEME $scheme; fastcgi_param HTTPS $https if_not_empty; + fastcgi_param PATH_INFO $request_uri; + fastcgi_param GATEWAY_INTERFACE CGI/1.1; fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; diff --git a/dot_config/nvim/lua/configs/options.lua b/dot_config/nvim/lua/configs/options.lua index af7a1ea..eabd0d4 100644 --- a/dot_config/nvim/lua/configs/options.lua +++ b/dot_config/nvim/lua/configs/options.lua @@ -37,6 +37,9 @@ function M.setup() vim.o.splitright = true --vim.o.clipboard = "unnamedplus" + vim.o.grepprg = 'rg --vimgrep --no-ignore --smart-case $*' + vim.o.grepformat = '%f:%l:%c:%m' + -- Buffer vim.cmd([[ augroup forceRecheck diff --git a/dot_config/nvim/lua/configs/trouble.lua b/dot_config/nvim/lua/configs/trouble.lua index eb4605a..a20ea6d 100644 --- a/dot_config/nvim/lua/configs/trouble.lua +++ b/dot_config/nvim/lua/configs/trouble.lua @@ -2,6 +2,7 @@ local M = {} function M.setup() require('trouble').setup({ + mode = 'document_diagnostics' }) end diff --git a/dot_config/php/80/fpm/php-fpm.conf.tmpl b/dot_config/php/80/fpm/php-fpm.conf.tmpl index fee5ac7..a166082 100644 --- a/dot_config/php/80/fpm/php-fpm.conf.tmpl +++ b/dot_config/php/80/fpm/php-fpm.conf.tmpl @@ -4,15 +4,16 @@ daemonize = no log_limit = 49152 [www] -listen = 127.0.0.1:9080 +listen = /run/user/1000/php80-fpm/fpm.sock -pm = dynamic -pm.max_children = 5 -pm.start_servers = 2 +pm = ondemand +pm.max_children = 30 +pm.start_servers = 1 pm.min_spare_servers = 1 -pm.max_spare_servers = 3 +pm.max_spare_servers = 15 pm.status_path = /fpm-status +pm.status_listen = /run/user/1000/php80-fpm/status.sock access.log = /dev/stdout access.format = "%R - %u %t \"%m %r\" %s %d" diff --git a/dot_config/systemd/user/php@.service.tmpl b/dot_config/systemd/user/php@.service.tmpl index dcbe06a..e2714c2 100644 --- a/dot_config/systemd/user/php@.service.tmpl +++ b/dot_config/systemd/user/php@.service.tmpl @@ -13,7 +13,7 @@ Type=notify ExecStart=/usr/bin/php-fpm%i --nodaemonize --fpm-config %E/php/%i/fpm/php-fpm.conf -n -c {{.chezmoi.homeDir}}/.config/php/%i/php.ini --force-stderr ExecReload=/bin/kill -USR2 $MAINPID #RuntimeDirectory=php-fpm-%i -RuntimeDirectory=php$i-fpm +RuntimeDirectory=php%i-fpm #ConfigurationDirectory=php/%i [Install] diff --git a/dot_config/zsh/include/p10k.zsh b/dot_config/zsh/include/p10k.zsh index 0f48a23..59d41db 100644 --- a/dot_config/zsh/include/p10k.zsh +++ b/dot_config/zsh/include/p10k.zsh @@ -72,9 +72,8 @@ # Right prompt segments. typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( command_execution_time # previous command duration - virtualenv # python virtual environment # context # user@host - # time # current time + time # current time ) # Basic style options that define the overall prompt look.