Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos
This commit is contained in:
commit
dc5f1d8a46
12
flake.lock
12
flake.lock
|
@ -59,11 +59,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1670372410,
|
||||
"narHash": "sha256-BDiOUkuqgq5DP+E5xfTzIFYYyMb8DpSLYmeaOBeZ0vg=",
|
||||
"lastModified": 1670543317,
|
||||
"narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5528350186a9e826588cee1329640899ca44a0cf",
|
||||
"rev": "7a6a010c3a1d00f8470a5ca888f2f927f1860a19",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -75,11 +75,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1670242877,
|
||||
"narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=",
|
||||
"lastModified": 1670507980,
|
||||
"narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198",
|
||||
"rev": "2787fc7d1e51404678614bf0fe92fc296746eec0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
digikam
|
||||
firefox
|
||||
gimp
|
||||
gnucash
|
||||
inkscape
|
||||
libreoffice-fresh
|
||||
makemkv
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
home.packages = with pkgs; [
|
||||
multimarkdown
|
||||
pandoc
|
||||
python310Packages.python-lsp-server
|
||||
];
|
||||
|
||||
programs.emacs = {
|
||||
|
@ -23,7 +24,6 @@
|
|||
python310Packages.flake8
|
||||
python310Packages.jedi
|
||||
python310Packages.pip
|
||||
python310Packages.python-lsp-server
|
||||
python310Packages.yapf
|
||||
epkgs.ace-window
|
||||
epkgs.amx
|
||||
|
@ -61,7 +61,6 @@
|
|||
epkgs.hydra
|
||||
epkgs.know-your-http-well
|
||||
epkgs.languagetool
|
||||
epkgs.lsp-mode
|
||||
epkgs.lv
|
||||
epkgs.magit
|
||||
epkgs.makey
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
(use-package lsp-mode
|
||||
(use-package eglot
|
||||
:config
|
||||
(add-hook 'python-mode-hook #'lsp))
|
||||
(add-hook 'python-mode-hook #'eglot-ensure))
|
||||
|
|
|
@ -59,6 +59,12 @@
|
|||
mu4e-index-update-in-background t
|
||||
mu4e-compose-dont-reply-to-self t
|
||||
mu4e-attachment-dir "~/nextcloud/10_documents/01_inbox"
|
||||
;; don't show threading by default:
|
||||
mu4e-headers-show-threads nil
|
||||
;; hide annoying "mu4e Retrieving mail..." msg in mini buffer:
|
||||
mu4e-hide-index-messages t
|
||||
;; Don't show related messages
|
||||
mu4e-headers-include-related nil
|
||||
mu4e-compose-signature-auto-include nil)
|
||||
|
||||
(add-hook 'mu4e-view-mode-hook 'visual-line-mode)
|
||||
|
|
|
@ -10,4 +10,6 @@
|
|||
(define-key evil-normal-state-map "gT" 'persp-prev)
|
||||
(define-key evil-normal-state-map "gr" 'persp-rename)
|
||||
(define-key evil-normal-state-map "gc" 'persp-kill)
|
||||
(setq persp-state-default-file "~/.emacs.d/persp-session")
|
||||
(add-hook 'kill-emacs-hook #'persp-state-save)
|
||||
(persp-mode))
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
;; disable menu and toolbar
|
||||
(tool-bar-mode -1)
|
||||
(menu-bar-mode -99)
|
||||
;;(menu-bar-mode -99)
|
||||
(when (boundp 'enable-scroll-bar)
|
||||
(scroll-bar-mode -1))
|
||||
|
||||
|
|
|
@ -14,6 +14,18 @@
|
|||
"${pkgs.qtile}/bin/qtile cmd-obj -o cmd -f restart"
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "gaming";
|
||||
outputs_connected = [ "DP-1-2" ];
|
||||
outputs_disconnected = [ "DP-1-1" ];
|
||||
configure_single = "DP-1-2";
|
||||
primary = true;
|
||||
atomic = true;
|
||||
execute_after = [
|
||||
"${pkgs.nitrogen}/bin/nitrogen --restore"
|
||||
"${pkgs.qtile}/bin/qtile cmd-obj -o cmd -f restart"
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "undocked";
|
||||
outputs_disconnected = [ "DP-1-1" "DP-1-2" ];
|
||||
|
|
Loading…
Reference in New Issue