linux-home/manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

renamed applicationConfigurations to managedConfigurations

Browse source
This commit is contained in:
Dan Anglin 2024-09-12 01:05:33 +01:00
parent 5e4afb02dd
commit 1e6ca5a9f1
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638
6 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hosts/falcon.json
View file

@ -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"
]
}

22
hosts/sparrow.json
View file

@ -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"
]
}

2
magefiles/common.go
View file

@ -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) {

10
magefiles/config.go
View file

@ -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{},
}
}

8
magefiles/files.go
View file

@ -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
}

8
magefiles/templates.go
View file

@ -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
}