diff --git a/.config/ags/modules/.miscutils/system.js b/.config/ags/modules/.miscutils/system.js index 002f5123d..4b24ed378 100644 --- a/.config/ags/modules/.miscutils/system.js +++ b/.config/ags/modules/.miscutils/system.js @@ -2,11 +2,18 @@ import * as Utils from 'resource:///com/github/Aylur/ags/utils.js'; const { execAsync, exec } = Utils; export const distroID = exec(`bash -c 'cat /etc/os-release | grep "^ID=" | cut -d "=" -f 2'`).trim(); -export const isDebianDistro = (distroID == 'linuxmint' || distroID == 'ubuntu' || distroID == 'debian' || distroID == 'zorin' || distroID == 'popos' || distroID == 'raspbian' || distroID == 'kali' || distroID == 'elementary'); +export const isDebianDistro = (distroID == 'linuxmint' || distroID == 'ubuntu' || distroID == 'debian' || distroID == 'zorin' || distroID == 'popos' || distroID == 'raspbian' || distroID == 'kali'); export const isArchDistro = (distroID == 'arch' || distroID == 'endeavouros' || distroID == 'cachyos'); export const hasFlatpak = !!exec(`bash -c 'command -v flatpak'`); export const getDistroIcon = () => { + // Arches + if(distroID == 'arch') return 'arch-symbolic'; + if(distroID == 'endeavouros') return 'endeavouros-symbolic'; + if(distroID == 'cachyos') return 'cachyos-symbolic'; + // Funny flake + if(distroID == 'nixos') return 'nixos-symbolic'; + // Debians if(distroID == 'linuxmint') return 'ubuntu-symbolic'; if(distroID == 'ubuntu') return 'ubuntu-symbolic'; if(distroID == 'debian') return 'debian-symbolic'; @@ -14,24 +21,23 @@ export const getDistroIcon = () => { if(distroID == 'popos') return 'ubuntu-symbolic'; if(distroID == 'raspbian') return 'debian-symbolic'; if(distroID == 'kali') return 'debian-symbolic'; - if(distroID == 'elementary') return 'debian-symbolic'; - if(distroID == 'arch') return 'arch-symbolic'; - if(distroID == 'endeavouros') return 'endeavouros-symbolic'; - if(distroID == 'cachyos') return 'cachyos-symbolic'; return 'linux-symbolic'; } export const getDistroName = () => { + // Arches + if(distroID == 'arch') return 'Arch Linux'; + if(distroID == 'endeavouros') return 'EndeavourOS'; + if(distroID == 'cachyos') return 'CachyOS'; + // Funny flake + if(distroID == 'nixos') return 'NixOS'; + // Debians if(distroID == 'linuxmint') return 'Linux Mint'; if(distroID == 'ubuntu') return 'Ubuntu'; if(distroID == 'debian') return 'Debian'; if(distroID == 'zorin') return 'Zorin'; - if(distroID == 'pop') return 'Pop!_OS'; + if(distroID == 'popos') return 'Pop!_OS'; if(distroID == 'raspbian') return 'Raspbian'; if(distroID == 'kali') return 'Kali Linux'; - if(distroID == 'elementary') return 'elementary OS'; - if(distroID == 'arch') return 'Arch Linux'; - if(distroID == 'endeavouros') return 'EndeavourOS'; - if(distroID == 'cachyos') return 'CachyOS'; return 'Linux'; } \ No newline at end of file diff --git a/.config/ags/modules/sideright/sideright.js b/.config/ags/modules/sideright/sideright.js index 7ed8095eb..c9ac81834 100644 --- a/.config/ags/modules/sideright/sideright.js +++ b/.config/ags/modules/sideright/sideright.js @@ -32,7 +32,7 @@ const timeRow = Box({ .poll(5000, label => { execAsync(['bash', '-c', `w | sed -n '1p' | cut -d, -f1 | cut -d' ' -f4-`]) .then(upTimeString => { - label.label = `Uptime: ${upTimeString}`; + label.label = `Uptime ${upTimeString}`; }).catch(print); }) ,