Skip to content

Commit

Permalink
Merge pull request #37 from pmenglund/dotenv
Browse files Browse the repository at this point in the history
add dotenv module
  • Loading branch information
justjanne authored Oct 5, 2017
2 parents 9f013a9 + 3dea103 commit 778f40e
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 2 deletions.
6 changes: 6 additions & 0 deletions defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ var themes = map[string]Theme{
DockerMachineFg: 177, // light purple
DockerMachineBg: 55, // purple

DotEnvFg: 15, // white
DotEnvBg: 55, // purple

RepoCleanFg: 0, // black
RepoCleanBg: 148, // a light green color
RepoDirtyFg: 15, // white
Expand Down Expand Up @@ -416,6 +419,9 @@ var themes = map[string]Theme{
DockerMachineFg: 55, // purple
DockerMachineBg: 177, // light purple

DotEnvFg: 15, // white
DotEnvBg: 55, // purple

RepoCleanFg: 232, // black
RepoCleanBg: 230, // light yellow
RepoDirtyFg: 232, // black
Expand Down
3 changes: 2 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ func getValidCwd() string {
var modules = map[string](func(*powerline)){
"cwd": segmentCwd,
"docker": segmentDocker,
"dotenv": segmentDotEnv,
"exit": segmentExitCode,
"git": segmentGit,
"gitlite": segmentGitLite,
Expand Down Expand Up @@ -126,7 +127,7 @@ func main() {
Modules: flag.String("modules",
"venv,user,host,ssh,cwd,perms,git,hg,jobs,exit,root",
"The list of modules to load, separated by ','\n"+
" (valid choices: cwd, docker, exit, git, gitlite, hg, host, jobs, perlbrew, perms, root, ssh, time, user, venv)\n"+
" (valid choices: cwd, docker, dotenv, exit, git, gitlite, hg, host, jobs, perlbrew, perms, root, ssh, time, user, venv)\n"+
" "),
Priority: flag.String("priority",
"root,cwd,user,host,ssh,perms,git-branch,git-status,hg,jobs,exit",
Expand Down
16 changes: 16 additions & 0 deletions segment-dotenv.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package main

import (
"os"
)

func segmentDotEnv(p *powerline) {
stat, err := os.Stat(".env")
if err == nil && !stat.IsDir() {
p.appendSegment("dotenv", segment{
content: " \u2235 ",
foreground: p.theme.DockerMachineFg,
background: p.theme.DockerMachineBg,
})
}
}
3 changes: 3 additions & 0 deletions themes.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ type Theme struct {
DockerMachineFg uint8
DockerMachineBg uint8

DotEnvFg uint8
DotEnvBg uint8

RepoCleanFg uint8
RepoCleanBg uint8
RepoDirtyFg uint8
Expand Down
4 changes: 3 additions & 1 deletion themes/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"SshBg": 166,
"DockerMachineFg": 177,
"DockerMachineBg": 55,
"DotEnvFg": 15,
"DotEnvBg": 55,
"RepoCleanFg": 0,
"RepoCleanBg": 148,
"RepoDirtyFg": 15,
Expand Down Expand Up @@ -306,4 +308,4 @@
"254": 242,
"255": 243
}
}
}

0 comments on commit 778f40e

Please sign in to comment.