chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Chris Cochrun 2022-06-23 12:19:09 -05:00
parent d0ef589a39 8fd6824934
commit a7476a1222
5 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
README.org
View file

@ -326,7 +326,7 @@ powertop
quickemu quickemu
OVMFFull OVMFFull
element-desktop-wayland element-desktop-wayland
# rustdesk scrcpy
# hyprland # hyprland
#+end_src #+end_src
@ -353,6 +353,8 @@ qt5.qtx11extras
libsForQt5.kirigami2 libsForQt5.kirigami2
libsForQt5.ki18n libsForQt5.ki18n
libsForQt5.kcoreaddons libsForQt5.kcoreaddons
plasma5Packages.kirigami2
sqlite
fennel fennel
#+end_src #+end_src
@ -655,14 +657,18 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
<<experimental-features>> <<experimental-features>>
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.kernelPackages = pkgs.linuxPackages_zen; boot = {
boot.loader.systemd-boot.enable = true; kernelPackages = pkgs.linuxPackages_zen;
boot.loader.efi.canTouchEfiVariables = true; kernelParams = [ "mem_sleep_default=deep" ];
initrd.kernelModules = [ "amdgpu" ];
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
};
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
boot.kernelParams = [ "mem_sleep_default=deep" ];
networking.hostName = "kaladin"; # Define your hostname. networking.hostName = "kaladin"; # Define your hostname.
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # 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.enp0s31f6.useDHCP = true;
networking.interfaces.wlp7s0.useDHCP = true; networking.interfaces.wlp7s0.useDHCP = true;
<<podman>>
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";

5
bpytop/btop.conf
View file

@ -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. #* 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" #* 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. #* Show mem box below net box instead of above.
mem_below_net = False 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. #* If swap memory should be shown in memory box.
show_swap = True show_swap = True

3
bpytop/btop.log Normal file
View 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!

20
system/kaladin/configuration.nix
View file

@ -11,14 +11,18 @@
}; };
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.kernelPackages = pkgs.linuxPackages_zen; boot = {
boot.loader.systemd-boot.enable = true; kernelPackages = pkgs.linuxPackages_zen;
boot.loader.efi.canTouchEfiVariables = true; kernelParams = [ "mem_sleep_default=deep" ];
initrd.kernelModules = [ "amdgpu" ];
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
};
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
boot.kernelParams = [ "mem_sleep_default=deep" ];
networking.hostName = "kaladin"; # Define your hostname. networking.hostName = "kaladin"; # Define your hostname.
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -33,6 +37,8 @@
networking.interfaces.enp0s31f6.useDHCP = true; networking.interfaces.enp0s31f6.useDHCP = true;
networking.interfaces.wlp7s0.useDHCP = true; networking.interfaces.wlp7s0.useDHCP = true;
virtualisation.podman.enable = true;
virtualisation.docker.enable = true;
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@ -231,7 +237,7 @@
quickemu quickemu
OVMFFull OVMFFull
element-desktop-wayland element-desktop-wayland
# rustdesk scrcpy
# hyprland # hyprland
blender blender
neofetch neofetch
@ -259,6 +265,8 @@
libsForQt5.kirigami2 libsForQt5.kirigami2
libsForQt5.ki18n libsForQt5.ki18n
libsForQt5.kcoreaddons libsForQt5.kcoreaddons
plasma5Packages.kirigami2
sqlite
fennel fennel
(libsForQt5.callPackage ../../LightlyShaders {}) (libsForQt5.callPackage ../../LightlyShaders {})
]; ];

4
system/syl/configuration.nix
View file

@ -254,7 +254,7 @@
quickemu quickemu
OVMFFull OVMFFull
element-desktop-wayland element-desktop-wayland
# rustdesk scrcpy
# hyprland # hyprland
neofetch neofetch
afetch afetch
@ -285,6 +285,8 @@
libsForQt5.kirigami2 libsForQt5.kirigami2
libsForQt5.ki18n libsForQt5.ki18n
libsForQt5.kcoreaddons libsForQt5.kcoreaddons
plasma5Packages.kirigami2
sqlite
fennel fennel
# (libsForQt5.callPackage ../../LightlyShaders {}) # (libsForQt5.callPackage ../../LightlyShaders {})
]; ];