Merge branch 'main' of git.atlanticaweb.fr:alexandre/nixos-config

main
Alexandre LUCAZEAU 2023-01-19 21:03:27 +01:00
commit 632f6bc353
10 changed files with 280 additions and 77 deletions

View File

@ -0,0 +1,9 @@
{ pkgs, ... }: {
services.openvpn.servers = {
DRI = { config = '' config /home/alexandre/git/nixos-config/hosts/dell-5590/nixpkgs/VPN.conf ''; };
};
nixpkgs.config.allowUnfree = true;
virtualisation.virtualbox.host.enable = true;
virtualisation.virtualbox.host.enableExtensionPack = true;
users.extraGroups.vboxusers.members = [ "alexandre" ];
}

View File

@ -0,0 +1,18 @@
client
remote '185.86.178.201' 1194 udp
pkcs12 '/home/alexandre/09_DRI/Serveur_VPN_pour_le_SI_DRI_alexandre/Serveur_VPN_pour_le_SI_DRI_alexandre.p12'
auth-user-pass
cipher AES-256-GCM
comp-lzo no
dev tun
proto udp
remote-cert-tls server
verify-x509-name 'C=FR, ST=Sarthe, L=Le Mans, O=DRI, emailAddress=support@dri.fr, CN=opn-vpn.si.dri.fr' subject
tls-auth '/home/alexandre/09_DRI/Serveur_VPN_pour_le_SI_DRI_alexandre/./Serveur_VPN_pour_le_SI_DRI_alexandre-tls.key' 1
nobind
auth-nocache
script-security 2
persist-key
persist-tun
user nm-openvpn
group nm-openvpn

View File

