From 2635e8f930c0e099e3eff98b73121d9de7abc530 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 5 Jul 2022 10:14:48 -0500 Subject: [PATCH 1/3] fixing emacs overlay on kaladin --- README.org | 2 +- system/kaladin/configuration.nix | 3 ++- system/syl/configuration.nix | 1 + user/home.nix | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.org b/README.org index 8fa9137..531653b 100644 --- a/README.org +++ b/README.org @@ -777,7 +777,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a (import (builtins.fetchTarball { url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; - sha256 = "07nj3ab2jbcmr66krxy6wli23srw0vgx1jhjg2b89amzllnzbi93"; + sha256 = "1v1n30a2ai5mnlkrkwv4mfczd3601sqxxlawadxariblfvg7qz4j"; })) <> diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index d4376c3..2e1fe1b 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -100,6 +100,7 @@ VISUAL = "emacsclient -c -a"; # Fixing Qt apps in other environments + # Thought I needed this but apparently they are working fine without it. # QT_XCB_GL_INTEGRATION = "xcb_egl"; # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; }; @@ -296,7 +297,7 @@ (import (builtins.fetchTarball { url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; - sha256 = "07nj3ab2jbcmr66krxy6wli23srw0vgx1jhjg2b89amzllnzbi93"; + sha256 = "1v1n30a2ai5mnlkrkwv4mfczd3601sqxxlawadxariblfvg7qz4j"; })) (self: super: diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 5390c75..d39c3b1 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -127,6 +127,7 @@ VISUAL = "emacsclient -c -a"; # Fixing Qt apps in other environments + # Thought I needed this but apparently they are working fine without it. # QT_XCB_GL_INTEGRATION = "xcb_egl"; # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; }; diff --git a/user/home.nix b/user/home.nix index d272df7..d840b11 100644 --- a/user/home.nix +++ b/user/home.nix @@ -417,7 +417,7 @@ myip = "curl icanhazip.com"; }; initExtra = '' - pfetch + macchina ''; }; From b859c4bd4d4ef7646b092a9a257d1238d1230f4c Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 5 Jul 2022 16:46:05 -0500 Subject: [PATCH 2/3] attempt at fixing wayland on plasma with kaladin --- README.org | 14 +++++++++++--- scripts/kdewindows | 8 ++++++-- system/kaladin/configuration.nix | 14 +++++++++++--- system/syl/configuration.nix | 4 +++- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/README.org b/README.org index 531653b..c0ce84f 100644 --- a/README.org +++ b/README.org @@ -249,6 +249,7 @@ gzip usbutils binutils hunspell +caffeine-ng hunspellDicts.en_US git transmission @@ -350,6 +351,7 @@ python Here are some dev tools that I often have on a few devices. #+NAME: dev-tools #+begin_src nix +direnv android-tools nix-index meson @@ -428,7 +430,7 @@ Emacs service #+begin_src nix services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); }; #+end_src @@ -703,7 +705,13 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a # NVIDIA services.xserver.videoDrivers = [ "nvidia" ]; hardware = { - opengl.enable = true; + opengl = { + enable = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + ]; + }; nvidia.modesetting.enable = true; }; @@ -765,7 +773,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a <> blender neofetch - ethminer + # ethminer lutris protonup # Dev tools diff --git a/scripts/kdewindows b/scripts/kdewindows index e40eae5..f2b2440 100755 --- a/scripts/kdewindows +++ b/scripts/kdewindows @@ -6,8 +6,12 @@ num=$(dbus-send --print-reply --dest=org.kde.KWin \ /Scripting org.kde.kwin.Scripting.loadScript \ string:"$script" | awk 'END {print $2}' ) -dbus-send --print-reply --dest=org.kde.KWin /$num \ - org.kde.kwin.Script.run +echo $num + +wins=$(dbus-send --print-reply --dest=org.kde.KWin /$num \ + org.kde.kwin.Script.run | sed 's/p/p/') + +echo $wins # I'm not sure if some delay is in order here to let your script complete? sleep 1 dbus-send --print-reply --dest=org.kde.KWin /$num \ diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 2e1fe1b..73a6def 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -49,7 +49,13 @@ # NVIDIA services.xserver.videoDrivers = [ "nvidia" ]; hardware = { - opengl.enable = true; + opengl = { + enable = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + ]; + }; nvidia.modesetting.enable = true; }; @@ -161,6 +167,7 @@ usbutils binutils hunspell + caffeine-ng hunspellDicts.en_US git transmission @@ -259,10 +266,11 @@ # hyprland blender neofetch - ethminer + # ethminer lutris protonup # Dev tools + direnv android-tools nix-index meson @@ -329,7 +337,7 @@ services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); }; services.samba-wsdd.enable = true; services.samba = { diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index d39c3b1..6d85cd1 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -175,6 +175,7 @@ usbutils binutils hunspell + caffeine-ng hunspellDicts.en_US git transmission @@ -280,6 +281,7 @@ fet-sh macchina # Dev tools + direnv android-tools nix-index meson @@ -346,7 +348,7 @@ services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); }; services.samba-wsdd.enable = true; services.samba = { From f01737dc56a39a4997279857045e54ad49d7221d Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 5 Jul 2022 17:04:02 -0500 Subject: [PATCH 3/3] not using pgtk just yet --- README.org | 2 +- system/kaladin/configuration.nix | 2 +- system/syl/configuration.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.org b/README.org index c0ce84f..30dcbcb 100644 --- a/README.org +++ b/README.org @@ -430,7 +430,7 @@ Emacs service #+begin_src nix services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); }; #+end_src diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 73a6def..899644e 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -337,7 +337,7 @@ services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); }; services.samba-wsdd.enable = true; services.samba = { diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 6d85cd1..22bec6a 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -348,7 +348,7 @@ services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); }; services.samba-wsdd.enable = true; services.samba = {