From b8c8d32895f0bcdbd97f726647313a1ebce9e50d Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Sat, 13 Mar 2021 14:38:31 +0100 Subject: [PATCH] updates --- fish/config.fish | 2 +- hjalmar-droneship/i3/config | 4 +- hjalmar-mothership/i3/config | 4 +- mimeapps.list | 26 +++----- nvim/coc-settings.json | 3 +- nvim/init.vim | 13 ++-- root/.tmux.conf | 4 +- sshd_config | 120 +++++++++++++++++++++++++++++++++++ 8 files changed, 143 insertions(+), 33 deletions(-) create mode 100644 sshd_config diff --git a/fish/config.fish b/fish/config.fish index 159483d..54982cb 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -4,7 +4,7 @@ set -x BROWSER /usr/bin/chromium set -x QT_QPA_PLATFORMTHEME "qt5ct" set -x GTK2_RC_FILES "$HOME/.gtkrc-2.0" set -x JAVA_HOME "/usr/lib/jvm/default/" -set -x PYTHONBREAKPOINT pudb.set_trace +set -x PYTHONBREAKPOINT ipdb.set_trace # cuda stuff set -x CUDA_HOME /opt/cuda diff --git a/hjalmar-droneship/i3/config b/hjalmar-droneship/i3/config index f93aa8e..370f606 100644 --- a/hjalmar-droneship/i3/config +++ b/hjalmar-droneship/i3/config @@ -94,8 +94,8 @@ bindsym $mod+Shift+x --release exec --no-startup-id xkill bindsym $mod+F1 exec $term -e 'htop' bindsym $mod+Shift+F1 exec $term -e 'glances' -bindsym $mod+F2 exec "chromium --start-fullscreen https://www.inoreader.com" -bindsym $mod+Shift+F2 exec "chromium --new-window --start-fullscreen https://www.inoreader.com" +bindsym $mod+F2 exec "xdg-open 'https://www.inoreader.com'" +bindsym $mod+Shift+F2 exec "xdg-open --new-window 'https://www.inoreader.com'" bindsym $mod+F3 exec $term -e 'ranger' bindsym $mod+Shift+F3 exec thunar bindsym $mod+F4 exec pamac-manager diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index ec34c9f..508fcfd 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -94,8 +94,8 @@ bindsym $mod+Shift+x --release exec --no-startup-id xkill bindsym $mod+F1 exec $term -e 'htop' bindsym $mod+Shift+F1 exec $term -e 'glances' -bindsym $mod+F2 exec "chromium --start-fullscreen https://www.inoreader.com" -bindsym $mod+Shift+F2 exec "chromium --new-window --start-fullscreen https://www.inoreader.com" +bindsym $mod+F2 exec "xdg-open 'https://www.inoreader.com'" +bindsym $mod+Shift+F2 exec "xdg-open --new-window 'https://www.inoreader.com'" bindsym $mod+F3 exec $term -e 'ranger' bindsym $mod+Shift+F3 exec thunar bindsym $mod+F4 exec pamac-manager diff --git a/mimeapps.list b/mimeapps.list index c26eae5..6e4080b 100644 --- a/mimeapps.list +++ b/mimeapps.list @@ -1,19 +1,12 @@ [Default Applications] -x-scheme-handler/msteams=teams.desktop; -x-scheme-handler/http=chromium.desktop; -x-scheme-handler/https=chromium.desktop; -x-scheme-handler/ftp=chromium.desktop; -x-scheme-handler/chrome=chromium.desktop; -x-scheme-handler/webcal=chromium.desktop -x-scheme-handler/mailto=chromium.desktop; -x-scheme-handler/msteams=teams.desktop -application/x-extension-htm=chromium.desktop; -application/x-extension-html=chromium.desktop; -application/x-extension-shtml=chromium.desktop; -application/x-extension-xhtml=chromium.desktop; -application/x-extension-xht=chromium.desktop; -application/xhtml+xml=chromium.desktop; -application/pdf=chromium.desktop;org.pwmt.zathura.desktop; +application/x-extension-htm=google-chrome.desktop; +application/x-extension-html=google-chrome.desktop; +application/x-extension-shtml=google-chrome.desktop; +application/x-extension-xhtml=google-chrome.desktop; +application/x-extension-xht=google-chrome.desktop; +application/xhtml+xml=google-chrome.desktop; +application/xml=draw.io.desktop; +application/pdf=google-chrome.desktop;org.pwmt.zathura.desktop; application/x-bittorrent=deluge.desktop; application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=freeoffice-planmaker.desktop; application/vnd.openxmlformats-officedocument.presentationml.presentation=freeoffice-presentations.desktop; @@ -21,7 +14,7 @@ inode/directory=ranger.desktop image/jpeg=viewnior.desktop; image/png=viewnior.desktop; image/svg+xml=viewnior.desktop; -message/rfc822=exo-web-browser.desktop; +message/rfc822=google-chrome.desktop; text/csv=freeoffice-planmaker.desktop; text/html=nvim.desktop; text/x-log=nvim.desktop; @@ -30,3 +23,4 @@ text/markdown=nvim.desktop;markdown_previewer.desktop; text/x-python=nvim.desktop; application/xml=nvim.desktop; application/octet-stream=nvim.desktop; +x-scheme-handler/msteams=teams.desktop; diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index f022cb4..b78be9b 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -5,8 +5,9 @@ "python.linting.flake8Enabled": true, "python.linting.mypyEnabled": true, "python.linting.pylintEnabled": false, + "python.analysis.useLibraryCodeForTypes": false, /* "python.linting.pylintArgs": ["--disable=all", "--enable=F,E,unreachable,duplicate-key,unnecessary-semicolon,global-variable-not-assigned,unused-variable,binary-op-exception,bad-format-string,anomalous-backslash-in-string,bad-open-mode"], */ - /* "python.linting.flake8Args": ["--ignore=E221,E226,E231,E241,E272,E501,E701,E704"], */ + "python.linting.flake8Args": ["--ignore=E731"], "git.enableGutters": true, "yaml.format.enable": true, "yaml.format.singleQuote": true, diff --git a/nvim/init.vim b/nvim/init.vim index ef2ea1c..c343f5c 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -43,7 +43,6 @@ Plug 'tpope/vim-sensible' Plug 'dkarter/bullets.vim' " python Plug 'tmhedberg/SimpylFold' -Plug 'jeetsukumaran/vim-pythonsense' " tmux Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim " aesthetics @@ -210,9 +209,9 @@ nnoremap Q " ***************************** " TERMINAL -nmap t :terminal tmap -tmap +tmap +nmap :terminal " ***************************** " SEARCH @@ -327,10 +326,8 @@ nmap (coc-refactor) xmap (coc-format-selected) nmap (coc-format-selected) nmap :CocDiagnostics -" F9 reserved for exec in terminal -nmap :Commits -nmap :BCommits -nmap :CocFzfList outline +nmap :Commits +nmap :BCommits nmap :Buffers nmap :RG nmap :GFiles? @@ -415,8 +412,6 @@ augroup myAu " A unique name for the group. DO NOT use the same name twice! autocmd BufReadPost quickfix nmap " quickfix autocmd CompleteDone * if pumvisible() == 0 | pclose | endif " bugfix autocmd BufNewFile,BufRead *.cfg set syntax=cfg - autocmd FileType python map :CocCommand python.execInTerminal - autocmd FileType python imap :CocCommand python.execInTerminal augroup end " CTRL-A CTRL-Q to select all and build quickfix list diff --git a/root/.tmux.conf b/root/.tmux.conf index 7c3d7c0..ebc48bf 100644 --- a/root/.tmux.conf +++ b/root/.tmux.conf @@ -95,8 +95,8 @@ bind -n M-o resize-pane -Z # split panes using | and -, make sure they open in the same path bind v split-window -h -c "#{pane_current_path}" bind s split-window -v -c "#{pane_current_path}" -bind ยง split-window -fh -c "#{pane_current_path}" -bind _ split-window -fv -c "#{pane_current_path}" +bind V split-window -fh -c "#{pane_current_path}" +bind S split-window -fv -c "#{pane_current_path}" # Change layouts bind o rotate-window diff --git a/sshd_config b/sshd_config new file mode 100644 index 0000000..f21b041 --- /dev/null +++ b/sshd_config @@ -0,0 +1,120 @@ +# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key + +# Ciphers and keying +#RekeyLimit default none + +# Logging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin prohibit-password +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +ChallengeResponseAuthentication no + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +UsePAM yes + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding yes +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PermitTTY yes +PrintMotd no # pam does that +#PrintLastLog yes +#TCPKeepAlive yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +UseDNS no +#PidFile /run/sshd.pid +#MaxStartups 10:30:100 +#PermitTunnel no +#ChrootDirectory none +#VersionAddendum none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/ssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# PermitTTY no +# ForceCommand cvs server + +# HB edits +AllowUsers hjalmarlucius theskjalg +Protocol 2