diff --git a/.doomseeker/doomseeker-irc.ini b/.doomseeker/doomseeker-irc.ini index 0e4e836..640d6cd 100644 --- a/.doomseeker/doomseeker-irc.ini +++ b/.doomseeker/doomseeker-irc.ini @@ -8,6 +8,9 @@ NetworkActionColor=#079CFF TimeStamps=1 UserListFont="Courier,12,-1,5,50,0,0,0,0,0" UrlColor=#00F6FF +CtcpColor=#de5aff +UserListSelectedTextColor=#cbcb0f +UserListSelectedBackgroundColor=#B74600 [Personal] AlternativeNickname= @@ -29,6 +32,7 @@ NickservCommand=/msg nickserv identify %1 NickservPassword= Password= Port=6667 +AutojoinCommands=@Invalid() [Network.1] Address=irc.quakenet.org @@ -39,6 +43,7 @@ NickservCommand=/msg nickserv identify %1 NickservPassword= Password= Port=6667 +AutojoinCommands=@Invalid() [Network.2] Address=irc.oftc.net @@ -49,6 +54,7 @@ NickservCommand=/msg nickserv identify %1 NickservPassword= Password= Port=6667 +AutojoinCommands=@Invalid() [LastUsedNetwork] Address= @@ -59,3 +65,4 @@ NickservCommand= NickservPassword= Password= Port=0 +AutojoinCommands=@Invalid() diff --git a/.doomseeker/doomseeker.ini b/.doomseeker/doomseeker.ini index 40a43e1..8d720b6 100644 --- a/.doomseeker/doomseeker.ini +++ b/.doomseeker/doomseeker.ini @@ -7,7 +7,7 @@ LookupHosts=1 QueryAutoRefreshDontIfActive=1 QueryAutoRefreshEnabled=0 QueryOnStartup=1 -MainWindowMaximized=1 +MainWindowMaximized=0 RecordDemo=0 RememberConnectPassword=1 TellMeWhereAreTheWADsWhenIHoverCursorOverWADSColumn=1 @@ -21,20 +21,28 @@ QueryBatchDelay=0 QueryTimeout=1000 QueryTries=3 SlotStyle=1 -WadPaths="/home/artem/dist/games/doom/wad;/home/artem/dist/games/doom/wad/downloads" +WadPaths=@Variant(\0\0\0\t\0\0\0\x2\0\0\0\n\0\0\0>\0/\0h\0o\0m\0\x65\0/\0\x61\0r\0t\0\x65\0m\0/\0\x64\0i\0s\0t\0/\0g\0\x61\0m\0\x65\0s\0/\0\x64\0o\0o\0m\0/\0w\0\x61\0\x64\0\0\0\x1\0), @Variant(\0\0\0\t\0\0\0\x2\0\0\0\n\0\0\0R\0/\0h\0o\0m\0\x65\0/\0\x61\0r\0t\0\x65\0m\0/\0\x64\0i\0s\0t\0/\0g\0\x61\0m\0\x65\0s\0/\0\x64\0o\0o\0m\0/\0w\0\x61\0\x64\0/\0\x64\0o\0w\0n\0l\0o\0\x61\0\x64\0s\0\0\0\x1\0) QueryBeforeLaunch=0 ConnectPassword= -MainWindowState="AAAA/wAAAAD9AAAAAwAAAAAAAAAAAAAAAPwCAAAAAfsAAAAeAEQAbwBjAGsAQgB1AGQAZABpAGUAcwBMAGkAcwB0AAAAAAD/////AAAAqAD///8AAAABAAAFVgAAAo78AgAAAAL7AAAAIABTAGUAcgB2AGUAcgBGAGkAbAB0AGUAcgBEAG8AYwBrAwAABFIAAACLAAABBAAAAa77AAAAFABTAGUAcgB2AGUAcgBMAGkAcwB0AQAAADwAAAKOAAAAcAD///4AAAADAAAAAAAAAAD8AQAAAAL7AAAADgBMAG8AZwBEAG8AYwBrAAAAAAD/////AAAAbgD////7AAAADgBJAFIAQwBEAG8AYwBrAAAAAAD/////AAAAnwD///8AAAAAAAACjgAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAABAAAADgBUAG8AbwBsAGIAYQByAQAAAAD/////AAAAAAAAAAA=" -MainWindowHeight=791 -MainWindowWidth=1367 -MainWindowX=109 -MainWindowY=107 +MainWindowState="AAAA/wAAAAD9AAAAAwAAAAAAAAAAAAAAAPwCAAAAAfsAAAAeAEQAbwBjAGsAQgB1AGQAZABpAGUAcwBMAGkAcwB0AAAAAAD/////AAAAsgD///8AAAABAAAFVgAAAn/8AgAAAAL7AAAAIABTAGUAcgB2AGUAcgBGAGkAbAB0AGUAcgBEAG8AYwBrAwAABHgAAAA+AAABFwAAAa77AAAAFABTAGUAcgB2AGUAcgBMAGkAcwB0AQAAADwAAAJ/AAAAZwD///4AAAADAAAAAAAAAAD8AQAAAAP7AAAADgBMAG8AZwBEAG8AYwBrAAAAAAD/////AAAAdgD////7AAAADgBJAFIAQwBEAG8AYwBrAAAAAAD/////AAAAhQD////7AAAAIgBTAGUAcgB2AGUAcgBEAGUAdABhAGkAbABzAEQAbwBjAGsAAAAAAP////8AAADEAP///wAAAAAAAAJ/AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAFQAbwBvAGwAYgBhAHIBAAAAAP////8AAAAAAAAAAA==" +MainWindowHeight=731 +MainWindowWidth=1366 +MainWindowX=0 +MainWindowY=18 PreviousCreateServerConfigDir=/home/artem/dist/games/doom PreviousCreateServerExecDir= PreviousCreateServerWadDir=/home/artem/dist/games/doom/wad ServerListColumnState=AAAA/wAAAAAAAAABAAAAAQAAAAEBAAAAAAAAAAAAAAAAAAAAAAAABHkAAAALAQEAAAAAAAAAAAAAAAAAAGT/////AAAAhAAAAAAAAAALAAAAGAAAAAEAAAACAAAAPAAAAAEAAAAAAAAAMgAAAAEAAAAAAAAA1wAAAAEAAAAAAAAAeAAAAAEAAAAAAAAAWgAAAAEAAAAAAAAARgAAAAEAAAAAAAABbgAAAAEAAAAAAAAAlgAAAAEAAAAAAAAAAAAAAAEAAAACAAAAAAAAAAEAAAAC CustomServers= BuddiesList= +Localization=en_US +ColorizeServerConsole=0 +DrawGridInServerTable=0 +GroupServersWithPlayersAtTheTopOfTheList=0 +ServerListSortIndex=1 +ServerListSortDirection=1 +WadAliases=@Variant(\0\0\0\b\0\0\0\x2\0\0\0\b\0n\0\x61\0m\0\x65\0\0\0\n\0\0\0\x10\0\x64\0o\0o\0m\0.\0w\0\x61\0\x64\0\0\0\xe\0\x61\0l\0i\0\x61\0s\0\x65\0s\0\0\0\v\0\0\0\x2\0\0\0\x18\0\x66\0r\0\x65\0\x65\0\x64\0o\0m\0u\0.\0w\0\x61\0\x64\0\0\0\x1a\0\x66\0r\0\x65\0\x65\0\x64\0o\0o\0m\0\x31\0.\0w\0\x61\0\x64), @Variant(\0\0\0\b\0\0\0\x2\0\0\0\b\0n\0\x61\0m\0\x65\0\0\0\n\0\0\0\x12\0\x64\0o\0o\0m\0\x32\0.\0w\0\x61\0\x64\0\0\0\xe\0\x61\0l\0i\0\x61\0s\0\x65\0s\0\0\0\v\0\0\0\x2\0\0\0\x18\0\x66\0r\0\x65\0\x65\0\x64\0o\0o\0m\0.\0w\0\x61\0\x64\0\0\0\x1a\0\x66\0r\0\x65\0\x65\0\x64\0o\0o\0m\0\x32\0.\0w\0\x61\0\x64), @Variant(\0\0\0\b\0\0\0\x2\0\0\0\b\0n\0\x61\0m\0\x65\0\0\0\n\0\0\0\xe\0t\0n\0t\0.\0w\0\x61\0\x64\0\0\0\xe\0\x61\0l\0i\0\x61\0s\0\x65\0s\0\0\0\v\0\0\0\x2\0\0\0\x18\0\x66\0r\0\x65\0\x65\0\x64\0o\0o\0m\0.\0w\0\x61\0\x64\0\0\0\x1a\0\x66\0r\0\x65\0\x65\0\x64\0o\0o\0m\0\x32\0.\0w\0\x61\0\x64), @Variant(\0\0\0\b\0\0\0\x2\0\0\0\b\0n\0\x61\0m\0\x65\0\0\0\n\0\0\0\x18\0p\0l\0u\0t\0o\0n\0i\0\x61\0.\0w\0\x61\0\x64\0\0\0\xe\0\x61\0l\0i\0\x61\0s\0\x65\0s\0\0\0\v\0\0\0\x2\0\0\0\x18\0\x66\0r\0\x65\0\x65\0\x64\0o\0o\0m\0.\0w\0\x61\0\x64\0\0\0\x1a\0\x66\0r\0\x65\0\x65\0\x64\0o\0o\0m\0\x32\0.\0w\0\x61\0\x64) +AdditionalSortColumns=@Invalid() [ServerFilter] bShowEmpty=1 @@ -43,7 +51,11 @@ bShowOnlyValid=0 GameMode= MaxPing=0 ServerName=dot.doom -WADs= +WADs=@Invalid() +bEnabled=0 +GameModes=@Invalid() +GameModesExcluded=@Invalid() +WADsExcluded=@Invalid() [Wadseeker] SearchInIdgames=1 @@ -57,6 +69,7 @@ MaxConcurrentSiteDownloads=3 MaxConcurrentWadDownloads=2 SearchURLs="http%3A%2F%2Fdoom.dogsoft.net%2Fgetwad.php%3Fsearch%3D%25WADNAME%25;http%3A%2F%2Fwadhost.fathax.com%2Fe107_files%2Fdownloads%2Fwadseeker.php%3Fsearch%3D%25WADNAME%25;http%3A%2F%2Fwww.rarefiles.com%2Fdownload%2F;http%3A%2F%2Fwads.coffeenet.org%2Fzips%2F;http%3A%2F%2Fstatic.totaltrash.org%2Fwads%2F;http%3A%2F%2Fsickedwick.net%2Fwads%2F;http%3A%2F%2Fwads.crisisresponseunit.com%2F" TargetDirectory=/home/artem/dist/games/doom/wad/downloads +IdgamesApiURL=http://www.doomworld.com/idgames/api/api.php [Zandronum] Masterserver=master.zandronum.com:15300 @@ -67,6 +80,7 @@ IRCRegistered=1 CustomParameters= TestingPath= Query=1 +AllowServersToDisplayMyCountry=false [ZDaemon] Masterserver=master.zdaemon.org:15300 @@ -85,3 +99,9 @@ Query=0 [Vavoom] Masterserver=altdeath.com:26001 Query=0 + +[Doomseeker_AutoUpdates] +UpdateChannelName=stable +UpdateMode=1 +LastKnownUpdateRevisions=@Variant(\0\0\0\b\0\0\0\0) +bPerformUpdateOnNextRun=false diff --git a/.doomseeker/tmpserver.ini b/.doomseeker/tmpserver.ini index 2148337..3121630 100644 --- a/.doomseeker/tmpserver.ini +++ b/.doomseeker/tmpserver.ini @@ -4,9 +4,9 @@ executable=/usr/bin/zandronum-server name=dot.doom port=10666 gamemode=0 -map= +map=map01 iwad=/home/artem/dist/games/doom/wad/doom2.wad -pwads="/home/artem/dist/games/doom/wad/scythe2.wad;/home/artem/dist/games/doom/wad/brutalv018a.pk3" +pwads="/home/artem/dist/games/doom/wad/brutal19.pk3;/home/artem/dist/games/doom/wad/scythe2.wad" broadcastToLAN=1 broadcastToMaster=1 @@ -18,6 +18,7 @@ maxPlayers=8 sv_maxlives=0 maplist= randomMapRotation=0 +%2Bsv_maxlives=0 [Misc] URL= @@ -29,7 +30,7 @@ MOTD= CustomParams= [dmflags] -dmflags=278532 +dmflags=2441220 dmflags2=1048576 dmflags3=0 compatflags=0 @@ -37,3 +38,5 @@ compatflags2=0 lmsallowedweapons=0 lmsspectatorsettings=0 defaultdmflags=0 +force_inactive_players_spectating_mins=0 +monsters_damage_factor=@Variant(\0\0\0\x87?\x80\0\0) diff --git a/.xinitrc b/.xinitrc index 7ba29ab..83d9647 100644 --- a/.xinitrc +++ b/.xinitrc @@ -10,6 +10,7 @@ xrdb -merge .Xresources setxkbmap -layout "us,ru" -option "grp:caps_toggle,grp_led:caps,compose:ralt" xset dpms 610 610 610 xset r rate 290 30 +xbacklight = 50 # set primary output to the first connected monitor xrandr --output $(set -- $(xrandr | grep ' connected') && echo $1) --primary @@ -42,6 +43,7 @@ fi clipit & clementine & linconnect-server & + #projects/systemd-journal-notifier/systemd-journal-notifier & devmon -g \ --exec-on-drive 'notify-send "%l" "%f %d ready"' \ --exec-on-unmount 'notify-send "%l" "%f %d is safe to remove"' & diff --git a/.zandronum/zandronum.ini b/.zandronum/zandronum.ini index 357f0d2..a54bbf6 100644 --- a/.zandronum/zandronum.ini +++ b/.zandronum/zandronum.ini @@ -1,4 +1,4 @@ -# This file was generated by Zandronum 1.0 on Wed Jun 26 13:14:31 2013 +# This file was generated by Zandronum 1.2.1 on Fri Jun 27 22:34:46 2014 # These are the directories to automatically search for IWADs. # Each directory should be on a separate line, preceded by Path= @@ -82,7 +82,7 @@ Version=210 [GlobalSettings] vid_winscale=1 -fullscreen=false +fullscreen=true vid_renderer=1 mouse_capturemode=1 joy_upspeed=-1 @@ -124,7 +124,8 @@ snd_announcervolume=1 cl_allowmultipleannouncersounds=true cl_alwaysplayfragsleft=false con_ctrl_d= -defaultiwad=doom2 +demo_pure=true +defaultiwad=doomu queryiwad=true cl_capfps=false nofilecompression=false @@ -172,8 +173,8 @@ vid_nowidescreen=false vid_refreshrate=0 vid_vsync=false vid_defbits=24 -vid_defheight=600 -vid_defwidth=800 +vid_defheight=768 +vid_defwidth=1366 map_point_coordinates=true crosshairgrow=false crosshairscale=false @@ -266,6 +267,7 @@ midi_config=timidity.cfg [GlobalSettings.Unknown] [Doom.Player] +cl_connectiontype=1 cl_ticsperupdate=3 cl_respawnonfire=true cl_unlagged=true @@ -358,6 +360,7 @@ msg2color=2 msg1color=5 msg0color=6 msg=0 +con_notifylines=4 sv_logfiletimestamp_usedate=false sv_logfiletimestamp=true con_colorinmessages=1 @@ -381,8 +384,7 @@ chatmacro3=I'm not looking too good! chatmacro2=I'm OK. chatmacro1=I'm ready to kick butt! cl_hitscandecalhack=true -cl_dontrestorefrags=false -cl_startasspectator=true +cl_connect_flags=1 cl_showspawnnames=0 cl_showcommands=0 cl_taunts=true @@ -453,7 +455,7 @@ menu_browser_showempty=true menu_browser_sortby=0 menu_browser_gametype=0 menu_browser_servers=0 -menu_screenratios=0 +menu_screenratios=1 chat_sound=1 show_obituaries=true sv_randommaprotation=false @@ -494,6 +496,7 @@ sv_password=password sv_maxplayers=8 sv_maxclients=8 sv_adminlistfile=adminlist.txt +sv_afk2spec=0 sv_maxclientsperip=2 sv_nodrop=false sv_nokill=false @@ -561,7 +564,6 @@ snd_pitched=false [Doom.LocalServerInfo] sv_dropstyle=0 -sv_coop_damagefactor=1 sv_disableautohealth=false sv_smartaim=0 forcewater=false @@ -569,6 +571,19 @@ sv_corpsequeuesize=64 maxviewpitch=90 [Doom.UnknownConsoleVariables] +PWO.Doom.Fist=0.1 +PWO.Doom.Chainsaw=0.2 +PWO.Doom.Pistol=0.3 +PWO.Doom.Shotgun=0.8 +PWO.Doom.SuperShotgun=0.9 +PWO.Doom.Chaingun=0.4 +PWO.Doom.RocketLauncher=0.5 +PWO.Doom.PlasmaRifle=0.6 +PWO.Doom.BFG9000=0.7 +PWO.Doom.Railgun=0.55 +PWO.Doom.BFG10K=0.75 +PWO.Doom.Minigun=0.85 +PWO.Doom.GrenadeLauncher=0.45 samsara_cl_exists=2601 samsara_cl_wolfmove=0 samsara_cl_vanilladoom=0 @@ -669,7 +684,6 @@ f=scfly [Doom.NetServerInfo] sv_dropstyle=0 -sv_coop_damagefactor=1 sv_disableautohealth=false sv_smartaim=0 forcewater=false diff --git a/.zshrc b/.zshrc index 9fb17df..fe8b72f 100644 --- a/.zshrc +++ b/.zshrc @@ -89,4 +89,6 @@ autoload -U add-zsh-hook add-zsh-hook precmd terminal_title_at_prompt add-zsh-hook preexec terminal_title_on_command +alias -s avi=smplayer + source ~/.rc diff --git a/bin/xmpp-resolve b/bin/xmpp-resolve index ade7684..7d3e4ee 100755 --- a/bin/xmpp-resolve +++ b/bin/xmpp-resolve @@ -20,7 +20,7 @@ function print_host() { host -t $ipv $1 $DNS_SERVER | grep -Ev "$EXTRA_LINES_EXPR" | awk "{ print \$$argn }" | while read server; do echo -n "$wl$server$wr:$port (${3-$ipv}" local response - response=$(echo '' | nc -nw 2 -q 2 $server $port) + response=$(echo '' | nc -nw 2 -q 2 $server $port 2>/dev/null) if [ $? -eq 0 ]; then local introduced_as=$(echo "$response" | grep -Eo "from=.[^\'\"]+." | cut -d= -f2) [ -n "$introduced_as" ] && echo -n " $introduced_as"