merge
This commit is contained in:
		
							parent
							
								
									bc2a197e4e
								
							
						
					
					
						commit
						0372972bd0
					
				@ -1,8 +1,6 @@
 | 
				
			|||||||
let unstable = import <nixos-unstable> { }; in
 | 
					let unstable = import <nixos-unstable> { }; in
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  allowUnfree = true;
 | 
					  allowUnfree = true;
 | 
				
			||||||
  oraclejdk.accept_license = true;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
  packageOverrides = pkgs: {
 | 
					  packageOverrides = pkgs: {
 | 
				
			||||||
    unstable = unstable;
 | 
					    unstable = unstable;
 | 
				
			||||||
 | 
				
			|||||||
@ -44,8 +44,7 @@ export QT_STYLE_OVERRIDE="breeze"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
          "Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
 | 
					          "Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
 | 
				
			||||||
          "${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
 | 
					          "${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
 | 
				
			||||||
          "${modifier}+Shift+U" = "exec /home/dan/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
 | 
					          "${modifier}+Shift+U" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
          "${modifier}+n" = "exec dolphin";
 | 
					          "${modifier}+n" = "exec dolphin";
 | 
				
			||||||
          "${modifier}+b" = "exec firefox";
 | 
					          "${modifier}+b" = "exec firefox";
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								home.nix
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								home.nix
									
									
									
									
									
								
							@ -88,8 +88,6 @@
 | 
				
			|||||||
    enable = true;
 | 
					    enable = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; };    
 | 
					    package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; };    
 | 
				
			||||||
 | 
					 | 
				
			||||||
    enableAdobeFlash = false;
 | 
					 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  programs.obs-studio = {
 | 
					  programs.obs-studio = {
 | 
				
			||||||
@ -120,6 +118,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  programs.home-manager = {
 | 
					  programs.home-manager = {
 | 
				
			||||||
    enable = true;
 | 
					    enable = true;
 | 
				
			||||||
    path = "https://github.com/rycee/home-manager/archive/release-19.03.tar.gz";
 | 
					    path = "https://github.com/rycee/home-manager/archive/release-19.09.tar.gz";
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@
 | 
				
			|||||||
# Must have xclip installed to even show menu.
 | 
					# Must have xclip installed to even show menu.
 | 
				
			||||||
xclip -h >/dev/null || exit
 | 
					xclip -h >/dev/null || exit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
chosen=$(grep -v "#" /home/dan/.config/nixpkgs/nix-dotfiles/scripts/emojis.txt | dmenu -i -l 20 -fn Monospace-14)
 | 
					chosen=$(grep -v "#" $HOME/.config/nixpkgs/nix-dotfiles/scripts/emojis.txt | dmenu -i -l 20 -fn Monospace-14)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[ "$chosen" != "" ] || exit
 | 
					[ "$chosen" != "" ] || exit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user