cleanup

flake.lock

@@ -69,11 +69,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1740103652,
+        "lastModified": 1740129365,
-        "narHash": "sha256-wfiBVm0xPFOQIqc8rNJDrRRdV1CAqhhtTlk7nprm/ek=",
+        "narHash": "sha256-SN2R1HKQsVHq0O9/Ilyi7221kIXUjlQawuk9BhysnE8=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "1e16548eb941484f83c854504631e7a70282a0ca",
+        "rev": "38cde30c151765ba64e8e7b0b47ec35ecbbbdb02",
         "type": "github"
       },
       "original": {
@@ -323,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740060750,
+        "lastModified": 1740145731,
-        "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=",
+        "narHash": "sha256-foYErxD5YuRCkRGUd5AcQjCrX7ELdPJr3+eYMfNmI4U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c",
+        "rev": "3c82285348bc811b723014cf4dba2f87e7ffc885",
         "type": "github"
       },
       "original": {
@@ -712,11 +712,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1740084907,
+        "lastModified": 1740124252,
-        "narHash": "sha256-cDyNztdZEZbWkt1ux5K4AdufHrkshdIenp7NOFuz3CY=",
+        "narHash": "sha256-s/wpy4RFcfsn5vPLC9LhMgoxdd7ReWRssWdxUgBym8s=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "67be5f0250b6666afe355d72dee1c162264e8e28",
+        "rev": "f989ca59d48550c3fd7021917647775969c26d54",
         "type": "github"
       },
       "original": {
@@ -745,11 +745,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1740079600,
+        "lastModified": 1740117926,
-        "narHash": "sha256-BdkjKqPyWoCn+r9qcxJqFE2s63SjlQXQrkh80ls6IFQ=",
+        "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "7b70cb66bc9f1ed6517855072147825eb810f1cf",
+        "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
         "type": "github"
       },
       "original": {
@@ -1429,11 +1429,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1740056577,
+        "lastModified": 1740139654,
-        "narHash": "sha256-Q4ICEFcl9tnnih08DElTJ2vuMzMRrrgdJ7v8NrJxo5c=",
+        "narHash": "sha256-qbE78jjws1Az80vrD1+3lPIU6EGF3PpKa9pfvvC4nBQ=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "c14bbecb1a5524e769a93af125d07848c2d6a0be",
+        "rev": "7f17ecd54708a728be42233db5619523ac73a8c8",
         "type": "github"
       },
       "original": {

homes/emenel/default.nix

@@ -126,6 +126,7 @@
       XCURSOR_SIZE = 32;
       XCURSOR_THEME = "Bibata-Modern-Classic";
       DISPLAY = ":0";
+      WAYLAND_DISPLAY="wayland-1";
     };
   };
 

homes/emenel/dotfiles/dot_config/eww/eww.scss

@@ -1,42 +0,0 @@
-* {
-  all: unset; // Unsets everything so you can style everything from scratch
-}
-
-// Global Styles
-.bar {
-  background-color: rgba(0,0,0,0);
-  color: #b0b4bc;
-  padding: 10px;
-}
-
-// Styles on classes (see eww.yuck for more information)
-
-.sidestuff slider {
-  all: unset;
-  color: #ffd5cd;
-}
-
-.metric scale trough highlight {
-  all: unset;
-  background-color: #D35D6E;
-  color: #000000;
-  border-radius: 10px;
-}
-
-.metric scale trough {
-  all: unset;
-  background-color: #4e4e4e;
-  border-radius: 50px;
-  min-height: 3px;
-  min-width: 50px;
-  margin-left: 10px;
-  margin-right: 20px;
-}
-
-.label-ram {
-  font-size: large;
-}
-
-.workspaces button:hover {
-  color: #D35D6E;
-}

homes/emenel/dotfiles/dot_config/eww/eww.yuck

