Merge pull request #3 from sergeyklay/wip

Migrate to sway and update kernel
sergeyklay · Jun 28, 2021 · 53f1769 · 53f1769
2 parents 12f2ab7 + 5b03b74
commit 53f1769
Show file tree

Hide file tree

Showing 35 changed files with 468 additions and 222 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ This repository holds the following configurations:
 - UEFI BIOS
 - GRUB2
 - Systemd
-- Gnome
+- Sway
 - Samba
 - Wayland
 

diff --git a/etc/default/grub b/etc/default/grub
@@ -26,7 +26,7 @@ GRUB_DISTRIBUTOR="Gentoo"
 # GRUB_CMDLINE_LINUX="net.ifnames=0"
 #
 # Boot with systemd instead of sysvinit (openrc)
-GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd resume=UUID=eaca1c21-9315-4a4c-819d-4d0dbcdf65a7"
+GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd resume=UUID=c29e14a5-c762-40d6-85da-22a4277f9a4a"
 
 # Append parameters to the linux kernel command line for non-recovery entries
 #GRUB_CMDLINE_LINUX_DEFAULT=""

diff --git a/etc/fstab b/etc/fstab
@@ -1,17 +1,16 @@
 # <file system>					<mount point>		<type>		<options>					<dump>	<pass>
 
-#/dev/nvme0n1p2: 130M (PARTLABEL=efi)
-UUID=5752-5875					/boot/efi		vfat		umask=0022,fmask=0022,dmask=0022		0	2
-/boot/efi/grub					/boot/grub		none		defaults,bind					0	0
+#/dev/nvme0n1p1: 256MM (PARTLABEL=efi)
+UUID=1B3F-1983					/boot/efi		vfat		umask=0022,fmask=0022,dmask=0022		0	2
 
-# /dev/nvme0n1p3: 16G (PARTLABEL=swap)
-UUID=eaca1c21-9315-4a4c-819d-4d0dbcdf65a7	none			swap		sw						0	0
-
-# /dev/nvme0n1p4: 460.8G (PARTLABEL=root)
-UUID=6a484306-a66d-4d2f-8562-ec3135e9e5ff	/			ext4		noatime						0	1
+# /dev/nvme0n1p2: 16G (PARTLABEL=swap)
+UUID=c29e14a5-c762-40d6-85da-22a4277f9a4a	none			swap		sw						0	0
 
+# /dev/nvme0n1p3: 460.7G (PARTLABEL=root)
+UUID=2daf45b5-3849-4131-8513-8afb5c169ee2	/			ext4		noatime						0	1
 # /dev/sda1: 212.9G (PARTLABEL=data)
 UUID=30eb2ed7-4c5a-48eb-8381-a01c7b0adffa	/mnt/data		ext4		users,defaults,errors=remount-ro		0	0
 
 # /dev/sda2: 20G (PARTLABEL=samba)
 UUID=4bf01fc2-99ff-4d5e-b3d1-68b72a0d89ae	/mnt/samba		ext4		noatime,defaults,errors=remount-ro		0	0
+
diff --git a/etc/genkernel.conf b/etc/genkernel.conf
@@ -147,9 +147,9 @@ MICROCODE_INITRAMFS="no"
 # Specify directory to pull from
 #FIRMWARE_DIR="/lib/firmware"
 
-# Specify a space-separated list of firmware files or directories to include,
+# Specify a comma-separated list of firmware files or directories to include,
 # relative to FIRMWARE_DIR.  If empty or unset, the full contents of 
-# FIRMWARE_DIR will be included.
+# FIRMWARE_DIR will be included (if FIRMWARE option above is set to YES).
 #FIRMWARE_FILES=""
 
 # Add new kernel to grub
@@ -347,7 +347,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # in /usr/share/genkernel/defaults/modules_load (see this file for
 # more details).  This would be used if, for example, you
 # required an additional crypto module or network device at boot
-# time and did not want to staticly compile these in the kernel.
+# time and did not want to statically compile these in the kernel.
 # Options take the form AMODULES_{group} where {group} is one of
 # the groups in modules_load (which are in the form MODULES_{group}).
 # Use this with caution.
