diff --git a/user/daniel/home.nix b/user/daniel/home.nix index dc440c6..bf4d7a3 100644 --- a/user/daniel/home.nix +++ b/user/daniel/home.nix @@ -2,10 +2,10 @@ { imports = [ - ../progs/alacritty + ../progs/alacritty ../progs/i3 ../progs/i3status-rust - ../progs/kitty + ../progs/kitty ../progs/neovim ]; @@ -14,28 +14,27 @@ services.dunst.enable = true; - nixpkgs.overlays = [ (final: prev: { - go_1_18 = prev.go_1_17.overrideAttrs (old: rec { - version="1.18beta1"; - src = prev.fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-QYwCjbFGmctbLUkHrTpBnXn3ibMZFu+HZIZ+SnjmU6E="; - }; - patches = builtins.filter ( - x: !(builtins.isList (builtins.match ".*/go-1.9-skip-flaky-20072.patch" (builtins.toString x))) - ) old.patches; - }); - }) + nixpkgs.overlays = [ (final: prev: { + go_1_18 = prev.go_1_17.overrideAttrs (old: rec { + version="1.18beta1"; + src = prev.fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "sha256-QYwCjbFGmctbLUkHrTpBnXn3ibMZFu+HZIZ+SnjmU6E="; + }; + patches = builtins.filter ( + x: !(builtins.isList (builtins.match ".*/go-1.9-skip-flaky-20072.patch" (builtins.toString x))) + ) old.patches; + }); + }) - (final: prev: { - gopls = prev.gopls.override { - buildGoModule = prev.buildGoModule.override { - go = final.go_1_18; - }; - }; - }) - - ]; + (final: prev: { + gopls = prev.gopls.override { + buildGoModule = prev.buildGoModule.override { + go = final.go_1_18; + }; + }; + }) + ]; home = { username = "daniel"; @@ -43,9 +42,9 @@ sessionVariables = { EDITOR = "vim"; }; - sessionPath = [ - "$HOME/go/bin" - ]; + sessionPath = [ + "$HOME/go/bin" + ]; file = { ".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/capitaine-cursors"; @@ -79,14 +78,14 @@ }; packages = with pkgs; [ - _1password - aerc + _1password + aerc discord element-desktop entr feh fzf - go_1_18 + go_1_18 google-drive-ocamlfuse gomuks gopls @@ -102,7 +101,7 @@ pavucontrol playerctl python3 - spotify + spotify ranger restic rofi