Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
						commit
						57ec05b532
					
				
					 5 changed files with 33 additions and 9 deletions
				
			
		
							
								
								
									
										14
									
								
								README.org
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								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
 | 
			
		||||
| 
						 | 
				
			
			@ -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
 | 
			
		|||
    <<general-packages>>
 | 
			
		||||
    blender
 | 
			
		||||
    neofetch
 | 
			
		||||
    ethminer
 | 
			
		||||
    # ethminer
 | 
			
		||||
    lutris
 | 
			
		||||
    protonup
 | 
			
		||||
    # 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 {
 | 
			
		||||
      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
 | 
			
		||||
      sha256 = "07nj3ab2jbcmr66krxy6wli23srw0vgx1jhjg2b89amzllnzbi93";
 | 
			
		||||
      sha256 = "1v1n30a2ai5mnlkrkwv4mfczd3601sqxxlawadxariblfvg7qz4j";
 | 
			
		||||
    }))
 | 
			
		||||
 | 
			
		||||
    <<overlays>>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -100,6 +106,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";
 | 
			
		||||
  };
 | 
			
		||||
| 
						 | 
				
			
			@ -160,6 +167,7 @@
 | 
			
		|||
    usbutils
 | 
			
		||||
    binutils
 | 
			
		||||
    hunspell
 | 
			
		||||
    caffeine-ng
 | 
			
		||||
    hunspellDicts.en_US
 | 
			
		||||
    git
 | 
			
		||||
    transmission
 | 
			
		||||
| 
						 | 
				
			
			@ -258,10 +266,11 @@
 | 
			
		|||
    # hyprland
 | 
			
		||||
    blender
 | 
			
		||||
    neofetch
 | 
			
		||||
    ethminer
 | 
			
		||||
    # ethminer
 | 
			
		||||
    lutris
 | 
			
		||||
    protonup
 | 
			
		||||
    # Dev tools
 | 
			
		||||
    direnv
 | 
			
		||||
    android-tools
 | 
			
		||||
    nix-index
 | 
			
		||||
    meson
 | 
			
		||||
| 
						 | 
				
			
			@ -296,7 +305,7 @@
 | 
			
		|||
 | 
			
		||||
    (import (builtins.fetchTarball {
 | 
			
		||||
      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
 | 
			
		||||
      sha256 = "07nj3ab2jbcmr66krxy6wli23srw0vgx1jhjg2b89amzllnzbi93";
 | 
			
		||||
      sha256 = "1v1n30a2ai5mnlkrkwv4mfczd3601sqxxlawadxariblfvg7qz4j";
 | 
			
		||||
    }))
 | 
			
		||||
 | 
			
		||||
    (self: super:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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";
 | 
			
		||||
  };
 | 
			
		||||
| 
						 | 
				
			
			@ -174,6 +175,7 @@
 | 
			
		|||
    usbutils
 | 
			
		||||
    binutils
 | 
			
		||||
    hunspell
 | 
			
		||||
    caffeine-ng
 | 
			
		||||
    hunspellDicts.en_US
 | 
			
		||||
    git
 | 
			
		||||
    transmission
 | 
			
		||||
| 
						 | 
				
			
			@ -279,6 +281,7 @@
 | 
			
		|||
    fet-sh
 | 
			
		||||
    macchina
 | 
			
		||||
    # Dev tools
 | 
			
		||||
    direnv
 | 
			
		||||
    android-tools
 | 
			
		||||
    nix-index
 | 
			
		||||
    meson
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -417,7 +417,7 @@
 | 
			
		|||
      myip = "curl icanhazip.com";
 | 
			
		||||
    };
 | 
			
		||||
    initExtra = ''
 | 
			
		||||
      pfetch
 | 
			
		||||
      macchina
 | 
			
		||||
    '';
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue