Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
e67ba646b1 | |||
61a88fc8e0 | |||
2707c290fa | |||
afda55fa52 | |||
34ecee9a2b | |||
7622dff84b | |||
c322e4c9a8 | |||
f3d8b5739e | |||
|
1a1327c0d9 | ||
|
1364183707 | ||
|
4c1871f5c2 | ||
cb63f82bfa | |||
b1e275ecfb | |||
|
c818b7118d |
1
.github/build-canary-v3
vendored
Normal file
1
.github/build-canary-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
1
|
1
.github/build-nest-v3
vendored
Normal file
1
.github/build-nest-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
1
|
1
.github/release-canary-v3
vendored
Normal file
1
.github/release-canary-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
1
|
1
.github/release-nest-v3
vendored
Normal file
1
.github/release-nest-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
1
|
37
.github/workflows/build-canaryv3.yml
vendored
Normal file
37
.github/workflows/build-canaryv3.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
name: PikaOS Package Build Only (Canary) (amd64-v3)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- '.github/build-canary-v3'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
|
||||
volumes:
|
||||
- /proc:/proc
|
||||
options: --privileged -it
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Install SSH key
|
||||
uses: shimataro/ssh-key-action@v2
|
||||
with:
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
name: id_rsa
|
||||
known_hosts: ${{ secrets.KNOWN_HOSTS }}
|
||||
if_key_exists: replace
|
||||
|
||||
- name: Update APT Cache
|
||||
run: apt-get update -y
|
||||
|
||||
- name: Set Build Config
|
||||
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
|
||||
|
||||
- name: Build Package
|
||||
run: ./main.sh
|
37
.github/workflows/build-nestv3.yml
vendored
Normal file
37
.github/workflows/build-nestv3.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
name: PikaOS Package Build Only (amd64-v3)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- '.github/build-nest-v3'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
|
||||
volumes:
|
||||
- /proc:/proc
|
||||
options: --privileged -it
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Install SSH key
|
||||
uses: shimataro/ssh-key-action@v2
|
||||
with:
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
name: id_rsa
|
||||
known_hosts: ${{ secrets.KNOWN_HOSTS }}
|
||||
if_key_exists: replace
|
||||
|
||||
- name: Update APT Cache
|
||||
run: apt-get update -y
|
||||
|
||||
- name: Set Build Config
|
||||
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
|
||||
|
||||
- name: Build Package
|
||||
run: ./main.sh
|
40
.github/workflows/release-canaryv3.yml
vendored
Normal file
40
.github/workflows/release-canaryv3.yml
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
name: PikaOS Package Build & Release (Canary) (amd64-v3)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- '.github/release-canary-v3'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
|
||||
volumes:
|
||||
- /proc:/proc
|
||||
options: --privileged -it
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Install SSH key
|
||||
uses: shimataro/ssh-key-action@v2
|
||||
with:
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
name: id_rsa
|
||||
known_hosts: ${{ secrets.KNOWN_HOSTS }}
|
||||
if_key_exists: replace
|
||||
|
||||
- name: Update APT Cache
|
||||
run: apt-get update -y
|
||||
|
||||
- name: Set Build Config
|
||||
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
|
||||
|
||||
- name: Build Package
|
||||
run: ./main.sh
|
||||
|
||||
- name: Release Package
|
||||
run: ./release.sh
|
40
.github/workflows/release-nestv3.yml
vendored
Normal file
40
.github/workflows/release-nestv3.yml
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
name: PikaOS Package Build & Release (amd64-v3)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- '.github/release-nest-v3'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
|
||||
volumes:
|
||||
- /proc:/proc
|
||||
options: --privileged -it
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Install SSH key
|
||||
uses: shimataro/ssh-key-action@v2
|
||||
with:
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
name: id_rsa
|
||||
known_hosts: ${{ secrets.KNOWN_HOSTS }}
|
||||
if_key_exists: replace
|
||||
|
||||
- name: Update APT Cache
|
||||
run: apt-get update -y
|
||||
|
||||
- name: Set Build Config
|
||||
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
|
||||
|
||||
- name: Build Package
|
||||
run: ./main.sh
|
||||
|
||||
- name: Release Package
|
||||
run: ./release.sh
|
24
LICENSE.md
Normal file
24
LICENSE.md
Normal file
@ -0,0 +1,24 @@
|
||||
MIT License (With DPKG packaging compatibility)
|
||||
|
||||
Copyright (c) 2024 PikaOS
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
Notes:
|
||||
The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT.
|
14
main.sh
14
main.sh
@ -1,3 +1,13 @@
|
||||
#! /bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
VERSION="2.0.0"
|
||||
|
||||
source ./pika-build-config.sh
|
||||
|
||||
echo "$PIKA_BUILD_ARCH" > pika-build-arch
|
||||
|
||||
# Clone Upstream
|
||||
cd ./pika-hyprland-settings
|
||||
|
||||
@ -5,8 +15,8 @@ cd ./pika-hyprland-settings
|
||||
apt-get build-dep ./ -y
|
||||
|
||||
# Build package
|
||||
dh_make --createorig
|
||||
dpkg-buildpackage
|
||||
LOGNAME=root dh_make --createorig -y -l -p pika-hyprland-settings_"$VERSION" || echo "dh-make: Ignoring Last Error"
|
||||
dpkg-buildpackage --no-sign
|
||||
|
||||
# Move the debs to output
|
||||
cd ../
|
||||
|
10
pika-build-config/amd64-v3.sh
Executable file
10
pika-build-config/amd64-v3.sh
Executable file
@ -0,0 +1,10 @@
|
||||
#! /bin/bash
|
||||
export PIKA_BUILD_ARCH="amd64-v3"
|
||||
export DEBIAN_FRONTEND="noninteractive"
|
||||
export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_BUILD_OPTIONS="nocheck notest terse"
|
||||
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
|
5
pika-build-config/i386.sh
Executable file
5
pika-build-config/i386.sh
Executable file
@ -0,0 +1,5 @@
|
||||
#! /bin/bash
|
||||
export PIKA_BUILD_ARCH="i386"
|
||||
export DEBIAN_FRONTEND="noninteractive"
|
||||
export DEB_BUILD_OPTIONS="nocheck notest terse"
|
||||
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
|
@ -1,4 +1,16 @@
|
||||
pika-hyprland-settings (1.1.6-100pika1) pikauwu; urgency=medium
|
||||
pika-hyprland-settings (2.0.0-101pika1) pika; urgency=medium
|
||||
|
||||
* port to pika os 4
|
||||
|
||||
-- ferrreo <harderthanfire@gmail.com> Sat, 01 Oct 2022 14:50:00 +0300
|
||||
|
||||
pika-hyprland-settings (1.1.8-100pika1) pikauwu; urgency=medium
|
||||
|
||||
* Upstream fix
|
||||
|
||||
-- ferrreo <harderthanfire@gmail.com> Sat, 01 Oct 2022 14:50:00 +0300
|
||||
|
||||
pika-hyprland-settings (1.1.7-100pika1) pikauwu; urgency=medium
|
||||
|
||||
* Upstream fix
|
||||
|
||||
|
@ -9,7 +9,7 @@ Rules-Requires-Root: no
|
||||
Package: pika-hyprland-settings
|
||||
Architecture: amd64
|
||||
Depends: breeze, pika-theme, greetd, ags
|
||||
Conflicts: pika-gnome-settings, pika-kde-settings, gdm3
|
||||
Conflicts: pika-gnome-settings, pika-kde-settings, gdm3, pika-gnome-layouts
|
||||
Provides: pika-settings
|
||||
Section: metapackages
|
||||
Priority: optional
|
||||
|
@ -1 +0,0 @@
|
||||
pika-hyprland-desktop_1.0.0_source.buildinfo metapackages optional
|
@ -10,6 +10,7 @@ cp -f /etc/skel/.config/examples/.profile /etc/skel/
|
||||
if ! test -f "${u}/.config/hypr/hyprland.conf"
|
||||
then
|
||||
cp -a /etc/skel/. "${u}/"
|
||||
chown -R "${u}:${u}" "${u}/"
|
||||
fi
|
||||
|
||||
if ! test -f "${u}/.config/ags/widgets/systray.js"
|
||||
|
@ -1 +1 @@
|
||||
3.0 (native)
|
||||
3.0 (quilt)
|
||||
|
@ -11,9 +11,13 @@ export const getWeatherSymbol = (weatherCode) => {
|
||||
const dt = new Date();
|
||||
const hour = dt.getHours();
|
||||
if (hour <= 7 || hour >= 20) {
|
||||
return NIGHT_WEATHER_SYMBOL[WWO_CODE[weatherCode]];
|
||||
return NIGHT_WEATHER_SYMBOL[OMAPI_CODE[weatherCode]];
|
||||
}
|
||||
return WEATHER_SYMBOL[WWO_CODE[weatherCode]];
|
||||
return WEATHER_SYMBOL[OMAPI_CODE[weatherCode]];
|
||||
};
|
||||
|
||||
export const getWeatherDesc = (weatherCode) => {
|
||||
return OMAPI_CODE_DESC[weatherCode];
|
||||
};
|
||||
|
||||
export const getFormattedTime = () => {
|
||||
@ -67,55 +71,66 @@ const battIcons = ["battery_0_bar","battery_1_bar","battery_2_bar","battery_3_ba
|
||||
const days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
|
||||
const months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
|
||||
|
||||
const WWO_CODE = {
|
||||
"113": "Sunny",
|
||||
"116": "PartlyCloudy",
|
||||
"119": "Cloudy",
|
||||
"122": "VeryCloudy",
|
||||
"143": "Fog",
|
||||
"176": "LightShowers",
|
||||
"179": "LightSleetShowers",
|
||||
"182": "LightSleet",
|
||||
"185": "LightSleet",
|
||||
"200": "ThunderyShowers",
|
||||
"227": "LightSnow",
|
||||
"230": "HeavySnow",
|
||||
"248": "Fog",
|
||||
"260": "Fog",
|
||||
"263": "LightShowers",
|
||||
"266": "LightRain",
|
||||
"281": "LightSleet",
|
||||
"284": "LightSleet",
|
||||
"293": "LightRain",
|
||||
"296": "LightRain",
|
||||
"299": "HeavyShowers",
|
||||
"302": "HeavyRain",
|
||||
"305": "HeavyShowers",
|
||||
"308": "HeavyRain",
|
||||
"311": "LightSleet",
|
||||
"314": "LightSleet",
|
||||
"317": "LightSleet",
|
||||
"320": "LightSnow",
|
||||
"323": "LightSnowShowers",
|
||||
"326": "LightSnowShowers",
|
||||
"329": "HeavySnow",
|
||||
"332": "HeavySnow",
|
||||
"335": "HeavySnowShowers",
|
||||
"338": "HeavySnow",
|
||||
"350": "LightSleet",
|
||||
"353": "LightShowers",
|
||||
"356": "HeavyShowers",
|
||||
"359": "HeavyRain",
|
||||
"362": "LightSleetShowers",
|
||||
"365": "LightSleetShowers",
|
||||
"368": "LightSnowShowers",
|
||||
"371": "HeavySnowShowers",
|
||||
"374": "LightSleetShowers",
|
||||
"377": "LightSleet",
|
||||
"386": "ThunderyShowers",
|
||||
"389": "ThunderyHeavyRain",
|
||||
"392": "ThunderySnowShowers",
|
||||
"395": "HeavySnowShowers",
|
||||
const OMAPI_CODE_DESC = {
|
||||
"0": "Clear",
|
||||
"1": "Mostly Clear",
|
||||
"2": "Partly Cloudy",
|
||||
"3": "Cloudy",
|
||||
"45": "Fog",
|
||||
"48": "Freezing Fog",
|
||||
"51": "Light Drizzle",
|
||||
"53": "Drizzle",
|
||||
"55": "Heavy Drizzle",
|
||||
"56": "Light Freezing Drizzle",
|
||||
"57": "Freezing Drizzle",
|
||||
"61": "Light Rain",
|
||||
"63": "Rain",
|
||||
"65": "Heavy Rain",
|
||||
"66": "Light Freezing Rain",
|
||||
"67": "Freezing Rain",
|
||||
"71": "Light Snow",
|
||||
"73": "Snow",
|
||||
"75": "Heavy Snow",
|
||||
"77": "Light Snow Shower",
|
||||
"80": "Light Rain Shower",
|
||||
"81": "Rain Shower",
|
||||
"82": "Heavy Rain Shower",
|
||||
"85": "Snow Shower",
|
||||
"86": "Heavy Snow Shower",
|
||||
"95": "Thunderstorm",
|
||||
"96": "Heavy Thunderstorm",
|
||||
"99": "THunderstorm with Hail"
|
||||
}
|
||||
|
||||
const OMAPI_CODE = {
|
||||
"0": "Sunny",
|
||||
"1": "PartlyCloudy",
|
||||
"2": "Cloudy",
|
||||
"3": "VeryCloudy",
|
||||
"45": "Fog",
|
||||
"48": "Fog",
|
||||
"51": "LightShowers",
|
||||
"53": "LightRain",
|
||||
"55": "HeavyShowers",
|
||||
"56": "LightSleetShowers",
|
||||
"57": "LightSleet",
|
||||
"61": "LightRain",
|
||||
"63": "LightRain",
|
||||
"65": "HeavyRain",
|
||||
"66": "LightSleet",
|
||||
"67": "LightSleet",
|
||||
"71": "LightSnow",
|
||||
"73": "HeavySnow",
|
||||
"75": "HeavySnow",
|
||||
"77": "LightSnowShowers",
|
||||
"80": "LightShowers",
|
||||
"81": "HeavyShowers",
|
||||
"82": "HeavyShowers",
|
||||
"85": "LightSnowShowers",
|
||||
"86": "HeavySnowShowers",
|
||||
"95": "ThunderyShowers",
|
||||
"96": "ThunderyHeavyRain",
|
||||
"99": "ThunderySnowShowers"
|
||||
}
|
||||
|
||||
const WEATHER_SYMBOL = {
|
||||
|
BIN
pika-hyprland-settings/etc/skel/.config/ags/programs/gohypr
Executable file → Normal file
BIN
pika-hyprland-settings/etc/skel/.config/ags/programs/gohypr
Executable file → Normal file
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
const { Widget } = ags;
|
||||
const { execAsync } = ags.Utils;
|
||||
import barConfig from '../barConfig.js';
|
||||
import { getWeatherSymbol, getTemp } from '../lib.js';
|
||||
import { getWeatherSymbol, getTemp, getWeatherDesc } from '../lib.js';
|
||||
|
||||
export const Weather = () => Widget.Box({
|
||||
halign: 'end',
|
||||
@ -23,15 +23,26 @@ export const Weather = () => Widget.Box({
|
||||
}),
|
||||
],
|
||||
connections: [[barConfig?.weatherUpdateInterval * 1000, async box => {
|
||||
setTimeout(() => {
|
||||
execAsync(`curl https://wttr.in/${barConfig?.city}?format=j1`)
|
||||
.then(output => {
|
||||
const weather = JSON.parse(output);
|
||||
const weatherCode = weather.current_condition[0].weatherCode;
|
||||
box.tooltipText = weather.current_condition[0].weatherDesc[0].value;
|
||||
box.children[0].label = getWeatherSymbol(weatherCode);
|
||||
box.children[1].label = getTemp(weather.current_condition[0].temp_C);
|
||||
}).catch(console.error)
|
||||
}, 5000);
|
||||
setTimeout(() => getWeather(box), 10000);
|
||||
}]],
|
||||
});
|
||||
|
||||
async function getWeather(box) {
|
||||
let latLng = [0, 0];
|
||||
execAsync(`curl https://geocoding-api.open-meteo.com/v1/search?name=${barConfig?.city}&count=1&language=en&format=json`)
|
||||
.then(output => {
|
||||
const geocoding = JSON.parse(output);
|
||||
if (geocoding.results.length === 0) {
|
||||
return;
|
||||
}
|
||||
latLng = [geocoding.results[0].latitude, geocoding.results[0].longitude];
|
||||
execAsync(`curl https://api.open-meteo.com/v1/forecast?latitude=${latLng[0]}&longitude=${latLng[1]}¤t=temperature_2m,is_day,weather_code`)
|
||||
.then(output => {
|
||||
const weather = JSON.parse(output);
|
||||
const weatherCode = weather.current.weather_code;
|
||||
box.tooltipText = getWeatherDesc(weatherCode);
|
||||
box.children[0].label = getWeatherSymbol(weatherCode);
|
||||
box.children[1].label = getTemp(Math.round(weather.current.temperature_2m) + "");
|
||||
}).catch(console.error)
|
||||
}).catch(console.error)
|
||||
}
|
@ -41,7 +41,6 @@ dwindle {
|
||||
|
||||
decoration {
|
||||
rounding=15
|
||||
multisample_edges=1
|
||||
blur {
|
||||
enabled = true
|
||||
xray = true
|
||||
|
@ -43,6 +43,16 @@ bind=SUPERSHIFT,up,movewindow,u
|
||||
bind=SUPERSHIFT,down,movewindow,d
|
||||
bind=SUPERCONTROL,left,workspace,-1
|
||||
bind=SUPERCONTROL,right,workspace,+1
|
||||
bind = SUPER SHIFT, 1, movetoworkspace, 1
|
||||
bind = SUPER SHIFT, 2, movetoworkspace, 2
|
||||
bind = SUPER SHIFT, 3, movetoworkspace, 3
|
||||
bind = SUPER SHIFT, 4, movetoworkspace, 4
|
||||
bind = SUPER SHIFT, 5, movetoworkspace, 5
|
||||
bind = SUPER SHIFT, 6, movetoworkspace, 6
|
||||
bind = SUPER SHIFT, 7, movetoworkspace, 7
|
||||
bind = SUPER SHIFT, 8, movetoworkspace, 8
|
||||
bind = SUPER SHIFT, 9, movetoworkspace, 9
|
||||
bind = SUPER SHIFT, 0, movetoworkspace, 10
|
||||
bind=SUPERCONTROL,up,focusmonitor,l
|
||||
bind=SUPERCONTROL,down,focusmonitor,r
|
||||
bind=$mainMod,tab,workspace,previous
|
||||
|
@ -1,8 +1,2 @@
|
||||
# send debs to server
|
||||
rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/
|
||||
|
||||
# add debs to repo
|
||||
ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pikauwu-main /srv/www/incoming/'
|
||||
|
||||
# publish the repo
|
||||
ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:'
|
||||
rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
|
||||
|
Loading…
Reference in New Issue
Block a user