diff --git a/packages.yaml b/packages.yaml index 4b97222..fbf3a5d 100644 --- a/packages.yaml +++ b/packages.yaml @@ -1,15 +1,16 @@ packages: - antergos-lsb-release - - antergos-release - - antergos-wallpapers - - yay - - downgrade + - antergos-next-desktop-settings - antergos-next-keyring - antergos-next-mirrorlist - - antergos-next-desktop-settings - - calamares-branding-antergos-next + - antergos-plasma-theme + - antergos-release + - antergos-sddm-theme + - antergos-wallpapers + - antergos-welcome - antergos-grub-theme - antergos-live - - antergos-next-memes - - antergos-welcome - - calamares \ No newline at end of file + - calamares + - calamares-branding-antergos-next + - downgrade + - yay \ No newline at end of file diff --git a/packages/antergos-next-desktop-settings/Antergos-dark-qt5.conf b/packages/antergos-next-desktop-settings/Antergos-dark-qt5.conf new file mode 100644 index 0000000..7945e82 --- /dev/null +++ b/packages/antergos-next-desktop-settings/Antergos-dark-qt5.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffe8e8e8, #ff2a2d2f, #ff383838, #ff353535, #ff282828, #ff313131, #ffcdcdcd, #fffafafa, #fffafafa, #ff1d1f21, #ff1a1c1e, #ffaba9a6, #ff2ea3f2, #fff9f9f9, #ff2ea3f2, #ffa70b06, #ff1d1f21, #ffcdcdcd, #ff3f3f36, #ffcdcdcd, #80fafafa +disabled_colors=#ff808080, #ff2a2d2f, #ff383838, #ff353535, #ff282828, #ff313131, #ff808080, #fffafafa, #ff808080, #ff1d1f21, #ff1a1c1e, #ffaba9a6, #ff2ea3f2, #ff808080, #ff2ea3f2, #ffa70b06, #ff1d1f21, #ffcdcdcd, #ff3f3f36, #ffcdcdcd, #80fafafa +inactive_colors=#ffe8e8e8, #ff2a2d2f, #ff383838, #ff353535, #ff282828, #ff313131, #ffcdcdcd, #fffafafa, #fffafafa, #ff1d1f21, #ff1a1c1e, #ffaba9a6, #ff2ea3f2, #fff9f9f9, #ff2ea3f2, #ffa70b06, #ff1d1f21, #ffcdcdcd, #ff3f3f36, #ffcdcdcd, #80fafafa diff --git a/packages/antergos-next-desktop-settings/Antergos-dark-qt6.conf b/packages/antergos-next-desktop-settings/Antergos-dark-qt6.conf new file mode 100644 index 0000000..7945e82 --- /dev/null +++ b/packages/antergos-next-desktop-settings/Antergos-dark-qt6.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffe8e8e8, #ff2a2d2f, #ff383838, #ff353535, #ff282828, #ff313131, #ffcdcdcd, #fffafafa, #fffafafa, #ff1d1f21, #ff1a1c1e, #ffaba9a6, #ff2ea3f2, #fff9f9f9, #ff2ea3f2, #ffa70b06, #ff1d1f21, #ffcdcdcd, #ff3f3f36, #ffcdcdcd, #80fafafa +disabled_colors=#ff808080, #ff2a2d2f, #ff383838, #ff353535, #ff282828, #ff313131, #ff808080, #fffafafa, #ff808080, #ff1d1f21, #ff1a1c1e, #ffaba9a6, #ff2ea3f2, #ff808080, #ff2ea3f2, #ffa70b06, #ff1d1f21, #ffcdcdcd, #ff3f3f36, #ffcdcdcd, #80fafafa +inactive_colors=#ffe8e8e8, #ff2a2d2f, #ff383838, #ff353535, #ff282828, #ff313131, #ffcdcdcd, #fffafafa, #fffafafa, #ff1d1f21, #ff1a1c1e, #ffaba9a6, #ff2ea3f2, #fff9f9f9, #ff2ea3f2, #ffa70b06, #ff1d1f21, #ffcdcdcd, #ff3f3f36, #ffcdcdcd, #80fafafa diff --git a/packages/antergos-next-desktop-settings/PKGBUILD b/packages/antergos-next-desktop-settings/PKGBUILD index 6627eeb..478f315 100644 --- a/packages/antergos-next-desktop-settings/PKGBUILD +++ b/packages/antergos-next-desktop-settings/PKGBUILD @@ -2,7 +2,7 @@ pkgname=antergos-next-desktop-settings pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="Antergos NeXT desktop settings, theme, and color scheme" arch=('any') url="https://github.com/Antergos-NeXT/antergos-pkgs" @@ -12,18 +12,22 @@ depends=( 'breeze-gtk' 'ttf-opensans' 'noto-fonts' + 'ttf-roboto' ) +optdepends=('qt5ct' 'qt6ct') source=( "antergos-next-gtk3.css" "antergos-next-gtk4.css" "antergos-next-gtkrc" "antergos-next-index.theme" "AntergosNeXT.colors" + "Antergos-dark-qt5.conf" + "Antergos-dark-qt6.conf" "gtk-settings.ini" "xsettings.xml" "antergos-next-dconf" ) -sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') +sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') package() { # Custom GTK theme @@ -43,11 +47,126 @@ package() { install -dm755 "${pkgdir}/etc/skel/.config/gtk-3.0" install -m644 "${srcdir}/gtk-settings.ini" "${pkgdir}/etc/skel/.config/gtk-3.0/settings.ini" + # Qt5/Qt6 color configs (for Qt apps outside KDE) + install -dm755 "${pkgdir}/usr/share/qt5ct/colors" + install -dm755 "${pkgdir}/usr/share/qt6ct/colors" + install -m644 "${srcdir}/Antergos-dark-qt5.conf" "${pkgdir}/usr/share/qt5ct/colors/Antergos-dark.conf" + install -m644 "${srcdir}/Antergos-dark-qt6.conf" "${pkgdir}/usr/share/qt6ct/colors/Antergos-dark.conf" + # KDE defaults install -dm755 "${pkgdir}/etc/skel/.config" cat > "${pkgdir}/etc/skel/.config/kdeglobals" << 'EOF' +[ColorEffects:Disabled] +Color=112,111,110 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=1 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=true +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=42,46,56 +BackgroundNormal=35,38,47 +DecorationFocus=46,163,242 +DecorationHover=46,163,242 +ForegroundActive=46,163,242 +ForegroundInactive=149,155,174 +ForegroundLink=46,163,242 +ForegroundNegative=218,68,83 +ForegroundNeutral=230,181,61 +ForegroundNormal=207,210,220 +ForegroundPositive=73,195,137 +ForegroundVisited=46,163,242 + +[Colors:Selection] +BackgroundAlternate=46,163,242 +BackgroundNormal=46,163,242 +DecorationFocus=46,163,242 +DecorationHover=46,163,242 +ForegroundActive=255,255,255 +ForegroundInactive=207,210,220 +ForegroundLink=46,163,242 +ForegroundNegative=218,68,83 +ForegroundNeutral=230,181,61 +ForegroundNormal=255,255,255 +ForegroundPositive=73,195,137 +ForegroundVisited=46,163,242 + +[Colors:View] +BackgroundAlternate=42,46,56 +BackgroundNormal=31,34,42 +DecorationFocus=46,163,242 +DecorationHover=46,163,242 +ForegroundActive=46,163,242 +ForegroundInactive=149,155,174 +ForegroundLink=46,163,242 +ForegroundNegative=218,68,83 +ForegroundNeutral=230,181,61 +ForegroundNormal=207,210,220 +ForegroundPositive=73,195,137 +ForegroundVisited=46,163,242 + +[Colors:Window] +BackgroundAlternate=42,46,56 +BackgroundNormal=35,38,47 +DecorationFocus=46,163,242 +DecorationHover=46,163,242 +ForegroundActive=46,163,242 +ForegroundInactive=149,155,174 +ForegroundLink=46,163,242 +ForegroundNegative=218,68,83 +ForegroundNeutral=230,181,61 +ForegroundNormal=207,210,220 +ForegroundPositive=73,195,137 +ForegroundVisited=46,163,242 + [General] -ColorScheme=Antergos NeXT +ColorScheme=AntergosDark +Name=Antergos-dark +XftAntialias=true +XftHintStyle=hintfull +XftSubPixel=rgb +fixed=Roboto Mono,11,-1,5,50,0,0,0,0,0,Regular +font=Roboto,11,-1,5,50,0,0,0,0,0,Regular +menuFont=Roboto,11,-1,5,50,0,0,0,0,0,Regular +shadeSortColumn=true +smallestReadableFont=Roboto,11,-1,5,50,0,0,0,0,0,Regular +toolBarFont=Roboto,11,-1,5,50,0,0,0,0,0,Regular +widgetStyle=Breeze + +[Icons] +Theme=breeze-dark + +[KDE] +ColorScheme=AntergosDark +LookAndFeelPackage=antergosdark.desktop +ShowIconsInMenuItems=true +ShowIconsOnPushButtons=true +SingleClick=false +contrast=0 +frameContrast=0.2 +widgetStyle=Breeze + +[WM] +activeBackground=45,45,45 +activeBlend=45,45,45 +activeFont=Roboto,11,-1,5,50,0,0,0,0,0,Regular +activeForeground=255,255,255 +inactiveBackground=53,53,53 +inactiveBlend=53,53,53 +inactiveForeground=155,155,155 EOF # XFCE defaults diff --git a/packages/antergos-next-desktop-settings/plasma-override b/packages/antergos-next-desktop-settings/plasma-override index 66e88d8..c27a84d 100644 --- a/packages/antergos-next-desktop-settings/plasma-override +++ b/packages/antergos-next-desktop-settings/plasma-override @@ -1,2 +1,2 @@ [Theme] -name=Antergos NeXT +name=antergos-dark diff --git a/packages/antergos-next-memes/PKGBUILD b/packages/antergos-next-memes/PKGBUILD deleted file mode 100644 index 1407c40..0000000 --- a/packages/antergos-next-memes/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: Celestia Ludenberg - -pkgname=antergos-next-memes -pkgver=1.0 -pkgrel=1 -pkgdesc="Antergos NeXT welcome audio" -arch=('any') -url="https://github.com/Antergos-NeXT" -license=('custom:fairuse') -depends=() -source=("its-raining-tacos.opus") -sha256sums=('SKIP') - -package() { - install -dm755 "${pkgdir}/usr/share/antergos-next-memes" - cp "its-raining-tacos.opus" "${pkgdir}/usr/share/antergos-next-memes/" -} diff --git a/packages/antergos-next-memes/its-raining-tacos.opus b/packages/antergos-next-memes/its-raining-tacos.opus deleted file mode 100644 index 112ac9c..0000000 Binary files a/packages/antergos-next-memes/its-raining-tacos.opus and /dev/null differ diff --git a/packages/antergos-plasma-theme/PKGBUILD b/packages/antergos-plasma-theme/PKGBUILD new file mode 100644 index 0000000..f5ccaa0 --- /dev/null +++ b/packages/antergos-plasma-theme/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Celestia Ludenberg + +pkgname=antergos-plasma-theme +pkgver=1 +pkgrel=1 +pkgdesc='Antergos NeXT Plasma desktop theme, look-and-feel, and splash screen' +arch=('any') +url="https://github.com/Antergos-NeXT/antergos-packages" +license=('GPL') +depends=('plasma-desktop' 'antergos-wallpapers') +groups=('antergos-branding' 'antergos-style') +optdepends=('qt5ct' 'qt6ct') +source=( + "antergos-dark/colors" + "antergos-dark/metadata.json" + "antergos-dark/plasmarc" + "antergosdark.desktop/metadata.json" + "antergosdark.desktop/contents/defaults" + "antergosdark.desktop/contents/layouts/org.kde.plasma.desktop-layout.js" + "antergosdark.desktop/contents/splash/Splash.qml" +) +sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') + +package() { + # Plasma Desktop Theme + install -dm755 "${pkgdir}/usr/share/plasma/desktoptheme/antergos-dark" + install -m644 "${srcdir}/antergos-dark/colors" "${pkgdir}/usr/share/plasma/desktoptheme/antergos-dark/" + install -m644 "${srcdir}/antergos-dark/metadata.json" "${pkgdir}/usr/share/plasma/desktoptheme/antergos-dark/" + install -m644 "${srcdir}/antergos-dark/plasmarc" "${pkgdir}/usr/share/plasma/desktoptheme/antergos-dark/" + + # Look-and-Feel + install -dm755 "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop" + install -m644 "${srcdir}/antergosdark.desktop/metadata.json" "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop/" + install -dm755 "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop/contents" + install -m644 "${srcdir}/antergosdark.desktop/contents/defaults" "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop/contents/" + install -dm755 "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop/contents/layouts" + install -m644 "${srcdir}/antergosdark.desktop/contents/layouts/org.kde.plasma.desktop-layout.js" "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop/contents/layouts/" + install -dm755 "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop/contents/splash" + install -m644 "${srcdir}/antergosdark.desktop/contents/splash/Splash.qml" "${pkgdir}/usr/share/plasma/look-and-feel/antergosdark.desktop/contents/splash/" +} diff --git a/packages/antergos-plasma-theme/antergos-dark/colors b/packages/antergos-plasma-theme/antergos-dark/colors new file mode 100644 index 0000000..1e24989 --- /dev/null +++ b/packages/antergos-plasma-theme/antergos-dark/colors @@ -0,0 +1,122 @@ +[ColorEffects:Disabled] +Color=112,111,110 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=1 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=true +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=66,66,66 +BackgroundNormal=53,53,53 +DecorationFocus=46,163,242 +DecorationHover=46,163,242 +ForegroundActive=46,163,242 +ForegroundInactive=160,160,160 +ForegroundLink=46,163,242 +ForegroundNegative=182,0,0 +ForegroundNeutral=255,221,0 +ForegroundNormal=245,245,245 +ForegroundPositive=88,175,88 +ForegroundVisited=199,79,79 + +[Colors:Complementary] +BackgroundAlternate=50,50,50 +BackgroundNormal=35,35,35 +DecorationFocus=46,163,242 +DecorationHover=46,163,242 +ForegroundActive=46,163,242 +ForegroundInactive=175,176,179 +ForegroundLink=61,174,230 +ForegroundNegative=237,21,21 +ForegroundNeutral=201,206,59 +ForegroundNormal=218,218,218 +ForegroundPositive=17,209,22 +ForegroundVisited=61,174,230 + +[Colors:Selection] +BackgroundAlternate=10,46,86 +BackgroundNormal=24,72,128 +DecorationFocus=76,76,76 +DecorationHover=63,63,63 +ForegroundActive=46,163,242 +ForegroundInactive=160,160,160 +ForegroundLink=38,155,193 +ForegroundNegative=182,0,0 +ForegroundNeutral=181,157,0 +ForegroundNormal=247,247,247 +ForegroundPositive=91,181,91 +ForegroundVisited=199,79,79 + +[Colors:Tooltip] +BackgroundAlternate=42,42,42 +BackgroundNormal=26,26,26 +DecorationFocus=76,76,76 +DecorationHover=63,63,63 +ForegroundActive=46,163,242 +ForegroundInactive=170,170,170 +ForegroundLink=35,146,180 +ForegroundNegative=171,0,0 +ForegroundNeutral=162,140,0 +ForegroundNormal=244,244,244 +ForegroundPositive=83,165,83 +ForegroundVisited=199,79,79 + +[Colors:View] +BackgroundAlternate=42,42,42 +BackgroundNormal=48,48,49 +DecorationFocus=76,76,76 +DecorationHover=86,86,86 +ForegroundActive=46,163,242 +ForegroundInactive=160,160,160 +ForegroundLink=250,250,250 +ForegroundNegative=163,0,0 +ForegroundNeutral=166,144,0 +ForegroundNormal=255,255,255 +ForegroundPositive=75,149,75 +ForegroundVisited=182,73,73 + +[Colors:Window] +BackgroundAlternate=42,42,42 +BackgroundNormal=50,49,49 +DecorationFocus=76,76,76 +DecorationHover=86,86,86 +ForegroundActive=46,163,242 +ForegroundInactive=160,160,160 +ForegroundLink=35,145,179 +ForegroundNegative=255,0,0 +ForegroundNeutral=235,204,0 +ForegroundNormal=249,249,249 +ForegroundPositive=111,221,111 +ForegroundVisited=255,101,101 + +[General] +ColorScheme=AntergosDark +Name=Antergos Dark +shadeSortColumn=true + +[Icons] +Theme=breeze-dark + +[KDE] +contrast=2 + +[WM] +activeBackground=45,45,45 +activeBlend=45,45,45 +activeForeground=255,255,255 +inactiveBackground=53,53,53 +inactiveBlend=53,53,53 +inactiveForeground=155,155,155 diff --git a/packages/antergos-plasma-theme/antergos-dark/icons/start.svgz b/packages/antergos-plasma-theme/antergos-dark/icons/start.svgz new file mode 100644 index 0000000..4e1d41a Binary files /dev/null and b/packages/antergos-plasma-theme/antergos-dark/icons/start.svgz differ diff --git a/packages/antergos-plasma-theme/antergos-dark/metadata.json b/packages/antergos-plasma-theme/antergos-dark/metadata.json new file mode 100644 index 0000000..6476bf2 --- /dev/null +++ b/packages/antergos-plasma-theme/antergos-dark/metadata.json @@ -0,0 +1,19 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "ash8820@proton.me", + "Name": "Antergos NeXT" + } + ], + "Category": "", + "Description": "Antergos NeXT dark Plasma theme", + "EnabledByDefault": true, + "Id": "antergos-dark", + "License": "LGPL", + "Name": "Antergos Dark", + "Version": "1.0.0", + "Website": "https://github.com/Antergos-NeXT" + }, + "X-Plasma-API": "5.0" +} diff --git a/packages/antergos-plasma-theme/antergos-dark/plasmarc b/packages/antergos-plasma-theme/antergos-dark/plasmarc new file mode 100644 index 0000000..f38efe4 --- /dev/null +++ b/packages/antergos-plasma-theme/antergos-dark/plasmarc @@ -0,0 +1,14 @@ +[Wallpaper] +defaultWallpaperTheme=antergos-wallpaper +defaultFileSuffix=.png +defaultWidth=1920 +defaultHeight=1080 + +[ContrastEffect] +nabled=true +contrast=0.2 +intensity=0.6 +saturation=10 + +[AdaptiveTransparency] +enabled=true diff --git a/packages/antergos-plasma-theme/antergosdark.desktop/contents/defaults b/packages/antergos-plasma-theme/antergosdark.desktop/contents/defaults new file mode 100644 index 0000000..87e6863 --- /dev/null +++ b/packages/antergos-plasma-theme/antergosdark.desktop/contents/defaults @@ -0,0 +1,24 @@ +[kdeglobals][General] +ColorScheme=AntergosDark + +[kdeglobals][Icons] +Theme=breeze-dark + +[kdeglobals][KDE] +widgetStyle=Breeze + +[plasmarc][Theme] +name=antergos-dark + +[Wallpaper] +Image=antergos-wallpaper + +[kwinrc][DesktopSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][WindowSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][org.kde.kdecoration2] +library=org.kde.breeze +theme=Breeze diff --git a/packages/antergos-plasma-theme/antergosdark.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/packages/antergos-plasma-theme/antergosdark.desktop/contents/layouts/org.kde.plasma.desktop-layout.js new file mode 100644 index 0000000..09fdfac --- /dev/null +++ b/packages/antergos-plasma-theme/antergosdark.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -0,0 +1,6 @@ +loadTemplate("org.kde.plasma.desktop.defaultPanel") + +var desktopsArray = desktopsForActivity(currentActivity()); +for( var j = 0; j < desktopsArray.length; j++) { + desktopsArray[j].wallpaperPlugin = 'org.kde.image'; +} diff --git a/packages/antergos-plasma-theme/antergosdark.desktop/contents/splash/Splash.qml b/packages/antergos-plasma-theme/antergosdark.desktop/contents/splash/Splash.qml new file mode 100644 index 0000000..96906a0 --- /dev/null +++ b/packages/antergos-plasma-theme/antergosdark.desktop/contents/splash/Splash.qml @@ -0,0 +1,98 @@ +import QtQuick + +Image { + id: root + source: "images/background.png" + + property int stage + + onStageChanged: { + if (stage == 1) { + introAnimation.running = true + } + } + + Rectangle { + id: overlay + color: "#cc1a1c21" + anchors.fill: parent + } + + Text { + id: logoText + text: "Antergos" + color: "#2EA3F2" + font.family: "Roboto" + font.weight: Font.Light + font.pointSize: 48 + anchors.centerIn: parent + anchors.verticalCenterOffset: -40 + } + + Text { + id: subtitleText + text: "NeXT" + color: "#eff0f1" + font.family: "Roboto" + font.weight: Font.Thin + font.pointSize: 24 + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: logoText.bottom + anchors.topMargin: 4 + } + + Rectangle { + id: progressBarBg + radius: 2 + color: "#3f4347" + anchors { + horizontalCenter: parent.horizontalCenter + top: subtitleText.bottom + topMargin: 40 + } + height: 4 + width: 200 + + Rectangle { + id: progressBar + radius: 2 + color: "#2EA3F2" + anchors { + left: parent.left + top: parent.top + bottom: parent.bottom + } + width: (parent.width / 6) * (stage - 1) + Behavior on width { + PropertyAnimation { + duration: 250 + easing.type: Easing.InOutQuad + } + } + } + } + + SequentialAnimation { + id: introAnimation + running: false + + ParallelAnimation { + PropertyAnimation { + property: "opacity" + target: logoText + from: 0 + to: 1 + duration: 800 + easing.type: Easing.InOutQuad + } + PropertyAnimation { + property: "opacity" + target: subtitleText + from: 0 + to: 1 + duration: 800 + easing.type: Easing.InOutQuad + } + } + } +} diff --git a/packages/antergos-plasma-theme/antergosdark.desktop/metadata.json b/packages/antergos-plasma-theme/antergosdark.desktop/metadata.json new file mode 100644 index 0000000..e886397 --- /dev/null +++ b/packages/antergos-plasma-theme/antergosdark.desktop/metadata.json @@ -0,0 +1,18 @@ +{ + "KPackageStructure": "Plasma/LookAndFeel", + "KPlugin": { + "Authors": [ + { + "Email": "ash8820@proton.me", + "Name": "Antergos NeXT" + } + ], + "Category": "", + "Description": "Antergos Dark look-and-feel by Antergos NeXT", + "Id": "antergosdark.desktop", + "License": "GPLv2+", + "Name": "Antergos Dark", + "Website": "https://github.com/Antergos-NeXT" + }, + "X-Plasma-API": "5.0" +} diff --git a/packages/antergos-plasma-theme/start-here-kde-antergos.svg b/packages/antergos-plasma-theme/start-here-kde-antergos.svg new file mode 100644 index 0000000..1f7470e --- /dev/null +++ b/packages/antergos-plasma-theme/start-here-kde-antergos.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/antergos-sddm-theme/Main.qml b/packages/antergos-sddm-theme/Main.qml new file mode 100644 index 0000000..77e2101 --- /dev/null +++ b/packages/antergos-sddm-theme/Main.qml @@ -0,0 +1,240 @@ +import QtQuick 2.14 +import SddmComponents 2.0 +import 'components' + + +Rectangle { + id: container + width: 640 + height: 480 + + LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft + LayoutMirroring.childrenInherit: true + + TextConstants { id: textConstants } + + Connections { + target: sddm + + function onLoginSucceeded() { + errorMessage.color = "#2EA3F2" + errorMessage.text = textConstants.loginSucceeded + } + + function onLoginFailed() { + password.text = "" + errorMessage.color = "#ed1515" + errorMessage.text = textConstants.loginFailed + } + } + + Background { + anchors.fill: parent + source: config.background + fillMode: Image.PreserveAspectCrop + onStatusChanged: { + if (status == Image.Error && source != config.defaultBackground) { + source = config.defaultBackground + } + } + } + + Rectangle { + anchors.fill: parent + gradient: Gradient { + GradientStop { position: 0.0; color: "#661a1c21" } + GradientStop { position: 0.5; color: "#aa1a1c21" } + GradientStop { position: 1.0; color: "#ee0d0e12" } + } + + Rectangle { + id: loginCard + anchors.centerIn: parent + anchors.verticalCenterOffset: -24 + width: 360 + height: cardColumn.implicitHeight + 40 + radius: 16 + color: "#232629" + border.color: "#3f4347" + border.width: 1 + + Column { + id: cardColumn + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + anchors.topMargin: 28 + spacing: 16 + width: parent.width - 40 + + Text { + text: "Antergos" + color: "#2EA3F2" + font.family: "Roboto" + font.weight: Font.Light + font.pointSize: 34 + horizontalAlignment: Text.AlignHCenter + anchors.horizontalCenter: parent.horizontalCenter + } + + Column { + width: parent.width + spacing: 10 + + TextBox { + id: name + width: parent.width + height: 40 + text: userModel.lastUser + font.pixelSize: 14 + color: "#1d1f21" + textColor: "#eff0f1" + focusColor: "#2EA3F2" + KeyNavigation.backtab: rebootButton + KeyNavigation.tab: password + Keys.onPressed: { + if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { + sddm.login(name.text, password.text, sessionCombo.index) + event.accepted = true + } + } + } + + PasswordBox { + id: password + width: parent.width + height: 40 + font.pixelSize: 14 + color: "#1d1f21" + textColor: "#eff0f1" + focusColor: "#2EA3F2" + KeyNavigation.backtab: name + KeyNavigation.tab: loginButton + Keys.onPressed: { + if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { + sddm.login(name.text, password.text, sessionCombo.index) + event.accepted = true + } + } + } + } + + Text { + id: errorMessage + width: parent.width + height: errorMessage.text ? 16 : 0 + font.pixelSize: 12 + horizontalAlignment: Text.AlignHCenter + visible: errorMessage.text !== "" + } + + Button { + id: loginButton + anchors.horizontalCenter: parent.horizontalCenter + text: textConstants.login + color: "#2EA3F2" + textColor: "#ffffff" + activeColor: "#268acc" + pressedColor: "#1a6da0" + KeyNavigation.backtab: password + KeyNavigation.tab: shutdownButton + Keys.onPressed: { + if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { + sddm.login(name.text, password.text, sessionCombo.index) + event.accepted = true + } + } + onClicked: sddm.login(name.text, password.text, sessionCombo.index) + } + + Row { + spacing: 8 + anchors.horizontalCenter: parent.horizontalCenter + + Button { + id: shutdownButton + text: textConstants.shutdown + color: "#3f4347" + textColor: "#eff0f1" + activeColor: "#ed1515" + KeyNavigation.backtab: loginButton + KeyNavigation.tab: rebootButton + onClicked: sddm.powerOff() + } + + Button { + id: rebootButton + text: textConstants.reboot + color: "#3f4347" + textColor: "#eff0f1" + activeColor: "#2EA3F2" + KeyNavigation.backtab: shutdownButton + KeyNavigation.tab: sessionCombo + onClicked: sddm.reboot() + } + } + } + } + + Rectangle { + anchors { + bottom: parent.bottom + bottomMargin: 32 + horizontalCenter: parent.horizontalCenter + } + width: 360 + height: 44 + radius: 12 + color: "#1a1c21" + border.color: "#3f4347" + border.width: 1 + + Row { + anchors.centerIn: parent + spacing: 16 + + ComboBox { + id: sessionCombo + width: 140 + height: 32 + model: sessionModel + index: sessionModel.lastIndex + color: "#31363b" + textColor: "#eff0f1" + menuColor: "#232629" + focusColor: "#2EA3F2" + hoverColor: "#3f4347" + borderColor: "#3f4347" + arrowIcon: "angle-up.png" + arrowColor: "#8a8f9c" + font.pixelSize: 12 + KeyNavigation.backtab: rebootButton + KeyNavigation.tab: layoutCombo + } + + LayoutBox { + id: layoutCombo + width: 110 + height: 32 + color: "#31363b" + textColor: "#eff0f1" + hoverColor: "#3f4347" + menuColor: "#232629" + borderColor: "#3f4347" + focusColor: "#2EA3F2" + arrowIcon: "angle-up.png" + arrowColor: "#8a8f9c" + font.pixelSize: 12 + KeyNavigation.backtab: sessionCombo + KeyNavigation.tab: name + } + } + } + } + + Component.onCompleted: { + if (name.text == "") + name.focus = true + else + password.focus = true + } +} diff --git a/packages/antergos-sddm-theme/PKGBUILD b/packages/antergos-sddm-theme/PKGBUILD new file mode 100644 index 0000000..9854118 --- /dev/null +++ b/packages/antergos-sddm-theme/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Celestia Ludenberg + +pkgname=antergos-sddm-theme +pkgver=1 +pkgrel=1 +pkgdesc='Antergos NeXT SDDM theme' +arch=('any') +url="https://github.com/Antergos-NeXT/antergos-packages" +license=('GPL') +depends=('sddm' 'qt5-declarative' 'antergos-wallpapers') +source=( + "Main.qml" + "metadata.desktop" + "theme.conf" + "angle-up.png" + "background.png" + "components/ComboBox.qml" + "components/LayoutBox.qml" + "components/qmldir" +) +sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') + +package() { + install -dm755 "${pkgdir}/usr/share/sddm/themes/antergos" + install -dm755 "${pkgdir}/usr/share/sddm/themes/antergos/components" + install -m644 "${srcdir}/Main.qml" "${pkgdir}/usr/share/sddm/themes/antergos/" + install -m644 "${srcdir}/metadata.desktop" "${pkgdir}/usr/share/sddm/themes/antergos/" + install -m644 "${srcdir}/theme.conf" "${pkgdir}/usr/share/sddm/themes/antergos/" + install -m644 "${srcdir}/angle-up.png" "${pkgdir}/usr/share/sddm/themes/antergos/" + install -m644 "${srcdir}/background.png" "${pkgdir}/usr/share/sddm/themes/antergos/" + install -m644 "${srcdir}/components/ComboBox.qml" "${pkgdir}/usr/share/sddm/themes/antergos/components/" + install -m644 "${srcdir}/components/LayoutBox.qml" "${pkgdir}/usr/share/sddm/themes/antergos/components/" + install -m644 "${srcdir}/components/qmldir" "${pkgdir}/usr/share/sddm/themes/antergos/components/" +} diff --git a/packages/antergos-sddm-theme/angle-up.png b/packages/antergos-sddm-theme/angle-up.png new file mode 100644 index 0000000..871d767 Binary files /dev/null and b/packages/antergos-sddm-theme/angle-up.png differ diff --git a/packages/antergos-sddm-theme/background.png b/packages/antergos-sddm-theme/background.png new file mode 100644 index 0000000..817e997 Binary files /dev/null and b/packages/antergos-sddm-theme/background.png differ diff --git a/packages/antergos-sddm-theme/components/ComboBox.qml b/packages/antergos-sddm-theme/components/ComboBox.qml new file mode 100644 index 0000000..4a23511 --- /dev/null +++ b/packages/antergos-sddm-theme/components/ComboBox.qml @@ -0,0 +1,259 @@ +/*************************************************************************** +* Copyright (c) 2013 Abdurrahman AVCI +* +* 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. +* +***************************************************************************/ + +import QtQuick 2.0 + +FocusScope { + id: container + width: 80; height: 30 + + property color color: "white" + property color borderColor: "#ababab" + property color focusColor: "#266294" + property color hoverColor: "#5692c4" + property color menuColor: "white" + property color textColor: "black" + + property int borderWidth: 1 + property font font + property alias model: listView.model + property int index: 0 + property alias arrowColor: arrow.color + property alias arrowIcon: arrowIcon.source + + property Component rowDelegate: defaultRowDelegate + + signal valueChanged(int id) + + Component { + id: defaultRowDelegate + Text { + anchors.fill: parent + anchors.margins: 3 + container.borderWidth + (LayoutMirroring.enabled ? arrow.width : 0) + verticalAlignment: Text.AlignVCenter + color: container.textColor + font: container.font + + text: parent.modelItem.name + } + } + + onFocusChanged: if (!container.activeFocus) close(false) + + Rectangle { + id: main + + anchors.fill: parent + + color: container.color + border.color: container.borderColor + border.width: container.borderWidth + + Behavior on border.color { ColorAnimation { duration: 100 } } + + states: [ + State { + name: "hover"; when: mouseArea.containsMouse + PropertyChanges { target: main; border.width: container.borderWidth; border.color: container.hoverColor } + }, + State { + name: "focus"; when: container.activeFocus && !mouseArea.containsMouse + PropertyChanges { target: main; border.width: container.borderWidth; border.color: container.focusColor } + } + ] + } + + Loader { + id: topRow + anchors.fill: parent + focus: true + clip: true + + sourceComponent: rowDelegate + property variant modelItem + } + + Rectangle { + id: arrow + anchors.right: parent.right + width: 20 + 2*border.width; height: parent.height + color: "transparent" + + border.color: main.border.color + border.width: main.border.width + + Image { + id: arrowIcon + anchors.fill: parent + anchors.leftMargin: parent.border.width + anchors.rightMargin: parent.border.width + clip: true + smooth: true + fillMode: Image.PreserveAspectFit + } + } + + MouseArea { + id: mouseArea + anchors.fill: container + + cursorShape: Qt.PointingHandCursor + + hoverEnabled: true + + onEntered: if (main.state == "") main.state = "hover"; + onExited: if (main.state == "hover") main.state = ""; + onClicked: { container.focus = true; toggle() } + onWheel: { + if (wheel.angleDelta.y > 0) + listView.decrementCurrentIndex() + else + listView.incrementCurrentIndex() + } + } + + Keys.onPressed: { + if (event.key === Qt.Key_Up) { + listView.decrementCurrentIndex() + } else if (event.key === Qt.Key_Down) { + if (event.modifiers !== Qt.AltModifier) + listView.incrementCurrentIndex() + else + toggle() + } else if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) { + close(true) + } else if (event.key === Qt.Key_Escape) { + close(false) + } + } + + Rectangle { + id: dropDown + width: container.width; height: 0 + anchors.bottom: container.top + anchors.bottomMargin: 0 + + color: container.menuColor + + clip: true + + Behavior on height { NumberAnimation { duration: 100 } } + + Component { + id: myDelegate + + Rectangle { + width: dropDown.width; height: container.height - 2*container.borderWidth + color: "transparent" + + Loader { + id: loader + anchors.fill: parent + sourceComponent: rowDelegate + + property variant modelItem: model + } + + property variant modelItem: model + + MouseArea { + id: delegateMouseArea + anchors.fill: parent + + cursorShape: Qt.PointingHandCursor + + hoverEnabled: true + onEntered: listView.currentIndex = index + onClicked: close(true) + } + } + } + + ListView { + id: listView + width: container.width; height: (container.height - 2*container.borderWidth) * count + container.borderWidth + delegate: myDelegate + highlight: Rectangle { + anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined; + color: container.hoverColor + } + } + + Rectangle { + anchors.fill: listView + anchors.bottomMargin: -container.borderWidth + color: "transparent" + clip: false + border.color: main.border.color + border.width: main.border.width + } + + states: [ + State { + name: "visible"; + PropertyChanges { target: dropDown; height: (container.height - 2*container.borderWidth) * listView.count + container.borderWidth} + } + ] + } + + function toggle() { + if (dropDown.state === "visible") + close(false) + else + open() + } + + function open() { + dropDown.state = "visible" + listView.currentIndex = container.index + } + + function close(update) { + dropDown.state = "" + + if (update) { + container.index = listView.currentIndex + topRow.modelItem = listView.currentItem.modelItem + valueChanged(listView.currentIndex) + } + } + + Component.onCompleted: { + listView.currentIndex = container.index + if (listView.currentItem) + topRow.modelItem = listView.currentItem.modelItem + } + + onIndexChanged: { + listView.currentIndex = container.index + if (listView.currentItem) + topRow.modelItem = listView.currentItem.modelItem + } + + onModelChanged: { + listView.currentIndex = container.index + if (listView.currentItem) + topRow.modelItem = listView.currentItem.modelItem + } +} diff --git a/packages/antergos-sddm-theme/components/LayoutBox.qml b/packages/antergos-sddm-theme/components/LayoutBox.qml new file mode 100644 index 0000000..6cf28c5 --- /dev/null +++ b/packages/antergos-sddm-theme/components/LayoutBox.qml @@ -0,0 +1,69 @@ +/*************************************************************************** +* Copyright (c) 2013 Nikita Mikhaylov +* +* 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. +* +***************************************************************************/ + +import QtQuick 2.0 + +ComboBox { + id: combo + + model: keyboard.layouts + index: keyboard.currentLayout + + onValueChanged: keyboard.currentLayout = id + + Connections { + target: keyboard + + function onCurrentLayoutChanged() { combo.index = keyboard.currentLayout } + } + + rowDelegate: Rectangle { + color: "transparent" + + Image { + id: img + source: "/usr/share/sddm/flags/%1.png".arg(modelItem ? modelItem.modelData.shortName : "zz") + + anchors.margins: 4 + fillMode: Image.PreserveAspectFit + + anchors.left: parent.left + anchors.top: parent.top + anchors.bottom: parent.bottom + } + + Text { + anchors.margins: 4 + anchors.left: img.right + anchors.top: parent.top + anchors.bottom: parent.bottom + color: '#eff0f1' + + verticalAlignment: Text.AlignVCenter + + text: modelItem ? modelItem.modelData.shortName : "zz" + font.pixelSize: 14 + } + } +} diff --git a/packages/antergos-sddm-theme/components/qmldir b/packages/antergos-sddm-theme/components/qmldir new file mode 100644 index 0000000..e235e70 --- /dev/null +++ b/packages/antergos-sddm-theme/components/qmldir @@ -0,0 +1,4 @@ +module SddmComponents + +LayoutBox 2.0 LayoutBox.qml +ComboBox 2.0 ComboBox.qml diff --git a/packages/antergos-sddm-theme/metadata.desktop b/packages/antergos-sddm-theme/metadata.desktop new file mode 100644 index 0000000..89f7429 --- /dev/null +++ b/packages/antergos-sddm-theme/metadata.desktop @@ -0,0 +1,12 @@ +[SddmGreeterTheme] +Name=Antergos +Description=Antergos NeXT SDDM Theme +Author=Celestia Ludenberg +Type=sddm-theme +Version=1.0 +Website=https://github.com/Antergos-NeXT +Email=ash8820@proton.me +MainScript=Main.qml +ConfigFile=theme.conf +Theme-Id=antergos +Theme-API=2.0 diff --git a/packages/antergos-sddm-theme/theme.conf b/packages/antergos-sddm-theme/theme.conf new file mode 100644 index 0000000..60807b0 --- /dev/null +++ b/packages/antergos-sddm-theme/theme.conf @@ -0,0 +1,2 @@ +[General] +background=background.png diff --git a/packages/antergos-wallpapers/PKGBUILD b/packages/antergos-wallpapers/PKGBUILD index 360331e..c7e926e 100644 --- a/packages/antergos-wallpapers/PKGBUILD +++ b/packages/antergos-wallpapers/PKGBUILD @@ -1,23 +1,29 @@ # Maintainer: Celestia Ludenberg # # Wallpapers and their licenses: -# antergos-wallpaper.png - GPL3 (Antergos project) -# adwaita-morning.webp - CC BY-SA 3.0 (Jakub Steiner / GNOME Project) -# https://gitlab.gnome.org/GNOME/gnome-backgrounds +# antergos-wallpaper.png - GPL3 (Antergos project) +# adwaita-morning.webp - CC BY-SA 3.0 (Jakub Steiner / GNOME Project) +# https://gitlab.gnome.org/GNOME/gnome-backgrounds +# antergos-darkest-hour.jpg - GPL-2+ (KDE Plasma / Risto Saukonpää) +# https://github.com/KDE/plasma-workspace-wallpapers pkgname=antergos-wallpapers pkgver=0.7 -pkgrel=5 +pkgrel=6 pkgdesc="Antergos NeXT wallpapers" arch=('any') url="https://github.com/Antergos/wallpapers" license=('GPL3') source=("antergos-wallpaper.png::https://raw.githubusercontent.com/Antergos/wallpapers/master/antergos-wallpaper.png" "metadata.desktop" - "adwaita-morning.webp") + "adwaita-morning.webp" + "antergos-darkest-hour.jpg" + "metadata-darkest-hour.desktop") sha256sums=('SKIP' 'SKIP' - 'eaa5c6960dd548526e189568fed449210f332f0358d666a8711ef399f9b94152') + 'eaa5c6960dd548526e189568fed449210f332f0358d666a8711ef399f9b94152' + '8e3703fae3a3c217b1fc2b399b706cd3720584268d071ba153e4809daa55f1ce' + '0c100d74404a07daefca49ec1ceea8faabc66b3df35bf4280bace53a5f68171c') package() { local wallpapers=(antergos-wallpaper.png adwaita-morning.webp) @@ -32,4 +38,13 @@ package() { done install -m644 "${srcdir}/metadata.desktop" "${pkgdir}/usr/share/wallpapers/antergos-wallpaper/" + + install -dm755 "${pkgdir}/usr/share/backgrounds/antergos" + install -m644 "${srcdir}/antergos-darkest-hour.jpg" "${pkgdir}/usr/share/backgrounds/antergos/" + install -dm755 "${pkgdir}/usr/share/antergos/backgrounds" + install -m644 "${srcdir}/antergos-darkest-hour.jpg" "${pkgdir}/usr/share/antergos/backgrounds/" + + install -dm755 "${pkgdir}/usr/share/wallpapers/antergos-darkest-hour/contents/images" + install -m644 "${srcdir}/antergos-darkest-hour.jpg" "${pkgdir}/usr/share/wallpapers/antergos-darkest-hour/contents/images/" + install -m644 "${srcdir}/metadata-darkest-hour.desktop" "${pkgdir}/usr/share/wallpapers/antergos-darkest-hour/metadata.desktop" } diff --git a/packages/antergos-wallpapers/antergos-darkest-hour.jpg b/packages/antergos-wallpapers/antergos-darkest-hour.jpg new file mode 100644 index 0000000..17ad330 Binary files /dev/null and b/packages/antergos-wallpapers/antergos-darkest-hour.jpg differ diff --git a/packages/antergos-wallpapers/antergos-wallpaper.png b/packages/antergos-wallpapers/antergos-wallpaper.png new file mode 100644 index 0000000..bf5900e Binary files /dev/null and b/packages/antergos-wallpapers/antergos-wallpaper.png differ diff --git a/packages/antergos-wallpapers/metadata-darkest-hour.desktop b/packages/antergos-wallpapers/metadata-darkest-hour.desktop new file mode 100644 index 0000000..07b62a1 --- /dev/null +++ b/packages/antergos-wallpapers/metadata-darkest-hour.desktop @@ -0,0 +1,4 @@ +[Wallpaper] +Name=Antergos Darkest Hour +X-KDE-PluginInfo-Name=antergos-darkest-hour +X-KDE-PluginInfo-Category=Wallpapers