From 4f773b96a4c3acca749a34f06c6b8261526c3a6d Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Tue, 23 Apr 2019 10:39:28 -0400
Subject: [PATCH] flag-emojis file not necessary

---
 .local/share/larbs/flag-emojis | 261 ---------------------------------
 .scripts/statusbar/locate      |   6 +-
 2 files changed, 1 insertion(+), 266 deletions(-)
 delete mode 100644 .local/share/larbs/flag-emojis

diff --git a/.local/share/larbs/flag-emojis b/.local/share/larbs/flag-emojis
deleted file mode 100644
index 49c634e9..00000000
--- a/.local/share/larbs/flag-emojis
+++ /dev/null
@@ -1,261 +0,0 @@
-🇦🇨 Ascension Island
-🇦🇩 Andorra
-🇦🇪 United Arab Emirates
-🇦🇫 Afghanistan
-🇦🇬 Antigua & Barbuda
-🇦🇮 Anguilla
-🇦🇱 Albania
-🇦🇲 Armenia
-🇦🇴 Angola
-🇦🇶 Antarctica
-🇦🇷 Argentina
-🇦🇸 American Samoa
-🇦🇹 Austria
-🇦🇺 Australia
-🇦🇼 Aruba
-🇦🇽 Åland Islands
-🇦🇿 Azerbaijan
-🇧🇦 Bosnia & Herzegovina
-🇧🇧 Barbados
-🇧🇩 Bangladesh
-🇧🇪 Belgium
-🇧🇫 Burkina Faso
-🇧🇬 Bulgaria
-🇧🇭 Bahrain
-🇧🇮 Burundi
-🇧🇯 Benin
-🇧🇱 St. Barthélemy
-🇧🇲 Bermuda
-🇧🇳 Brunei
-🇧🇴 Bolivia
-🇧🇶 Caribbean Netherlands
-🇧🇷 Brazil
-🇧🇸 Bahamas
-🇧🇹 Bhutan
-🇧🇻 Bouvet Island
-🇧🇼 Botswana
-🇧🇾 Belarus
-🇧🇿 Belize
-🇨🇦 Canada
-🇨🇨 Cocos (Keeling) Islands
-🇨🇩 Congo - Kinshasa
-🇨🇫 Central African Republic
-🇨🇬 Congo - Brazzaville
-🇨🇭 Switzerland
-🇨🇮 Côte d’Ivoire
-🇨🇰 Cook Islands
-🇨🇱 Chile
-🇨🇲 Cameroon
-🇨🇳 China
-🇨🇴 Colombia
-🇨🇵 Clipperton Island
-🇨🇷 Costa Rica
-🇨🇺 Cuba
-🇨🇻 Cape Verde
-🇨🇼 Curaçao
-🇨🇽 Christmas Island
-🇨🇾 Cyprus
-🇨🇿 Czechia
-🇩🇪 Germany
-🇩🇬 Diego Garcia
-🇩🇯 Djibouti
-🇩🇰 Denmark
-🇩🇲 Dominica
-🇩🇴 Dominican Republic
-🇩🇿 Algeria
-🇪🇦 Ceuta & Melilla
-🇪🇨 Ecuador
-🇪🇪 Estonia
-🇪🇬 Egypt
-🇪🇭 Western Sahara
-🇪🇷 Eritrea
-🇪🇸 Spain
-🇪🇹 Ethiopia
-🇪🇺 European Union
-🇫🇮 Finland
-🇫🇯 Fiji
-🇫🇰 Falkland Islands
-🇫🇲 Micronesia
-🇫🇴 Faroe Islands
-🇫🇷 France
-🇬🇦 Gabon
-🇬🇧 United Kingdom
-🇬🇩 Grenada
-🇬🇪 Georgia
-🇬🇫 French Guiana
-🇬🇬 Guernsey
-🇬🇭 Ghana
-🇬🇮 Gibraltar
-🇬🇱 Greenland
-🇬🇲 Gambia
-🇬🇳 Guinea
-🇬🇵 Guadeloupe
-🇬🇶 Equatorial Guinea
-🇬🇷 Greece
-🇬🇸 South Georgia & South Sandwich Islands
-🇬🇹 Guatemala
-🇬🇺 Guam
-🇬🇼 Guinea-Bissau
-🇬🇾 Guyana
-🇭🇰 Hong Kong SAR China
-🇭🇲 Heard & McDonald Islands
-🇭🇳 Honduras
-🇭🇷 Croatia
-🇭🇹 Haiti
-🇭🇺 Hungary
-🇮🇨 Canary Islands
-🇮🇩 Indonesia
-🇮🇪 Ireland
-🇮🇱 Israel
-🇮🇲 Isle of Man
-🇮🇳 India
-🇮🇴 British Indian Ocean Territory
-🇮🇶 Iraq
-🇮🇷 Iran
-🇮🇸 Iceland
-🇮🇹 Italy
-🇯🇪 Jersey
-🇯🇲 Jamaica
-🇯🇴 Jordan
-🇯🇵 Japan
-🇰🇪 Kenya
-🇰🇬 Kyrgyzstan
-🇰🇭 Cambodia
-🇰🇮 Kiribati
-🇰🇲 Comoros
-🇰🇳 St. Kitts & Nevis
-🇰🇵 North Korea
-🇰🇷 South Korea
-🇰🇼 Kuwait
-🇰🇾 Cayman Islands
-🇰🇿 Kazakhstan
-🇱🇦 Laos
-🇱🇧 Lebanon
-🇱🇨 St. Lucia
-🇱🇮 Liechtenstein
-🇱🇰 Sri Lanka
-🇱🇷 Liberia
-🇱🇸 Lesotho
-🇱🇹 Lithuania
-🇱🇺 Luxembourg
-🇱🇻 Latvia
-🇱🇾 Libya
-🇲🇦 Morocco
-🇲🇨 Monaco
-🇲🇩 Moldova
-🇲🇪 Montenegro
-🇲🇫 St. Martin
-🇲🇬 Madagascar
-🇲🇭 Marshall Islands
-🇲🇰 North Macedonia
-🇲🇱 Mali
-🇲🇲 Myanmar (Burma)
-🇲🇳 Mongolia
-🇲🇴 Macau Sar China
-🇲🇵 Northern Mariana Islands
-🇲🇶 Martinique
-🇲🇷 Mauritania
-🇲🇸 Montserrat
-🇲🇹 Malta
-🇲🇺 Mauritius
-🇲🇻 Maldives
-🇲🇼 Malawi
-🇲🇽 Mexico
-🇲🇾 Malaysia
-🇲🇿 Mozambique
-🇳🇦 Namibia
-🇳🇨 New Caledonia
-🇳🇪 Niger
-🇳🇫 Norfolk Island
-🇳🇬 Nigeria
-🇳🇮 Nicaragua
-🇳🇱 Netherlands
-🇳🇴 Norway
-🇳🇵 Nepal
-🇳🇷 Nauru
-🇳🇺 Niue
-🇳🇿 New Zealand
-🇴🇲 Oman
-🇵🇦 Panama
-🇵🇪 Peru
-🇵🇫 French Polynesia
-🇵🇬 Papua New Guinea
-🇵🇭 Philippines
-🇵🇰 Pakistan
-🇵🇱 Poland
-🇵🇲 St. Pierre & Miquelon
-🇵🇳 Pitcairn Islands
-🇵🇷 Puerto Rico
-🇵🇸 Palestinian Territories
-🇵🇹 Portugal
-🇵🇼 Palau
-🇵🇾 Paraguay
-🇶🇦 Qatar
-🇷🇪 Réunion
-🇷🇴 Romania
-🇷🇸 Serbia
-🇷🇺 Russia
-🇷🇼 Rwanda
-🇸🇦 Saudi Arabia
-🇸🇧 Solomon Islands
-🇸🇨 Seychelles
-🇸🇩 Sudan
-🇸🇪 Sweden
-🇸🇬 Singapore
-🇸🇭 St. Helena
-🇸🇮 Slovenia
-🇸🇯 Svalbard & Jan Mayen
-🇸🇰 Slovakia
-🇸🇱 Sierra Leone
-🇸🇲 San Marino
-🇸🇳 Senegal
-🇸🇴 Somalia
-🇸🇷 Suriname
-🇸🇸 South Sudan
-🇸🇹 São Tomé & Príncipe
-🇸🇻 El Salvador
-🇸🇽 Sint Maarten
-🇸🇾 Syria
-🇸🇿 Swaziland
-🇹🇦 Tristan Da Cunha
-🇹🇨 Turks & Caicos Islands
-🇹🇩 Chad
-🇹🇫 French Southern Territories
-🇹🇬 Togo
-🇹🇭 Thailand
-🇹🇯 Tajikistan
-🇹🇰 Tokelau
-🇹🇱 Timor-Leste
-🇹🇲 Turkmenistan
-🇹🇳 Tunisia
-🇹🇴 Tonga
-🇹🇷 Turkey
-🇹🇹 Trinidad & Tobago
-🇹🇻 Tuvalu
-🇹🇼 Taiwan
-🇹🇿 Tanzania
-🇺🇦 Ukraine
-🇺🇬 Uganda
-🇺🇲 U.S. Outlying Islands
-🇺🇳 United Nations
-🇺🇸 United States
-🇺🇾 Uruguay
-🇺🇿 Uzbekistan
-🇻🇦 Vatican City
-🇻🇨 St. Vincent & Grenadines
-🇻🇪 Venezuela
-🇻🇬 British Virgin Islands
-🇻🇮 U.S. Virgin Islands
-🇻🇳 Vietnam
-🇻🇺 Vanuatu
-🇼🇫 Wallis & Futuna
-🇼🇸 Samoa
-🇽🇰 Kosovo
-🇾🇪 Yemen
-🇾🇹 Mayotte
-🇿🇦 South Africa
-🇿🇲 Zambia
-🇿🇼 Zimbabwe
-🏴󠁧󠁢󠁥󠁮󠁧󠁿 England
-🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland
-🏴󠁿 Wales
diff --git a/.scripts/statusbar/locate b/.scripts/statusbar/locate
index 35a60b04..4ca4f107 100755
--- a/.scripts/statusbar/locate
+++ b/.scripts/statusbar/locate
@@ -4,10 +4,6 @@
 # displays that information in the statusbar
 #
 # https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/
-# To get the flag-emojis file:
-#
-# 	curl https://samerickson.me/files/flag-emojis > ~/.local/share/flag-emojis
-#
 ifinstalled "geoiplookup" || exit
 addr="$(curl ifconfig.me 2>/dev/null)" || exit
-grep "$(geoiplookup "$addr" | sed 's/.*, //')" ~/.local/share/flag-emojis
+grep "flag: " ~/.config/emoji | grep "$(geoiplookup $addr | sed 's/.*, //')" | sed "s/flag: //;s/;.*//"