@ -13,12 +13,12 @@
(column-number-mode 't) ; show current column in status bar
(set-fringe-mode 10)
;; Indent 4 spaces by default. Use the "BSD" style for C-like languages.
(setq c-default-style
(quote ((java-mode . "java")
(awk-mode . "awk")
(other . "bsd")))
c-basic-offset 4)
;;;; Indent 4 spaces by default. Use the "BSD" style for C-like languages.
;;(setq c-default-style
;; (quote ((java-mode . "java")
;; (awk-mode . "awk")
;; (other . "bsd")))
;; c-basic-offset 4)
;; Use 4 spaces for one tab visually.
(setq tab-width 4)
@ -51,11 +51,11 @@
(setq visible-bell t)
; Advanced per-language checks.
(require 'flycheck)
(global-flycheck-mode 1)
(setq flycheck-checker-error-threshold 1000) ; for large go files and the escape checker
(setq flycheck-check-syntax-automatically '(mode-enabled save))
;;(require 'flycheck)
;;(global-flycheck-mode 1)
;;(setq flycheck-checker-error-threshold 1000) ; for large go files and the escape checker
;;
;;(setq flycheck-check-syntax-automatically '(mode-enabled save))
;; Backup
@ -91,12 +91,12 @@
;;(setq message-citation-line-function 'message-insert-formatted-citation-line)
;;(setq message-citation-line-format "On %d/%m/%Y %H:%M, %N wrote:")
(defun default-web-indent-mode ()
(setq indent-tabs-mode nil)
(setq tab-width 2)
(setq web-mode-markup-indent-offset 2)
(setq web-mode-css-indent-offset 2)
(setq web-mode-code-indent-offset 2))
;;(defun default-web-indent-mode ()
;; (setq indent-tabs-mode nil)
;; (setq tab-width 2)
;; (setq web-mode-markup-indent-offset 2)
;; (setq web-mode-css-indent-offset 2)
;; (setq web-mode-code-indent-offset 2))
(use-package doom-themes
:init (load-theme 'doom-nord t)
@ -112,21 +112,21 @@
:config (lsp-enable-which-key-integration t)
:hook (lsp-mode . electric-pair-mode))
(use-package web-mode
:mode ("\\.json\\'" . web-mode)
:mode ("\\.html?\\'" . web-mode)
:mode ("\\.s?css\\'" . web-mode)
:mode ("\\.[jt]sx?\\'" . web-mode)
:hook (web-mode . lsp-deferred)
:hook (web-mode . default-web-indent-mode))
;;(use-package web-mode
;; :mode ("\\.json\\'" . web-mode)
;; :mode ("\\.html?\\'" . web-mode)
;; :mode ("\\.s?css\\'" . web-mode)
;; :mode ("\\.[jt]sx?\\'" . web-mode)
;; :hook (web-mode . lsp-deferred)
;; :hook (web-mode . default-web-indent-mode))
(use-package nix-mode
:mode ("\\.nix\\'" . nix-mode)
:hook (nix-mode . lsp-deferred))
(use-package rust-mode
:hook (rust-mode . lsp-deferred)
:config (setq rust-format-on-save t))
;;(use-package rust-mode
;; :hook (rust-mode . lsp-deferred)
;; :config (setq rust-format-on-save t))
(use-package company
:config (setq company-idle-delay 0.25)
@ -139,48 +139,47 @@
:hook (yas-minor-mode . yas-reload-all)
:config (setq yas-snippet-dirs '("/etc/nixos/programs/emacs/snippets")))
(use-package prettier-js
:after (web-mode)
:hook (web-mode . prettier-js-mode))
;;(use-package prettier-js
;; :after (web-mode)
;; :hook (web-mode . prettier-js-mode))
;;
;;(use-package smartparens
;; :bind ("C-c s s" . sp-splice-sexp)
;; :bind ("C-c s r" . sp-rewrap-sexp))
;;
;;(use-package bbdb
;; :init (bbdb-initialize 'gnus 'message)
;; :init (bbdb-mua-auto-update-init 'gnus 'message)
;; :config (setq bbdb-file "~/Nextcloud/PRIVE/13_Org/contacts/bbdb")
;; :config (setq bbdb-mua-auto-update-p 'create))
(use-package smartparens
:bind ("C-c s s" . sp-splice-sexp)
:bind ("C-c s r" . sp-rewrap-sexp))
(use-package bbdb
:init (bbdb-initialize 'gnus 'message)
:init (bbdb-mua-auto-update-init 'gnus 'message)
:config (setq bbdb-file "~/Nextcloud/PRIVE/13_Org/contacts/bbdb")
:config (setq bbdb-mua-auto-update-p 'create))
(use-package org
:config
(setq org-startup-folded t)
(setq org-agenda-files
"~/Nextcloud/PRIVE/13_Org/agenda-DRI.org"
"~/Nextcloud/PRIVE/13_Org/perso.org")
(setq org-refile-use-outline-path 'file)
(setq org-refile-targets
'(("~/Nextcloud/PRIVE/13_Org/DRI.org" :maxlevel . 3)
("~/Nextcloud/PRIVE/13_Org/perso.org" :level . 1)
("~/Nextcloud/PRIVE/13_Org/pizajoffre.org" :level . 1)))
(setq org-todo-keywords
'((sequence "TODO(t)" "PENDING(p)" "|" "CANCELLED(c)" "DONE(d)")))
(setq org-todo-keyword-faces
'(("TODO" . (:foreground "#c678dd" :weight bold))
("PENDING" . (:background "#3f444a" :foreground "#ff6c6b" :weight bold))))
(setq org-capture-templates
'(("i" "Inbox" entry (file "~/Nextcloud/PRIVE/13_Org/DRI.org") "* TODO %i%?")
("a" "Agenda" entry (file "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org") "* TODO %i%?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))")))
(setq org-agenda-custom-commands
'(("t" "Today" tags-todo "+LEVEL=1+CATEGORY=\"tasks\"|+SCHEDULED<=\"<today>\"|+DEADLINE<=\"<today>\""))))
(setq org-caldav-url "https://next20.produhost.net/remote.php/dav/calendars/alexandre")
(setq org-caldav-calendars
'((:calendar-id "alexandre-dri" :files ("~/Nextcloud/PRIVE/13_Org/agenda.org")
:inbox "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org")
)
)
;;(use-package org
;; (setq org-startup-folded t)
;; (setq org-agenda-files
;; "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org"
;; "~/Nextcloud/PRIVE/13_Org/perso.org")
;; (setq org-refile-use-outline-path 'file)
;; (setq org-refile-targets
;; '(("~/Nextcloud/PRIVE/13_Org/DRI.org" :maxlevel . 3)
;; ("~/Nextcloud/PRIVE/13_Org/perso.org" :level . 1)
;; ("~/Nextcloud/PRIVE/13_Org/pizajoffre.org" :level . 1)))
;; (setq org-todo-keywords
;; '((sequence "TODO(t)" "PENDING(p)" "|" "CANCELLED(c)" "DONE(d)")))
;; (setq org-todo-keyword-faces
;; '(("TODO" . (:foreground "#c678dd" :weight bold))
;; ("PENDING" . (:background "#3f444a" :foreground "#ff6c6b" :weight bold))))
;; (setq org-capture-templates
;; '(("i" "Inbox" entry (file "~/Nextcloud/PRIVE/13_Org/DRI.org") "* TODO %i%?")
;; ("a" "Agenda" entry (file "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org") "* TODO %i%?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))")))
;; (setq org-agenda-custom-commands
;; '(("t" "Today" tags-todo "+LEVEL=1+CATEGORY=\"tasks\"|+SCHEDULED<=\"<today>\"|+DEADLINE<=\"<today>\""))))
;;
;;(setq org-caldav-url "https://next20.produhost.net/remote.php/dav/calendars/alexandre")
;;(setq org-caldav-calendars
;; '((:calendar-id "alexandre-dri" :files ("~/Nextcloud/PRIVE/13_Org/agenda.org")
;; :inbox "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org")
;; )
;;)
(use-package magit)
@ -297,3 +296,71 @@
(autoload 'gfm-mode "markdown-mode"
"Major mode for editing GitHub Flavored Markdown files" t)
(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
;; org-mode
(require 'org)
(require 'remember)
(require 'org-mouse)
;; files with ".org" open in org-mode
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
;; one file org
(defvar org-gtd-file "~/Nextcloud/PRIVE/13_Org/DRI.org")
;; Open DRI.org when I hit C-c g
(defun gtd ()
"Open the GTD file."
(interactive)
(find-file org-gtd-file))
;; keybinding
(global-set-key "\C-cl" 'org-store-link)
(global-set-key "\C-ca" 'org-agenda)
(global-set-key "\C-cr" 'org-remember)
(global-set-key "\C-cg" 'gtd)
(global-set-key (kbd "C-c l") 'org-store-link)
;; This seems like a good basic set of keywords to start out with:
(setq org-todo-keywords '((type "TODO" "SCHEDULED" "NEXT" "WAITING" "DONE")))
(setf org-todo-keyword-faces '(("NEXT" . (:foreground "yellow" :background "red" :bold t :weight bold))
("TODO" . (:foreground "cyan" :background "steelblue" :bold t :weight bold))
("WAITING" . (:foreground "yellow" :background "magenta2" :bold t :weight bold))
("DONE" . (:foreground "gray50" :background "gray30"))))
;; Remember support. This creates several files:
;;
;; ~/todo.org Where remembered TODO's are stored.
;; ~/journal.org Timestamped journal entries.
;; ~/remember.org All other notes
;; and a keybinding of "C-c r" for making quick notes from any buffer.
;; These bits of Remembered information must eventually be reviewed
;; and filed somewhere (perhaps in gtd.org, or in a project-specific
;; org file.) The out-of-sight, out-of-mind rule applies here---if I
;; don't review these auxiliary org-files, I'll probably forget what's
;; in them.
(require 'remember)
(setq org-reverse-note-order t) ;; note at beginning of file by default.
(setq org-default-notes-file "~/remember.org")
(setq remember-annotation-functions '(org-remember-annotation))
(setq remember-handler-functions '(org-remember-handler))
(add-hook 'remember-mode-hook 'org-remember-apply-template)
(setq org-remember-templates
'((?t "* TODO %?\n %i\n %a" "~/Nextcloud/PRIVE/13_Org/todo.org")
(?j "* %U %?\n\n %i\n %a" "~/Nextcloud/PRIVE/13_Org/journal.org")
(?i "* %^{Title}\n %i\n %a" "~/Nextcloud/PRIVE/13_Org/remember.org" "New Ideas")))
(global-set-key "\C-cr" 'org-remember)
(global-set-key [(f12)] 'org-remember)
;; widen category field a little
(setq org-agenda-prefix-format " %-17:c%?-12t% s")
;; https://gist.github.com/dandrews/4644693

View File

@ -0,0 +1,58 @@
; xfce4-terminal GtkAccelMap rc-file -*- scheme -*-
; this file is an automated accelerator map dump
;
(gtk_accel_path "<Actions>/terminal-window/goto-tab-2" "<Alt>2")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-6" "<Alt>6")
; (gtk_accel_path "<Actions>/terminal-window/copy-input" "")
; (gtk_accel_path "<Actions>/terminal-window/close-other-tabs" "")
; (gtk_accel_path "<Actions>/terminal-window/move-tab-right" "<Primary><Shift>Page_Down")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-7" "<Alt>7")
; (gtk_accel_path "<Actions>/terminal-window/set-title-color" "")
; (gtk_accel_path "<Actions>/terminal-window/edit-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/zoom-menu" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-1" "<Alt>1")
; (gtk_accel_path "<Actions>/terminal-window/fullscreen" "F11")
; (gtk_accel_path "<Actions>/terminal-window/read-only" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-5" "<Alt>5")
; (gtk_accel_path "<Actions>/terminal-window/preferences" "")
; (gtk_accel_path "<Actions>/terminal-window/reset-and-clear" "")
; (gtk_accel_path "<Actions>/terminal-window/about" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-4" "<Alt>4")
; (gtk_accel_path "<Actions>/terminal-window/close-window" "<Primary><Shift>q")
; (gtk_accel_path "<Actions>/terminal-window/reset" "")
; (gtk_accel_path "<Actions>/terminal-window/save-contents" "")
(gtk_accel_path "<Actions>/terminal-window/toggle-menubar" "F10")
; (gtk_accel_path "<Actions>/terminal-window/copy" "<Primary><Shift>c")
; (gtk_accel_path "<Actions>/terminal-window/copy-html" "")
; (gtk_accel_path "<Actions>/terminal-window/last-active-tab" "")
; (gtk_accel_path "<Actions>/terminal-window/show-borders" "")
; (gtk_accel_path "<Actions>/terminal-window/view-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/detach-tab" "<Primary><Shift>d")
; (gtk_accel_path "<Actions>/terminal-window/scroll-on-output" "")
; (gtk_accel_path "<Actions>/terminal-window/show-toolbar" "")
; (gtk_accel_path "<Actions>/terminal-window/next-tab" "<Primary>Page_Down")
; (gtk_accel_path "<Actions>/terminal-window/tabs-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/search-next" "")
; (gtk_accel_path "<Actions>/terminal-window/search-prev" "")
; (gtk_accel_path "<Actions>/terminal-window/undo-close-tab" "")
; (gtk_accel_path "<Actions>/terminal-window/set-title" "<Primary><Shift>s")
; (gtk_accel_path "<Actions>/terminal-window/contents" "F1")
; (gtk_accel_path "<Actions>/terminal-window/zoom-reset" "<Primary>0")
; (gtk_accel_path "<Actions>/terminal-window/close-tab" "<Primary><Shift>w")
; (gtk_accel_path "<Actions>/terminal-window/new-tab" "<Primary><Shift>t")
; (gtk_accel_path "<Actions>/terminal-window/new-window" "<Primary><Shift>n")
; (gtk_accel_path "<Actions>/terminal-window/terminal-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/show-menubar" "")
; (gtk_accel_path "<Actions>/terminal-window/select-all" "<Primary><Shift>a")
; (gtk_accel_path "<Actions>/terminal-window/paste" "<Primary><Shift>v")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-9" "<Alt>9")
; (gtk_accel_path "<Actions>/terminal-window/move-tab-left" "<Primary><Shift>Page_Up")
; (gtk_accel_path "<Actions>/terminal-window/search" "<Primary><Shift>f")
; (gtk_accel_path "<Actions>/terminal-window/file-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/prev-tab" "<Primary>Page_Up")
; (gtk_accel_path "<Actions>/terminal-window/paste-selection" "")
; (gtk_accel_path "<Actions>/terminal-window/zoom-in" "<Primary>plus")
; (gtk_accel_path "<Actions>/terminal-window/zoom-out" "<Primary>minus")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-8" "<Alt>8")
; (gtk_accel_path "<Actions>/terminal-window/help-menu" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-3" "<Alt>3")

View File

@ -0,0 +1,9 @@
[Scheme]
Name=Nord
ColorCursor=#D8DEE9
ColorForeground=#D8DEE9
ColorBackground=#2E3440
TabActivityColor=#88C0D0
ColorPalette=#3B4252;#BF616A;#A3BE8C;#EBCB8B;#81A1C1;#B48EAD;#88C0D0;#E5E9F0;#4C566A;#BF616A;#A3BE8C;#EBCB8B;#81A1C1;#B48EAD;#8FBCBB;#ECEFF4
ColorBold=#D8DEE9
ColorBoldUseDefault=FALSE

View File

@ -0,0 +1,37 @@
[Configuration]
ColorForeground=#D8DEE9
ColorBackground=#2E3440
ColorCursor=#D8DEE9
ColorBold=#D8DEE9
ColorBoldUseDefault=FALSE
ColorPalette=#3B4252;#BF616A;#A3BE8C;#EBCB8B;#81A1C1;#B48EAD;#88C0D0;#E5E9F0;#4C566A;#BF616A;#A3BE8C;#EBCB8B;#81A1C1;#B48EAD;#8FBCBB;#ECEFF4
MiscAlwaysShowTabs=FALSE
MiscBell=FALSE
MiscBellUrgent=FALSE
MiscBordersDefault=FALSE
MiscCursorBlinks=FALSE
MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
MiscDefaultGeometry=80x24
MiscInheritGeometry=FALSE
MiscMenubarDefault=FALSE
MiscMouseAutohide=FALSE
MiscMouseWheelZoom=TRUE
MiscToolbarDefault=FALSE
MiscConfirmClose=TRUE
MiscCycleTabs=TRUE
MiscTabCloseButtons=TRUE
MiscTabCloseMiddleClick=TRUE
MiscTabPosition=GTK_POS_TOP
MiscHighlightUrls=TRUE
MiscMiddleClickOpensUri=FALSE
MiscCopyOnSelect=TRUE
MiscShowRelaunchDialog=TRUE
MiscRewrapOnResize=TRUE
MiscUseShiftArrowsToScroll=FALSE
MiscSlimTabs=FALSE
MiscNewTabAdjacent=FALSE
MiscSearchDialogOpacity=100
MiscShowUnsafePasteDialog=TRUE
TabActivityColor=#88C0D0
MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU

View File

@ -10,7 +10,6 @@
./mails.nix
./dunst.nix
./bat.nix
./AstroNvim.nix
# ./redshift.nix
# ../../../modules/neovim.nix
../../../modules/rust.nix

View File

@ -66,10 +66,8 @@
openvpn_24
networkmanager-openvpn
python39Packages.grip
super-productivity
];
nixpkgs.config.permittedInsecurePackages = [
"ferdi-5.8.1"
"electron-17.4.1"
];
}

10
modules/rust.nix Normal file
View File

@ -0,0 +1,10 @@
{ config, pkgs, ...}:
with import <nixpkgs> {};
{
home.packages = [
pkgs.gcc
pkgs.rustc
pkgs.cargo
pkgs.cargo-edit
];
}

View File

@ -2,20 +2,18 @@
{
programs.tmux = {
enable = true;
shortcut = "a";
shortcut = "b";
# aggressiveResize = true; -- Disabled to be iTerm-friendly
baseIndex = 1;
newSession = true;
# newSession = true;
# Stop tmux+escape craziness.
escapeTime = 0;
# Force tmux to use /tmp for sockets (WSL2 compat)
secureSocket = false;
secureSocket = true;
plugins = with pkgs; [
tmuxPlugins.better-mouse-mode
tmuxPlugins.sidebar
tmuxPlugins.nord
# tmuxPlugins.tmux-power
];
extraConfig = ''
@ -56,7 +54,7 @@
set -g set-titles on
# Attach to a session if runs otherwise create a new one
new-session -n $HOST
new-session -n DRI
'';
};