From ff7124390819c4b5e7d276273bc9ba2876bbb814 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Tue, 31 Jul 2018 19:53:06 +0200 Subject: [PATCH] woo, arch --- .Xdefaults | 19 +++++--- .vimrc | 54 ++++++++++----------- PowerShell/Microsoft.PowerShell_profile.ps1 | 4 +- PowerShell/functions.ps1 | 17 ++++--- PowerShell/prompt.ps1 | 44 ++++++++++++----- 5 files changed, 83 insertions(+), 55 deletions(-) diff --git a/.Xdefaults b/.Xdefaults index be9d3a6..0a8d3bc 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -1,20 +1,23 @@ -URxvt.perl-ext-common: selection-to-clipboard - -urxvt*font: xft:Ubuntu Mono:pixelsize=13 -urxvt*termName: rxvt -urxvt*foreground: #cccccc +urxvt*font: xft:Fira Code Medium:size=8 +urxvt*termName: xterm +urxvt*foreground: #d5d5d5 urxvt*scrollBar: false urxvt*perl-lib: /usr/lib/urxvt/perl/ urxvt*perl-ext-common: default,matcher urxvt*urlLauncher: firefox urxvt*matcher.button: 1 +urxvt*letterSpace: -1 +urxvt*internalBorder: 6 +urxvt*fading: 40 +urxvt*fadeColor: [40]#000000 -Xft*dpi: 96 +Xft*dpi: 102 Xft*antialias: true -Xft*hinting: full +Xft.rgba: none +Xft*hinting: hintfull urxvt*depth: 32 -urxvt*background: rgba:0000/0000/0200/c800 +urxvt*background: [80]#000000 URxvt*color0: #222222 URxvt*color1: #9e1828 diff --git a/.vimrc b/.vimrc index 7aebb0f..efc38d3 100644 --- a/.vimrc +++ b/.vimrc @@ -7,10 +7,6 @@ if has('win32') || has ('win64') set directory=$TEMP// else let $VIMHOME = $HOME."/.vim" - - let &t_SI = "\[6 q" - let &t_SR = "\[4 q" - let &t_EI = "\[2 q" endif call plug#begin($VIMHOME.'/plugged') @@ -33,40 +29,40 @@ call plug#begin($VIMHOME.'/plugged') call plug#end() set colorcolumn=80,120 +set t_Co=256 " " My own config " " one time settings -if !exists("g:running") - " Conemu specific settings - if !has('gui_running') && !has('nvim') - set term=xterm - set t_Co=256 +" if !exists("g:running") +" " Conemu specific settings +" if !has('gui_running') && !has('nvim') +" set term=xterm - inoremap - nnoremap +" inoremap +" nnoremap - let &t_AB="\e[48;5;%dm" - let &t_AF="\e[38;5;%dm" +" let &t_AB="\e[48;5;%dm" +" let &t_AF="\e[38;5;%dm" - inoremap [62~ - inoremap [63~ - nnoremap [62~ - nnoremap [63~ - endif +" inoremap [62~ +" inoremap [63~ +" nnoremap [62~ +" nnoremap [63~ +" endif - if has('gui_running') - set guifont=Fira_Code_Medium:h9:cANSI:qDRAFT - set guioptions= +" if has('gui_running') +" set guifont=Fira_Code_Medium:h9:cANSI:qDRAFT +" set guioptions= - set columns=200 - set lines=58 +" set columns=200 +" set lines=58 - colorscheme tender - endif -endif +" colorscheme tender +" endif +" endif let g:running = 1 @@ -90,7 +86,7 @@ set hidden set splitbelow set shellslash -set backspace=2 +" set backspace=2 set autoindent " tabs @@ -104,6 +100,10 @@ set number " disable bells set noeb vb t_vb= + +let &t_SI = "\[6 q" +let &t_SR = "\[6 q" +let &t_EI = "\[2 q" " filetypes " autocmd FileType c,cpp :compiler cl diff --git a/PowerShell/Microsoft.PowerShell_profile.ps1 b/PowerShell/Microsoft.PowerShell_profile.ps1 index 606af0b..2ca2f57 100644 --- a/PowerShell/Microsoft.PowerShell_profile.ps1 +++ b/PowerShell/Microsoft.PowerShell_profile.ps1 @@ -2,8 +2,8 @@ [Console]::OutputEncoding = New-Object -typename System.Text.UTF8Encoding [Console]::InputEncoding = New-Object -typename System.Text.UTF8Encoding -Import-Module posh-git -Import-Module php +# Import-Module posh-git +# Import-Module php $__dir__ = $(Get-Item $profile).Directory; diff --git a/PowerShell/functions.ps1 b/PowerShell/functions.ps1 index 22e15dd..10105bc 100644 --- a/PowerShell/functions.ps1 +++ b/PowerShell/functions.ps1 @@ -1,12 +1,17 @@ function Test-IsAdmin { - try { - $identity = [Security.Principal.WindowsIdentity]::GetCurrent() - $principal = New-Object Security.Principal.WindowsPrincipal -ArgumentList $identity - return $principal.IsInRole( [Security.Principal.WindowsBuiltInRole]::Administrator ) - } catch { - throw "Failed to determine if the current user has elevated privileges. The error was: '{0}'." -f $_ + if ($IsWindows) { + try { + $identity = [Security.Principal.WindowsIdentity]::GetCurrent() + $principal = New-Object Security.Principal.WindowsPrincipal -ArgumentList $identity + return $principal.IsInRole( [Security.Principal.WindowsBuiltInRole]::Administrator ) + } catch { + throw "Failed to determine if the current user has elevated privileges. The error was: '{0}'." -f $_ + } + } else { + $(whoami) -eq "root" } + <# .SYNOPSIS Checks if the current Powershell instance is running with elevated privileges or not. diff --git a/PowerShell/prompt.ps1 b/PowerShell/prompt.ps1 index d3bb9d1..3fb131f 100644 --- a/PowerShell/prompt.ps1 +++ b/PowerShell/prompt.ps1 @@ -1,12 +1,24 @@ -$script:bg = [Console]::BackgroundColor; +$script:bg = [System.ConsoleColor]::Black; $script:fg = [System.ConsoleColor]::White; $script:first = $true; $script:last = 0; -$global:PromptReplacementDirs = @{ - $env:USERPROFILE = '~'; +function Get-If { + [CmdletBinding()]param( + $Condition, + $IfTrue, + $IfFalse + ) + + if ($Condition) { + $IfTrue + } else { + $IfFalse + } } +New-Alias ?: Get-If + function Write-PromptFancyEnd { Write-Host  -NoNewline -ForegroundColor $script:fg @@ -14,6 +26,16 @@ function Write-PromptFancyEnd { $script:fg = [System.ConsoleColor]::White } +if ($IsWindows) { + $script:separator = '\'; +} else { + $script:separator = '/'; +} + +$global:PromptReplacementDirs = @{ + $(?: $IsWindows $env:USERPROFILE $env:HOME) = '~' +} + function Write-PromptSegment { param( [Parameter( @@ -24,17 +46,15 @@ function Write-PromptSegment { )][string]$Text, [Parameter(Position=1)][System.ConsoleColor] $Foreground = [System.ConsoleColor]::White, - [Parameter(Position=2)][System.ConsoleColor] $Background = [Console]::BackgroundColor, [switch] $NoSegment ) - Write-Host $text -NoNewline -BackgroundColor $Background -ForegroundColor $Foreground + Write-Host $text -NoNewline -ForegroundColor $Foreground if (-not $NoSegment) { - Write-Host  -NoNewline -BackgroundColor $Background -ForegroundColor $Foreground + Write-Host  -NoNewline -ForegroundColor $Foreground } - $script:bg = $Background; $script:fg = $Foreground; } @@ -44,7 +64,7 @@ function Get-FancyDir { $location = $location.Replace($replacement.Name, $replacement.Value); } - return $location.Replace('\', '  '); + return $location.Replace($script:separator, '  '); } function Get-GitBranch { @@ -77,14 +97,14 @@ function Write-PromptVirtualEnv { } function Write-PromptDir { - Write-PromptSegment " $(Get-FancyDir) " DarkGray -NoSegment + Write-PromptSegment " $(Get-FancyDir) " Gray -NoSegment } # Depends on posh-git function Write-PromptGit { - if(Get-GitDirectory) { - Write-PromptSegment "  $(Get-GitBranch) " Blue - } +# if(Get-GitDirectory) { +# Write-PromptSegment "  $(Get-GitBranch) " Blue +# } } function prompt {