diff --git a/.gitignore b/.gitignore index f107bc11..a0dea6b5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ community/lxqt-wip *.sig /blackbox/ /pacbang-linux/ +/nixdk/ diff --git a/community/lxqt/Packages-Desktop b/community/lxqt/Packages-Desktop index eee55d20..0b7fdce3 100644 --- a/community/lxqt/Packages-Desktop +++ b/community/lxqt/Packages-Desktop @@ -54,7 +54,6 @@ gparted mintstick ## webbrowser -otter-browser-nowebengine firefox ## bluetooth device management @@ -97,10 +96,8 @@ wallpapers-juhraya xcursor-breeze ## display manager and greeter -lightdm -lightdm-slick-greeter -lightdm-settings -light-locker +sddm +norse-sddm-theme ## office qpdfview diff --git a/community/lxqt/profile.conf b/community/lxqt/profile.conf index 35a95b4c..e3af99e6 100644 --- a/community/lxqt/profile.conf +++ b/community/lxqt/profile.conf @@ -6,7 +6,7 @@ multilib="false" # displaymanager -displaymanager="lightdm" +displaymanager="sddm" # Set to false to disable autologin in the livecd autologin="true" diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop index cccb6faf..a4e9c9b8 100644 --- a/community/openbox/Packages-Desktop +++ b/community/openbox/Packages-Desktop @@ -163,6 +163,7 @@ net-tools network-manager-applet networkmanager-openvpn networkmanager +nm-connection-editor openresolv openssh traceroute @@ -174,7 +175,6 @@ manjaro-openbox-desktop-settings manjaro-openbox-scripts manjaro-pacbang-grub-theme manjaro-pacbang-gtk-theme -manjaro-pacbang-lxdm-theme manjaro-pacbang-wallpapers manjaro-zsh-config masalla-icon-theme @@ -193,17 +193,21 @@ qt5-styleplugins qt5ct ## DISPLAY MANAGER -lxdm-gtk3 +sddm +norse-sddm-theme ## CONFIGURATION DEPENDENCIES arandr conky-lua-nv dunst fzf -gpicview-gtk3 +gpicview gsimplecal i3lock jgmenu +kmscon +libdrm +libva nitrogen numlockx picom @@ -267,7 +271,6 @@ gnome-keyring gtk-engines gtk-engine-murrine gtk3 -kmscon perl-file-mimeinfo polkit python-pyxdg @@ -279,10 +282,11 @@ zensu ### XORG xf86-input-libinput +xf86-video-dummy +xf86-video-fbdev xorg-fonts-100dpi xorg-fonts-75dpi xorg-fonts-type1 -xorg-drivers xorg-server xorg-server-common xorg-server-xephyr @@ -293,4 +297,3 @@ xorg-xinput xorg-xkill xorg-xprop xorg-xwininfo -xterm diff --git a/community/openbox/desktop-overlay/etc/connman/main.conf b/community/openbox/desktop-overlay/etc/connman/main.conf deleted file mode 100644 index 1e23a32b..00000000 --- a/community/openbox/desktop-overlay/etc/connman/main.conf +++ /dev/null @@ -1,9 +0,0 @@ -[General] -# -# based on connman article on Arch wiki -# https://wiki.archlinux.org/index.php/ConnMan -# -AllowHostnameUpdates=false -PreferredTechnologies=ethernet,wifi -#SingleConnectedTechnology=true -NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,ifb,docker,veth,eth,wlan \ No newline at end of file diff --git a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf index e11522a8..25e88f7e 100644 --- a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf +++ b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf @@ -34,7 +34,7 @@ arg=/usr/bin/X -background vt7 theme=PacBang ## gtk theme used by greeter -gtk_theme=PacBang +gtk_theme= ## background of the greeter bg=/usr/share/backgrounds/PacBang/lunix/PacBang_1920x1080(by_Lunix).png diff --git a/community/openbox/desktop-overlay/etc/systemd/system/connman_iwd.service b/community/openbox/desktop-overlay/etc/systemd/system/connman_iwd.service deleted file mode 100644 index e81a37e0..00000000 --- a/community/openbox/desktop-overlay/etc/systemd/system/connman_iwd.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Connection service -DefaultDependencies=false -Conflicts=shutdown.target -RequiresMountsFor=/var/lib/connman -After=dbus.service network-pre.target systemd-sysusers.service iwd.service -Before=network.target multi-user.target shutdown.target -Wants=network.target -Requires=iwd.service - -[Service] -Type=dbus -BusName=net.connman -Restart=on-failure -ExecStart=/usr/bin/connmand --wifi=iwd_agent -n -StandardOutput=null -CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SYS_TIME CAP_SYS_MODULE -ProtectHome=true -ProtectSystem=true - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/community/openbox/desktop-overlay/etc/systemd/system/iwd.service b/community/openbox/desktop-overlay/etc/systemd/system/iwd.service deleted file mode 100644 index d2e537c4..00000000 --- a/community/openbox/desktop-overlay/etc/systemd/system/iwd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Internet Wireless Daemon (IWD) -Before=network.target -Wants=network.target - -[Service] -ExecStart=/usr/lib/iwd/iwd - -[Install] -Alias=multi-user.target.wants/iwd.service \ No newline at end of file diff --git a/community/openbox/desktop-overlay/etc/xdg/autostart/cmst-autostart.desktop b/community/openbox/desktop-overlay/etc/xdg/autostart/cmst-autostart.desktop deleted file mode 100644 index cc488cfa..00000000 --- a/community/openbox/desktop-overlay/etc/xdg/autostart/cmst-autostart.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Connman UI Setup -GenericName=Network Configuration -Comment=QT GUI frontend for connman -Categories=Settings;System;Qt;Network; -Icon=cmst -Exec=cmst -w5 -m -Terminal=false -StartupNotify=false -X-GNOME-Autostart-enabled=true -Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Bluetooth;vpn;DNS; - -Name[de]=Netzwerk-Konfiguration - diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf index db071412..f150c3e3 100644 --- a/community/openbox/profile.conf +++ b/community/openbox/profile.conf @@ -12,7 +12,7 @@ multilib="false" ## default displaymanager: none ## supported; lightdm, sddm, gdm, lxdm, mdm -displaymanager="lxdm" +displaymanager="sddm" ## Set to false to disable autologin in the livecd # autologin="true" @@ -44,7 +44,7 @@ enable_systemd=('systemd-timesyncd' 'pkgfile-update.timer' 'fstrim.timer' 'Netwo disable_systemd=('pacman-init') ## unset defaults to given values -addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" +addgroups="network,lp,scanner,wheel" ## the same workgroup name if samba is used # smb_workgroup="Manjaro"