palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

update fixes

Browse source
This commit is contained in:
Ingolf Wagner 2021-07-10 20:01:54 +02:00
parent 6d83c88757
commit 5b6c9ab92b
Signed by: palo
GPG key ID: 76BF5F1928B9618B
3 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
configs/sternchen/packages.nix
View file

@ -37,16 +37,16 @@ in {
skanlite skanlite
# #
tor-browser-bundle-bin #tor-browser-bundle-bin
#(tor-browser-bundle-bin.overrideAttrs (old: rec { (tor-browser-bundle-bin.overrideAttrs (old: rec {
# version = "10.0.15"; version = "10.5";
# name = "tor-browser-bundle-${version}"; name = "tor-browser-bundle-${version}";
# src = pkgs.fetchurl { src = pkgs.fetchurl {
# url = url =
# "https://dist.torproject.org/torbrowser/10.0.15/tor-browser-linux64-10.0.15_en-US.tar.xz"; "https://dist.torproject.org/torbrowser/10.5/tor-browser-linux64-10.5_en-US.tar.xz";
# sha256 = "1ah69jmfgik063f9gkvyv9d4k706pqihmzc4k7cc95zyd17v8wrs"; sha256 = "1dq9jys60rn2w37dvb2a69gmqsi7278b782am14wci57kmajlpvm";
# }; };
#})) }))
]; ];
} }

23
system/desktop/home-manager/spacemacs.nix
View file

@ -113,11 +113,11 @@ in {
terraform terraform
graphviz graphviz
c-c++ c-c++
(haskell :variables ;; (haskell :variables
haskell-enable-hindent t ;; haskell-enable-hindent t
haskell-completion-backend 'lsp ;; haskell-completion-backend 'lsp
haskell-enable-hindent-style "gibiansky" ;; haskell-enable-hindent-style "gibiansky"
haskell-process-type 'cabal-new-repl) ;; haskell-process-type 'cabal-new-repl)
)))) ))))
(let (let
@ -125,9 +125,10 @@ in {
(setq (setq
dotspacemacs-additional-packages dotspacemacs-additional-packages
(append user-packages (append user-packages
'( lsp-mode '(
lsp-ui ;; lsp-mode
lsp-haskell ;; lsp-ui
;; lsp-haskell
direnv direnv
)))) ))))
''; '';
@ -165,9 +166,9 @@ in {
;; lsp setup for haskell ;; lsp setup for haskell
;; hie-wrapper must be configured in the direnv setup ;; hie-wrapper must be configured in the direnv setup
;; make sure cabal update was executed once on the machine ;; make sure cabal update was executed once on the machine
(setq lsp-haskell-process-path-hie "hie-wrapper") ;; (setq lsp-haskell-process-path-hie "hie-wrapper")
(setq lsp-response-timeout 60) ;; (setq lsp-response-timeout 60)
(require 'lsp-haskell) ;; (require 'lsp-haskell)
;; (add-hook 'haskell-mode-hook #'lsp) ;; (add-hook 'haskell-mode-hook #'lsp)
(add-hook 'haskell-mode-hook #'direnv-update-environment) (add-hook 'haskell-mode-hook #'direnv-update-environment)

2
system/desktop/home-manager/xmonad/Main.hs
View file

@ -519,7 +519,7 @@ myXPConfig =
{ bgColor = Solarized.base03 { bgColor = Solarized.base03
, fgColor = Solarized.base0 , fgColor = Solarized.base0
, promptBorderWidth = 0 , promptBorderWidth = 0
-- , font = "xft:inconsolata:pixelsize=18:antialias=true:hinting=true" , font = "xft:DejaVu Sans:pixelsize=16:antialias=true:hinting=true"
} }
data LibNotifyUrgencyHook = LibNotifyUrgencyHook deriving (Read, Show) data LibNotifyUrgencyHook = LibNotifyUrgencyHook deriving (Read, Show)