From d1bbf5c3c394b6859a0398c337af54674a0beda7 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@tfcconneciton.org>
Date: Fri, 17 Jun 2022 09:47:01 -0500
Subject: [PATCH 1/2] stupid?
---
README.org | 15 ++++++++++-----
system/kaladin/configuration.nix | 15 ++++++++++-----
system/syl/configuration.nix | 1 +
3 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/README.org b/README.org
index cab6398..8cb3ac1 100644
--- a/README.org
+++ b/README.org
@@ -350,6 +350,7 @@ qt5.qtx11extras
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
+sqlite
fennel
#+end_src
@@ -652,14 +653,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.
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index bc4f784..a0f9347 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -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.
@@ -256,6 +260,7 @@
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
+ sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
];
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index 522a3fd..dc7ad15 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -282,6 +282,7 @@
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
+ sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
];
From 8fd6824934202636a02c1ebf97216250371cce62 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Thu, 23 Jun 2022 12:16:05 -0500
Subject: [PATCH 2/2] updating some things I guess
---
README.org | 5 ++++-
awesome/init.fnl | 4 ++--
awesome/keybindings.fnl | 2 +-
bpytop/btop.conf | 5 ++++-
bpytop/btop.log | 3 +++
fish/config.fish | 2 +-
flake.lock | 18 +++++++++---------
system/kaladin/configuration.nix | 6 +++++-
system/syl/configuration.nix | 4 +++-
9 files changed, 32 insertions(+), 17 deletions(-)
create mode 100644 bpytop/btop.log
diff --git a/README.org b/README.org
index 8cb3ac1..102c2a8 100644
--- a/README.org
+++ b/README.org
@@ -233,7 +233,7 @@ wget
killall
tmux
discover
-kde-rounded-corners
+# kde-rounded-corners
lightly-qt
pinentry
pinentry-qt
@@ -324,6 +324,7 @@ powertop
quickemu
OVMFFull
element-desktop-wayland
+scrcpy
# hyprland
#+end_src
@@ -350,6 +351,7 @@ qt5.qtx11extras
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
+plasma5Packages.kirigami2
sqlite
fennel
#+end_src
@@ -679,6 +681,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";
diff --git a/awesome/init.fnl b/awesome/init.fnl
index e15621e..6dfabd6 100644
--- a/awesome/init.fnl
+++ b/awesome/init.fnl
@@ -766,8 +766,8 @@
(awful.spawn.once "killall jellyfin-mpv-shim && jellyfin-mpv-shim")
(awful.spawn.once "xset r rate 220 90")
(awful.spawn.once "/usr/lib/kdeconnectd")
-;; (awful.spawn.once "emacs --daemon")
-;; (if laptop (awful.spawn.once "nm-applet"))
+(awful.spawn.once "emacs --daemon")
+(if laptop (awful.spawn.once "nm-applet"))
(awful.spawn.once "xcape -e 'Super_L=Super_L|Control_L|Escape'")
(awful.spawn.once "xcape -e 'Alt_L=Super_L|W'")
(awful.spawn.once "unclutter")
diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl
index 583c7e6..b92bb98 100644
--- a/awesome/keybindings.fnl
+++ b/awesome/keybindings.fnl
@@ -183,7 +183,7 @@
(awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer"))
{:description "Open Writer" :group "apps" })
;;ff
- (awful.key [modkey] "b" (fn [] (awful.spawn "fflof"))
+ (awful.key [modkey] "b" (fn [] (awful.spawn "qblof"))
{:description "launch browser" :group "apps"})
;; rofi
(awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh"))
diff --git a/bpytop/btop.conf b/bpytop/btop.conf
index 261e84a..924c63d 100644
--- a/bpytop/btop.conf
+++ b/bpytop/btop.conf
@@ -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
diff --git a/bpytop/btop.log b/bpytop/btop.log
new file mode 100644
index 0000000..c977ce2
--- /dev/null
+++ b/bpytop/btop.log
@@ -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!
diff --git a/fish/config.fish b/fish/config.fish
index e83338a..11fa7b0 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -236,4 +236,4 @@ end
# end
# fm6000 -r -c blue
-any-nix-shell fish --info-right | source
+# any-nix-shell fish --info-right | source
diff --git a/flake.lock b/flake.lock
index 141dfd3..3523c9b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1655199284,
- "narHash": "sha256-R/g2ZWplGWVOfm2TyB4kR+YcOE/uWkgjkYrl/RYgJ/U=",
+ "lastModified": 1655381586,
+ "narHash": "sha256-2IrSYYjxoT+iOihSiH0Elo9wzjbHjDSH+qPvI5BklCs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "87d30c164849a7471d99749aa4d2d28b81564f69",
+ "rev": "1de492f6f8e9937c822333739c5d5b20d93bf49f",
"type": "github"
},
"original": {
@@ -49,11 +49,11 @@
"wlroots": "wlroots"
},
"locked": {
- "lastModified": 1655154988,
- "narHash": "sha256-yjVNcLIqUkyhHbOS9lSWFurQx/qKD9YMPpQJpX5nqq4=",
+ "lastModified": 1655497428,
+ "narHash": "sha256-B1P/EDJvho3lBxqtGAXKBlPDXlF/7bLHeC+h2aTPkWc=",
"owner": "vaxerski",
"repo": "Hyprland",
- "rev": "fa6530c7e8f5f79041a28456ca91d4641c7ad354",
+ "rev": "f7bdc2e87020ea7308035bceaa2ab659af91d2de",
"type": "github"
},
"original": {
@@ -64,11 +64,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1655130522,
- "narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=",
+ "lastModified": 1655400192,
+ "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "13f08d71ceff5101321e0291854495a1ec153a5e",
+ "rev": "3d7435c638baffaa826b85459df0fff47f12317d",
"type": "github"
},
"original": {
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index a0f9347..08e7125 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -37,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";
@@ -142,7 +144,7 @@
killall
tmux
discover
- kde-rounded-corners
+ # kde-rounded-corners
lightly-qt
pinentry
pinentry-qt
@@ -233,6 +235,7 @@
quickemu
OVMFFull
element-desktop-wayland
+ scrcpy
# hyprland
blender
neofetch
@@ -260,6 +263,7 @@
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
+ plasma5Packages.kirigami2
sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index dc7ad15..8cc9e39 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -161,7 +161,7 @@
killall
tmux
discover
- kde-rounded-corners
+ # kde-rounded-corners
lightly-qt
pinentry
pinentry-qt
@@ -252,6 +252,7 @@
quickemu
OVMFFull
element-desktop-wayland
+ scrcpy
# hyprland
neofetch
afetch
@@ -282,6 +283,7 @@
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
+ plasma5Packages.kirigami2
sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})