[nb] Commit

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

cores/base/default.nix

@@ -30,9 +30,7 @@
       strace
     ];
     systemPackages = with pkgs; [
-      bottom
       curl
-      eva
       ranger
       wget
     ];

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

cores/gui/default.nix

@@ -120,5 +120,6 @@
   };
   users.users.${user.name}.packages = with pkgs; [
     glib
+    xdg-desktop-portal-wlr
   ];
 }

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";
 }

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";
 }

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 = {

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