From 1612c290fa1e1c9a2e0da2729e371d7ea8b2b693 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 9 Sep 2022 20:35:06 -0500 Subject: [PATCH] modifications to fonts.conf modifications to gtk themes modifications to nixos configuration.nix --- .config/fontconfig/fonts.conf | 22 ++++---- .config/gtk-2.0/gtkrc-2.0 | 2 +- .config/gtk-3.0/settings.ini | 2 +- .config/sway/config | 16 +++--- .local/bin/unrar | 0 .local/installers/nixos/configuration.nix | 61 +++++++++++++++++++++-- .local/installers/nixos/install.sh | 9 ++++ .profile | 4 +- 8 files changed, 90 insertions(+), 26 deletions(-) mode change 100755 => 100644 .local/bin/unrar diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 3bef0ce..ba7eb7e 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -5,15 +5,15 @@ Serif - Linux Libertine + Noto Serif sans-serif - Linux Biolinum + Noto Sans sans - Linux Biolinum + Noto Sans Regular monospace @@ -25,50 +25,50 @@ Arial - Linux Biolinum + sans Helvetica - Linux Biolinum + sans Verdana - Linux Biolinum + sans Tahoma - Linux Biolinum + sans Comic Sans MS - Linux Biolinum + sans Times New Roman - Linux Libertine + serif Times - Linux Libertine + serif Courier New - Mononoki Nerd Font + monospace diff --git a/.config/gtk-2.0/gtkrc-2.0 b/.config/gtk-2.0/gtkrc-2.0 index b68bf34..5e6b31d 100644 --- a/.config/gtk-2.0/gtkrc-2.0 +++ b/.config/gtk-2.0/gtkrc-2.0 @@ -2,7 +2,7 @@ # Any customization should be done in ~/.gtkrc-2.0.mine instead. include "/home/alex/.gtkrc-2.0.mine" -gtk-theme-name="Nordic-standard-buttons" +gtk-theme-name="Dracula" gtk-icon-theme-name="Papirus-Dark" gtk-font-name="Sans 10" gtk-cursor-theme-name="Adwaita" diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 259da03..8605b6e 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,5 +1,5 @@ [Settings] -gtk-theme-name=Nordic-standard-buttons +gtk-theme-name=Dracula gtk-icon-theme-name=Papirus-Dark gtk-font-name=Sans 10 gtk-cursor-theme-size=0 diff --git a/.config/sway/config b/.config/sway/config index ab2f306..c5fe1ea 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -41,20 +41,22 @@ output VGA-1 disable ### Idle configuration # # Example configuration: -# -# exec swayidle -w \ -# timeout 900 'swaylock -f -c 000000' \ -# timeout 1200 'swaymsg "output * dpms off"' \ -# resume 'swaymsg "output * dpms on"' \ -# before-sleep 'swaylock -f -c 000000' # exec swayidle -w \ + timeout 900 'swaylock -f -c 000000' \ timeout 1200 'swaymsg "output * dpms off"' \ - resume 'swaymsg "output * dpms on"' + resume 'swaymsg "output * dpms on"' \ + before-sleep 'swaylock -f -c 000000' +# # This will lock your screen after 300 seconds of inactivity, then turn off # your displays after another 300 seconds, and turn your screens back on when # resumed. It will also lock your screen before your computer goes to sleep. +#alternate idle config that just turns display off +# exec swayidle -w \ +# timeout 1200 'swaymsg "output * dpms off"' \ +# resume 'swaymsg "output * dpms on"' + #set transparency set $opacity 0.9 #for_window [class=".*"] opacity 1.0 diff --git a/.local/bin/unrar b/.local/bin/unrar old mode 100755 new mode 100644 diff --git a/.local/installers/nixos/configuration.nix b/.local/installers/nixos/configuration.nix index 7b86827..ab01894 100644 --- a/.local/installers/nixos/configuration.nix +++ b/.local/installers/nixos/configuration.nix @@ -1,4 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: + + { imports = @@ -21,12 +23,15 @@ # accidentally delete configuration.nix. system.copySystemConfiguration = true; + system.autoUpgrade.enable = true; + system.autoUpgrade.allowReboot = true; + # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "bismarck"; # Define your hostname. + networking.hostName = "nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. #networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. @@ -76,7 +81,8 @@ yt-dlp zathura sfeed - chromium + ungoogled-chromium + firefox ]; }; @@ -106,12 +112,15 @@ environment.systemPackages = with pkgs; [ glib # gsettings dracula-theme # gtk theme + flat-remix-gtk gnome3.adwaita-icon-theme # default gnome cursors - zsh + papirus-icon-theme noto-fonts noto-fonts-extra noto-fonts-emoji noto-fonts-cjk-sans + nerdfonts + zsh zip unzip p7zip @@ -145,6 +154,7 @@ shellcheck jq monero-cli + monero-gui bc gnome.zenity cura @@ -152,11 +162,52 @@ udiskie python3 python3.pkgs.pip + wget + ani-cli + keepassxc + appimage-run + fuse + lxappearance + gtk-engine-murrine + gtk_engines + img2pdf #dep of manga-cli + pcmanfm + steam-run ]; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam-original" + "steam-run" + ]; + + + fonts = { + + fonts = with pkgs; [ + noto-fonts + noto-fonts-extra + noto-fonts-emoji + noto-fonts-cjk-sans + nerdfonts + ]; + + fontconfig = { + defaultFonts = { + serif = [ "Noto Serif" ]; + sansSerif = [ "Noto Sans" ]; + monospace = [ "Mononoki Nerd Font" ]; + }; + }; + + }; + + #enable flatpak services.flatpak.enable = true; + services.udisks2.enable = true; + security.rtkit.enable = true; services.pipewire = { enable = true; @@ -179,7 +230,7 @@ wlr.enable = true; # gtk portal needed to make gtk apps happy extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - gtkUsePortal = true; + #gtkUsePortal = true; }; } diff --git a/.local/installers/nixos/install.sh b/.local/installers/nixos/install.sh index 69b3726..009bcae 100644 --- a/.local/installers/nixos/install.sh +++ b/.local/installers/nixos/install.sh @@ -14,6 +14,15 @@ mkdir -p ~/.cache/zsh touch ~/.cache/zsh/history +sh ~/.local/scripts/install.sh add-repos ~/.local/installers/nixos/repos.list + + +#link rofi themes directory so that theming works +mkdir -p "$HOME"/.local/share/rofi/ +ln -s "$HOME"/.local/src/base16-rofi/themes/ "$HOME"/.local/share/rofi/themes + + + #set limits for esync #sudo sh -c "echo '$USER hard nofile 524288' >> /etc/security/limits.conf" #set limits for monero diff --git a/.profile b/.profile index cf4610c..6e2d83d 100644 --- a/.profile +++ b/.profile @@ -20,6 +20,8 @@ export TERM="xterm-256color" #export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme. must have qt5-styleplugins installed export QT_QPA_PLATFORMTHEME="qt5ct" #have QT use qt5ct theme +export GTK_THEME=Adwaita:dark + export LESSHISTFILE="-" export ZDOTDIR="$HOME/.config/zsh" @@ -78,7 +80,7 @@ export AWT_TOOLKIT=MToolkit #mount samba share, needs entry in /etc/fstab for this line to work # //192.168.1.218/storage /media/nagato cifs username=alex,pass=PASSWORD,workgroup=WORKGROUP,user,noauto 0 0 #mount /media/nagato/ & -mount /media/bismarck & +#mount /media/bismarck & if [ "$(tty)" = /dev/tty1 ]; then