diff --git a/hosts/falcon.json b/hosts/falcon.json index 3e91395..a8d0ba6 100644 --- a/hosts/falcon.json +++ b/hosts/falcon.json @@ -1,15 +1,4 @@ { - "applicationConfigurations": [ - "alacritty", - "amfora", - "git", - "lf", - "logrotate", - "tmux", - "user-dirs.dirs", - "user-dirs.locale", - "zk" - ], "bashProfile": { "manage": true, "sessionPaths": [ @@ -144,5 +133,16 @@ "name": "Dan Anglin", "signingKey": "0C1D44CFBEE68638" } - } + }, + "managedConfigurations": [ + "alacritty", + "amfora", + "git", + "lf", + "logrotate", + "tmux", + "user-dirs.dirs", + "user-dirs.locale", + "zk" + ] } diff --git a/hosts/sparrow.json b/hosts/sparrow.json index dfc6903..026db54 100644 --- a/hosts/sparrow.json +++ b/hosts/sparrow.json @@ -1,14 +1,4 @@ { - "applicationConfigurations": [ - "foot", - "git", - "lf", - "logrotate", - "river", - "tmux", - "user-dirs.dirs", - "user-dirs.locale" - ], "bashProfile": { "manage": true, "aliases": {}, @@ -59,5 +49,15 @@ "name": "Dan Anglin", "signingKey": "" } - } + }, + "managedConfigurations": [ + "foot", + "git", + "lf", + "logrotate", + "river", + "tmux", + "user-dirs.dirs", + "user-dirs.locale" + ] } diff --git a/magefiles/common.go b/magefiles/common.go index efd933d..2490563 100644 --- a/magefiles/common.go +++ b/magefiles/common.go @@ -121,7 +121,7 @@ func ensureSymlink(source, dest string) error { return nil } -func applicationConfigurationSet(applicationConfigurationList []string) map[string]struct{} { +func managedConfigSet(applicationConfigurationList []string) map[string]struct{} { set := make(map[string]struct{}) for _, app := range slices.All(applicationConfigurationList) { diff --git a/magefiles/config.go b/magefiles/config.go index 8cc16c3..2742ef4 100644 --- a/magefiles/config.go +++ b/magefiles/config.go @@ -11,10 +11,10 @@ import ( ) type config struct { - ApplicationConfigurations []string `json:"applicationConfigurations"` - BashProfile configBashProfile `json:"bashProfile"` - Directories configDirectories `json:"directories"` - Git configGit `json:"git"` + ManagedConfigurations []string `json:"managedConfigurations"` + BashProfile configBashProfile `json:"bashProfile"` + Directories configDirectories `json:"directories"` + Git configGit `json:"git"` } type configDirectories struct { @@ -106,6 +106,6 @@ func defaultConfig() config { SigningKey: "", }, }, - ApplicationConfigurations: []string{}, + ManagedConfigurations: []string{}, } } diff --git a/magefiles/files.go b/magefiles/files.go index 7ef6a91..26b61f2 100644 --- a/magefiles/files.go +++ b/magefiles/files.go @@ -27,16 +27,16 @@ func Files() error { return fmt.Errorf("unable to load the configuration: %w", err) } - appConfigSet := applicationConfigurationSet(config.ApplicationConfigurations) + managedConfig := managedConfigSet(config.ManagedConfigurations) - if err = filepath.WalkDir(rootFilesDir, manageFilesFunc(homeConfigDirectory, appConfigSet)); err != nil { + if err = filepath.WalkDir(rootFilesDir, manageFilesFunc(homeConfigDirectory, managedConfig)); err != nil { return fmt.Errorf("received an error while processing the files: %w", err) } return nil } -func manageFilesFunc(homeConfigDirectory string, appConfigSet map[string]struct{}) fs.WalkDirFunc { +func manageFilesFunc(homeConfigDirectory string, managedConfig map[string]struct{}) fs.WalkDirFunc { return func(path string, d fs.DirEntry, err error) error { if err != nil { return err @@ -50,7 +50,7 @@ func manageFilesFunc(homeConfigDirectory string, appConfigSet map[string]struct{ appConfigName := strings.SplitN(relativePath, "/", 2)[0] - if _, exists := appConfigSet[appConfigName]; !exists { + if _, exists := managedConfig[appConfigName]; !exists { return nil } diff --git a/magefiles/templates.go b/magefiles/templates.go index 521bc68..6f1ec15 100644 --- a/magefiles/templates.go +++ b/magefiles/templates.go @@ -28,16 +28,16 @@ func Templates() error { return fmt.Errorf("unable to load the configuration: %w", err) } - appConfigSet := applicationConfigurationSet(config.ApplicationConfigurations) + managedConfig := managedConfigSet(config.ManagedConfigurations) - if err = filepath.WalkDir(rootTemplateDir, manageTemplatesFunc(homeConfigDirectory, config, appConfigSet)); err != nil { + if err = filepath.WalkDir(rootTemplateDir, manageTemplatesFunc(homeConfigDirectory, config, managedConfig)); err != nil { return fmt.Errorf("received an error while processing the templates: %w", err) } return nil } -func manageTemplatesFunc(homeConfigDirectory string, config config, appConfigSet map[string]struct{}) fs.WalkDirFunc { +func manageTemplatesFunc(homeConfigDirectory string, config config, managedConfig map[string]struct{}) fs.WalkDirFunc { funcMap := template.FuncMap{ "env": env, } @@ -55,7 +55,7 @@ func manageTemplatesFunc(homeConfigDirectory string, config config, appConfigSet appConfigName := strings.SplitN(relativePath, "/", 2)[0] - if _, exists := appConfigSet[appConfigName]; !exists { + if _, exists := managedConfig[appConfigName]; !exists { return nil }