commit 442223190afa650f495aa5da8eb757e8ff70a7db parent 59ba7763b50b1cc2a6800be33a6ed9fcdbb46e9f Author: Vincent Demeester <vincent@sbr.pm> Date: Fri, 8 May 2020 14:39:05 +0200 dev.go: remove goreturns and dep-collector… … and nixpkgfmts Signed-off-by: Vincent Demeester <vincent@sbr.pm> Diffstat:
| M | modules/profiles/dev.go.nix | | | 97 | +++++++++++++++++++++++++++++++++++++++---------------------------------------- |
1 file changed, 48 insertions(+), 49 deletions(-)
diff --git a/modules/profiles/dev.go.nix b/modules/profiles/dev.go.nix @@ -10,56 +10,55 @@ in enable = mkEnableOption "Enable go development profile"; }; }; - config = mkIf cfg.enable ( - mkMerge [ - { - home.sessionVariables = { - GOPATH = "${config.home.homeDirectory}"; - }; - profiles.dev.enable = true; - home.packages = with pkgs; [ - gcc - go - godef - golangci-lint - golint - gopkgs - go-outline - go-symbols - delve - goimports - # vendoring tools - dep - my.dep-collector - # misc - protobuf - my.protobuild - my.ram - my.sec - my.goreturns - my.esc - my.yaspell - ]; - xdg.configFile."nr/go" = { - text = builtins.toJSON [ - { cmd = "pprof"; chan = "unstable"; } - { cmd = "vndr"; chan = "unstable"; } - { cmd = "go2nix"; } - { cmd = "dep2nix"; } + config = mkIf cfg.enable + ( + mkMerge [ + { + home.sessionVariables = { + GOPATH = "${config.home.homeDirectory}"; + }; + profiles.dev.enable = true; + home.packages = with pkgs; [ + gcc + go + godef + golangci-lint + golint + gopkgs + go-outline + go-symbols + delve + goimports + # vendoring tools + dep + # misc + protobuf + my.protobuild + my.ram + my.sec + my.esc + my.yaspell ]; - onChange = "${pkgs.my.nr}/bin/nr go"; - }; - } - ( - mkIf config.profiles.fish.enable { - xdg.configFile."fish/conf.d/go.fish".source = ./assets/fish/go.fish; - programs.fish.shellAbbrs = { - got = "go test -v"; - gob = "go build -v"; - gol = "golangci-lint run"; + xdg.configFile."nr/go" = { + text = builtins.toJSON [ + { cmd = "pprof"; chan = "unstable"; } + { cmd = "vndr"; chan = "unstable"; } + { cmd = "go2nix"; } + { cmd = "dep2nix"; } + ]; + onChange = "${pkgs.my.nr}/bin/nr go"; }; } - ) - ] - ); + ( + mkIf config.profiles.fish.enable { + xdg.configFile."fish/conf.d/go.fish".source = ./assets/fish/go.fish; + programs.fish.shellAbbrs = { + got = "go test -v"; + gob = "go build -v"; + gol = "golangci-lint run"; + }; + } + ) + ] + ); }