Migrate rose to sway + fcitx5 with greetd
This commit is contained in:
parent
8887da20c6
commit
5b3d1d1bd3
4 changed files with 89 additions and 8 deletions
28
files/sway-greetd.conf
Normal file
28
files/sway-greetd.conf
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
# sway config file
|
||||||
|
#
|
||||||
|
|
||||||
|
set $mod Mod1
|
||||||
|
set $win Mod4
|
||||||
|
|
||||||
|
# Font for window titles. Will also be used by the bar unless a different font
|
||||||
|
# is used in the bar {} block below.
|
||||||
|
font pango:monospace 8
|
||||||
|
|
||||||
|
# kill focused window
|
||||||
|
bindsym $mod+Shift+q kill
|
||||||
|
|
||||||
|
# reload the configuration file
|
||||||
|
bindsym $mod+Shift+x reload
|
||||||
|
# restart sway inplace (preserves your layout/session, can be used to upgrade sway)
|
||||||
|
bindsym $mod+Shift+o restart
|
||||||
|
# exit sway (logs you out of your X session)
|
||||||
|
bindsym $mod+Shift+p exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your X session.' -B 'Yes, exit sway' 'swaymsg exit'"
|
||||||
|
|
||||||
|
default_border pixel
|
||||||
|
hide_edge_borders smart
|
||||||
|
|
||||||
|
input type:keyboard {
|
||||||
|
xkb_layout fr
|
||||||
|
xkb_variant bepo
|
||||||
|
xkb_options ctrl:nocaps
|
||||||
|
}
|
26
packages.scm
26
packages.scm
|
@ -3,6 +3,7 @@
|
||||||
(gnu packages chromium)
|
(gnu packages chromium)
|
||||||
(gnu packages compression)
|
(gnu packages compression)
|
||||||
(gnu packages commencement)
|
(gnu packages commencement)
|
||||||
|
(gnu packages cryptsetup)
|
||||||
(gnu packages curl)
|
(gnu packages curl)
|
||||||
(gnu packages databases)
|
(gnu packages databases)
|
||||||
(gnu packages fonts)
|
(gnu packages fonts)
|
||||||
|
@ -11,6 +12,7 @@
|
||||||
(gnu packages gnuzilla)
|
(gnu packages gnuzilla)
|
||||||
(gnu packages haskell)
|
(gnu packages haskell)
|
||||||
(gnu packages haskell-xyz)
|
(gnu packages haskell-xyz)
|
||||||
|
(gnu packages image)
|
||||||
(gnu packages libreoffice)
|
(gnu packages libreoffice)
|
||||||
(gnu packages mail)
|
(gnu packages mail)
|
||||||
(gnu packages man)
|
(gnu packages man)
|
||||||
|
@ -26,6 +28,7 @@
|
||||||
(gnu packages virtualization)
|
(gnu packages virtualization)
|
||||||
(gnu packages wm)
|
(gnu packages wm)
|
||||||
(gnu packages web)
|
(gnu packages web)
|
||||||
|
(gnu packages xdisorg)
|
||||||
(gnu packages xfce)
|
(gnu packages xfce)
|
||||||
(gnu packages xorg)
|
(gnu packages xorg)
|
||||||
(loom packages eyecandy)
|
(loom packages eyecandy)
|
||||||
|
@ -33,27 +36,44 @@
|
||||||
|
|
||||||
(define %desktop
|
(define %desktop
|
||||||
(list
|
(list
|
||||||
|
adwaita-icon-theme
|
||||||
arc-icon-theme
|
arc-icon-theme
|
||||||
arc-theme
|
arc-theme
|
||||||
audacious-gtk
|
audacious-gtk
|
||||||
|
cryptsetup
|
||||||
evince
|
evince
|
||||||
|
flat-remix-icon-theme
|
||||||
|
font-awesome
|
||||||
|
font-lohit
|
||||||
font-openmoji
|
font-openmoji
|
||||||
font-sarasa-gothic
|
font-sarasa-gothic
|
||||||
|
grim
|
||||||
htop
|
htop
|
||||||
|
kanshi
|
||||||
|
moka-icon-theme
|
||||||
mplayer
|
mplayer
|
||||||
nitrogen
|
neovim
|
||||||
|
nwg-launchers
|
||||||
|
papirus-icon-theme
|
||||||
pavucontrol
|
pavucontrol
|
||||||
pwgen
|
pwgen
|
||||||
recutils
|
recutils
|
||||||
|
ristretto
|
||||||
|
slurp
|
||||||
|
thunar
|
||||||
tmux
|
tmux
|
||||||
toon-cursors
|
toon-cursors
|
||||||
|
tumbler
|
||||||
unzip
|
unzip
|
||||||
vim-full
|
|
||||||
vim-solarized
|
vim-solarized
|
||||||
|
waybar
|
||||||
|
wdisplays
|
||||||
|
wl-color-picker
|
||||||
xarchiver
|
xarchiver
|
||||||
xfce4-screenshooter
|
xfce4-terminal
|
||||||
xrandr
|
xrandr
|
||||||
yaru-theme
|
yaru-theme
|
||||||
|
zenity
|
||||||
zip))
|
zip))
|
||||||
|
|
||||||
(define %dev
|
(define %dev
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
"kook"
|
"kook"
|
||||||
"/dev/disk/by-uuid/c896e07f-d2ed-4390-8ce0-b82080d1bdc2")
|
"/dev/disk/by-uuid/c896e07f-d2ed-4390-8ce0-b82080d1bdc2")
|
||||||
pam-audio)
|
pam-audio)
|
||||||
(desktop-environment (operating-system-keyboard-layout os))
|
(nonguix %greetd-sway-desktop)))
|
||||||
(nonguix %desktop-services)))
|
|
||||||
(kernel linux)
|
(kernel linux)
|
||||||
(initrd microcode-initrd)
|
(initrd microcode-initrd)
|
||||||
(firmware (list linux-firmware))
|
(firmware (list linux-firmware))
|
||||||
|
|
40
system.scm
40
system.scm
|
@ -2,16 +2,30 @@
|
||||||
((gnu packages anthy) #:select (anthy))
|
((gnu packages anthy) #:select (anthy))
|
||||||
((gnu packages certs) #:select (nss-certs))
|
((gnu packages certs) #:select (nss-certs))
|
||||||
((gnu packages gnome) #:select (gvfs))
|
((gnu packages gnome) #:select (gvfs))
|
||||||
|
((gnu packages fcitx5) #:select (fcitx5
|
||||||
|
fcitx5-anthy
|
||||||
|
fcitx5-gtk
|
||||||
|
fcitx5-gtk4
|
||||||
|
fcitx5-qt))
|
||||||
((gnu packages file-systems) #:select (davfs2))
|
((gnu packages file-systems) #:select (davfs2))
|
||||||
|
((gnu packages glib) #:select (dbus))
|
||||||
((gnu packages ibus) #:select (ibus ibus-anthy))
|
((gnu packages ibus) #:select (ibus ibus-anthy))
|
||||||
((gnu packages wm) #:select (i3-wm))
|
((gnu packages wm) #:select (sway))
|
||||||
((gnu services desktop) #:select (xfce-desktop-service-type))
|
((gnu services desktop) #:select (xfce-desktop-service-type))
|
||||||
((gnu services pam-mount) #:select (pam-mount-service-type pam-mount-configuration))
|
((gnu services pam-mount) #:select (pam-mount-service-type pam-mount-configuration))
|
||||||
((gnu services xorg) #:select (set-xorg-configuration xorg-configuration))
|
((gnu services xorg) #:select (gdm-service-type set-xorg-configuration xorg-configuration))
|
||||||
(gnu system))
|
(gnu system))
|
||||||
|
|
||||||
(define %utils
|
(define %utils
|
||||||
(list anthy davfs2 gvfs i3-wm ibus ibus-anthy nss-certs))
|
(list davfs2
|
||||||
|
fcitx5
|
||||||
|
fcitx5-anthy
|
||||||
|
fcitx5-gtk
|
||||||
|
fcitx5-gtk4
|
||||||
|
fcitx5-qt
|
||||||
|
gvfs
|
||||||
|
sway
|
||||||
|
nss-certs))
|
||||||
|
|
||||||
(define (install-to root-fs)
|
(define (install-to root-fs)
|
||||||
(operating-system
|
(operating-system
|
||||||
|
@ -74,6 +88,26 @@
|
||||||
(set-xorg-configuration
|
(set-xorg-configuration
|
||||||
(xorg-configuration (keyboard-layout keyboard-layout)))))
|
(xorg-configuration (keyboard-layout keyboard-layout)))))
|
||||||
|
|
||||||
|
(define %greetd-sway-desktop
|
||||||
|
(cons
|
||||||
|
(service greetd-service-type
|
||||||
|
(greetd-configuration
|
||||||
|
(greeter-supplementary-groups (list "video" "input"))
|
||||||
|
(terminals
|
||||||
|
(list
|
||||||
|
(greetd-terminal-configuration
|
||||||
|
(terminal-vt "7")
|
||||||
|
(terminal-switch #t)
|
||||||
|
(default-session-command
|
||||||
|
(greetd-wlgreet-sway-session
|
||||||
|
(wlgreet-session
|
||||||
|
(greetd-wlgreet-session
|
||||||
|
(command (file-append dbus "/bin/dbus-run-session"))
|
||||||
|
(command-args (list (file-append sway "/bin/sway")))))
|
||||||
|
(sway-configuration
|
||||||
|
(local-file "files/sway-greetd.conf")))))))))
|
||||||
|
(modify-services %desktop-services (delete gdm-service-type))))
|
||||||
|
|
||||||
(define (ssh-only authorized-keys)
|
(define (ssh-only authorized-keys)
|
||||||
(service openssh-service-type
|
(service openssh-service-type
|
||||||
(openssh-configuration
|
(openssh-configuration
|
||||||
|
|
Loading…
Reference in a new issue