From fc749306a0240f24be9a6c1e05434c85aa6bbcc0 Mon Sep 17 00:00:00 2001 From: Lilith Date: Sun, 16 Jun 2024 11:58:11 +0200 Subject: [PATCH 1/6] ssh-agent --- home/default.nix | 2 +- home/ssh.nix | 4 ++ home/waybar/default.nix | 93 ----------------------------------------- 3 files changed, 5 insertions(+), 94 deletions(-) create mode 100644 home/ssh.nix delete mode 100644 home/waybar/default.nix diff --git a/home/default.nix b/home/default.nix index 5a488e92..3ec5faa5 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,7 +3,6 @@ # Graphical setup ./ags # ToDo: get codin :3 - # ./waybar ./hyprland ./rofi.nix ./dunst.nix @@ -21,6 +20,7 @@ ./packages.nix ./playerctld.nix ./sops.nix + ./ssh.nix ./thunderbird.nix ./zsh ]; 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; - }; - }; - }; - }; -} From ef45e9c6c976e428c3b752db9e01bbd4e219b716 Mon Sep 17 00:00:00 2001 From: Lilith Date: Sun, 23 Jun 2024 23:40:43 +0200 Subject: [PATCH 2/6] poe --- home/firefox.nix | 8 -------- home/hyprland/default.nix | 1 - system/full.nix | 1 + system/poe.nix | 13 +++++++++++++ 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 system/poe.nix 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/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/system/full.nix b/system/full.nix index 633bd9f5..e877fd2b 100644 --- a/system/full.nix +++ b/system/full.nix @@ -18,5 +18,6 @@ ./syncthing.nix ./wayland.nix ./zsh.nix + ./poe.nix ]; } diff --git a/system/poe.nix b/system/poe.nix new file mode 100644 index 00000000..d8544ad3 --- /dev/null +++ b/system/poe.nix @@ -0,0 +1,13 @@ +let + awakened-poe-trade = import (builtins.fetchGit { url = "https://github.com/hukasu/awakened-poe-trade-nix"; ref = "refs/tags/v0.0.3"; }); +in { + environment.systemPackages = [ + # This is the to add the application + awakened-poe-trade.app + # Add this to add a Desktop Item + # This requires the `app`, but the way it's setup right now, + # it does not install the `app` automatically + awakened-poe-trade.desktop + ]; +} + From cdeee496e2f7bae377093bc58ee12fd08e48f0c4 Mon Sep 17 00:00:00 2001 From: Lilith Date: Tue, 25 Jun 2024 19:09:21 +0200 Subject: [PATCH 3/6] poe --- .../awakened-poe-trading.nix | 26 +++++++++++++++++++ home/games/awakened-poe-trading/default.nix | 8 ++++++ home/games/default.nix | 5 ++++ system/poe.nix | 13 ---------- 4 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 home/games/awakened-poe-trading/awakened-poe-trading.nix create mode 100644 home/games/awakened-poe-trading/default.nix create mode 100644 home/games/default.nix delete mode 100644 system/poe.nix 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..fb1a9e51 --- /dev/null +++ b/home/games/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ./awakened-poe-trading + ]; +} diff --git a/system/poe.nix b/system/poe.nix deleted file mode 100644 index d8544ad3..00000000 --- a/system/poe.nix +++ /dev/null @@ -1,13 +0,0 @@ -let - awakened-poe-trade = import (builtins.fetchGit { url = "https://github.com/hukasu/awakened-poe-trade-nix"; ref = "refs/tags/v0.0.3"; }); -in { - environment.systemPackages = [ - # This is the to add the application - awakened-poe-trade.app - # Add this to add a Desktop Item - # This requires the `app`, but the way it's setup right now, - # it does not install the `app` automatically - awakened-poe-trade.desktop - ]; -} - From ba8c71efcf07ee2dd4e31774f86b02617a67ea41 Mon Sep 17 00:00:00 2001 From: Lilith Date: Tue, 25 Jun 2024 19:11:36 +0200 Subject: [PATCH 4/6] poe --- home/default.nix | 1 + home/games/default.nix | 3 ++- system/full.nix | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/home/default.nix b/home/default.nix index 3ec5faa5..99b082fd 100644 --- a/home/default.nix +++ b/home/default.nix @@ -14,6 +14,7 @@ ./direnv.nix ./firefox.nix ./fzf.nix + ./gaming ./git.nix ./gpg.nix ./helix.nix diff --git a/home/games/default.nix b/home/games/default.nix index fb1a9e51..704aec48 100644 --- a/home/games/default.nix +++ b/home/games/default.nix @@ -1,5 +1,6 @@ -{...}: { +{ lib, system-config, ...}: { imports = [ + ] ++ lib.optionals system-config.gaming [ ./awakened-poe-trading ]; } diff --git a/system/full.nix b/system/full.nix index e877fd2b..633bd9f5 100644 --- a/system/full.nix +++ b/system/full.nix @@ -18,6 +18,5 @@ ./syncthing.nix ./wayland.nix ./zsh.nix - ./poe.nix ]; } From 6b2d319deb8eef9e026b4a3b1e5fb3280ed71571 Mon Sep 17 00:00:00 2001 From: Lilith Date: Tue, 2 Jul 2024 00:36:15 +0200 Subject: [PATCH 5/6] alias --- home/default.nix | 2 ++ home/env.nix | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 home/env.nix diff --git a/home/default.nix b/home/default.nix index 3ec5faa5..2414fbef 100644 --- a/home/default.nix +++ b/home/default.nix @@ -7,6 +7,8 @@ ./rofi.nix ./dunst.nix ./stylix.nix + + ./env.nix ./alacritty.nix ./clipman.nix diff --git a/home/env.nix b/home/env.nix new file mode 100644 index 00000000..26ec66ea --- /dev/null +++ b/home/env.nix @@ -0,0 +1,12 @@ +{conf, config,...}: { + home = { + file.inbox.source = config.lib.file.mkOutOfStoreSymLink "/home/${conf.user}/sync/inbox"; + + shellAliases = [ + cat = "bat -p" + ls = "eza" + ll = "eza -l" + la = "eza -la" + ]; + }; +} From dcdb94250c867b3f37f4277d0bc7fa62d12a5064 Mon Sep 17 00:00:00 2001 From: Lilith Date: Sun, 14 Jul 2024 22:33:17 +0200 Subject: [PATCH 6/6] steam --- home/env.nix | 18 ++++++++++-------- home/packages.nix | 2 ++ home/persist.nix | 1 + home/zsh/default.nix | 12 +----------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/home/env.nix b/home/env.nix index 26ec66ea..b860818d 100644 --- a/home/env.nix +++ b/home/env.nix @@ -1,12 +1,14 @@ -{conf, config,...}: { +{conf, config, pkgs, ...}: { home = { - file.inbox.source = config.lib.file.mkOutOfStoreSymLink "/home/${conf.user}/sync/inbox"; + file.inbox.source = config.lib.file.mkOutOfStoreSymlink "/home/${conf.user}/sync/inbox"; - shellAliases = [ - cat = "bat -p" - ls = "eza" - ll = "eza -l" - la = "eza -la" - ]; + 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/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/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; }; }