@@ -1,70 +0,0 @@
-(defwidget bar []
-  (centerbox :orientation "h"
-  (time)
-(workspaces)
-    (music)
-    (sidestuff)))
-
-(defwidget sidestuff []
-  (box :class "sidestuff" :orientation "h" :space-evenly false :halign "end"
-    (metric :label "🔊"
-            :value volume
-            :onchange "amixer -D pulse sset Master {}%")
-    (metric :label ""
-            :value {EWW_RAM.used_mem_perc}
-            :onchange "")
-    (metric :label "💾"
-            :value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)}
-            :onchange "")
-    ))
-
-(defwidget workspaces []
-  (box :class "workspaces"
-       :orientation "h"
-       :space-evenly true
-       :halign "start"
-       :spacing 10
-    (button :onclick "wmctrl -s 0" 1)
-    (button :onclick "wmctrl -s 1" 2)
-    (button :onclick "wmctrl -s 2" 3)
-    (button :onclick "wmctrl -s 3" 4)
-    (button :onclick "wmctrl -s 4" 5)
-    (button :onclick "wmctrl -s 5" 6)
-    (button :onclick "wmctrl -s 6" 7)
-    (button :onclick "wmctrl -s 7" 8)
-    (button :onclick "wmctrl -s 8" 9)))
-
-(defwidget music []
-  (box :class "music"
-       :orientation "h"
-       :space-evenly false
-       :halign "center"
-    {music != "" ? "🎵${music}" : ""}))
-
-
-(defwidget metric [label value onchange]
-  (box :orientation "h"
-       :class "metric"
-       :space-evenly false
-    (box :class "label" label)
-    (scale :min 0
-           :max 101
-           :active {onchange != ""}
-           :value value
-           :onchange onchange)))
-
-(deflisten music :initial ""
-  "playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true")
-
-(defpoll time :interval "10s"
-  "date '+%H:%M %b %d, %Y'")
-
-(defwindow bar
-  :monitor 0
-  :windowtype "dock"
-  :geometry (geometry :x "0%"
-                      :y "0%"
-                      :width "99%"
-                      :height "10px"
-                      :anchor "top center")
-  (bar))

homes/emenel/dotfiles/dot_config/fish/completions/maestral.fish

@@ -1,18 +0,0 @@
-function _maestral_completion;
-    set -l response (env _MAESTRAL_COMPLETE=fish_complete COMP_WORDS=(commandline -cp) COMP_CWORD=(commandline -t) maestral);
-
-    for completion in $response;
-        set -l metadata (string split "," $completion);
-
-        if test $metadata[1] = "dir";
-            __fish_complete_directories $metadata[2];
-        else if test $metadata[1] = "file";
-            __fish_complete_path $metadata[2];
-        else if test $metadata[1] = "plain";
-            echo $metadata[2];
-        end;
-    end;
-end;
-
-complete --no-files --command maestral --arguments "(_maestral_completion)";
-

homes/emenel/dotfiles/dot_config/fish/functions/nixgcboot.fish

@@ -1,5 +0,0 @@
-#!/usr/bin/env fish
-
-function nixgcboot --description 'fix full boot'
-     sudo nixos-rebuild boot --flake ~/source/nixos-config/#eddie $argv
-end

homes/emenel/dotfiles/dot_config/ghostty/config

@@ -1,41 +0,0 @@
-command = /home/emenel/.nix-profile/bin/fish --login --interactive
-shell-integration = fish
-shell-integration-features = true
-
-theme = Adventure
-
-font-family = "JetBrains Mono"
-font-size = 12
-background = 111111
-selection-foreground = ffffff
-selection-background = 444444
-bold-is-bright = true
-cursor-style = bar
-adjust-cursor-thickness = 2
-resize-overlay = never
-cursor-click-to-move = true
-
-clipboard-paste-protection = true
-
-keybind = ctrl+t=new_tab
-keybind = ctrl+w=close_surface
-keybind = ctrl+enter=new_split:down
-keybind = ctrl+shift+enter=new_split:right
-keybind = ctrl+alt+enter=equalize_splits
-keybind = ctrl+alt+z=toggle_split_zoom
-keybind = ctrl+alt+left=previous_tab
-keybind = ctrl+alt+right=next_tab
-keybind = ctrl+alt+up=goto_split:left
-keybind = ctrl+alt+down=goto_split:right
-keybind = ctrl+backspace=text:\x1b\x7f
-# keybind = ctrl+shift+k=clear_screen
-
-# disabled bindings for testing zellij
-# keybind = ctrl+t=unbind
-# keybind = ctrl+w=unbind
-# keybind = ctrl+alt+right=unbind
-# keybind = ctrl+alt+left=unbind
-# keybind = ctrl+alt+up=unbind
-# keybind = ctrl+alt+down=unbind
-# keybind = ctrl+enter=unbind
-# keybind = ctrl+shift+enter=unbind

homes/emenel/dotfiles/dot_config/sway-launcher-desktop/files.conf

@@ -1,5 +0,0 @@
-[files-provider]
-list_cmd=
-preview_cmd=
-launch_cmd=
-purge_cmd=

