diff --git a/home/default.nix b/home/default.nix
index 5a488e92..922422a4 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,11 +3,12 @@
# Graphical setup
./ags # ToDo: get codin :3
- # ./waybar
./hyprland
./rofi.nix
./dunst.nix
./stylix.nix
+
+ ./env.nix
./alacritty.nix
./clipman.nix
@@ -15,12 +16,14 @@
./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
new file mode 100644
index 00000000..b860818d
--- /dev/null
+++ b/home/env.nix
@@ -0,0 +1,14 @@
+{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 32ffa547..12236845 100644
--- a/home/firefox.nix
+++ b/home/firefox.nix
@@ -1,11 +1,6 @@
{ 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;
@@ -27,7 +22,6 @@
OfferToSaveLogins = false;
PasswordManagerEnabled = false;
- DisablePrivateBrowsing = true;
DisableSetDesktopBackground = true;
DisableTelemetry = true;
DisableFirefoxScreenshots = true;
@@ -42,8 +36,6 @@
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
new file mode 100644
index 00000000..d04d8307
--- /dev/null
+++ b/home/games/awakened-poe-trading/awakened-poe-trading.nix
@@ -0,0 +1,26 @@
+{ 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
new file mode 100644
index 00000000..a9f27d04
--- /dev/null
+++ b/home/games/awakened-poe-trading/default.nix
@@ -0,0 +1,8 @@
+{ 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
new file mode 100644
index 00000000..704aec48
--- /dev/null
+++ b/home/games/default.nix
@@ -0,0 +1,6 @@
+{ 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 6a6a889f..ab7982c9 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -17,7 +17,6 @@
settings = {
"$terminal" = "alacritty";
- "$fileManager" = "alacritty -e ranger";
env = [
"HYPRCURSOR_THEME,rose-pine-hyprcursor"
diff --git a/home/packages.nix b/home/packages.nix
index c238d7cb..d3d7a3b4 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -31,11 +31,13 @@
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 b050e71a..1f3b8d26 100644
--- a/home/persist.nix
+++ b/home/persist.nix
@@ -21,6 +21,7 @@
".local/share/PrismLauncher"
".local/share/Steam"
".local/share/lutris"
+ ".local/share/games"
];
files = [];
};
diff --git a/home/ssh.nix b/home/ssh.nix
new file mode 100644
index 00000000..6aee5dcb
--- /dev/null
+++ b/home/ssh.nix
@@ -0,0 +1,4 @@
+{...}:{
+ services.ssh-agent.enable = true;
+}
+
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
deleted file mode 100644
index 28ef2a43..00000000
--- a/home/waybar/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{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 f92316f5..db1735e7 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -1,13 +1,4 @@
-{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 {
+{pkgs, ...}: {
programs.zsh = {
enable = true;
autosuggestion.enable = true;
@@ -34,6 +25,5 @@ in {
zstyle ':completion:*' menu select
'';
- shellAliases = aliases;
};
}