@@ -378,7 +378,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Compress generated initramfs
 #COMPRESS_INITRD="yes"
 
-# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest
+# Types of compression: best, xz, lzma, bzip2, gzip, lzop, lz4, zstd, fastest
 # "best" selects the best available compression method
 # "fastest" selects the fastest available compression method
 #COMPRESS_INITRD_TYPE="best"

diff --git a/etc/modules-load.d/crypto.conf b/etc/modules-load.d/crypto.conf
@@ -1,7 +1,10 @@
 ecb
 aesni-intel
 ghash-clmulni-intel
+sha1_generic
+des_generic
 sha512_generic
 md4
 crypto_user
 algif_aead
+algif_skcipher
diff --git a/etc/modules-load.d/lm_sensors.conf b/etc/modules-load.d/lm_sensors.conf
@@ -0,0 +1,2 @@
+# Generated by sensors-detect on Mon Jun 28 01:45:28 2021
+coretemp
diff --git a/etc/modules-load.d/net.conf b/etc/modules-load.d/net.conf
@@ -1,6 +1,6 @@
 tun
 
-# netfilter
+# iptables
 ip_tables
 ip6_tables
 
@@ -17,6 +17,7 @@ xt_tcpudp
 xt_MASQUERADE
 xt_addrtype
 
+# netfilter
 nf_conntrack_netbios_ns
 nf_nat_ftp
 nf_conntrack_netlink

diff --git a/etc/modules-load.d/sound.conf b/etc/modules-load.d/sound.conf
@@ -1,4 +1,4 @@
-snd_seq_midi
+snd-seq-midi
 snd-seq-dummy
 snd-hda-intel
 snd-hda-codec-realtek

diff --git a/etc/nsswitch.conf b/etc/nsswitch.conf
@@ -50,18 +50,27 @@
 # shadow:    db files
 # group:     db files
 
-passwd:		db files
-group:		db files
-initgroups:	db [SUCCESS=continue] files
-shadow:		db files
-gshadow:	files
+# If you encounter slowdowns of file operations and do not use
+# systemd-generated users and groups, you can disable the corresponding
+# lookups by replacing the group and passwd lines with, e.g.,
+# group:    files
+# passwd:   files
+# See also https://bugs.gentoo.org/773436
 
-hosts:		files mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns
-networks:	files dns
-
-protocols:	db files
-services:	db files
-ethers:		db files
-rpc:		db files
-
-netgroup:	db files
+# In alphabetical order. Re-order as required to optimize peformance.
+aliases:    files
+ethers:     files
+group:      db files [SUCCESS=merge] systemd
+gshadow:    files systemd
+hosts:      files dns
+# Allow initgroups to default to the setting for group.
+initgroups: db [SUCCESS=continue] files
+hosts:      files mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns
+netgroup:   db files
+networks:   files dns
+passwd:     db files systemd
+protocols:  db files
+publickey:  files
+rpc:        db files
+shadow:     db files systemd
+services:   db files
diff --git a/etc/portage/make.conf b/etc/portage/make.conf
@@ -1,4 +1,4 @@
-# AMD64 architecture
+# amd64 architecture
 CHOST="x86_64-pc-linux-gnu"
 
 # -O2 for super-safe output
@@ -17,14 +17,14 @@ PKGDIR="/var/cache/binpkgs"
 
 LC_MESSAGES=C
 
-# Quad-core with enabled Hyper-Threading technology - 8 logical processors
+# Quad-core with enabled Hyper-Threading technology - 8 logical cores
 MAKEOPTS="-j8"
 
-GENTOO_MIRRORS="https://mirrors.evowise.com/gentoo/ http://mirrors.xservers.ro/gentoo/ http://ftp.romnet.org/gentoo/"
+GENTOO_MIRRORS="http://mirrors.xservers.ro/gentoo/ http://ftp.romnet.org/gentoo/"
 
 ACCEPT_LICENSE="-* @FREE"
 