homes/emenel/dotfiles/dot_config/waybar/config

@@ -1,133 +0,0 @@
-{
-  "modules-left": [
-    "clock",
-    "niri/workspaces",
-    "mpris"
-  ],
-  "modules-right": [
-    "wlr/taskbar",
-    "tray",
-    "cpu",
-    "memory",
-    "network",
-    "wireplumber",
-    "power-profiles-daemon",
-    "upower",
-    "idle_inhibitor",
-    "custom/notification",
-  ],
-
-  "custom/notification": {
-    "tooltip": false,
-    "format": "{icon}",
-    "format-icons": {
-      "notification": "<span foreground='red'><sup></sup></span>",
-      "none": "",
-      "dnd-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-none": "",
-      "inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "inhibited-none": "",
-      "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-inhibited-none": ""
-    },
-    "return-type": "json",
-    "exec-if": "which swaync-client",
-    "exec": "swaync-client -swb",
-    "on-click": "swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "escape": true
-  },
-  "idle_inhibitor": {
-    "format": "{icon}",
-    "tooltip-format-activated": "idle inhibitor: {status}",
-    "tooltip-format-deactivated": "idle inhibitor: {status}",
-    "format-icons": {
-      "activated": "󱡆",
-      "deactivated": "󱡇"
-    }
-  },
-  "power-profiles-daemon": {
-    "format": "{icon}",
-    "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
-    "tooltip": true,
-    "format-icons": {
-      "default": "?",
-      "performance": "",
-      "balanced": "",
-      "power-saver": ""
-    }
-  },
-  "memory": {
-    "interval": 30,
-    "format": "{used:0.1f}G/{total:0.1f}G ",
-    "on-click": "$HOME/.local/bin/wezapp btop"
-  },
-  "cpu": {
-    "interval": 10,
-    "format": "{}% ",
-    "max-length": 10,
-    "on-click": "$HOME/.local/bin/wezapp btop"
-  },
-  "network": {
-    "format-wifi": "",
-    "format-ethernet": "",
-    "format-disconnected": "󰱟",
-    "tooltip-format": "{essid} {ifname}",
-    "max-length": 50,
-    "on-click": "$HOME/.local/bin/wezlauncher nmtui",
-  },
-  "tray": {
-    "icon-size": 20,
-    "spacing": 10
-  },
-  "clock": {
-    "format": "{:%a %d %b %Y %I:%M}",
-    "on-click": "gnome-calendar",
-    "tooltip": false,
-  },
-  "wireplumber": {
-    "format": "{volume}% {icon}",
-    "format-muted": "",
-    "on-click": "helvum",
-    "format-icons": [
-      "",
-      "",
-      ""
-    ],
-    "on-click": "pavucontrol"
-  },
-  "mpris": {
-    "dynamic-order": ["title", "artist", "album", "length"],
-    "format": "{player_icon} {dynamic}",
-    "format-paused": "{status_icon} <i>{dynamic}</i>",
-    "dynamic-len": 75,
-    "player-icons": {
-      "default": "",
-    },
-    "status-icons": {
-      "paused": ""
-    },
-  },
-  "wlr/taskbar": {
-    "format": "{icon}",
-    "icon-size": 20,
-    "tooltip-format": "{title}",
-    "on-click": "activate",
-    "app_ids-mapping": {
-      "firefoxdeveloperedition": "firefox-developer-edition"
-    },
-    "ignore-list": [
-      "Signal"
-    ],
-    "rewrite": {
-      "Firefox Web Browser": "Firefox",
-    }
-  },
-  "niri/workspaces": {
-    "format": "{icon}",
-    "format-icons": {
-      "main": "",
-      "scratchpad": "",
-    }
-  }
-}

homes/emenel/dotfiles/dot_npmrc

@@ -1 +0,0 @@
-prefix=~/.npm-packages

hosts/eddie/configuration.nix

@@ -75,6 +75,7 @@
     clinfo
     alsa-utils
     alsa-oss
+    alsa-tools
     psutils
     util-linux
     libgtop
@@ -87,6 +88,7 @@
     xwayland-satellite
     xwayland-run
     cifs-utils
+    samba
     ddcutil
     ddcui
   ];
@@ -288,6 +290,11 @@
   programs.labwc.enable = true;
   programs.ssh.startAgent = true;
 
