From e0d8fd1473779e81778f160d208252b98dd533f8 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 13 Nov 2024 03:43:51 -0500 Subject: [PATCH] Split up Librewolf CSS to make it more readable --- .../home/programs/gui/librewolf/default.nix | 285 +----------------- .../home/programs/gui/librewolf/quteFox.css | 256 ++++++++++++++++ .../home/programs/gui/mangohud/default.nix | 2 +- .../home/programs/gui/pcmanfm-qt/default.nix | 2 - .../home/programs/terminal/ranger/default.nix | 7 +- modules/home/wms/sway/hotkeys/default.nix | 2 +- modules/home/wms/sway/rules/default.nix | 6 - modules/home/wms/waybar/default.nix | 14 +- .../system/services/general/mpd/default.nix | 4 +- .../server/fileserver/local/nfs/default.nix | 8 +- .../server/fileserver/local/samba/default.nix | 10 - .../public/nextcloud/nginx/default.nix | 6 +- .../fileserver/public/photoprism/default.nix | 40 +-- .../server/icecast/liquidsoap/default.nix | 2 +- .../icecast/liquidsoap/jimbops/default.nix | 2 +- .../{jimscrap => jimscrapped}/default.nix | 2 +- .../server/mailserver/simplenix/default.nix | 14 +- 17 files changed, 303 insertions(+), 359 deletions(-) create mode 100644 modules/home/programs/gui/librewolf/quteFox.css rename modules/system/services/server/icecast/liquidsoap/{jimscrap => jimscrapped}/default.nix (93%) diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix index 3893ec2..09174f5 100644 --- a/modules/home/programs/gui/librewolf/default.nix +++ b/modules/home/programs/gui/librewolf/default.nix @@ -1,6 +1,10 @@ { pkgs, config, ... }: let - # FireFox colors, based on https://github.com/Dook97/firefox-qutebrowser-userchrome + # FireFox theme, based on https://github.com/Dook97/firefox-qutebrowser-userchrome + themeFont = '' + --tab-font: '${config.look.fonts.main}'; + --urlbar-font: '${config.look.fonts.main}'; + ''; themeJim = '' :root { --tab-active-bg-color: #${config.look.colors.prime}; @@ -23,267 +27,6 @@ let --urlbar-not-focused-bg-color: #${config.look.colors.prime}; --toolbar-bgcolor: #${config.look.colors.prime} !important; ''; - quteFoxCSS = '' - --tab-font: '${config.look.fonts.main}'; - --urlbar-font: '${config.look.fonts.main}'; - - /* try increasing if you encounter problems */ - --urlbar-height-setting: 24px; - --tab-min-height: 20px !important; - - /* I don't recommend you touch this */ - --arrowpanel-menuitem-padding: 2px !important; - --arrowpanel-border-radius: 0px !important; - --arrowpanel-menuitem-border-radius: 0px !important; - --toolbarbutton-border-radius: 0px !important; - --toolbarbutton-inner-padding: 0px 2px !important; - --toolbar-field-focus-background-color: var(--urlbar-focused-bg-color) !important; - --toolbar-field-background-color: var(--urlbar-not-focused-bg-color) !important; - --toolbar-field-focus-border-color: transparent !important; - } - - /* --- General debloat ------------------------------ */ - - /* bottom left page loading status or url preview */ - #statuspanel { display: none !important; } - - /* remove radius from right-click popup */ - menupopup, panel { --panel-border-radius: 0px !important; } - menu, menuitem, menucaption { border-radius: 0px !important; } - - /* no large buttons in right-click menu */ - menupopup > #context-navigation { display: none !important; } - menupopup > #context-sep-navigation { display: none !important; } - - /* --- Debloat navbar ------------------------------- */ - - #back-button { display: none; } - #forward-button { display: none; } - #reload-button { display: none; } - #stop-button { display: none; } - #home-button { display: none; } - #library-button { display: none; } - #fxa-toolbar-menu-button { display: none; } - /* empty space before and after the url bar */ - #customizableui-special-spring1, #customizableui-special-spring2 { display: none; } - - /* --- Style navbar -------------------------------- */ - - /* remove padding between toolbar buttons */ - toolbar .toolbarbutton-1 { padding: 0 0 !important; } - - #urlbar-container { - --urlbar-container-height: var(--urlbar-height-setting) !important; - margin-left: 0 !important; - margin-right: 0 !important; - padding-top: 0 !important; - padding-bottom: 0 !important; - font-family: var(--urlbar-font, 'monospace'); - font-size: 14px; - } - - #urlbar { - --urlbar-height: var(--urlbar-height-setting) !important; - --urlbar-toolbar-height: var(--urlbar-height-setting) !important; - min-height: var(--urlbar-height-setting) !important; - border-color: var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25)) !important; - } - - #urlbar-input { - margin-left: 0.8em !important; - margin-right: 0.4em !important; - } - - #navigator-toolbox { - border: none !important; - } - - /* keep pop-up menus from overlapping with navbar */ - #widget-overflow { margin: 0 !important; } - #appmenu-popup { margin: 0 !important; } - #customizationui-widget-panel { margin: 0 !important; } - #unified-extensions-panel { margin: 0 !important; } - - /* --- Unified extensions button -------------------- */ - - /* make extension icons smaller */ - #unified-extensions-view { - --uei-icon-size: 18px; - } - - /* hide bloat */ - .unified-extensions-item-message-deck, - #unified-extensions-view > .panel-header, - #unified-extensions-view > toolbarseparator, - #unified-extensions-manage-extensions { - display: none !important; - } - - /* add 3px padding on the top and the bottom of the box */ - .panel-subview-body { - padding: 3px 0px !important; - } - - #unified-extensions-view .unified-extensions-item-menu-button { - margin-inline-end: 0 !important; - } - - #unified-extensions-view .toolbarbutton-icon { - padding: 0 !important; - } - - .unified-extensions-item-contents { - line-height: 1 !important; - white-space: nowrap !important; - } - - /* --- Debloat URL bar ------------------------------- */ - - #identity-box { display: none; } - #pageActionButton { display: none; } - #pocket-button { display: none; } - #urlbar-zoom-button { display: none; } - #tracking-protection-icon-container { display: none !important; } - #reader-mode-button{ display: none !important; } - #star-button { display: none; } - #star-button-box:hover { background: inherit !important; } - - /* Go to arrow button at the end of the urlbar when searching */ - #urlbar-go-button { display: none; } - - /* remove container indicator from urlbar */ - #userContext-label, #userContext-indicator { display: none !important;} - - /* --- Style tab toolbar ---------------------------- */ - - #titlebar { - --proton-tab-block-margin: 0px !important; - --tab-block-margin: 0px !important; - } - - #TabsToolbar, .tabbrowser-tab { - max-height: var(--tab-min-height) !important; - font-size: 14px !important; - outline: none !important; - } - - /* Change color of normal tabs */ - tab:not([selected="true"]) { - background-color: var(--tab-inactive-bg-color) !important; - color: var(--identity-icon-color, var(--tab-inactive-fg-fallback-color)) !important; - } - - tab { - font-family: var(--tab-font, monospace); - border: none !important; - } - - /* safari style tab width */ - .tabbrowser-tab[fadein] { - max-width: 100vw !important; - border: none - } - - /* Hide close button on tabs */ - #tabbrowser-tabs .tabbrowser-tab .tab-close-button { display: none !important; } - - .tabbrowser-tab { - /* remove border between tabs */ - padding-inline: 0px !important; - /* reduce fade effect of tab text */ - --tab-label-mask-size: 1em !important; - /* fix pinned tab behaviour on overflow */ - overflow-clip-margin: 0px !important; - } - - /* Tab: selected colors */ - #tabbrowser-tabs .tabbrowser-tab[selected] .tab-content { - background: var(--tab-active-bg-color) !important; - color: var(--identity-icon-color, var(--tab-active-fg-fallback-color)) !important; - } - - /* Tab: hovered colors */ - #tabbrowser-tabs .tabbrowser-tab:hover:not([selected]) .tab-content { - background: var(--tab-hover-bg-color) !important; - } - - /* hide window controls */ - .titlebar-buttonbox-container { display: none; } - - /* remove titlebar spacers */ - .titlebar-spacer { display: none !important; } - - /* disable tab shadow */ - #tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) { - box-shadow: none !important; - } - - /* remove dark space between pinned tab and first non-pinned tab */ - #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > - #tabbrowser-arrowscrollbox > - .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) { - margin-inline-start: 0px !important; - } - - /* remove dropdown menu button which displays all tabs on overflow */ - #alltabs-button { display: none !important } - - /* fix displaying of pinned tabs on overflow */ - #tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container { - height: var(--tab-min-height) !important; - } - - /* remove overflow scroll buttons */ - #scrollbutton-up, #scrollbutton-down { display: none !important; } - - /* remove new tab button */ - #tabs-newtab-button { - display: none !important; - } - - /* --- Autohide Navbar ------------------------------ */ - - /* hide navbar unless focused */ - #nav-bar { - min-height: 0 !important; - max-height: 0 !important; - height: 0 !important; - --moz-transform: scaleY(0) !important; - transform: scaleY(0) !important; - } - - /* show on focus */ - #nav-bar:focus-within { - --moz-transform: scale(1) !important; - transform: scale(1) !important; - max-height: var(--urlbar-height-setting) !important; - height: var(--urlbar-height-setting) !important; - min-height: var(--urlbar-height-setting) !important; - } - - #navigator-toolbox:focus-within > .browser-toolbar { - transform: translateY(0); - opacity: 1; - } - - /* --- Hide tab bar on single tab ------------------- */ - - #tabbrowser-tabs .tabbrowser-tab:only-of-type, - #tabbrowser-tabs .tabbrowser-tab:only-of-type + #tabbrowser-arrowscrollbox-periphery{ - display:none !important; - } - #tabbrowser-tabs, #tabbrowser-arrowscrollbox {min-height:0!important;} - #alltabs-button {display:none !important;} - - /* --- Prevent tab folding -------------------------- */ - - .tabbrowser-tab { - min-width: initial !important; - } - .tab-content { - overflow: hidden !important; - } - ''; in { # Enable Librewolf and extensions programs.firefox = let @@ -376,7 +119,8 @@ in { settings = commonSettings; userChrome = '' ${themeJim} - ${quteFoxCSS} + ${themeFont} + ${builtins.readFile ./quteFox.css} ''; }; Alt = { @@ -386,7 +130,8 @@ in { settings = commonSettings; userChrome = '' ${themeAlt} - ${quteFoxCSS} + ${themeFont} + ${builtins.readFile ./quteFox.css} ''; }; Misc = { @@ -395,18 +140,6 @@ in { search = commonSearch; settings = commonSettings; containersForce = true; - containers = { - Google = { - color = "green"; - icon = "fingerprint"; - id = 200; - }; - Work = { - color = "red"; - icon = "briefcase"; - id = 201; - }; - }; }; }; }; diff --git a/modules/home/programs/gui/librewolf/quteFox.css b/modules/home/programs/gui/librewolf/quteFox.css new file mode 100644 index 0000000..9be0846 --- /dev/null +++ b/modules/home/programs/gui/librewolf/quteFox.css @@ -0,0 +1,256 @@ + /* try increasing if you encounter problems */ + --urlbar-height-setting: 24px; + --tab-min-height: 20px !important; + + /* I don't recommend you touch this */ + --arrowpanel-menuitem-padding: 2px !important; + --arrowpanel-border-radius: 0px !important; + --arrowpanel-menuitem-border-radius: 0px !important; + --toolbarbutton-border-radius: 0px !important; + --toolbarbutton-inner-padding: 0px 2px !important; + --toolbar-field-focus-background-color: var(--urlbar-focused-bg-color) !important; + --toolbar-field-background-color: var(--urlbar-not-focused-bg-color) !important; + --toolbar-field-focus-border-color: transparent !important; +} + +/* --- General debloat ------------------------------ */ + +/* bottom left page loading status or url preview */ +#statuspanel { display: none !important; } + +/* remove radius from right-click popup */ +menupopup, panel { --panel-border-radius: 0px !important; } +menu, menuitem, menucaption { border-radius: 0px !important; } + +/* no large buttons in right-click menu */ +menupopup > #context-navigation { display: none !important; } +menupopup > #context-sep-navigation { display: none !important; } + +/* --- Debloat navbar ------------------------------- */ + +#back-button { display: none; } +#forward-button { display: none; } +#reload-button { display: none; } +#stop-button { display: none; } +#home-button { display: none; } +#library-button { display: none; } +#fxa-toolbar-menu-button { display: none; } +/* empty space before and after the url bar */ +#customizableui-special-spring1, #customizableui-special-spring2 { display: none; } + +/* --- Style navbar -------------------------------- */ + +/* remove padding between toolbar buttons */ +toolbar .toolbarbutton-1 { padding: 0 0 !important; } + +#urlbar-container { + --urlbar-container-height: var(--urlbar-height-setting) !important; + margin-left: 0 !important; + margin-right: 0 !important; + padding-top: 0 !important; + padding-bottom: 0 !important; + font-family: var(--urlbar-font, 'monospace'); + font-size: 14px; +} + +#urlbar { + --urlbar-height: var(--urlbar-height-setting) !important; + --urlbar-toolbar-height: var(--urlbar-height-setting) !important; + min-height: var(--urlbar-height-setting) !important; + border-color: var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25)) !important; +} + +#urlbar-input { + margin-left: 0.8em !important; + margin-right: 0.4em !important; +} + +#navigator-toolbox { + border: none !important; +} + +/* keep pop-up menus from overlapping with navbar */ +#widget-overflow { margin: 0 !important; } +#appmenu-popup { margin: 0 !important; } +#customizationui-widget-panel { margin: 0 !important; } +#unified-extensions-panel { margin: 0 !important; } + +/* --- Unified extensions button -------------------- */ + +/* make extension icons smaller */ +#unified-extensions-view { + --uei-icon-size: 18px; +} + +/* hide bloat */ +.unified-extensions-item-message-deck, +#unified-extensions-view > .panel-header, +#unified-extensions-view > toolbarseparator, +#unified-extensions-manage-extensions { + display: none !important; +} + +/* add 3px padding on the top and the bottom of the box */ +.panel-subview-body { + padding: 3px 0px !important; +} + +#unified-extensions-view .unified-extensions-item-menu-button { + margin-inline-end: 0 !important; +} + +#unified-extensions-view .toolbarbutton-icon { + padding: 0 !important; +} + +.unified-extensions-item-contents { + line-height: 1 !important; + white-space: nowrap !important; +} + +/* --- Debloat URL bar ------------------------------- */ + +#identity-box { display: none; } +#pageActionButton { display: none; } +#pocket-button { display: none; } +#urlbar-zoom-button { display: none; } +#tracking-protection-icon-container { display: none !important; } +#reader-mode-button{ display: none !important; } +#star-button { display: none; } +#star-button-box:hover { background: inherit !important; } + +/* Go to arrow button at the end of the urlbar when searching */ +#urlbar-go-button { display: none; } + +/* remove container indicator from urlbar */ +#userContext-label, #userContext-indicator { display: none !important;} + +/* --- Style tab toolbar ---------------------------- */ + +#titlebar { + --proton-tab-block-margin: 0px !important; + --tab-block-margin: 0px !important; +} + +#TabsToolbar, .tabbrowser-tab { + max-height: var(--tab-min-height) !important; + font-size: 14px !important; + outline: none !important; +} + +/* Change color of normal tabs */ +tab:not([selected="true"]) { + background-color: var(--tab-inactive-bg-color) !important; + color: var(--identity-icon-color, var(--tab-inactive-fg-fallback-color)) !important; +} + +tab { + font-family: var(--tab-font, monospace); + border: none !important; +} + +/* safari style tab width */ +.tabbrowser-tab[fadein] { + max-width: 100vw !important; + border: none +} + +/* Hide close button on tabs */ +#tabbrowser-tabs .tabbrowser-tab .tab-close-button { display: none !important; } + +.tabbrowser-tab { + /* remove border between tabs */ + padding-inline: 0px !important; + /* reduce fade effect of tab text */ + --tab-label-mask-size: 1em !important; + /* fix pinned tab behaviour on overflow */ + overflow-clip-margin: 0px !important; +} + +/* Tab: selected colors */ +#tabbrowser-tabs .tabbrowser-tab[selected] .tab-content { + background: var(--tab-active-bg-color) !important; + color: var(--identity-icon-color, var(--tab-active-fg-fallback-color)) !important; +} + +/* Tab: hovered colors */ +#tabbrowser-tabs .tabbrowser-tab:hover:not([selected]) .tab-content { + background: var(--tab-hover-bg-color) !important; +} + +/* hide window controls */ +.titlebar-buttonbox-container { display: none; } + +/* remove titlebar spacers */ +.titlebar-spacer { display: none !important; } + +/* disable tab shadow */ +#tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) { + box-shadow: none !important; +} + +/* remove dark space between pinned tab and first non-pinned tab */ +#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > +#tabbrowser-arrowscrollbox > +.tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) { + margin-inline-start: 0px !important; +} + +/* remove dropdown menu button which displays all tabs on overflow */ +#alltabs-button { display: none !important } + +/* fix displaying of pinned tabs on overflow */ +#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container { + height: var(--tab-min-height) !important; +} + +/* remove overflow scroll buttons */ +#scrollbutton-up, #scrollbutton-down { display: none !important; } + +/* remove new tab button */ +#tabs-newtab-button { + display: none !important; +} + +/* --- Autohide Navbar ------------------------------ */ + +/* hide navbar unless focused */ +#nav-bar { + min-height: 0 !important; + max-height: 0 !important; + height: 0 !important; + --moz-transform: scaleY(0) !important; + transform: scaleY(0) !important; +} + +/* show on focus */ +#nav-bar:focus-within { + --moz-transform: scale(1) !important; + transform: scale(1) !important; + max-height: var(--urlbar-height-setting) !important; + height: var(--urlbar-height-setting) !important; + min-height: var(--urlbar-height-setting) !important; +} + +#navigator-toolbox:focus-within > .browser-toolbar { + transform: translateY(0); + opacity: 1; +} + +/* --- Hide tab bar on single tab ------------------- */ + +#tabbrowser-tabs .tabbrowser-tab:only-of-type, +#tabbrowser-tabs .tabbrowser-tab:only-of-type + #tabbrowser-arrowscrollbox-periphery{ + display:none !important; +} +#tabbrowser-tabs, #tabbrowser-arrowscrollbox {min-height:0!important;} +#alltabs-button {display:none !important;} + +/* --- Prevent tab folding -------------------------- */ + +.tabbrowser-tab { + min-width: initial !important; +} +.tab-content { + overflow: hidden !important; +} diff --git a/modules/home/programs/gui/mangohud/default.nix b/modules/home/programs/gui/mangohud/default.nix index f46d2b2..95f87f0 100644 --- a/modules/home/programs/gui/mangohud/default.nix +++ b/modules/home/programs/gui/mangohud/default.nix @@ -3,7 +3,7 @@ home = { packages = with pkgs; [ mangohud ]; file = { - # I know options exist for this, but the order is not respected. + # These options exist in Nixlang, but the order is not respected. ".config/MangoHud/MangoHud.conf".text = '' table_columns=2 frametime=0 diff --git a/modules/home/programs/gui/pcmanfm-qt/default.nix b/modules/home/programs/gui/pcmanfm-qt/default.nix index ff6ee82..06ec2f7 100644 --- a/modules/home/programs/gui/pcmanfm-qt/default.nix +++ b/modules/home/programs/gui/pcmanfm-qt/default.nix @@ -13,7 +13,6 @@ RecentFilesNumber=0 [Desktop] - HideItems=false SortColumn=name SortFolderFirst=true SortHiddenLast=false @@ -51,7 +50,6 @@ ShowMenuBar=true ShowTabClose=true SwitchToNewTab=true - TabPaths=@Invalid() ''; }; }; diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index 3ab4e45..5279d2b 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/modules/home/programs/terminal/ranger/default.nix @@ -115,10 +115,9 @@ # Remote files J:/home/jimbo/JimboNFS - K:/home/jimbo/JimboNFS/Downloads - P:/home/jimbo/JimboNFS/Photos - V:/home/jimbo/JimboNFS/Videos/Random - M:/home/jimbo/JimboNFS/Music/Synced + K:/home/jimbo/JimboNFS/Files + V:/home/jimbo/JimboNFS/Media + M:/home/jimbo/JimboNFS/Music ''; }; packages = with pkgs; [ diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix index 8949749..e7738d8 100644 --- a/modules/home/wms/sway/hotkeys/default.nix +++ b/modules/home/wms/sway/hotkeys/default.nix @@ -217,7 +217,7 @@ "${primeMod}+shift+a" = ''focus child''; # Scratchpads - "Shift+Ctrl+Backslash" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888''; + "Shift+Ctrl+Backslash" = ''[app_id="gotop"] scratchpad show, move position center resize set 1216 888''; "${primeMod}+Shift+m" = ''[app_id="music"] scratchpad show, move position center, resize set 1006 657''; "${primeMod}+Shift+v" = ''[app_id="sound"] scratchpad show, move position center, resize set 1000 800''; "${primeMod}+Shift+Backslash" = ''[app_id="com.github.wwmm.easyeffects"] scratchpad show, move position center, resize set 1000 800''; diff --git a/modules/home/wms/sway/rules/default.nix b/modules/home/wms/sway/rules/default.nix index 40e879f..0a6bd94 100644 --- a/modules/home/wms/sway/rules/default.nix +++ b/modules/home/wms/sway/rules/default.nix @@ -71,12 +71,6 @@ command = ''mark scratchpad, opacity 0.9''; } - # Create a "Scratchpad" for apps I don't want to be seen when launched - { - criteria = { con_mark = "hiddenaway"; }; - command = ''move scratchpad''; - } - # Give apps that don't have them borders { criteria = { con_mark = "borderless"; }; diff --git a/modules/home/wms/waybar/default.nix b/modules/home/wms/waybar/default.nix index d601c94..d4af17a 100644 --- a/modules/home/wms/waybar/default.nix +++ b/modules/home/wms/waybar/default.nix @@ -217,20 +217,8 @@ condition=$(echo "$fetch" | sed -n '3p') location=$(echo "$fetch" | sed -n '4p') - # Map weather conditions to emojis - case "$condition" in - "Clear"|"Sunny") emoji="☀️";; - "Cloudy"|"Partly cloudy"|"Overcast") emoji="☁️";; - "Rain") emoji="🌧️";; - "Drizzle") emoji="🌦️";; - "Thunderstorm") emoji="⛈️";; - "Snow") emoji="❄️";; - "Mist"|"Fog"|"Haze") emoji="🌫️";; - *) emoji="🌍";; # Default emoji for unknown - esac - # Display weather emoji and temperature - echo {\"text\":\"$emoji $temp\",\"tooltip\":\"$location: $condition\"} + echo {\"text\":\" $temp\",\"tooltip\":\"$location: $condition\"} ''; format = "{}"; return-type = "json"; diff --git a/modules/system/services/general/mpd/default.nix b/modules/system/services/general/mpd/default.nix index 2f28d76..5ce31d8 100644 --- a/modules/system/services/general/mpd/default.nix +++ b/modules/system/services/general/mpd/default.nix @@ -5,8 +5,8 @@ enable = true; user = "jimbo"; group = "users"; - musicDirectory = "/home/jimbo/JimboNFS/Music/Synced"; - playlistDirectory = "/home/jimbo/JimboNFS/Music/Synced/Playlists"; + musicDirectory = "/home/jimbo/JimboNFS/Music/JimBops"; + playlistDirectory = "/home/jimbo/JimboNFS/Music/JimBops/Playlists"; extraConfig = '' audio_output { type "pipewire" diff --git a/modules/system/services/server/fileserver/local/nfs/default.nix b/modules/system/services/server/fileserver/local/nfs/default.nix index 808c181..99eaa33 100644 --- a/modules/system/services/server/fileserver/local/nfs/default.nix +++ b/modules/system/services/server/fileserver/local/nfs/default.nix @@ -3,12 +3,8 @@ services.nfs.server = { enable = true; exports = '' - /export/JimboNFS/Downloads *(rw,sync,no_subtree_check) - /export/JimboNFS/Documents *(rw,sync,no_subtree_check) - - /export/JimboNFS/Photos *(rw,sync,no_subtree_check) - /export/JimboNFS/Videos *(rw,sync,no_subtree_check) - + /export/JimboNFS/Files *(rw,sync,no_subtree_check) + /export/JimboNFS/Media *(rw,sync,no_subtree_check) /export/JimboNFS/Music *(rw,sync,no_subtree_check) ''; }; diff --git a/modules/system/services/server/fileserver/local/samba/default.nix b/modules/system/services/server/fileserver/local/samba/default.nix index fa1b694..987df05 100644 --- a/modules/system/services/server/fileserver/local/samba/default.nix +++ b/modules/system/services/server/fileserver/local/samba/default.nix @@ -15,16 +15,6 @@ "guest account" = "nobody"; "map to guest" = "bad user"; }; - "roms" = { - "path" = "/export/JimboNFS/Downloads/GameFiles/ROMS"; - "browseable" = "yes"; - "read only" = "no"; - "guest ok" = "yes"; - "create mask" = "0644"; - "directory mask" = "0755"; - "force user" = "username"; - "force group" = "groupname"; - }; }; }; diff --git a/modules/system/services/server/fileserver/public/nextcloud/nginx/default.nix b/modules/system/services/server/fileserver/public/nextcloud/nginx/default.nix index 52f7643..9cd9c06 100644 --- a/modules/system/services/server/fileserver/public/nextcloud/nginx/default.nix +++ b/modules/system/services/server/fileserver/public/nextcloud/nginx/default.nix @@ -5,14 +5,14 @@ addSSL = true; locations."/" = { proxyWebsockets = true; - extraConfig = " - location /.well-known/carddav { + extraConfig = '' + location /.well-known/carddav { return 301 $scheme://$host/remote.php/dav; } location /.well-known/caldav { return 301 $scheme://$host/remote.php/dav; } - "; + ''; }; }; } diff --git a/modules/system/services/server/fileserver/public/photoprism/default.nix b/modules/system/services/server/fileserver/public/photoprism/default.nix index 0871f34..d0e217e 100644 --- a/modules/system/services/server/fileserver/public/photoprism/default.nix +++ b/modules/system/services/server/fileserver/public/photoprism/default.nix @@ -2,31 +2,21 @@ { imports = [ ./nginx ]; - services = { - photoprism = { - enable = true; - port = 2342; - originalsPath = "/var/lib/private/photoprism/originals"; - address = "0.0.0.0"; - settings = { - PHOTOPRISM_ADMIN_USER = "jimbo"; - PHOTOPRISM_ADMIN_PASSWORD = "${config.secrets.prismAdminPass}"; - PHOTOPRISM_DEFAULT_LOCALE = "en"; - PHOTOPRISM_DATABASE_DRIVER = "mysql"; - PHOTOPRISM_DATABASE_NAME = "photoprism"; - PHOTOPRISM_DATABASE_SERVER = "/run/mysqld/mysqld.sock"; - PHOTOPRISM_DATABASE_USER = "photoprism"; - PHOTOPRISM_SITE_URL = "https://gallery.${config.domains.jim1}"; - PHOTOPRISM_SITE_TITLE = "Jimbo's PhotoPrism"; - }; - }; - nginx.virtualHosts."gallery.${config.domains.jim1}" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:2342"; - proxyWebsockets = true; - }; + services.photoprism = { + enable = true; + port = 2342; + originalsPath = "/var/lib/private/photoprism/originals"; + address = "0.0.0.0"; + settings = { + PHOTOPRISM_ADMIN_USER = "jimbo"; + PHOTOPRISM_ADMIN_PASSWORD = "${config.secrets.prismAdminPass}"; + PHOTOPRISM_DEFAULT_LOCALE = "en"; + PHOTOPRISM_DATABASE_DRIVER = "mysql"; + PHOTOPRISM_DATABASE_NAME = "photoprism"; + PHOTOPRISM_DATABASE_SERVER = "/run/mysqld/mysqld.sock"; + PHOTOPRISM_DATABASE_USER = "photoprism"; + PHOTOPRISM_SITE_URL = "https://gallery.${config.domains.jim1}"; + PHOTOPRISM_SITE_TITLE = "Jimbo's PhotoPrism"; }; }; } diff --git a/modules/system/services/server/icecast/liquidsoap/default.nix b/modules/system/services/server/icecast/liquidsoap/default.nix index 63d5d00..87be74d 100644 --- a/modules/system/services/server/icecast/liquidsoap/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/default.nix @@ -2,6 +2,6 @@ { imports = [ ./jimbops - ./jimscrap + ./jimscrapped ]; } diff --git a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix index ec5d850..5b96751 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix @@ -7,7 +7,7 @@ settings.scheduler.fast_queues.set(2) # Define the source with random playlist - jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/Synced")) + jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops")) # Ensure the stream never stops jimbops_fallback = fallback([jimbops, jimbops]) diff --git a/modules/system/services/server/icecast/liquidsoap/jimscrap/default.nix b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix similarity index 93% rename from modules/system/services/server/icecast/liquidsoap/jimscrap/default.nix rename to modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix index 16e32b9..cf0f6f3 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimscrap/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix @@ -7,7 +7,7 @@ settings.scheduler.fast_queues.set(2) # Define the source with random playlist - jimscrap = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/Unsynced")) + jimscrap = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimScrapped")) # Ensure the stream never stops jimscrap_fallback = fallback([jimscrap, jimscrap]) diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix index 69c425b..8aad38c 100644 --- a/modules/system/services/server/mailserver/simplenix/default.nix +++ b/modules/system/services/server/mailserver/simplenix/default.nix @@ -25,7 +25,7 @@ organizationName = "Jimbo's Files"; }; - # A list of accounts, passwords generated with nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' + # Passwords generated with 'mkpasswd -sm bcrypt' loginAccounts = { "noreply@${config.domains.jim1}" = { hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash; @@ -34,11 +34,11 @@ "jimbo@${config.domains.jim2}" = { hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash; aliases = [ - "jimbo@${config.domains.jim1}" - "james@${config.domains.jim1}" - "james@${config.domains.jim2}" - "contact@${config.domains.jim1}" - "contact@${config.domains.jim2}" + "jimbo@${config.domains.jim1}" + "james@${config.domains.jim1}" + "james@${config.domains.jim2}" + "contact@${config.domains.jim1}" + "contact@${config.domains.jim2}" ]; }; "luna@${config.domains.luna}" = { @@ -53,6 +53,6 @@ }; }; - # Assign the correct port + # Rspamd port from earlier to avoid overlap services.redis.servers.rspamd.port = 1515; }