Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
						commit
						a7476a1222
					
				
					 5 changed files with 37 additions and 14 deletions
				
			
		
							
								
								
									
										19
									
								
								README.org
									
										
									
									
									
								
							
							
						
						
									
										19
									
								
								README.org
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -326,7 +326,7 @@ powertop
 | 
			
		|||
quickemu
 | 
			
		||||
OVMFFull
 | 
			
		||||
element-desktop-wayland
 | 
			
		||||
# rustdesk
 | 
			
		||||
scrcpy
 | 
			
		||||
# hyprland
 | 
			
		||||
#+end_src
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -353,6 +353,8 @@ qt5.qtx11extras
 | 
			
		|||
libsForQt5.kirigami2
 | 
			
		||||
libsForQt5.ki18n
 | 
			
		||||
libsForQt5.kcoreaddons
 | 
			
		||||
plasma5Packages.kirigami2
 | 
			
		||||
sqlite
 | 
			
		||||
fennel
 | 
			
		||||
#+end_src
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -655,14 +657,18 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
 | 
			
		|||
  <<experimental-features>>
 | 
			
		||||
 | 
			
		||||
  # Use the systemd-boot EFI boot loader.
 | 
			
		||||
  boot.kernelPackages = pkgs.linuxPackages_zen;
 | 
			
		||||
  boot.loader.systemd-boot.enable = true;
 | 
			
		||||
  boot.loader.efi.canTouchEfiVariables = true;
 | 
			
		||||
  boot = {
 | 
			
		||||
    kernelPackages = pkgs.linuxPackages_zen;
 | 
			
		||||
    kernelParams = [ "mem_sleep_default=deep" ];
 | 
			
		||||
    initrd.kernelModules = [ "amdgpu" ];
 | 
			
		||||
    loader = {
 | 
			
		||||
      systemd-boot.enable = true;
 | 
			
		||||
      efi.canTouchEfiVariables = true;
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  nixpkgs.config.allowUnfree = true;
 | 
			
		||||
 | 
			
		||||
  boot.kernelParams = [ "mem_sleep_default=deep" ];
 | 
			
		||||
 | 
			
		||||
  networking.hostName = "kaladin"; # Define your hostname.
 | 
			
		||||
  networking.networkmanager.enable = true;
 | 
			
		||||
  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 | 
			
		||||
| 
						 | 
				
			
			@ -677,6 +683,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
 | 
			
		|||
  networking.interfaces.enp0s31f6.useDHCP = true;
 | 
			
		||||
  networking.interfaces.wlp7s0.useDHCP = true;
 | 
			
		||||
 | 
			
		||||
  <<podman>>
 | 
			
		||||
 | 
			
		||||
  # Select internationalisation properties.
 | 
			
		||||
  i18n.defaultLocale = "en_US.UTF-8";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
#? Config file for btop v. 1.2.6
 | 
			
		||||
#? Config file for btop v. 1.2.7
 | 
			
		||||
 | 
			
		||||
#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 | 
			
		||||
#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
 | 
			
		||||
| 
						 | 
				
			
			@ -144,6 +144,9 @@ mem_graphs = True
 | 
			
		|||
#* Show mem box below net box instead of above.
 | 
			
		||||
mem_below_net = False
 | 
			
		||||
 | 
			
		||||
#* Count ZFS ARC in cached and available memory.
 | 
			
		||||
zfs_arc_cached = True
 | 
			
		||||
 | 
			
		||||
#* If swap memory should be shown in memory box.
 | 
			
		||||
show_swap = True
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								bpytop/btop.log
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								bpytop/btop.log
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
 | 
			
		||||
2022/06/21 (16:49:09) | ===> btop++ v.1.2.7
 | 
			
		||||
2022/06/21 (16:49:09) | ERROR: Stall in Runner thread, restarting!
 | 
			
		||||
| 
						 | 
				
			
			@ -11,14 +11,18 @@
 | 
			
		|||
  };
 | 
			
		||||
 | 
			
		||||
  # Use the systemd-boot EFI boot loader.
 | 
			
		||||
  boot.kernelPackages = pkgs.linuxPackages_zen;
 | 
			
		||||
  boot.loader.systemd-boot.enable = true;
 | 
			
		||||
  boot.loader.efi.canTouchEfiVariables = true;
 | 
			
		||||
  boot = {
 | 
			
		||||
    kernelPackages = pkgs.linuxPackages_zen;
 | 
			
		||||
    kernelParams = [ "mem_sleep_default=deep" ];
 | 
			
		||||
    initrd.kernelModules = [ "amdgpu" ];
 | 
			
		||||
    loader = {
 | 
			
		||||
      systemd-boot.enable = true;
 | 
			
		||||
      efi.canTouchEfiVariables = true;
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  nixpkgs.config.allowUnfree = true;
 | 
			
		||||
 | 
			
		||||
  boot.kernelParams = [ "mem_sleep_default=deep" ];
 | 
			
		||||
 | 
			
		||||
  networking.hostName = "kaladin"; # Define your hostname.
 | 
			
		||||
  networking.networkmanager.enable = true;
 | 
			
		||||
  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 | 
			
		||||
| 
						 | 
				
			
			@ -33,6 +37,8 @@
 | 
			
		|||
  networking.interfaces.enp0s31f6.useDHCP = true;
 | 
			
		||||
  networking.interfaces.wlp7s0.useDHCP = true;
 | 
			
		||||
 | 
			
		||||
  virtualisation.podman.enable = true;
 | 
			
		||||
  virtualisation.docker.enable = true;
 | 
			
		||||
 | 
			
		||||
  # Select internationalisation properties.
 | 
			
		||||
  i18n.defaultLocale = "en_US.UTF-8";
 | 
			
		||||
| 
						 | 
				
			
			@ -231,7 +237,7 @@
 | 
			
		|||
    quickemu
 | 
			
		||||
    OVMFFull
 | 
			
		||||
    element-desktop-wayland
 | 
			
		||||
    # rustdesk
 | 
			
		||||
    scrcpy
 | 
			
		||||
    # hyprland
 | 
			
		||||
    blender
 | 
			
		||||
    neofetch
 | 
			
		||||
| 
						 | 
				
			
			@ -259,6 +265,8 @@
 | 
			
		|||
    libsForQt5.kirigami2
 | 
			
		||||
    libsForQt5.ki18n
 | 
			
		||||
    libsForQt5.kcoreaddons
 | 
			
		||||
    plasma5Packages.kirigami2
 | 
			
		||||
    sqlite
 | 
			
		||||
    fennel
 | 
			
		||||
    (libsForQt5.callPackage ../../LightlyShaders {})
 | 
			
		||||
  ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -254,7 +254,7 @@
 | 
			
		|||
    quickemu
 | 
			
		||||
    OVMFFull
 | 
			
		||||
    element-desktop-wayland
 | 
			
		||||
    # rustdesk
 | 
			
		||||
    scrcpy
 | 
			
		||||
    # hyprland
 | 
			
		||||
    neofetch
 | 
			
		||||
    afetch
 | 
			
		||||
| 
						 | 
				
			
			@ -285,6 +285,8 @@
 | 
			
		|||
    libsForQt5.kirigami2
 | 
			
		||||
    libsForQt5.ki18n
 | 
			
		||||
    libsForQt5.kcoreaddons
 | 
			
		||||
    plasma5Packages.kirigami2
 | 
			
		||||
    sqlite
 | 
			
		||||
    fennel
 | 
			
		||||
    # (libsForQt5.callPackage ../../LightlyShaders {})
 | 
			
		||||
  ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue