Merge remote-tracking branch 'origin/master'

This commit is contained in:
Chris Cochrun 2022-07-05 17:05:22 -05:00
commit 57ec05b532
5 changed files with 33 additions and 9 deletions

View file

@ -249,6 +249,7 @@ gzip
usbutils usbutils
binutils binutils
hunspell hunspell
caffeine-ng
hunspellDicts.en_US hunspellDicts.en_US
git git
transmission transmission
@ -350,6 +351,7 @@ python
Here are some dev tools that I often have on a few devices. Here are some dev tools that I often have on a few devices.
#+NAME: dev-tools #+NAME: dev-tools
#+begin_src nix #+begin_src nix
direnv
android-tools android-tools
nix-index nix-index
meson meson
@ -703,7 +705,13 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
# NVIDIA # NVIDIA
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware = { hardware = {
opengl.enable = true; opengl = {
enable = true;
extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
};
nvidia.modesetting.enable = true; nvidia.modesetting.enable = true;
}; };
@ -765,7 +773,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
<<general-packages>> <<general-packages>>
blender blender
neofetch neofetch
ethminer # ethminer
lutris lutris
protonup protonup
# Dev tools # Dev tools
@ -777,7 +785,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
(import (builtins.fetchTarball { (import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "07nj3ab2jbcmr66krxy6wli23srw0vgx1jhjg2b89amzllnzbi93"; sha256 = "1v1n30a2ai5mnlkrkwv4mfczd3601sqxxlawadxariblfvg7qz4j";
})) }))
<<overlays>> <<overlays>>

View file

@ -6,8 +6,12 @@ num=$(dbus-send --print-reply --dest=org.kde.KWin \
/Scripting org.kde.kwin.Scripting.loadScript \ /Scripting org.kde.kwin.Scripting.loadScript \
string:"$script" | awk 'END {print $2}' ) string:"$script" | awk 'END {print $2}' )
dbus-send --print-reply --dest=org.kde.KWin /$num \ echo $num
org.kde.kwin.Script.run
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? # I'm not sure if some delay is in order here to let your script complete?
sleep 1 sleep 1
dbus-send --print-reply --dest=org.kde.KWin /$num \ dbus-send --print-reply --dest=org.kde.KWin /$num \

View file

@ -49,7 +49,13 @@
# NVIDIA # NVIDIA
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware = { hardware = {
opengl.enable = true; opengl = {
enable = true;
extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
};
nvidia.modesetting.enable = true; nvidia.modesetting.enable = true;
}; };
@ -100,6 +106,7 @@
VISUAL = "emacsclient -c -a"; VISUAL = "emacsclient -c -a";
# Fixing Qt apps in other environments # 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_XCB_GL_INTEGRATION = "xcb_egl";
# QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms";
}; };
@ -160,6 +167,7 @@
usbutils usbutils
binutils binutils
hunspell hunspell
caffeine-ng
hunspellDicts.en_US hunspellDicts.en_US
git git
transmission transmission
@ -258,10 +266,11 @@
# hyprland # hyprland
blender blender
neofetch neofetch
ethminer # ethminer
lutris lutris
protonup protonup
# Dev tools # Dev tools
direnv
android-tools android-tools
nix-index nix-index
meson meson
@ -296,7 +305,7 @@
(import (builtins.fetchTarball { (import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "07nj3ab2jbcmr66krxy6wli23srw0vgx1jhjg2b89amzllnzbi93"; sha256 = "1v1n30a2ai5mnlkrkwv4mfczd3601sqxxlawadxariblfvg7qz4j";
})) }))
(self: super: (self: super:

View file

@ -127,6 +127,7 @@
VISUAL = "emacsclient -c -a"; VISUAL = "emacsclient -c -a";
# Fixing Qt apps in other environments # 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_XCB_GL_INTEGRATION = "xcb_egl";
# QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms";
}; };
@ -174,6 +175,7 @@
usbutils usbutils
binutils binutils
hunspell hunspell
caffeine-ng
hunspellDicts.en_US hunspellDicts.en_US
git git
transmission transmission
@ -279,6 +281,7 @@
fet-sh fet-sh
macchina macchina
# Dev tools # Dev tools
direnv
android-tools android-tools
nix-index nix-index
meson meson

View file

@ -417,7 +417,7 @@
myip = "curl icanhazip.com"; myip = "curl icanhazip.com";
}; };
initExtra = '' initExtra = ''
pfetch macchina
''; '';
}; };