+  programs.npm = {
+    enable = true;
+    npmrc = "prefix=~/.npm-packages";
+  };
+
   programs.nh = {
     enable = true;
     clean = {

modules/home/langs.nix

@@ -34,7 +34,6 @@
     (tree-sitter.withPlugins (_: tree-sitter.allGrammars))
   ];
 
-  home.file.".npmrc".source = ../../homes/emenel/dotfiles/dot_npmrc;
   home.file.".sbclrc".source = ../../homes/emenel/dotfiles/dot_sbclrc;
 
 }

modules/home/niri.nix

@@ -14,7 +14,7 @@ in {
           { command = ["clipse" "-listen"]; }
           { command = [ "${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; }
           # { command = ["waybar"]; }
-          { command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" "waybar.service" ]; }
+          { command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" ]; }
         ];
 
         workspaces = {

modules/home/shell-conf.nix

@@ -165,43 +165,6 @@
     thefuck = {
       enable = true;
     };
-    ghostty = {
-      enable = true;
-      enableFishIntegration = true;
-      installBatSyntax = true;
-      settings = {
-        command = "/home/emenel/.nix-profile/bin/fish --login --interactive";
-        theme = "Adventure";
-        font-family = "JetBrains Mono";
-        font-size = 12;
-        background = 111111;
-        selection-foreground = "ffffff";
-        selection-background = 444444;
-        bold-is-bright = true;
-        cursor-style = "bar";
-        adjust-cursor-thickness = 2;
-        resize-overlay = "never";
-        cursor-click-to-move = true;
-
-        clipboard-paste-protection = true;
-        keybind = [
-          "ctrl+t=new_tab"
-          "ctrl+w=close_surface"
-          "ctrl+enter=new_split:down"
-          "ctrl+shift+enter=new_split:right"
-          "ctrl+alt+enter=equalize_splits"
-          "ctrl+alt+z=toggle_split_zoom"
-          "ctrl+alt+left=previous_tab"
-          "ctrl+alt+right=next_tab"
-          "ctrl+alt+up=goto_split:left"
-          "ctrl+alt+down=goto_split:right"
-          "ctrl+backspace=text:\x1b\x7f"
-        ];
-      };
-    };
-    # zellij = {
-    #   enable = true;
-    # };
     wezterm = {
       enable = true;
       package = inputs.wezterm.packages.${pkgs.system}.default;

modules/home/waybar.nix

@@ -4,10 +4,166 @@ let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
 in {
 
   programs.waybar = {
+    enable = true;
+    package = pkgs.waybar;
+    systemd = {
       enable = true;
-      package = pkgs.waybar;
+    };
-      systemd.enable = true;
+    settings = {
-      style = ''
+      mainBar = {
+        layer = "top";
+        position = "top";
+
+        modules-left = [
+          "clock"
+          "niri/workspaces"
+          "mpris"
+        ];
+
+        modules-right = [
+          "wlr/taskbar"
+          "tray"
+          "cpu"
+          "memory"
+          "network"
+          "wireplumber"
+          "power-profiles-daemon"
+          "upower"
+          "idle_inhibitor"
+          "custom/notification"
+        ];
+
+        "custom/notification" = {
+          "tooltip" = false;
+          "format" = "{icon}";
+          "format-icons" = {
+            "notification" = "<span foreground='red'><sup></sup></span>";
+            "none" = "";
+            "dnd-notification" = "<span foreground='red'><sup></sup></span>";
+            "dnd-none" = "";
+            "inhibited-notification" = "<span foreground='red'><sup></sup></span>";
+            "inhibited-none" = "";
+            "dnd-inhibited-notification" = "<span foreground='red'><sup></sup></span>";
+            "dnd-inhibited-none" = "";
+          };
+
+          "return-type" = "json";
+          "exec-if" = "which swaync-client";
+          "exec" = "swaync-client -swb";
+          "on-click" = "swaync-client -t -sw";
+          "on-click-right" = "swaync-client -d -sw";
+          "escape" = true;
+        };
+
+        "idle_inhibitor" = {
+          "format" = "{icon}";
+          "tooltip-format-activated" = "idle inhibitor = {status}";
+          "tooltip-format-deactivated" = "idle inhibitor = {status}";
+          "format-icons" = {
+            "activated" = "󱡆";
+            "deactivated" = "󱡇";
+          };
+        };
+
+        "power-profiles-daemon" = {
+          "format" = "{icon}";
+          "tooltip-format" = "Power profile = {profile}\nDriver = {driver}";
+          "tooltip" = true;
+          "format-icons" = {
+            "default" = "?";
+            "performance" = "";
+            "balanced" = "";
+            "power-saver" = "";
+          };
+        };
+
+        "memory" = {
+          "interval" = 30;
+          "format" = "{used =0.1f}G/{total =0.1f}G ";
+          "on-click" = "$HOME/.local/bin/wezapp btop";
+        };
+
+        "cpu" = {
+          "interval" = 10;
+          "format" = "{}% ";
+          "max-length" = 10;
+          "on-click" = "$HOME/.local/bin/wezapp btop";
+        };
+
+        "network" = {
+          "format-wifi" = "";
+          "format-ethernet" = "";
+          "format-disconnected" = "󰱟";
+          "tooltip-format" = "{essid} {ifname}";
+          "max-length" = 50;
+          "on-click" = "$HOME/.local/bin/wezlauncher nmtui";
+        };
+
+        "tray" = {
+          "icon-size" = 20;
+          "spacing" = 10;
+        };
+
+        "clock" = {
+          "format" = "{ =%a %d %b %Y %I =%M}";
+          "on-click" = "gnome-calendar";
+          "tooltip" = false;
+        };
+
+        "wireplumber" = {
+          "format" = "{volume}% {icon}";
+          "format-muted" = "";
+          "format-icons" = [
+            ""
+            ""
+            ""
+          ];
+          "on-click" = "pavucontrol";
+        };
+
+        "mpris" = {
+          "dynamic-order" = ["title"
+                             "artist"
+                             "album"
+                             "length"];
+          "format" = "{player_icon} {dynamic}";
+          "format-paused" = "{status_icon} <i>{dynamic}</i>";
+          "dynamic-len" = 75;
+          "player-icons" = {
+            "default" = "";
+          };
+          "status-icons" = {
+            "paused" = "";
+          };
+        };
+
+        "wlr/taskbar" = {
+          "format" = "{icon}";
+          "icon-size" = 20;
+          "tooltip-format" = "{title}";
+          "on-click" = "activate";
+          "app_ids-mapping" = {
+            "firefoxdeveloperedition" = "firefox-developer-edition";
+          };
+          "ignore-list" = [
+            "Signal"
+          ];
+          "rewrite" = {
+            "Firefox Web Browser" = "Firefox";
+          };
+        };
+
+        "niri/workspaces" = {
+          "format" = "{icon}";
+          "format-icons" = {
+            "main" = "";
+            "scratchpad" = "";
+          };
+        };
+      };
+    };
+
+    style = ''
 * {
     border: none;
     font-size: 12pt;
@@ -155,7 +311,4 @@ window#waybar {
 }
     '';
   };
-
-  xdg.configFile."waybar/config".source = ../../homes/emenel/dotfiles/dot_config/waybar/config;
-
 }

modules/home/yazi.nix

@@ -7,10 +7,13 @@
     initLua = ../../homes/emenel/dotfiles/dot_config/yazi/init.lua;
     keymap = {
       manager.prepend_keymap = [
-        { on = ["c" "d"]; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; desc = "drag selection";}
+        { on = ["c" "d"]; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; desc = "Drag selection";}
+        { on = ["c" "c"]; run = "yank"; desc = "Copy file"; }
+        { on = ["c" "n"]; run = "copy filename"; desc = "Copy file name"; }
+        { on = ["c" "N"]; run = "copy name_without_ext"; desc = "Copy file name without extension"; }
         { on = "y"; run = ["shell 'for path in \"$@\"; do echo \"file://$path\"; done | wl-copy -t text/uri-list'\n" "yank"]; }
-        { on = ["g" "r"]; run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'\n"; desc = "go to top of git repo"; }
+        { on = ["g" "r"]; run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'\n"; desc = "Go to top of git repo"; }
-        { on = ["g" "p"]; run = "cd ~/Projects"; desc = "go to ~/Projects"; }
+        { on = ["g" "p"]; run = "cd ~/Projects"; desc = "Go to ~/Projects"; }
         { on = ["t" "p"]; run = "plugin toggle-view parent"; desc = "Toggle parent"; }
         { on = ["t" "c"]; run = "plugin toggle-view current"; desc = "Toggle current"; }
         { on = ["t" "r"]; run = "plugin toggle-view preview"; desc = "Toggle preview"; }
@@ -32,6 +35,8 @@
         { on = "l"; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; }
         { on = "<Enter>"; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; }
         { on = "<Right>"; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; }
+        { on = "<Delete>"; run = "remove"; }
+        { on = "<Backspace>"; run = "remove"; }
       ];
     };
     settings = {