diff --git a/flake.lock b/flake.lock index 4313795..d8151a7 100644 --- a/flake.lock +++ b/flake.lock @@ -409,11 +409,11 @@ }, "master": { "locked": { - "lastModified": 1733891572, - "narHash": "sha256-hjHQRAr9BvGc4d9D1WO3yfgcB6PuSdMmgEs3h0H6Fyc=", + "lastModified": 1733978256, + "narHash": "sha256-JSWAumioVHzcihVEutSMdWni9Mbm7hU9IJ41AvHLiS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ba85f8268e192247d5239e2e7de26455db7d2bb", + "rev": "94b321638afed597e9bb528d45441c3fbfee2662", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733846759, - "narHash": "sha256-Xp/rWqO4XXJAqh5c2xju4NCBRpi8lQIknLQmCYfrdWY=", + "lastModified": 1733962285, + "narHash": "sha256-djpjqhPZkqfe1USsuu+eT4ZyGO+dVvAf3l4FUCZEb6Y=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "dcd1be4d5f9fa160d0c68c1967f4ecc458b01969", + "rev": "2025aef04baf723bfa4cb8225fc11a319a5681f1", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1733731191, - "narHash": "sha256-Xtd0YLx6RKJMDu2GfE9geO48Dw3KnpVkfZjUqA51xDw=", + "lastModified": 1733924897, + "narHash": "sha256-Fxzl754uzyNebXW54LUliFliMbw30XG+bdb0AVtPSM0=", "owner": "neovim", "repo": "neovim", - "rev": "3bb2d027597107a3d7f84ef61507104fd4dc050a", + "rev": "442d338cb50e4cf08c58cb82b6d33b6d5df9fb1b", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1733706547, - "narHash": "sha256-BdFW7TMgES7q8I5FGX5hlz+0Xp4WyfAP3tHDwEupSWU=", + "lastModified": 1733965598, + "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f5a0197ccfef7388885fc9455e74d6dd39e0c5e8", + "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", "type": "github" }, "original": { @@ -661,11 +661,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733656523, - "narHash": "sha256-w0FXPfpGhOihoJDiwMsyN1EzpsXi2F8VQ+NVZQSMtys=", + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "93dc9803a1ee435e590b02cde9589038d5cc3a4e", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "type": "github" }, "original": { @@ -685,11 +685,11 @@ ] }, "locked": { - "lastModified": 1733890938, - "narHash": "sha256-LEq3RrH5VzyrcSMeFrel3YVQwNCf3QGjeYUJsPKKm70=", + "lastModified": 1733977336, + "narHash": "sha256-rxzLvbEPO7sm6wOMKb87EukGKSXUmviUMdYFNmqYIkU=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "0020db05066d3674ba240328db7c66085be54117", + "rev": "08a4f044937d93feed488f30b95109a6430f04d7", "type": "github" }, "original": { @@ -828,11 +828,11 @@ ] }, "locked": { - "lastModified": 1733785344, - "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "mic92", "repo": "sops-nix", - "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { @@ -849,11 +849,11 @@ ] }, "locked": { - "lastModified": 1733890649, - "narHash": "sha256-hHh4lrCNK7PSj7pnIu17NPGjfq+cVzgU0Qg8G0FcAaM=", + "lastModified": 1733977011, + "narHash": "sha256-o01UQJJwQWKXYGTrBy2TBmtTeCVUPmoGKVQv9JQcICk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b4389ffe0af645713baf1a16a0fa69bea9c08a34", + "rev": "b13d7de63ad41b10bab6e96ad7aacbfa83ab1d26", "type": "github" }, "original": { @@ -864,11 +864,11 @@ }, "stable": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { diff --git a/hosts/gerg-desktop/secrets.yaml b/hosts/gerg-desktop/secrets.yaml index 0c3b34d..d5050cd 100644 --- a/hosts/gerg-desktop/secrets.yaml +++ b/hosts/gerg-desktop/secrets.yaml @@ -5,7 +5,6 @@ searxngenv: ENC[AES256_GCM,data:HtH4KxXWoQEJp88Bgfhfj5Y4Up+inHu8mnVtay64XvCRpVKH minifluxenv: ENC[AES256_GCM,data:wgz6sxSbbjXrgBAak0Q0TlvG78+JHPpiPtcbqGo9HpSF3qY78edECCDB3qqIaynxdhI4,iv:mbsr+OG8fE5MggmC+TNkLmhhDNGvJo+uelNRo/rMLoo=,tag:xN+FbNHZIVCruQh23aMt5g==,type:str] gerg: ENC[AES256_GCM,data:iSwWGIIxQenCPMd/Tith/eagjVINn0mgrO99IG85cP4UXtut6GF2R57XDMeD7SU18vW1ULod/lYuTo0SmmrkmX+wlDWgm4cODw==,iv:fHTcn4ZmjSqLC8jQkuualRbp+RwvgblS1ic6WPb2WEY=,tag:rkDuXhvleKekv3bVpdNNuw==,type:str] store_key: ENC[AES256_GCM,data:2XioKwoH0V5QuedXl4w2IFrT2qOQWF0kbchYTMhyL9BaUqYHhXQi4buvKUVbBQ8AnzD1GJT3ZRy1S13CxEkdQvXE0IY0iX5nkTJtI3VgpiF64wfvZqcLQGaaNTCg+AEDP304KtIZZiao,iv:PV0bORWHoRDM8HvFwOI2sl7QjfD9G0VXSZ9RrPBUsyM=,tag:caVnOow466eBT/5bqYU0Iw==,type:str] -nextcloud: ENC[AES256_GCM,data:CJqcH+l7EMwV8q7S,iv:uiq+lRMYR8APoVCmliAvUEthBUABdPXxs53y8I1WB+M=,tag:ObRMNYp9xIKR4VPxQr3JfA==,type:str] github_token: ENC[AES256_GCM,data:nIWnOvoO8jcoPvKIF4TDdMZxO5H+mAEjLOfQpPmIh0gUSHjadFCwdI0FpMN3D/+8zUXVuAWd2FfCdzKIxGApGqlXAn3aajkUeBK8rYF554COuxa4B43SjRlfvanCZyfsbxzFxoO1RDlzHUMUSzYgFE8wdvj804luIA==,iv:OcRPCZP3KIKv+OuS28jIEp5zQyFw/41gMMdPBVj5N9w=,tag:t+oJDxqwyFU92kDh0ot+6w==,type:str] gerg_ssl_key: ENC[AES256_GCM,data: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,iv:fq1npi+bC2O1OqsizTAgK6qRf8MG98ACyydnGGNptwQ=,tag:kBR6cPmS7uvWlRo1CLQG3Q==,type:str] gerg_ssl_cert: ENC[AES256_GCM,data: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,iv:VHH48PmpIsrWOtTqHmmT+q7CE+HmsEX9+DaXmGXreFE=,tag:s+zhy9blkNBUZDD8cJJnyg==,type:str] @@ -26,8 +25,8 @@ sops: dGhDRXRTWE9xSGtxQU80RVpuL1A5MkEKxAxC/wDkq+6hM8eXkWd/RBDNIUtGYnPy MvVxB6dkj+S11oRcMpdFqiM9jSzz/gYecB2tfuDgj+UX/VAzSkvPxA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-23T00:55:21Z" - mac: ENC[AES256_GCM,data:pWFsQRxR07TQabhLKG7RDy2HoxiiBm1TwUFQPPfRJHQGIxDNtkXMogrduWnE/Lg3TD2WrICWREiqgr5kluKrAUHHiaOHkprLv46ki7hHxHlfNLPorxEB2B0IUJXszvEu4LtdOl7tgsxdKxqbmMUlt6aeXFo/ruffCLEWnzYOhdY=,iv:qtS3k/Dd1oPHsYh7wCKziZp8iF0EWGxjMV4Qv8U5yLE=,tag:D4hzye2Ady10CYje9FT8ig==,type:str] + lastmodified: "2024-12-12T02:54:09Z" + mac: ENC[AES256_GCM,data:35sEYE7m/B2M0hZIQuVLIBtYxMcCzwSqf+airqCevcOF1TR/2TaMIuBlFYYx/EhYF+St/iIrXezk/3N8L88Vhsxkz9KZzURFK+0WijAafa7gObWGrFbacQVaLQJpsYawvWsFIhK6BwLByGyzwn8VPZJvrI7Y3XwWCd/E9/sJ/WE=,iv:IaZZf/iGDK6YUTLq9Q3H8dEeQAsXTGPFxyEczOtyWgc=,tag:/T/Hikiiip3w+DVfdFPd9Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.2 diff --git a/hosts/gerg-desktop/services/nextcloud.nix b/hosts/gerg-desktop/services/nextcloud.nix deleted file mode 100644 index 20872fe..0000000 --- a/hosts/gerg-desktop/services/nextcloud.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, config }: -{ - sops.secrets.nextcloud.owner = "nextcloud"; - - users.users.nextcloud.extraGroups = [ "postgres" ]; - - services.nextcloud = { - enable = true; - package = pkgs.nextcloud30; - home = "/persist/services/nextcloud"; - datadir = "/persist/services/nextcloud"; - extraAppsEnable = false; - hostName = "next.gerg-l.com"; - autoUpdateApps.enable = false; - database.createLocally = true; - config = { - dbtype = "pgsql"; - adminpassFile = config.sops.secrets.nextcloud.path; - adminuser = "admin-root"; - }; - settings = { - overwriteprotocol = "https"; - default_phone_region = "US"; - }; - }; -} diff --git a/hosts/gerg-desktop/services/nginx.nix b/hosts/gerg-desktop/services/nginx.nix index eba9dbf..8262374 100644 --- a/hosts/gerg-desktop/services/nginx.nix +++ b/hosts/gerg-desktop/services/nginx.nix @@ -21,9 +21,9 @@ extraDomainNames = [ "search.gerg-l.com" "git.gerg-l.com" - "next.gerg-l.com" "flux.gerg-l.com" "cache.gerg-l.com" + "photos.gerg-l.com" ]; }; }; @@ -66,14 +66,6 @@ locations."/".proxyPass = "http://unix:${config.systemd.services.miniflux.environment.LISTEN_ADDR}"; }; - "next.gerg-l.com" = { - forceSSL = true; - useACMEHost = "gerg-l.com"; - extraConfig = '' - zstd on; - zstd_types "*"; - ''; - }; "cache.gerg-l.com" = { forceSSL = true; useACMEHost = "gerg-l.com"; @@ -83,6 +75,7 @@ extraConfig = '' zstd on; zstd_types "*"; + client_max_body_size 50000M; ''; }; }; @@ -90,6 +83,11 @@ forceSSL = true; useACMEHost = "gerg-l.com"; locations."/".proxyPass = "http://localhost:${toString config.services.immich.port}"; + extraConfig = '' + zstd on; + zstd_types "*"; + client_max_body_size 50000M; + ''; }; }; }; diff --git a/modules/misc.nix b/modules/misc.nix index 21d37b8..0372f33 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -11,11 +11,9 @@ }; config = { - nixpkgs = { - config = { - allowAliases = false; - allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree; - }; + nixpkgs.config = { + allowAliases = false; + allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree; }; programs.git.enable = true; diff --git a/modules/page.nix b/modules/page.nix new file mode 100644 index 0000000..d8403ff --- /dev/null +++ b/modules/page.nix @@ -0,0 +1,23 @@ +{ pkgs, config }: +{ + systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ]; + + environment = { + systemPackages = [ pkgs.page ]; + variables = { + PAGER = "page -WC -q 90000 -z 90000"; + SYSTEMD_PAGERSECURE = "true"; + MANPAGER = "page -t man"; + }; + shellAliases.page = config.environment.variables.PAGER; + }; + + programs.zsh.interactiveShellInit = '' + man () { + PROGRAM="''${@[-1]}" + SECTION="''${@[-2]}" + page -W "man://$PROGRAM''${SECTION:+($SECTION)}" + } + ''; + +} diff --git a/modules/security.nix b/modules/security.nix new file mode 100644 index 0000000..49e74e0 --- /dev/null +++ b/modules/security.nix @@ -0,0 +1,22 @@ +{ + environment.shellAliases = { + sudo = "sudo "; + #make run0 use aliases + run0 = "run0 --background='' "; + s = "run0"; + }; + security = { + sudo = { + execWheelOnly = true; + extraConfig = '' + Defaults timestamp_timeout=1 + Defaults env_keep += "EDITOR VISUAL PAGER SYSTEMD_PAGERSECURE MANPAGER" + Defaults lecture = never + ''; + }; + pam.services.systemd-run0 = { + setEnvironment = true; + pamMount = false; + }; + }; +} diff --git a/modules/shell.nix b/modules/shell.nix index 66799e7..62409c9 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -1,27 +1,18 @@ { fetch-rs, pkgs, - config, }: { - systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ]; environment = { systemPackages = builtins.attrValues { - inherit (pkgs) page eza fzf; + inherit (pkgs) eza fzf; inherit (fetch-rs.packages) fetch-rs; }; variables = { EDITOR = "nvim"; VISUAL = "nvim"; - PAGER = "page -WC -q 90000 -z 90000"; - SYSTEMD_PAGERSECURE = "true"; - MANPAGER = "page -t man"; }; shellAliases = { - sudo = "sudo "; - #make run0 use aliases - run0 = "run0 --background='' "; - s = "run0"; #paste link trick pastebin = "curl -F 'clbin=<-' https://clbin.com"; termbin = "nc termbin.com 9999"; @@ -40,127 +31,60 @@ lx = "eza -lbhHigUmuSa@ --time-style=long-iso --git --color-scale"; lS = "eza -1"; lt = "eza --tree --level=2"; - page = config.environment.variables.PAGER; }; interactiveShellInit = "fetch-rs"; }; - security.sudo = { - execWheelOnly = true; - extraConfig = '' - Defaults timestamp_timeout=1 - Defaults env_keep += "EDITOR VISUAL PAGER SYSTEMD_PAGERSECURE MANPAGER" - Defaults lecture = never - ''; - }; - - #zsh stuff - users.defaultUserShell = pkgs.zsh; - programs = { - zsh = { - enable = true; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - histSize = 10000; - histFile = "$HOME/.cache/zsh_history"; - interactiveShellInit = '' - ### zsh-history-substring-search ### - setopt HIST_IGNORE_ALL_DUPS - source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh - bindkey '^[[A' history-substring-search-up - bindkey '^[[B' history-substring-search-down - ### fzf-tab ### - source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh - ### pager ### - man () { - PROGRAM="''${@[-1]}" - SECTION="''${@[-2]}" - page -W "man://$PROGRAM''${SECTION:+($SECTION)}" - } - ### transient shell prompt ### - zle-line-init() { - emulate -L zsh - - [[ $CONTEXT == start ]] || return 0 - - while true; do - zle .recursive-edit - local -i ret=$? - [[ $ret == 0 && $KEYS == $'\4' ]] || break - [[ -o ignore_eof ]] || exit 0 - done - - local saved_prompt=$PROMPT - local saved_rprompt=$RPROMPT - PROMPT='\$ ' - RPROMPT=''' - zle .reset-prompt - PROMPT=$saved_prompt - RPROMPT=$saved_rprompt - - if (( ret )); then - zle .send-break - else - zle .accept-line - fi - return ret - } - - zle -N zle-line-init - ''; - }; - #starship - starship = { - enable = true; - settings = { - add_newline = false; + programs.starship = { + enable = true; + settings = { + add_newline = false; + format = '' + $cmd_duration$git_metrics$git_state$git_branch + $status$directory$character''; + right_format = "$sudo$nix_shell\${custom.direnv} $time"; + continuation_prompt = "▶▶ "; + character = { + success_symbol = "[\\$](#9ece6a bold)"; + error_symbol = "[\\$](#db4b4b bold)"; + }; + status = { + disabled = false; + format = "[$status]($style) "; + }; + nix_shell = { + format = "[󱄅 ](#74b2ff)"; + heuristic = true; + }; + directory = { + read_only = " "; + }; + git_metrics = { + disabled = false; + }; + git_branch = { + format = "[$symbol$branch(:$remote_branch)]($style)"; + style = "bold red"; + }; + cmd_duration = { + min_time = 5000; + style = "bold #9ece6a"; + }; + custom.direnv = { + format = "[\\[direnv\\]]($style)"; + style = "#36c692"; + when = "printenv DIRENV_FILE"; + }; + time = { format = '' - $cmd_duration$git_metrics$git_state$git_branch - $status$directory$character''; - right_format = "$sudo$nix_shell\${custom.direnv} $time"; - continuation_prompt = "▶▶ "; - character = { - success_symbol = "[\\$](#9ece6a bold)"; - error_symbol = "[\\$](#db4b4b bold)"; - }; - status = { - disabled = false; - format = "[$status]($style) "; - }; - nix_shell = { - format = "[󱄅 ](#74b2ff)"; - heuristic = true; - }; - directory = { - read_only = " "; - }; - git_metrics = { - disabled = false; - }; - git_branch = { - format = "[$symbol$branch(:$remote_branch)]($style)"; - style = "bold red"; - }; - cmd_duration = { - min_time = 5000; - style = "bold #9ece6a"; - }; - custom.direnv = { - format = "[\\[direnv\\]]($style)"; - style = "#36c692"; - when = "printenv DIRENV_FILE"; - }; - time = { - format = '' - [$time]($style) - ''; - time_format = "%I:%M %p"; - disabled = false; - }; - sudo = { - format = "[ ](#7aa2f7)"; - disabled = false; - }; + [$time]($style) + ''; + time_format = "%I:%M %p"; + disabled = false; + }; + sudo = { + format = "[ ](#7aa2f7)"; + disabled = false; }; }; }; diff --git a/modules/zsh.nix b/modules/zsh.nix new file mode 100644 index 0000000..dc1239a --- /dev/null +++ b/modules/zsh.nix @@ -0,0 +1,53 @@ +{ pkgs }: +{ + users.defaultUserShell = pkgs.zsh; + programs = { + zsh = { + enable = true; + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + histSize = 20000; + histFile = "$HOME/.cache/zsh_history"; + interactiveShellInit = '' + ### zsh-history-substring-search ### + setopt HIST_IGNORE_ALL_DUPS + source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh + bindkey '^[[A' history-substring-search-up + bindkey '^[[B' history-substring-search-down + ### fzf-tab ### + source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh + ### transient shell prompt ### + zle-line-init() { + emulate -L zsh + + [[ $CONTEXT == start ]] || return 0 + + while true; do + zle .recursive-edit + local -i ret=$? + [[ $ret == 0 && $KEYS == $'\4' ]] || break + [[ -o ignore_eof ]] || exit 0 + done + + local saved_prompt=$PROMPT + local saved_rprompt=$RPROMPT + PROMPT='\$ ' + RPROMPT=''' + zle .reset-prompt + PROMPT=$saved_prompt + RPROMPT=$saved_rprompt + + if (( ret )); then + zle .send-break + else + zle .accept-line + fi + return ret + } + + zle -N zle-line-init + ''; + }; + + }; +}