-USE="${USE} initramfs networkmanager pulseaudio colord gtk3 bluetooth wayland"
+USE="${USE} initramfs networkmanager pulseaudio colord bluetooth wayland wifi"
 
 # Input devices
 INPUT_DEVICES="libinput"
@@ -34,7 +34,7 @@ VIDEO_CARDS="intel i965 iris"
 
 GRUB_PLATFORMS="efi-64"
 
-RUBY_TARGETS="ruby27"
-
 # Intel Microcode
 MICROCODE_SIGNATURES="-S"
+
+GENTOO_MIRRORS="http://ftp.romnet.org/gentoo/ http://mirrors.xservers.ro/gentoo/"
diff --git a/etc/portage/package.license b/etc/portage/package.license
@@ -1,3 +1,2 @@
 sys-kernel/linux-firmware linux-fw-redistributable no-source-code
 sys-firmware/intel-microcode intel-ucode
-net-im/zoom all-rights-reserved
diff --git a/etc/portage/package.mask b/etc/portage/package.mask
@@ -1 +0,0 @@
-

diff --git a/etc/portage/package.use/aspell b/etc/portage/package.use/aspell
@@ -0,0 +1 @@
+app-text/aspell l10n_en l10n_ru
diff --git a/etc/portage/package.use/cfg-update b/etc/portage/package.use/cfg-update
@@ -0,0 +1 @@
+app-portage/cfg-update -X
diff --git a/etc/portage/package.use/evince b/etc/portage/package.use/evince
diff --git a/etc/portage/package.use/evolution b/etc/portage/package.use/evolution
diff --git a/etc/portage/package.use/firefox b/etc/portage/package.use/firefox
@@ -0,0 +1,5 @@
+www-client/firefox l10n_en-GB l10n_ru
+
+# required by www-client/firefox-89.0.2::gentoo[system-libvpx]
+# required by www-client/firefox (argument)
+>=media-libs/libvpx-1.10.0 postproc
diff --git a/etc/portage/package.use/gnome-disk-utility b/etc/portage/package.use/gnome-disk-utility
diff --git a/etc/portage/package.use/gparted b/etc/portage/package.use/gparted
diff --git a/etc/portage/package.use/gvfs b/etc/portage/package.use/gvfs
diff --git a/etc/portage/package.use/hunspel → etc/portage/package.use/hunspell b/etc/portage/package.use/hunspel → etc/portage/package.use/hunspell
diff --git a/etc/portage/package.use/laptop b/etc/portage/package.use/laptop
@@ -0,0 +1 @@
+app-laptop/laptop-mode-tools acpi bluetooth
diff --git a/etc/portage/package.use/libreoffice b/etc/portage/package.use/libreoffice
@@ -1 +1 @@
-app-office/libreoffice -bluetooth -ldap pdfimport
+app-office/libreoffice -ldap pdfimport
diff --git a/etc/portage/package.use/mc b/etc/portage/package.use/mc
diff --git a/etc/portage/package.use/neofetch b/etc/portage/package.use/neofetch
diff --git a/etc/portage/package.use/pass b/etc/portage/package.use/pass
@@ -0,0 +1 @@
+app-admin/pass -X git wayland dmenu # emacs
diff --git a/etc/portage/package.use/rhythmbox b/etc/portage/package.use/rhythmbox
diff --git a/etc/portage/package.use/seahorse b/etc/portage/package.use/seahorse
diff --git a/etc/portage/package.use/util-linux b/etc/portage/package.use/util-linux
diff --git a/etc/portage/package.use/vim b/etc/portage/package.use/vim
@@ -0,0 +1 @@
+app-editors/vim lua python
diff --git a/etc/portage/package.use/vlc b/etc/portage/package.use/vlc
diff --git a/etc/portage/package.use/weechat b/etc/portage/package.use/weechat
@@ -0,0 +1 @@
+net-irc/weechat -guile -php -tcl -lua -ruby -fifo -xfer
diff --git a/etc/portage/package.use/wimlib b/etc/portage/package.use/wimlib
diff --git a/screenshot.png b/screenshot.png