diff --git a/home/default.nix b/home/default.nix
index 922422a4..5a488e92 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,12 +3,11 @@
# Graphical setup
./ags # ToDo: get codin :3
+ # ./waybar
./hyprland
./rofi.nix
./dunst.nix
./stylix.nix
-
- ./env.nix
./alacritty.nix
./clipman.nix
@@ -16,14 +15,12 @@
./direnv.nix
./firefox.nix
./fzf.nix
- ./gaming
./git.nix
./gpg.nix
./helix.nix
./packages.nix
./playerctld.nix
./sops.nix
- ./ssh.nix
./thunderbird.nix
./zsh
];
diff --git a/home/env.nix b/home/env.nix
deleted file mode 100644
index b860818d..00000000
--- a/home/env.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{conf, config, pkgs, ...}: {
- home = {
- file.inbox.source = config.lib.file.mkOutOfStoreSymlink "/home/${conf.user}/sync/inbox";
-
- shellAliases = {
- cat = "bat -p";
- "." = "source";
- ls = "${pkgs.eza}/bin/eza -g --git --group-directories-first";
- ll = "${pkgs.eza}/bin/eza -l";
- la = "${pkgs.eza}/bin/eza -la";
- grep = "grep --color=auto";
- };
- };
-}
diff --git a/home/firefox.nix b/home/firefox.nix
index 12236845..32ffa547 100644
--- a/home/firefox.nix
+++ b/home/firefox.nix
@@ -1,6 +1,11 @@
{ pkgs, arkenfox, ...}: {
imports = [arkenfox.hmModules.arkenfox];
+ home.file.".mozilla/firefox/ChatGPT/chrome/userChrome.css".text = ''
+ #TabsToolbar { visibility: collapse !important; }
+ #nav-bar { visibility: collapse !important; }
+ '';
+
programs.firefox = {
enable = true;
@@ -22,6 +27,7 @@
OfferToSaveLogins = false;
PasswordManagerEnabled = false;
+ DisablePrivateBrowsing = true;
DisableSetDesktopBackground = true;
DisableTelemetry = true;
DisableFirefoxScreenshots = true;
@@ -36,6 +42,8 @@
SearchBar = "unified";
SearchSuggestEnabled = false;
DownloadDirectory = "/home/lilith/sync/inbox";
+
+ SanitizeOnShutdown = true;
Containers = {
"Default" = [
diff --git a/home/games/awakened-poe-trading/awakened-poe-trading.nix b/home/games/awakened-poe-trading/awakened-poe-trading.nix
deleted file mode 100644
index d04d8307..00000000
--- a/home/games/awakened-poe-trading/awakened-poe-trading.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs }:
-let
- appimage = pkgs.appimageTools.wrapType2 {
- pname = "awakened-poe-trade";
- version = "3.24.10004";
- src = pkgs.fetchurl {
- url = "https://github.com/SnosMe/awakened-poe-trade/releases/download/v3.24.10004/Awakened-PoE-Trade-3.24.10004.AppImage";
- hash = "sha256-0FSePkDZYCU32EUpyymuSIGcRXUomIOrd38QPMaFV4E=";
- };
- meta = {
- homepage = "https://github.com/SnosMe/awakened-poe-trade";
- description = "💲 🔨 Path of Exile trading app for price checking";
- platforms = pkgs.lib.platforms.linux;
- };
- };
- desktopItem = pkgs.makeDesktopItem {
- name = "AwakenedPoETrade";
- exec = appimage.name;
- icon = "${appimage}/awakened-poe-trade.png";
- desktopName = "Awakened PoE Trade";
- comment = appimage.meta.description;
- };
-in
- {
- inherit appimage desktopItem;
- }
diff --git a/home/games/awakened-poe-trading/default.nix b/home/games/awakened-poe-trading/default.nix
deleted file mode 100644
index a9f27d04..00000000
--- a/home/games/awakened-poe-trading/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ...}: let
- awakened-poe-trade = pkgs.callPackage ./awakened-poe-trade.nix;
-in {
- home.packages = [
- awakened-poe-trade.app
- awakened-poe-trade.desktop
- ];
-}
diff --git a/home/games/default.nix b/home/games/default.nix
deleted file mode 100644
index 704aec48..00000000
--- a/home/games/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ lib, system-config, ...}: {
- imports = [
- ] ++ lib.optionals system-config.gaming [
- ./awakened-poe-trading
- ];
-}
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index ab7982c9..6a6a889f 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -17,6 +17,7 @@
settings = {
"$terminal" = "alacritty";
+ "$fileManager" = "alacritty -e ranger";
env = [
"HYPRCURSOR_THEME,rose-pine-hyprcursor"
diff --git a/home/packages.nix b/home/packages.nix
index d3d7a3b4..c238d7cb 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -31,13 +31,11 @@
htop
ollama
- zoom-us
];
gaming = with pkgs; [
prismlauncher
lutris
- steamtinkerlaunch
];
in
common ++ (lib.optionals system-config.gaming.enable gaming);
diff --git a/home/persist.nix b/home/persist.nix
index 1f3b8d26..b050e71a 100644
--- a/home/persist.nix
+++ b/home/persist.nix
@@ -21,7 +21,6 @@
".local/share/PrismLauncher"
".local/share/Steam"
".local/share/lutris"
- ".local/share/games"
];
files = [];
};
diff --git a/home/ssh.nix b/home/ssh.nix
deleted file mode 100644
index 6aee5dcb..00000000
--- a/home/ssh.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{...}:{
- services.ssh-agent.enable = true;
-}
-
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
new file mode 100644
index 00000000..28ef2a43
--- /dev/null
+++ b/home/waybar/default.nix
@@ -0,0 +1,93 @@
+{pkgs, ...}: {
+ home.packages = with pkgs; [
+ pavucontrol
+ playerctl
+ ];
+
+ programs.waybar = {
+ enable = true;
+ systemd.enable = true;
+
+ settings = {
+ default = {
+ layer = "top";
+ position = "top";
+
+ module-left = ["clock" "hyprland/workspaces" "wlr/taskbar"];
+ modules-center = ["custom/playerctl"];
+ modules-right = ["hyprland/language" "tray" "pulseaudio" "temperature" "battery"];
+
+ clock = {
+ format = "{:%Y-%m-%d}";
+ };
+
+ "hyprland/workspaces" = {
+ active-only = false;
+ all-outputs = true;
+ disable-scroll = false;
+ on-scroll-up = "hyprctl dispatch workspace -1";
+ on-scroll-down = "hyprctl dispatch workspace +1";
+
+ format = "{number}";
+ on-click = "activate";
+
+ sort-by = "number";
+ };
+
+ "custom/playerctl" = {
+ format = "{text}";
+ return-type = "json";
+ max-length = 64;
+
+ on-click-middle = "playerctl play-pause";
+ on-click = "playerctl previous";
+ on-click-right = "playerctl next";
+
+ format-icons = {
+ Playing = " ";
+ Paused = " ";
+ };
+
+ interval = 5;
+
+ exec = ''
+ playerctl -a metadata --format '{"text": "{{artist}} - {{markup_escape(title)}}", "tooltip": "{{playerName}} : {{markup_escape(title)}}", "alt": "{{status}}", "class": "{{status}}"}'
+ '';
+ };
+
+ pulseaudio = {
+ format = "{icon:2} {volume:4}% - {desc}";
+ format-bluetooth = " {icon:2} {volume:4}% - {desc}";
+ format-alt = "{icon:2} {volume:4}%";
+ format-alt-click = "click-right";
+ format-muted = "";
+ format-icons = {
+ headphone = [" " " " " " " "];
+ default = ["" "" "" ""];
+ };
+ scroll-step = 2;
+ on-click = "pavucontrol";
+ tooltip = false;
+ };
+
+ battery = {
+ states = {
+ good = 90;
+ warning = 30;
+ critical = 15;
+ };
+ format = "{icon} {capacity}%";
+ format-charging = " {icon}{capacity}%";
+ format-plugged = " {capacity}%";
+ format-alt = "{icon} {time}";
+ format-icons = ["" "" "" "" "" "" "" "" "" "" ""];
+ };
+
+ tray = {
+ "icon-size" = 18;
+ "spacing" = 18;
+ };
+ };
+ };
+ };
+}
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index db1735e7..f92316f5 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -1,4 +1,13 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+ aliases = {
+ "." = "source";
+ ls = "EXA_COLORS='xx=2;37' ${pkgs.eza}/bin/eza -g --git --group-directories-first";
+ l = "ls -aal";
+ atree = "ls -alT";
+ tree = "ls -lT";
+ grep = "grep --color=auto";
+ };
+in {
programs.zsh = {
enable = true;
autosuggestion.enable = true;
@@ -25,5 +34,6 @@
zstyle ':completion:*' menu select
'';
+ shellAliases = aliases;
};
}