commit 915513439d60efb2dd75c84a362e6d55ce4b20f9
parent e9a0d02c57d664946adb4ee043960fe6bfb4e630
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Wed, 27 Aug 2025 19:38:45 +0200
parent e9a0d02c57d664946adb4ee043960fe6bfb4e630
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Wed, 27 Aug 2025 19:38:45 +0200
cleanup
32 files changed, 313 insertions(+), 412 deletions(-)
M
|
237
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
|
65
++++++++++++++++++++++++++++++++---------------------------------
M
|
71
++++++++++++++++++++++++++++++++++-------------------------------------
M
|
107
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
diff --git a/config/home-manager/zaphyra/impermanence.nix b/config/home-manager/zaphyra/impermanence.nix @@ -22,9 +22,6 @@ (symlink "data/Downloads") (symlink "data/proj") ]; - files = [ - "ssh/.ssh/known_hosts" - ]; }; }
diff --git a/config/home-manager/zaphyra/programs/airscan.nix b/config/home-manager/zaphyra/programs/airscan.nix @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = [ pkgs.airscan ]; - -}
diff --git a/config/home-manager/zaphyra/programs/ansible.nix b/config/home-manager/zaphyra/programs/ansible.nix @@ -1,20 +0,0 @@ -{ pkgs, ... }: - -let - ansible = pkgs.python3Packages.toPythonApplication ( - pkgs.python3Packages.ansible-core.overridePythonAttrs (old: rec { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.python3Packages.jmespath - ]; - }) - ); - -in -{ - - home.packages = [ - ansible - pkgs.ansible-lint - ]; - -}
diff --git a/config/home-manager/zaphyra/programs/blueman.nix b/config/home-manager/zaphyra/programs/blueman.nix @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = [ pkgs.blueman ]; - -}
diff --git a/config/home-manager/zaphyra/programs/dino.nix b/config/home-manager/zaphyra/programs/dino.nix @@ -6,10 +6,10 @@ { - home.packages = [ pkgs.dino ]; - home.persistence."/nix/persist/home/${config.home.username}".directories = [ "dino/.local/share/dino" ]; + home.packages = [ pkgs.dino ]; + }
diff --git a/config/home-manager/zaphyra/programs/errands.nix b/config/home-manager/zaphyra/programs/errands.nix @@ -6,10 +6,10 @@ { - home.packages = [ pkgs.errands ]; - home.persistence."/nix/persist/home/${config.home.username}".directories = [ "errands/.local/share/errands" ]; + home.packages = [ pkgs.errands ]; + }
diff --git a/config/home-manager/zaphyra/programs/euphonica.nix b/config/home-manager/zaphyra/programs/euphonica.nix @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = [ pkgs.euphonica ]; - -}
diff --git a/config/home-manager/zaphyra/programs/firefox.nix b/config/home-manager/zaphyra/programs/firefox.nix @@ -8,6 +8,11 @@ { + home.persistence."/nix/persist/home/${config.home.username}".directories = [ + "firefox/.mozilla/firefox/" + "firefox/.cache/mozilla/firefox" + ]; + home.sessionVariables = { BROWSER = "firefox"; }; @@ -17,11 +22,6 @@ target = ".mozilla/firefox/${config.home.username}/chrome/firefox-gnome-theme"; }; - home.persistence."/nix/persist/home/${config.home.username}".directories = [ - "firefox/.mozilla/firefox/" - "firefox/.cache/mozilla/firefox" - ]; - programs.firefox = { enable = true; package = pkgs.firefox; @@ -291,10 +291,6 @@ }; }; - wayland.windowManager.sway.config.startup = [ - { command = "firefox"; } - ]; - xdg = { enable = true; mime.enable = true;
diff --git a/config/home-manager/zaphyra/programs/fractal.nix b/config/home-manager/zaphyra/programs/fractal.nix @@ -2,13 +2,11 @@ { - home = { - packages = [ pkgs.fractal ]; - - persistence."/nix/persist/home/${config.home.username}".directories = [ - "fractal/.local/share/fractal/" - "fractal/.cache/fractal/" - ]; - }; + home.persistence."/nix/persist/home/${config.home.username}".directories = [ + "fractal/.local/share/fractal/" + "fractal/.cache/fractal/" + ]; + + home.packages = [ pkgs.fractal ]; }
diff --git a/config/home-manager/zaphyra/programs/gajim.nix b/config/home-manager/zaphyra/programs/gajim.nix @@ -6,11 +6,11 @@ { - home.packages = [ pkgs.gajim ]; - home.persistence."/nix/persist/home/${config.home.username}".directories = [ "gajim/.local/share/gajim" "gajim/.config/gajim" ]; + home.packages = [ pkgs.gajim ]; + }
diff --git a/config/home-manager/zaphyra/programs/helix.nix b/config/home-manager/zaphyra/programs/helix.nix @@ -3,7 +3,7 @@ { home = { - # sessionVariables.EDITOR = lib.mkForce "hx"; + # sessionVariables.EDITOR = lib.mkForce "hx"; }; programs.helix = { @@ -29,9 +29,8 @@ } ]; }; - extraPackages = with pkgs; [ - nil - markdown-oxide + extraPackages = [ + pkgs.markdown-oxide ]; };
diff --git a/config/home-manager/zaphyra/programs/imv.nix b/config/home-manager/zaphyra/programs/imv.nix @@ -4,11 +4,4 @@ home.packages = [ pkgs.imv ]; - xdg.desktopEntries = { - imv-folder = { - name = "imv (Folder)"; - settings.NoDisplay = "true"; - }; - }; - }
diff --git a/config/home-manager/zaphyra/programs/languages/nix.nix b/config/home-manager/zaphyra/programs/languages/nix.nix @@ -4,6 +4,11 @@ home.packages = [ pkgs.nixfmt-rfc-style ]; + programs.helix.extraPackages = [ + pkgs.nixd + pkgs.nil + ]; + programs.micro.lsp-servers.nix = { command = lib.getExe pkgs.nixd; options = { @@ -13,4 +18,4 @@ }; }; -}- \ No newline at end of file +}
diff --git a/config/home-manager/zaphyra/programs/micro.nix b/config/home-manager/zaphyra/programs/micro.nix @@ -52,9 +52,11 @@ "lsp.formatOnSave" = true; "lsp.tabcompletion" = true; "lsp.autocompleteDetails" = false; - "lsp.server" = if systemConfig.modules.presets.graphical.enable != true then "" else ( - lib.concatMapAttrsStringSep "," - ( + "lsp.server" = + if systemConfig.modules.presets.graphical.enable != true then + "" + else + (lib.concatMapAttrsStringSep "," ( name: value: lib.concatStringsSep "=" ( [ @@ -65,9 +67,7 @@ (builtins.toJSON (value.options)) ]) ) - ) - config.programs.micro.lsp-servers - ); + ) config.programs.micro.lsp-servers); }; }; @@ -76,118 +76,120 @@ shellAliases.nano = "micro"; file = { # keybindings - "${config.xdg.configHome}/micro/bindings.json".source = pkgs.writeText "micro-keybindings.json" (builtins.toJSON { - "Alt-," = "PreviousTab"; - "Alt-." = "NextTab"; - "Alt-Backspace" = "DeleteWordLeft"; - "Alt-CtrlH" = "DeleteWordLeft"; - "Alt-F" = "FindLiteral"; - "Alt-[" = "DiffPrevious|CursorStart"; - "Alt-]" = "DiffNext|CursorEnd"; - "Alt-a" = "StartOfLine"; - "Alt-b" = "WordLeft"; - "Alt-c" = "RemoveAllMultiCursors"; - "Alt-e" = "EndOfLine"; - "Alt-f" = "WordRight"; - "Alt-g" = "ToggleKeyMenu"; - "Alt-m" = "SpawnMultiCursorSelect"; - "Alt-n" = "SpawnMultiCursor"; - "Alt-p" = "RemoveMultiCursor"; - "Alt-x" = "SkipMultiCursor"; - "Alt-{" = "ParagraphPrevious"; - "Alt-}" = "ParagraphNext"; - "AltDown" = "MoveLinesDown"; - "AltLeft" = "StartOfTextToggle"; - "AltRight" = "EndOfLine"; - "AltShiftDown" = "SpawnMultiCursorDown"; - "AltShiftLeft" = "SelectToStartOfTextToggle"; - "AltShiftRight" = "SelectToEndOfLine"; - "AltShiftUp" = "SpawnMultiCursorUp"; - "AltUp" = "MoveLinesUp"; - "Backspace" = "Backspace"; - "Backtab" = "OutdentSelection|OutdentLine"; - "Ctrl-MouseLeft" = "MouseMultiCursor"; - "Ctrl-a" = "SelectAll"; - "Ctrl-b" = "ShellMode"; - "Ctrl-c" = "Copy|CopyLine"; - "Ctrl-d" = "DuplicateLine"; - "Ctrl-e" = "CommandMode"; - "Ctrl-f" = "Find"; - "Ctrl-g" = "ToggleHelp"; - "Ctrl-h" = "Backspace"; - "Ctrl-j" = "PlayMacro"; - "Ctrl-k" = "CutLine"; - "Ctrl-l" = "command-edit:goto "; - "Ctrl-n" = "FindNext"; - "Ctrl-o" = "OpenFile"; - "Ctrl-p" = "FindPrevious"; - "Ctrl-q" = "Quit"; - "Ctrl-r" = "ToggleRuler"; - "Ctrl-s" = "Save"; - "Ctrl-t" = "AddTab"; - "Ctrl-u" = "ToggleMacro"; - "Ctrl-v" = "Paste"; - "Ctrl-w" = "NextSplit"; - "Ctrl-x" = "Cut|CutLine"; - "Ctrl-y" = "Redo"; - "Ctrl-z" = "Undo"; - "CtrlDown" = "CursorEnd"; - "CtrlEnd" = "CursorEnd"; - "CtrlHome" = "CursorStart"; - "CtrlPageDown" = "NextTab"; - "CtrlPageUp" = "PreviousTab"; - "AltPageDown" = "NextTab"; - "AltPageUp" = "PreviousTab"; - "CtrlShiftDown" = "SelectToEnd"; - "CtrlShiftLeft" = "SelectWordLeft"; - "CtrlShiftRight" = "SelectWordRight"; - "CtrlShiftUp" = "SelectToStart"; - "CtrlUp" = "CursorStart"; - "Delete" = "Delete"; - "Down" = "CursorDown"; - "End" = "EndOfLine"; - "Enter" = "InsertNewline"; - "Esc" = "Escape"; - "F10" = "Quit"; - "F2" = "Save"; - "F3" = "Find"; - "F4" = "Quit"; - "F7" = "Find"; - "Home" = "StartOfText"; - "Insert" = "ToggleOverwriteMode"; - "Left" = "CursorLeft"; - "MouseLeft" = "MousePress"; - "MouseLeftDrag" = "MouseDrag"; - "MouseLeftRelease" = "MouseRelease"; - "MouseMiddle" = "PastePrimary"; - "MouseWheelDown" = "ScrollDown"; - "MouseWheelUp" = "ScrollUp"; - "PageDown" = "CursorPageDown"; - "PageUp" = "CursorPageUp"; - "Right" = "CursorRight"; - "ShiftDown" = "SelectDown"; - "ShiftEnd" = "SelectToEndOfLine"; - "ShiftHome" = "SelectToStartOfTextToggle"; - "ShiftLeft" = "SelectLeft"; - "ShiftPageDown" = "SelectPageDown"; - "ShiftPageUp" = "SelectPageUp"; - "ShiftRight" = "SelectRight"; - "ShiftUp" = "SelectUp"; - "Tab" = "Autocomplete|IndentSelection|InsertTab"; - "Up" = "CursorUp"; + "${config.xdg.configHome}/micro/bindings.json".source = pkgs.writeText "micro-keybindings.json" ( + builtins.toJSON { + "Alt-," = "PreviousTab"; + "Alt-." = "NextTab"; + "Alt-Backspace" = "DeleteWordLeft"; + "Alt-CtrlH" = "DeleteWordLeft"; + "Alt-F" = "FindLiteral"; + "Alt-[" = "DiffPrevious|CursorStart"; + "Alt-]" = "DiffNext|CursorEnd"; + "Alt-a" = "StartOfLine"; + "Alt-b" = "WordLeft"; + "Alt-c" = "RemoveAllMultiCursors"; + "Alt-e" = "EndOfLine"; + "Alt-f" = "WordRight"; + "Alt-g" = "ToggleKeyMenu"; + "Alt-m" = "SpawnMultiCursorSelect"; + "Alt-n" = "SpawnMultiCursor"; + "Alt-p" = "RemoveMultiCursor"; + "Alt-x" = "SkipMultiCursor"; + "Alt-{" = "ParagraphPrevious"; + "Alt-}" = "ParagraphNext"; + "AltDown" = "MoveLinesDown"; + "AltLeft" = "StartOfTextToggle"; + "AltRight" = "EndOfLine"; + "AltShiftDown" = "SpawnMultiCursorDown"; + "AltShiftLeft" = "SelectToStartOfTextToggle"; + "AltShiftRight" = "SelectToEndOfLine"; + "AltShiftUp" = "SpawnMultiCursorUp"; + "AltUp" = "MoveLinesUp"; + "Backspace" = "Backspace"; + "Backtab" = "OutdentSelection|OutdentLine"; + "Ctrl-MouseLeft" = "MouseMultiCursor"; + "Ctrl-a" = "SelectAll"; + "Ctrl-b" = "ShellMode"; + "Ctrl-c" = "Copy|CopyLine"; + "Ctrl-d" = "DuplicateLine"; + "Ctrl-e" = "CommandMode"; + "Ctrl-f" = "Find"; + "Ctrl-g" = "ToggleHelp"; + "Ctrl-h" = "Backspace"; + "Ctrl-j" = "PlayMacro"; + "Ctrl-k" = "CutLine"; + "Ctrl-l" = "command-edit:goto "; + "Ctrl-n" = "FindNext"; + "Ctrl-o" = "OpenFile"; + "Ctrl-p" = "FindPrevious"; + "Ctrl-q" = "Quit"; + "Ctrl-r" = "ToggleRuler"; + "Ctrl-s" = "Save"; + "Ctrl-t" = "AddTab"; + "Ctrl-u" = "ToggleMacro"; + "Ctrl-v" = "Paste"; + "Ctrl-w" = "NextSplit"; + "Ctrl-x" = "Cut|CutLine"; + "Ctrl-y" = "Redo"; + "Ctrl-z" = "Undo"; + "CtrlDown" = "CursorEnd"; + "CtrlEnd" = "CursorEnd"; + "CtrlHome" = "CursorStart"; + "CtrlPageDown" = "NextTab"; + "CtrlPageUp" = "PreviousTab"; + "AltPageDown" = "NextTab"; + "AltPageUp" = "PreviousTab"; + "CtrlShiftDown" = "SelectToEnd"; + "CtrlShiftLeft" = "SelectWordLeft"; + "CtrlShiftRight" = "SelectWordRight"; + "CtrlShiftUp" = "SelectToStart"; + "CtrlUp" = "CursorStart"; + "Delete" = "Delete"; + "Down" = "CursorDown"; + "End" = "EndOfLine"; + "Enter" = "InsertNewline"; + "Esc" = "Escape"; + "F10" = "Quit"; + "F2" = "Save"; + "F3" = "Find"; + "F4" = "Quit"; + "F7" = "Find"; + "Home" = "StartOfText"; + "Insert" = "ToggleOverwriteMode"; + "Left" = "CursorLeft"; + "MouseLeft" = "MousePress"; + "MouseLeftDrag" = "MouseDrag"; + "MouseLeftRelease" = "MouseRelease"; + "MouseMiddle" = "PastePrimary"; + "MouseWheelDown" = "ScrollDown"; + "MouseWheelUp" = "ScrollUp"; + "PageDown" = "CursorPageDown"; + "PageUp" = "CursorPageUp"; + "Right" = "CursorRight"; + "ShiftDown" = "SelectDown"; + "ShiftEnd" = "SelectToEndOfLine"; + "ShiftHome" = "SelectToStartOfTextToggle"; + "ShiftLeft" = "SelectLeft"; + "ShiftPageDown" = "SelectPageDown"; + "ShiftPageUp" = "SelectPageUp"; + "ShiftRight" = "SelectRight"; + "ShiftUp" = "SelectUp"; + "Tab" = "Autocomplete|IndentSelection|InsertTab"; + "Up" = "CursorUp"; - # plugins - "Alt-/" = "lua:comment.comment"; - "Alt-d" = "command:definition"; - # "Alt-f" = "command:format"; - "Alt-k" = "command:hover"; - "Alt-r" = "command:references"; - "CtrlSpace" = "command:lspcompletion"; - "CtrlUnderscore" = "lua:comment.comment"; - "F1" = "command:cheat"; - # "F4" = "command:jumptag"; - "F5" = "lua:wc.wordCount"; - }); + # plugins + "Alt-/" = "lua:comment.comment"; + "Alt-d" = "command:definition"; + # "Alt-f" = "command:format"; + "Alt-k" = "command:hover"; + "Alt-r" = "command:references"; + "CtrlSpace" = "command:lspcompletion"; + "CtrlUnderscore" = "lua:comment.comment"; + "F1" = "command:cheat"; + # "F4" = "command:jumptag"; + "F5" = "lua:wc.wordCount"; + } + ); # plugins "${config.xdg.configHome}/micro/plug/lsp".source = pkgs.fetchFromGitHub { @@ -213,5 +215,4 @@ }; }; - }
diff --git a/config/home-manager/zaphyra/programs/networkManagerDmenu.nix b/config/home-manager/zaphyra/programs/networkManagerDmenu.nix @@ -2,40 +2,39 @@ { - home = { - packages = [ pkgs.networkmanager_dmenu ]; - file.".config/networkmanager-dmenu/config.ini".text = lib.generators.toINI { } { - dmenu = { - dmenu_command = "${lib.getExe pkgs.fuzzel} --anchor=top-right --x-margin=13 --y-margin=13"; - active_chars = "=="; - highlight = true; - highlight_bold = true; - compact = false; - pinentry = lib.getExe pkgs.pinentry-gnome3; - wifi_icons = ""; - format = "{name:<{max_len_name}s} {sec:<{max_len_sec}s} {icon:>4}"; - list_saved = false; - prompt = "Networks"; - }; - - dmenu_passphrase = { - obscure = false; - obscure_color = "#222222"; - }; - - pinentry = { - description = "Get network password"; - prompt = "Password:"; - }; - - editor = { - terminal = lib.getExe pkgs.ghostty; - gui_if_available = true; - gui = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; - }; - - nmdm.rescan_delay = 5; + home.packages = [ pkgs.networkmanager_dmenu ]; + + home.file.".config/networkmanager-dmenu/config.ini".text = lib.generators.toINI { } { + dmenu = { + dmenu_command = "${lib.getExe pkgs.fuzzel} --anchor=top-right --x-margin=13 --y-margin=13"; + active_chars = "=="; + highlight = true; + highlight_bold = true; + compact = false; + pinentry = lib.getExe pkgs.pinentry-gnome3; + wifi_icons = ""; + format = "{name:<{max_len_name}s} {sec:<{max_len_sec}s} {icon:>4}"; + list_saved = false; + prompt = "Networks"; }; + + dmenu_passphrase = { + obscure = false; + obscure_color = "#222222"; + }; + + pinentry = { + description = "Get network password"; + prompt = "Password:"; + }; + + editor = { + terminal = lib.getExe pkgs.ghostty; + gui_if_available = true; + gui = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + }; + + nmdm.rescan_delay = 5; }; programs.sherlock.settings.ignore = "NetworkManager Dmenu";
diff --git a/config/home-manager/zaphyra/programs/paper-plane.nix b/config/home-manager/zaphyra/programs/paper-plane.nix @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = [ pkgs.paper-plane ]; - -}
diff --git a/config/home-manager/zaphyra/programs/password-store.nix b/config/home-manager/zaphyra/programs/password-store.nix @@ -2,9 +2,7 @@ { - home = { - packages = [ pkgs.pwgen ]; - }; + home.packages = [ pkgs.pwgen ]; programs = { password-store = {
diff --git a/config/home-manager/zaphyra/programs/phockup.nix b/config/home-manager/zaphyra/programs/phockup.nix @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = [ pkgs.phockup ]; - -}
diff --git a/config/home-manager/zaphyra/programs/profanity.nix b/config/home-manager/zaphyra/programs/profanity.nix @@ -2,13 +2,11 @@ { - home = { - packages = [ pkgs.profanity ]; - - persistence."/nix/persist/home/${config.home.username}".directories = [ - "profanity/.config/profanity/" - "profanity/.local/share/profanity/" - ]; - }; + home.persistence."/nix/persist/home/${config.home.username}".directories = [ + "profanity/.config/profanity/" + "profanity/.local/share/profanity/" + ]; + + home.packages = [ pkgs.profanity ]; }
diff --git a/config/home-manager/zaphyra/programs/shellUtilities.nix b/config/home-manager/zaphyra/programs/shellUtilities.nix @@ -18,60 +18,57 @@ grep = "rg"; find = "fd"; - backgrounditems = ''bgiparser -f "$HOME/Library/Application Support/com.apple.backgroundtaskmanagementagent/backgrounditems.btm" -c''; - - zzz = (if pkgs.stdenv.isLinux then "sleep 1 && systemctl suspend" else "pmset sleepnow"); + zzz = "sleep 1 && systemctl suspend"; wget = "wget --hsts-file=\"${config.xdg.dataHome}/wget-hsts\""; }; - home.packages = - with pkgs; - [ - coreutils - trash-cli + home.packages = with pkgs; [ + coreutils + trash-cli + + pwgen - pwgen + (pkgs.writeShellScriptBin "use" '' + declare -a all + for p in "$@"; do + all+=("''${NIXPKGS_PATH}#$p") + done + eval nix shell ''${all[@]} + '') - (pkgs.writeShellScriptBin "use" '' - declare -a all - for p in "$@"; do - all+=("''${NIXPKGS_PATH}#$p") - done - eval nix shell ''${all[@]} - '') + wget + curl + rsync - wget - curl - rsync + ripgrep + fd - ripgrep - fd + fx + file + bc - fx - file - bc + unzip - unzip + smartmontools - smartmontools + gptfdisk + e2fsprogs + dosfstools - gptfdisk - e2fsprogs - dosfstools - ] - ++ lib.optionals pkgs.stdenv.isLinux [ - (pkgs.writeShellScriptBin "open" (lib.concatStringsSep " " [ + (pkgs.writeShellScriptBin "open" ( + lib.concatStringsSep " " [ (lib.getExe' pkgs.coreutils "nohup") (lib.getExe' pkgs.xdg-utils "xdg-open") "$@" "> /dev/null 2>&1" - ])) + ] + )) - usbutils - pciutils + usbutils + pciutils - lm_sensors - ]; + lm_sensors + ]; }
diff --git a/config/home-manager/zaphyra/programs/texlive.nix b/config/home-manager/zaphyra/programs/texlive.nix @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = [ pkgs.texlive.combined.scheme-full ]; - -}
diff --git a/config/home-manager/zaphyra/programs/thunderbird.nix b/config/home-manager/zaphyra/programs/thunderbird.nix @@ -8,29 +8,31 @@ { - home.packages = [ pkgs.thunderbird ]; - home.persistence."/nix/persist/home/${config.home.username}".directories = [ "thunderbird/.thunderbird/" "thunderbird/.cache/thunderbird" ]; + home.packages = [ pkgs.thunderbird ]; + systemd.user.services.thunderbird = { Unit.After = [ "graphical-session-pre.target" ]; Unit.PartOf = [ "graphical-session.target" ]; Service = { - Environment = "PATH=" + (lib.makeBinPath [ - "/run/wrappers" - ( - if !systemConfig.nix.settings.use-xdg-base-directories then - "/home/${config.home.username}/.nix-profile" - else - "/home/${config.home.username}/.local/state/nix/profile" - ) - "/nix/var/nix/profiles/default" - "/run/current-system/sw" - ]); + Environment = + "PATH=" + + (lib.makeBinPath [ + "/run/wrappers" + ( + if !systemConfig.nix.settings.use-xdg-base-directories then + "/home/${config.home.username}/.nix-profile" + else + "/home/${config.home.username}/.local/state/nix/profile" + ) + "/nix/var/nix/profiles/default" + "/run/current-system/sw" + ]); ExecStart = lib.getExe pkgs.thunderbird; Restart = "always"; RestartSec = 5;
diff --git a/config/home-manager/zaphyra/programs/tuba.nix b/config/home-manager/zaphyra/programs/tuba.nix @@ -6,12 +6,12 @@ { - home.packages = [ pkgs.tuba ]; - home.persistence."/nix/persist/home/${config.home.username}".directories = [ "tuba/.cache/tuba" ]; + home.packages = [ pkgs.tuba ]; + dconf.settings = { "dev/geopjr/Tuba" = { work-in-background = true;
diff --git a/config/home-manager/zaphyra/services/batsignal.nix b/config/home-manager/zaphyra/services/batsignal.nix @@ -15,8 +15,9 @@ "-w20" "-c10" "-d5" - "-D" "systemctl suspend" + "-D" + "systemctl suspend" ]; }; -}- \ No newline at end of file +}
diff --git a/config/home-manager/zaphyra/services/dssd.nix b/config/home-manager/zaphyra/services/dssd.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: {
diff --git a/config/home-manager/zaphyra/services/easyeffects.nix b/config/home-manager/zaphyra/services/easyeffects.nix @@ -1,29 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = [ pkgs.easyeffects ]; - - systemd.user.services.easyeffects = { - Unit.After = [ "graphical-session-pre.target" ]; - Unit.PartOf = [ "graphical-session.target" ]; - - Service = { - ExecStart = "${pkgs.easyeffects}/bin/easyeffects --gapplication-service"; - Restart = "always"; - RestartSec = 5; - Environment = "PATH=" + (lib.makeBinPath (with pkgs; [ - ( - if !config.nix.settings.use-xdg-base-directories then - "/home/${config.home.username}/.nix-profile" - else - "/home/${config.home.username}/.local/state/nix/profile/bin" - ) - "/run/current-system/sw" - ])); - }; - - Install.WantedBy = [ "graphical-session.target" ]; - }; - -}
diff --git a/config/home-manager/zaphyra/services/owntone.nix b/config/home-manager/zaphyra/services/owntone.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { @@ -6,52 +11,57 @@ "owntone/.local/share/owntone" ]; - systemd.user.services.owntone = let - configFile = pkgs.writeText "owntone.conf" '' - general { - uid = "${config.home.username}" - db_path = "/home/${config.home.username}/.local/share/owntone/db_songs3.db" - loglevel = log - logfile = "/home/${config.home.username}/.local/share/owntone/owntone.log" - cache_dir = "/home/${config.home.username}/.local/share/owntone/cache" - speaker_autoselect = true - } - - airplay_shared { - control_port = 7200 - timing_port = 7201 - } - - library { - name = "owntone on %h" - port = 3689 - clear_queue_on_stop_disable = true - directories = { "/home/${config.home.username}/Music", "/home/${config.home.username}/Audiobooks" } - audiobooks = { "/Audiobooks" } - } - - audio { - nickname = "Computer" - type = "pulseaudio" - } - - streaming {} - ''; - in { - Unit = { - Description = "owntone music server"; - ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" "pipewire-pulse.service" ]; - StartLimitBurst = 5; - StartLimitIntervalSec = 10; - }; - Service = { - ExecStart = "${lib.getExe pkgs.owntone} -f -c ${configFile}"; - Restart = "on-failure"; - RestartSec = 5; + systemd.user.services.owntone = + let + configFile = pkgs.writeText "owntone.conf" '' + general { + uid = "${config.home.username}" + db_path = "/home/${config.home.username}/.local/share/owntone/db_songs3.db" + loglevel = log + logfile = "/home/${config.home.username}/.local/share/owntone/owntone.log" + cache_dir = "/home/${config.home.username}/.local/share/owntone/cache" + speaker_autoselect = true + } + + airplay_shared { + control_port = 7200 + timing_port = 7201 + } + + library { + name = "owntone on %h" + port = 3689 + clear_queue_on_stop_disable = true + directories = { "/home/${config.home.username}/Music", "/home/${config.home.username}/Audiobooks" } + audiobooks = { "/Audiobooks" } + } + + audio { + nickname = "Computer" + type = "pulseaudio" + } + + streaming {} + ''; + in + { + Unit = { + Description = "owntone music server"; + ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; + PartOf = [ "graphical-session.target" ]; + After = [ + "graphical-session.target" + "pipewire-pulse.service" + ]; + StartLimitBurst = 5; + StartLimitIntervalSec = 10; + }; + Service = { + ExecStart = "${lib.getExe pkgs.owntone} -f -c ${configFile}"; + Restart = "on-failure"; + RestartSec = 5; + }; + Install.WantedBy = [ "graphical-session.target" ]; }; - Install.WantedBy = [ "graphical-session.target" ]; - }; -}- \ No newline at end of file +}
diff --git a/config/home-manager/zaphyra/services/shaderbg.nix b/config/home-manager/zaphyra/services/shaderbg.nix @@ -1,10 +1,14 @@ { inputs, ... }: { + tgc.services.shaderbg = { enable = true; systemd.enable = true; - systemd.extraArgs = [ "--fps" "10" ]; + systemd.extraArgs = [ + "--fps" + "10" + ]; systemd.shaderFile = inputs.self.resources.shaders.background1; };
diff --git a/config/home-manager/zaphyra/services/swaync.nix b/config/home-manager/zaphyra/services/swaync.nix @@ -1,5 +1,4 @@ { - config, lib, pkgs, ... @@ -90,7 +89,7 @@ { type = "toggle"; label = ""; -# command = "swaync-client -cp; ${config.home.sessionVariables.TERMINAL} --confirm-close-surface=false -e ${lib.getExe pkgs.bluetui}"; + # command = "swaync-client -cp; ${config.home.sessionVariables.TERMINAL} --confirm-close-surface=false -e ${lib.getExe pkgs.bluetui}"; command = "swaync-client -cp; ${lib.getExe pkgs.overskride}"; update-command = "sh -c 'bluetoothctl show | grep -q \\\"Powered: yes\\\" && echo true || echo false'"; } @@ -136,15 +135,17 @@ cancel-symbol= ''; waylogout = lib.concatStringsSep " " [ - (lib.getExe (pkgs.waylogout.overrideAttrs rec { - version = "0.3"; - src = pkgs.fetchFromGitHub { - owner = "loserMcloser"; - repo = "waylogout"; - rev = "v${version}"; - hash = "sha256-dsuuTjmZm3IpqXU68LsAz86HNbMFvKhWPYOMG/5Z4jE="; - }; - })) + (lib.getExe ( + pkgs.waylogout.overrideAttrs rec { + version = "0.3"; + src = pkgs.fetchFromGitHub { + owner = "loserMcloser"; + repo = "waylogout"; + rev = "v${version}"; + hash = "sha256-dsuuTjmZm3IpqXU68LsAz86HNbMFvKhWPYOMG/5Z4jE="; + }; + } + )) "--config=${configFile}" ];
diff --git a/config/home-manager/zaphyra/services/swayosd.nix b/config/home-manager/zaphyra/services/swayosd.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }:
diff --git a/config/home-manager/zaphyra/services/waybar.nix b/config/home-manager/zaphyra/services/waybar.nix @@ -1,5 +1,4 @@ { - inputs, config, homeManagerModules, pkgs,
diff --git a/config/nixos/modules/users/zaphyra.nix b/config/nixos/modules/users/zaphyra.nix @@ -74,7 +74,6 @@ in programs.languages.javascript programs.yt-dlp - programs.phockup programs.bitwarden-cli programs.chaosctl