From 62bc6ab9239f843cb8c4c2b7c0a43645e79f1de2 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 15 Sep 2023 15:31:19 -0400 Subject: [PATCH] Do more migration work --- {link => legacy/link}/gemrc | 0 {link => legacy/link}/linux/tmux.conf | 0 {link => legacy/link}/linux/vimrc_os_specific | 0 {link => legacy/link}/mac/profile | 0 {link => legacy/link}/mac/tmux.conf | 0 .../nix/config/powershell/PoshThemes/beantest.psm1 | 0 {link => legacy/link}/nix/oh-my-posh.omp.json | 0 {link => legacy/link}/nix/vimrc | 0 {link => legacy/link}/nix/zshrc | 0 .../powershell/Microsoft.PowerShell_profile.ps1 | 11 ----------- .../config/powershell/Microsoft.VSCode_profile.ps1 | 1 - link/ssh/config | 6 ------ modules/home-manager/default.nix | 6 ++++++ .../files/Microsoft.PowerShell_profile.ps1 | 4 ++++ 14 files changed, 10 insertions(+), 18 deletions(-) rename {link => legacy/link}/gemrc (100%) rename {link => legacy/link}/linux/tmux.conf (100%) rename {link => legacy/link}/linux/vimrc_os_specific (100%) rename {link => legacy/link}/mac/profile (100%) rename {link => legacy/link}/mac/tmux.conf (100%) rename {link => legacy/link}/nix/config/powershell/PoshThemes/beantest.psm1 (100%) rename {link => legacy/link}/nix/oh-my-posh.omp.json (100%) rename {link => legacy/link}/nix/vimrc (100%) rename {link => legacy/link}/nix/zshrc (100%) delete mode 100644 link/nix/config/powershell/Microsoft.PowerShell_profile.ps1 delete mode 120000 link/nix/config/powershell/Microsoft.VSCode_profile.ps1 delete mode 100644 link/ssh/config create mode 100644 modules/home-manager/files/Microsoft.PowerShell_profile.ps1 diff --git a/link/gemrc b/legacy/link/gemrc similarity index 100% rename from link/gemrc rename to legacy/link/gemrc diff --git a/link/linux/tmux.conf b/legacy/link/linux/tmux.conf similarity index 100% rename from link/linux/tmux.conf rename to legacy/link/linux/tmux.conf diff --git a/link/linux/vimrc_os_specific b/legacy/link/linux/vimrc_os_specific similarity index 100% rename from link/linux/vimrc_os_specific rename to legacy/link/linux/vimrc_os_specific diff --git a/link/mac/profile b/legacy/link/mac/profile similarity index 100% rename from link/mac/profile rename to legacy/link/mac/profile diff --git a/link/mac/tmux.conf b/legacy/link/mac/tmux.conf similarity index 100% rename from link/mac/tmux.conf rename to legacy/link/mac/tmux.conf diff --git a/link/nix/config/powershell/PoshThemes/beantest.psm1 b/legacy/link/nix/config/powershell/PoshThemes/beantest.psm1 similarity index 100% rename from link/nix/config/powershell/PoshThemes/beantest.psm1 rename to legacy/link/nix/config/powershell/PoshThemes/beantest.psm1 diff --git a/link/nix/oh-my-posh.omp.json b/legacy/link/nix/oh-my-posh.omp.json similarity index 100% rename from link/nix/oh-my-posh.omp.json rename to legacy/link/nix/oh-my-posh.omp.json diff --git a/link/nix/vimrc b/legacy/link/nix/vimrc similarity index 100% rename from link/nix/vimrc rename to legacy/link/nix/vimrc diff --git a/link/nix/zshrc b/legacy/link/nix/zshrc similarity index 100% rename from link/nix/zshrc rename to legacy/link/nix/zshrc diff --git a/link/nix/config/powershell/Microsoft.PowerShell_profile.ps1 b/link/nix/config/powershell/Microsoft.PowerShell_profile.ps1 deleted file mode 100644 index 41742ee..0000000 --- a/link/nix/config/powershell/Microsoft.PowerShell_profile.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -# With PowerCLI installed via ps-get this isn't needed anymore -#Get-Module -ListAvailable PowerCLI.* | Import-Module - -# PowerShellGet\Install-Module posh-git -Scope CurrentUser -AllowPrerelease -Force -#Import-Module '/Users/gene.liverman/.local/share/powershell/Modules/posh-git/1.0.0/posh-git.psd1' -Import-Module posh-git - -# Install-Module -Name oh-my-posh -Import-module oh-my-posh -#Set-Theme Paradox -Set-PoshPrompt -Theme ~/.oh-my-posh.omp.json diff --git a/link/nix/config/powershell/Microsoft.VSCode_profile.ps1 b/link/nix/config/powershell/Microsoft.VSCode_profile.ps1 deleted file mode 120000 index 967bf9d..0000000 --- a/link/nix/config/powershell/Microsoft.VSCode_profile.ps1 +++ /dev/null @@ -1 +0,0 @@ -Microsoft.PowerShell_profile.ps1 \ No newline at end of file diff --git a/link/ssh/config b/link/ssh/config deleted file mode 100644 index 26f2795..0000000 --- a/link/ssh/config +++ /dev/null @@ -1,6 +0,0 @@ -Host *.westga.edu - User ven-gliverman -HOST *.delivery.puppetlabs.net - IdentityFile ~/.ssh/id_rsa-acceptance -Host beanbag.technicalissues.us - User gliverma diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 9f8422d..bf07ee6 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -14,6 +14,7 @@ mtr nix-zsh-completions nurl + powershell rename slack subversion @@ -217,5 +218,10 @@ usessh = "gpgconf --kill gpg-agent"; }; }; # end zsh + }; # end programs + + home.file = { + ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1; + ".config/powershell/Microsoft.VSCode_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1; }; } diff --git a/modules/home-manager/files/Microsoft.PowerShell_profile.ps1 b/modules/home-manager/files/Microsoft.PowerShell_profile.ps1 new file mode 100644 index 0000000..a65e5e4 --- /dev/null +++ b/modules/home-manager/files/Microsoft.PowerShell_profile.ps1 @@ -0,0 +1,4 @@ +# With PowerCLI installed via ps-get this isn't needed anymore +#Get-Module -ListAvailable PowerCLI.* | Import-Module + +oh-my-posh init pwsh --config ~/.config/oh-my-posh/config.json | Invoke-Expression