From c727bdb8ff3af89211e34203711e41fcacdaeb30 Mon Sep 17 00:00:00 2001
From: coast <coasteen@proton.me>
Date: Fri, 31 Oct 2025 22:12:27 +0330
Subject: [PATCH] big nix changes

---
 config/waybar/config.jsonc                    |  7 +--
 etc/nixos/README                              |  1 +
 .../{ => configuration}/configuration.nix     |  7 ++-
 .../sys/coreutils-configuration.nix           | 48 +++++++++++++++++++
 etc/nixos/flake.nix                           |  5 +-
 etc/nixos/home-configuration/apps/sway.nix    |  1 +
 .../{home.nix => configuration.nix}           |  0
 7 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 etc/nixos/README
 rename etc/nixos/{ => configuration}/configuration.nix (94%)
 create mode 100644 etc/nixos/configuration/sys/coreutils-configuration.nix
 rename etc/nixos/home-configuration/{home.nix => configuration.nix} (100%)

diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index 85915af..8bb52c8 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -97,7 +97,8 @@
     "modules-right": [
        "pulseaudio",
        "clock",
-       "bluetooth"
+       "network",
+       "bluetooth",
     ],
     "pulseaudio": {
         "tooltip": false,
@@ -159,8 +160,8 @@
     },
     "network": {
         "interface": "wlo1",
-        "format-wifi": "+ {essid}",
-        "format-ethernet": "  {ipaddr}/{cidr}",
+        "format-wifi": "NET {ipaddr}",
+        "format-ethernet": "NET {ipaddr}/{cidr}",
         "format-disconnected": "disconnected",
         "tooltip": false,
         "max-length": 50
diff --git a/etc/nixos/README b/etc/nixos/README
new file mode 100644
index 0000000..d2fbb10
--- /dev/null
+++ b/etc/nixos/README
@@ -0,0 +1 @@
+My new NixOS configuration. Still working on it.
diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration/configuration.nix
similarity index 94%
rename from etc/nixos/configuration.nix
rename to etc/nixos/configuration/configuration.nix
index 68f0fb6..c2c1f1a 100644
--- a/etc/nixos/configuration.nix
+++ b/etc/nixos/configuration/configuration.nix
@@ -6,7 +6,6 @@
   unstable = pkgsUnstable;
 in
 {
-
   services = {
     xserver = {
       enable = true;
@@ -76,9 +75,9 @@ in
   virtualisation.waydroid.enable = true;
 
   environment.systemPackages = with pkgs; [
-    (lib.hiPrio unstable.uutils-coreutils-noprefix)
-    (lib.hiPrio unstable.uutils-findutils)
-    (lib.hiPrio unstable.uutils-diffutils)
+#    (lib.hiPrio unstable.uutils-coreutils-noprefix)
+#    (lib.hiPrio unstable.uutils-findutils)
+#    (lib.hiPrio unstable.uutils-diffutils)
     (pkgs.runCommand "vim-wrapper" { } ''
       mkdir -p $out/bin
       ln -s ${pkgs.neovim}/bin/nvim $out/bin/vim
diff --git a/etc/nixos/configuration/sys/coreutils-configuration.nix b/etc/nixos/configuration/sys/coreutils-configuration.nix
new file mode 100644
index 0000000..9532a3e
--- /dev/null
+++ b/etc/nixos/configuration/sys/coreutils-configuration.nix
@@ -0,0 +1,48 @@
+{
+  pkgs,
+  ...
+}: let
+  coreutils-full-name = "coreuutils-full" + builtins.concatStringsSep ""
+    (builtins.genList (_: "_") (builtins.stringLength pkgs.coreutils-full.version));
+
+  coreutils-name = "coreuutils" + builtins.concatStringsSep ""
+    (builtins.genList (_: "_") (builtins.stringLength pkgs.coreutils.version));
+
+  findutils-name = "finduutils" + builtins.concatStringsSep ""
+    (builtins.genList (_: "_") (builtins.stringLength pkgs.findutils.version));
+
+  diffutils-name = "diffuutils" + builtins.concatStringsSep ""
+    (builtins.genList (_: "_") (builtins.stringLength pkgs.diffutils.version));
+in
+{
+  system.replaceDependencies.replacements = [
+    {
+      oldDependency = pkgs.coreutils-full;
+      newDependency = pkgs.symlinkJoin {
+        name = coreutils-full-name;
+        paths = [pkgs.uutils-coreutils-noprefix];
+      };
+    }
+    {
+      oldDependency = pkgs.coreutils;
+      newDependency = pkgs.symlinkJoin {
+        name = coreutils-name;
+        paths = [pkgs.uutils-coreutils-noprefix];
+      };
+    }
+    {
+      oldDependency = pkgs.findutils;
+      newDependency = pkgs.symlinkJoin {
+        name = findutils-name;
+        paths = [pkgs.uutils-findutils];
+      };
+    }
+    {
+      oldDependency = pkgs.diffutils;
+      newDependency = pkgs.symlinkJoin {
+        name = diffutils-name;
+        paths = [pkgs.uutils-diffutils];
+      };
+    }
+  ];
+}
diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix
index f296368..baa0c75 100644
--- a/etc/nixos/flake.nix
+++ b/etc/nixos/flake.nix
@@ -41,7 +41,8 @@
       nixosConfigurations.gloria = nixpkgs.lib.nixosSystem {
         inherit system;
         modules = [
-          (import ./configuration.nix { inherit pkgs pkgsUnstable; })
+          (import ./configuration/configuration.nix { inherit pkgs pkgsUnstable; })
+          ./configuration/sys/coreutils-configuration.nix
           ./hardware-configuration.nix
           home-manager.nixosModules.home-manager {
             home-manager = {
@@ -50,7 +51,7 @@
               backupFileExtension = "home-backup";
               users.coast = { ... }: {
                 imports = [
-                  ./home-configuration/home.nix
+                  ./home-configuration/configuration.nix
                   ./home-configuration/apps/sway.nix
                 ];
               };
diff --git a/etc/nixos/home-configuration/apps/sway.nix b/etc/nixos/home-configuration/apps/sway.nix
index 26bfebd..ea65d84 100644
--- a/etc/nixos/home-configuration/apps/sway.nix
+++ b/etc/nixos/home-configuration/apps/sway.nix
@@ -68,6 +68,7 @@ in
         "${modifier}+Shift+v" = "exec vesktop --ozone-platform=wayland";
         "${modifier}+Shift+p" = "exec /home/coast/.local/src/local/bin/setwall.py";
         "${modifier}+Shift+d" = "mode 'resize'";
+        "${modifier}+space" = "floating toggle";
       };
       modes = {
         resize = {
diff --git a/etc/nixos/home-configuration/home.nix b/etc/nixos/home-configuration/configuration.nix
similarity index 100%
rename from etc/nixos/home-configuration/home.nix
rename to etc/nixos/home-configuration/configuration.nix