From 8b1a4a265d7aff750d04fbbad5de7cde7dbbfb61 Mon Sep 17 00:00:00 2001
From: iiogama <iiogama@0x212.org>
Date: Sat, 2 Mar 2024 16:57:38 -0800
Subject: [PATCH] [nb] Commit

---
 README.md                         |  4 ++++
 cores/base/default.nix            |  2 --
 cores/cli/default.nix             | 12 ++++++++++++
 cores/gui/default.nix             |  1 +
 hosts/buckwheat/configuration.nix | 10 +++-------
 hosts/fireweed/configuration.nix  | 11 +++++------
 modules/home-manager/river.nix    |  6 +++---
 modules/nixos/misc/default.nix    |  5 +++++
 8 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 1f9742d..4a2fabb 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,10 @@ sudo nixos-rebuild switch --flake ".#<hostname>"
 sudo nixos-rebuild switch --flake ".#<hostname>" --update-input nixpkgs --commit-lock-file
 ```
 
+## How to install with single command
+```
+nix-shell -p git --command "nix run https://git.sdf.org/iiogama/confix --extra-experimental-features nix-command --extra-experimental-features flakes --flake .#fireweed"
+
 ## How to install new system with flake
 
 ### Method 1
diff --git a/cores/base/default.nix b/cores/base/default.nix
index 8148e16..11ed667 100644
--- a/cores/base/default.nix
+++ b/cores/base/default.nix
@@ -30,9 +30,7 @@
       strace
     ];
     systemPackages = with pkgs; [
-      bottom
       curl
-      eva
       ranger
       wget
     ];
diff --git a/cores/cli/default.nix b/cores/cli/default.nix
index 649ddea..d89d34e 100644
--- a/cores/cli/default.nix
+++ b/cores/cli/default.nix
@@ -7,8 +7,18 @@
   environment = {
     localBinInPath = true;
     variables = {
+      LIBSEAT_BACKEND = "logind";
+      SYSTEMD_PAGER = "";
+    };
+    sessionVariables = rec {
+      INPUTRC = "$XDG_CONFIG_HOME/inputrc";
       # Environmental variable needed for mosh connections
       LC_CTYPE = "${user.locale}";
+      XDG_BIN_HOME = "$HOME/.local/bin";
+      XDG_CACHE_HOME = "$HOME/.cache";
+      XDG_CONFIG_HOME = "$HOME/.config";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_STATE_HOME = "$HOME/.local/state";
     };
   };
   services = {
@@ -30,7 +40,9 @@
   };
   users.users.${user.name}.packages = with pkgs; [
     bashmount
+    bottom
     cifs-utils
+    eva
     exiftool
     gpg-tui
     killall
diff --git a/cores/gui/default.nix b/cores/gui/default.nix
index d561994..2312be5 100644
--- a/cores/gui/default.nix
+++ b/cores/gui/default.nix
@@ -120,5 +120,6 @@
   };
   users.users.${user.name}.packages = with pkgs; [
     glib
+    xdg-desktop-portal-wlr
   ];
 }
diff --git a/hosts/buckwheat/configuration.nix b/hosts/buckwheat/configuration.nix
index 8199d2e..aea219d 100644
--- a/hosts/buckwheat/configuration.nix
+++ b/hosts/buckwheat/configuration.nix
@@ -21,7 +21,8 @@ in
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet -c river";
+          #command = "${pkgs.greetd.tuigreet}/bin/tuigreet -c river";
+          command = "${pkgs.greetd.greetd}/bin/agreety --cmd river";
         };
       };
     };
@@ -66,13 +67,8 @@ in
       nushell
       python311Packages.eyeD3
       tagutil
-      greetd.tuigreet
+      #greetd.tuigreet
     ];
   };
-  environment.sessionVariables = {
-    SYSTEMD_PAGER = "";
-    INPUTRC = "$XDG_CONFIG_HOME/inputrc";
-    LIBSEAT_BACKEND = "logind";
-  };
   system.stateVersion = "23.11";
 }
diff --git a/hosts/fireweed/configuration.nix b/hosts/fireweed/configuration.nix
index bb70563..6e5b356 100644
--- a/hosts/fireweed/configuration.nix
+++ b/hosts/fireweed/configuration.nix
@@ -33,17 +33,16 @@ in
       allowedUDPPorts = [];
     };
   };
-  users.users.${user.name} = {
-  };
   services = {
-    mullvad-vpn = {
-      enable = true;
-      package = pkgs.mullvad-vpn;
-    };
     cage = {
       enable = true;
       program = "${pkgs.foot}/bin/foot";
       user = "${user.name}";
     };
+    mullvad-vpn = {
+      enable = true;
+      package = pkgs.mullvad-vpn;
+    };
   };
+  system.stateVersion = "24.05";
 }
diff --git a/modules/home-manager/river.nix b/modules/home-manager/river.nix
index c99cba7..07b6917 100644
--- a/modules/home-manager/river.nix
+++ b/modules/home-manager/river.nix
@@ -57,9 +57,6 @@
       };
       map = {
         command = {
-          "None+Shift Comma" = "spawn 'playerctl previous'";
-          "None Space" = "spawn 'playerctl play-pause'";
-          "None+Shift Period" = "spawn 'playerctl next'";
           "None 1" = "spawn 'mullvad-browser'";
           "None 2" = "spawn 'librewolf'";
           "None 3" = "spawn 'libreoffice'";
@@ -68,6 +65,9 @@
           "None 6" = "spawn 'signal-desktop'";
           "None 9" = "spawn 'steam'";
           "None Z" = "spawn 'riverctl toggle-fullscreen; riverctl enter-mode normal'";
+          "None+Shift Comma" = "spawn 'playerctl previous; riverctl enter-mode normal'";
+          "None Space" = "spawn 'playerctl play-pause; riverctl enter-mode normal'";
+          "None+Shift Period" = "spawn 'playerctl next; riverctl enter-mode normal'";
           "None Escape" = "enter-mode normal";
         };
         locked = {
diff --git a/modules/nixos/misc/default.nix b/modules/nixos/misc/default.nix
index 9f972bb..9de30da 100644
--- a/modules/nixos/misc/default.nix
+++ b/modules/nixos/misc/default.nix
@@ -1,6 +1,11 @@
 # Misc Tools
 { config, lib, pkgs, user, ... }:
 {
+  programs.nix-ld = {
+    enable = true;
+    libraries = with pkgs; [
+    ];
+  };
   users.users.${user.name}.packages = with pkgs; [
     dua
     dstat