From d5ce9cd3eb1a575a1eeddb828016bda8e8e69fdd Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 29 Apr 2025 16:17:02 -0500 Subject: [PATCH 01/73] updates --- hosts/h002/flake.nix | 7 +++++++ readme.md | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hosts/h002/flake.nix b/hosts/h002/flake.nix index a3ce5aa..3e62499 100644 --- a/hosts/h002/flake.nix +++ b/hosts/h002/flake.nix @@ -35,6 +35,7 @@ { environment.systemPackages = with pkgs; [ lua + qdirstat ]; ringofstorms_common = { @@ -43,10 +44,12 @@ secrets.enable = true; desktopEnvironment.gnome.enable = true; programs = { + qFlipper.enable = true; rustDev.enable = true; tailnet.enable = true; ssh.enable = true; docker.enable = true; + uhkAgent.enable = true; }; users = { admins = [ "luser" ]; # First admin is also the primary user owning nix config @@ -69,6 +72,10 @@ packages = with pkgs; [ bitwarden vaultwarden + google-chrome + firefox-esr + openscad + vlc ]; }; }; diff --git a/readme.md b/readme.md index 066ded1..7b2acce 100644 --- a/readme.md +++ b/readme.md @@ -68,9 +68,7 @@ - atuin setup - if atuin is on enable that mod in configuration.nix, make sure to `atuin login` get key from existing device - TODO move key into secrets and mount it to atuin local share -- stormd onboard to network - ssh key access, ssh iden in config in nix config -- ### Notes From b0ca7ab8d7f6460778fafe576f6cf91b1e0878bc Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 29 Apr 2025 17:15:19 -0500 Subject: [PATCH 02/73] wip podman on h001 --- common/programs/default.nix | 31 +++++++++- common/programs/podman.nix | 32 +++++++++++ hosts/h001/containers/default.nix | 96 +++++++++++++++++++++++++++++++ hosts/h001/flake.nix | 3 +- hosts/h002/flake.lock | 48 +++++----------- hosts/lio/containers.nix | 18 +++--- 6 files changed, 186 insertions(+), 42 deletions(-) create mode 100644 common/programs/podman.nix create mode 100644 hosts/h001/containers/default.nix diff --git a/common/programs/default.nix b/common/programs/default.nix index 9dcd9d3..83e7271 100644 --- a/common/programs/default.nix +++ b/common/programs/default.nix @@ -1,4 +1,8 @@ -{ ... }: +{ config, lib, ... }: +let + ccfg = import ../config.nix; + cfg = config.${ccfg.custom_config_key}.programs; +in { imports = [ ./qFlipper.nix @@ -7,6 +11,31 @@ ./tailnet.nix ./ssh.nix ./docker.nix + ./podman.nix ./incus.nix ]; + config = { + assertions = [ + ( + let + enabledVirtualizers = lib.filter (x: x.enabled) [ + { + name = "docker"; + enabled = cfg.docker.enable; + } + { + name = "podman"; + enabled = cfg.podman.enable; + } + ]; + in + { + assertion = lib.length enabledVirtualizers <= 1; + message = + "Only one virtualizer can be enabled at a time. Enabled: " + + lib.concatStringsSep ", " (map (x: x.name) enabledVirtualizers); + } + ) + ]; + }; } diff --git a/common/programs/podman.nix b/common/programs/podman.nix new file mode 100644 index 0000000..8be88f9 --- /dev/null +++ b/common/programs/podman.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + ... +}: +let + ccfg = import ../config.nix; + cfg_path = [ + ccfg.custom_config_key + "programs" + "podman" + ]; + cfg = lib.attrsets.getAttrFromPath cfg_path config; + users_cfg = config.${ccfg.custom_config_key}.users; +in +{ + options = + { } + // lib.attrsets.setAttrByPath cfg_path { + enable = lib.mkEnableOption "podman"; + }; + + config = lib.mkIf cfg.enable { + virtualisation.podman = { + enable = true; + dockerSocket.enable = true; + autoPrune.enable = true; + }; + # TODO add admins? + users.extraGroups.podman.members = lib.mkIf (users_cfg.primary != null) [ users_cfg.primary ]; + }; +} diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix new file mode 100644 index 0000000..a8952cd --- /dev/null +++ b/hosts/h001/containers/default.nix @@ -0,0 +1,96 @@ +{ common }: +{ + ... +}: +{ + imports = [ + # common.nixosModules.containers.librechat + # common.nixosModules.containers.forgejo + ]; + + config = { + ## Give internet access + networking = { + nat = { + enable = true; + internalInterfaces = [ "ve-*" ]; + externalInterface = "enp0s31f6"; + enableIPv6 = true; + }; + firewall.trustedInterfaces = [ "ve-*" ]; + }; + + containers.wasabi = { + ephemeral = true; + autoStart = true; + privateNetwork = true; + hostAddress = "10.0.0.1"; + localAddress = "10.0.0.111"; + config = + { config, pkgs, ... }: + { + system.stateVersion = "24.11"; + services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall = { + enable = true; + allowedTCPPorts = [ 80 ]; + }; + }; + }; + + virtualisation.oci-containers.containers = { + ntest = { + image = "nginx:alpine"; + ports = [ + "127.0.0.1:8085:80" + ]; + }; + }; + + virtualisation.oci-containers.backend = "podman"; + + services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts = { + "localhost" = { + locations."/" = { + proxyPass = "http://10.0.0.111"; + }; + }; + + # "git.joshuabell.xyz" = { + # # GIT passthrough + # locations."/" = { + # proxyPass = "http://10.0.0.2:3000"; + # }; + # }; + + "_" = { + default = true; + locations."/" = { + return = "404"; # or 444 for drop + }; + }; + }; + + # STREAMS + streamConfig = '' + server { + listen 3032; + proxy_pass 10.0.0.2:3032; + } + ''; + + }; + + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; + }; +} diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index ef45406..e9643ae 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -30,6 +30,7 @@ ros_neovim.nixosModules.default ./configuration.nix ./hardware-configuration.nix + (import ./containers { inherit common; }) ( { config, pkgs, ... }: { @@ -44,7 +45,7 @@ programs = { tailnet.enable = true; ssh.enable = true; - docker.enable = true; + podman.enable = true; }; users = { admins = [ "luser" ]; # First admin is also the primary user owning nix config diff --git a/hosts/h002/flake.lock b/hosts/h002/flake.lock index ac5caf1..ea91b0e 100644 --- a/hosts/h002/flake.lock +++ b/hosts/h002/flake.lock @@ -32,17 +32,17 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1742406739, - "narHash": "sha256-1Tdt3a0Le9cDD0voBeDcSuHtRbVTX/vAhbDrMIOE/+o=", + "lastModified": 1745957989, + "narHash": "sha256-mLYJXPri4DVRa6exEPtzlkje5FZVSYAteObHOxcAvfA=", "ref": "refs/heads/master", - "rev": "2b026ed0c883c942a84d20a9c0491905e61ddbf3", - "revCount": 373, + "rev": "6277d06b4dcaa6665e92aaf5f20eee49a8362556", + "revCount": 426, "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, "crane": { @@ -210,16 +210,15 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1735697839, - "narHash": "sha256-0Acw0UaLi+VNThsmeX8zOKi000DFrYXNnrgpOpk2+MM=", + "lastModified": 1745961410, + "narHash": "sha256-RU4c9JVZp/CdWyPUUZGsZvTWvjrFtXLUnlMs38IeHD0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5eaa5fdf06d2b15d373b82c0f3a1ec1c6cab02ae", + "rev": "a2001229477b3a343b13e6e7870fa37fedd8e09d", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -624,22 +623,6 @@ "type": "github" } }, - "nvim_plugin-lvimuser/lsp-inlayhints.nvim": { - "flake": false, - "locked": { - "lastModified": 1686236485, - "narHash": "sha256-06CiJ+xeMO4+OJkckcslqwloJyt2gwg514JuxV6KOfQ=", - "owner": "lvimuser", - "repo": "lsp-inlayhints.nvim", - "rev": "d981f65c9ae0b6062176f0accb9c151daeda6f16", - "type": "github" - }, - "original": { - "owner": "lvimuser", - "repo": "lsp-inlayhints.nvim", - "type": "github" - } - }, "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { @@ -1193,7 +1176,6 @@ "nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim", "nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim", "nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim", - "nvim_plugin-lvimuser/lsp-inlayhints.nvim": "nvim_plugin-lvimuser/lsp-inlayhints.nvim", "nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim", "nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree", "nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint", @@ -1228,17 +1210,17 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1735841437, - "narHash": "sha256-ZwmlaFhOlQ7f6Rq6VxRup7giPiwQlwe71HcoO/laRJo=", + "lastModified": 1745585761, + "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", "ref": "refs/heads/master", - "rev": "71d82c875fff85ae250804f45f1acf65f42cdc1e", - "revCount": 253, + "rev": "e5523910a0c07c88d026d006f5962434bfa53548", + "revCount": 277, "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" } }, "rust-overlay": { diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index c7ccf60..a8a25ac 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -26,15 +26,12 @@ firewall.trustedInterfaces = [ "ve-*" ]; }; - # mathesar - # services.mathesar.secretKey = "mImvhwyu0cFmtUNOAyOjm6qozWjEmHyrGIpOTZXWW7lnkj5RP3"; - containers.wasabi = { ephemeral = true; autoStart = true; privateNetwork = true; - hostAddress = "192.168.100.2"; - localAddress = "192.168.100.11"; + hostAddress = "10.0.0.1"; + localAddress = "10.0.0.111"; config = { config, pkgs, ... }: { @@ -48,10 +45,17 @@ }; }; + virtualisation.oci-containers.containers = { + ntest = { + image = "nginx:alpine"; + ports = [ + "127.0.0.1:8085:80" + ]; + }; + }; + virtualisation.oci-containers.backend = "docker"; - security.acme.acceptTerms = true; - security.acme.defaults.email = "admin@joshuabell.xyz"; services.nginx = { enable = true; recommendedGzipSettings = true; From ffaa99b97577e1c7389d99b89ad9ae4f200edf76 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 29 Apr 2025 17:23:33 -0500 Subject: [PATCH 03/73] updates; --- hosts/lio/flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 602500b..157fe4b 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -32,11 +32,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745953495, - "narHash": "sha256-8FzNmiQ4FuAk3Lz1vP3Up2npluYPXe5eos05h3npvrA=", + "lastModified": 1745957989, + "narHash": "sha256-mLYJXPri4DVRa6exEPtzlkje5FZVSYAteObHOxcAvfA=", "ref": "refs/heads/master", - "rev": "37d4ac85b2450a407d8528aef1f5de38fbabb72d", - "revCount": 413, + "rev": "6277d06b4dcaa6665e92aaf5f20eee49a8362556", + "revCount": 426, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, From 38fde325abbec819b876998ff006fe31a8f4e228 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 29 Apr 2025 20:52:02 -0500 Subject: [PATCH 04/73] forgejo is setup and works --- hosts/h001/containers/default.nix | 8 +++++++- hosts/h001/flake.lock | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix index a8952cd..4d82b81 100644 --- a/hosts/h001/containers/default.nix +++ b/hosts/h001/containers/default.nix @@ -5,7 +5,7 @@ { imports = [ # common.nixosModules.containers.librechat - # common.nixosModules.containers.forgejo + common.nixosModules.containers.forgejo ]; config = { @@ -63,6 +63,12 @@ }; }; + "git.joshuabell.xyz" = { + locations."/" = { + proxyPass = "http://10.0.0.2:3000"; + }; + }; + # "git.joshuabell.xyz" = { # # GIT passthrough # locations."/" = { diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index 04a823c..9a82927 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -32,11 +32,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745956269, - "narHash": "sha256-rD++3De0ixxLWQcCVJIQzNam5TKXfP5BOX/wZbjlshY=", + "lastModified": 1745965414, + "narHash": "sha256-Vn/sXOtIj5y09jGKw3iaLIrpqW5h37vW1vFBmFehRx8=", "ref": "refs/heads/master", - "rev": "45834a4caf0c72e965fce9e5aa394db35f7a76fe", - "revCount": 423, + "rev": "3d4d7d88290dd1f55542691d3ac45b2a5f021709", + "revCount": 430, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, From 43e095513bf8eb0e0a3ebb78ca9d43f5952ffd3f Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 29 Apr 2025 20:54:19 -0500 Subject: [PATCH 05/73] migrated forgejo to h001, removed from lio --- hosts/linode/l002/flake.lock | 53 ++++++++------------- hosts/linode/l002/flake.nix | 1 - hosts/linode/l002/nginx.nix | 4 +- hosts/lio/containers.nix | 89 ++++++++++++------------------------ hosts/lio/flake.lock | 8 ++-- 5 files changed, 52 insertions(+), 103 deletions(-) diff --git a/hosts/linode/l002/flake.lock b/hosts/linode/l002/flake.lock index ea531e7..9c883c7 100644 --- a/hosts/linode/l002/flake.lock +++ b/hosts/linode/l002/flake.lock @@ -32,17 +32,17 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1742406125, - "narHash": "sha256-+NQNj2IMJuEiymB+YrcZkxeZt7QlC+Bwe5rWgRRHKrU=", + "lastModified": 1745965414, + "narHash": "sha256-Vn/sXOtIj5y09jGKw3iaLIrpqW5h37vW1vFBmFehRx8=", "ref": "refs/heads/master", - "rev": "138565efadeed6baf2a632c5dcc95a2031c77f86", - "revCount": 371, + "rev": "3d4d7d88290dd1f55542691d3ac45b2a5f021709", + "revCount": 430, "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, "crane": { @@ -143,11 +143,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1744743431, + "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", "owner": "rycee", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", "type": "github" }, "original": { @@ -198,11 +198,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -675,22 +675,6 @@ "type": "github" } }, - "nvim_plugin-lvimuser/lsp-inlayhints.nvim": { - "flake": false, - "locked": { - "lastModified": 1686236485, - "narHash": "sha256-06CiJ+xeMO4+OJkckcslqwloJyt2gwg514JuxV6KOfQ=", - "owner": "lvimuser", - "repo": "lsp-inlayhints.nvim", - "rev": "d981f65c9ae0b6062176f0accb9c151daeda6f16", - "type": "github" - }, - "original": { - "owner": "lvimuser", - "repo": "lsp-inlayhints.nvim", - "type": "github" - } - }, "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { @@ -1245,7 +1229,6 @@ "nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim", "nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim", "nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim", - "nvim_plugin-lvimuser/lsp-inlayhints.nvim": "nvim_plugin-lvimuser/lsp-inlayhints.nvim", "nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim", "nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree", "nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint", @@ -1280,17 +1263,17 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1742226527, - "narHash": "sha256-CT9227XXn1t8H1ivNBBkBcf+npB7tWk5yzEQoJvbGVU=", + "lastModified": 1745585761, + "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", "ref": "refs/heads/master", - "rev": "e8bafafc36fb2227dab8f0ddb67a2439d9077091", - "revCount": 268, + "rev": "e5523910a0c07c88d026d006f5962434bfa53548", + "revCount": 277, "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" } }, "rust-overlay": { diff --git a/hosts/linode/l002/flake.nix b/hosts/linode/l002/flake.nix index 55bba4b..30436eb 100644 --- a/hosts/linode/l002/flake.nix +++ b/hosts/linode/l002/flake.nix @@ -63,7 +63,6 @@ }; programs = { tailnet.enable = true; - tailnet.useSecretsAuth = false; ssh.enable = true; }; users = { diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix index 4b61a1c..e786e9d 100644 --- a/hosts/linode/l002/nginx.nix +++ b/hosts/linode/l002/nginx.nix @@ -72,7 +72,7 @@ enableACME = true; forceSSL = true; locations."/" = { - proxyPass = "http://100.64.0.1"; + proxyPass = "http://100.64.0.13"; }; }; @@ -145,7 +145,7 @@ streamConfig = '' server { listen 3032; - proxy_pass 100.64.0.1:3032; + proxy_pass 100.64.0.13:3032; } ''; }; diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index a8a25ac..008cb7f 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -3,7 +3,6 @@ ... }: { - # NOTE some useful links # nixos containers: https://blog.beardhatcode.be/2020/12/Declarative-Nixos-Containers.html # https://nixos.wiki/wiki/NixOS_Containers @@ -11,7 +10,7 @@ imports = [ common.nixosModules.containers.librechat - common.nixosModules.containers.forgejo + # common.nixosModules.containers.forgejo ]; config = { @@ -26,33 +25,33 @@ firewall.trustedInterfaces = [ "ve-*" ]; }; - containers.wasabi = { - ephemeral = true; - autoStart = true; - privateNetwork = true; - hostAddress = "10.0.0.1"; - localAddress = "10.0.0.111"; - config = - { config, pkgs, ... }: - { - system.stateVersion = "24.11"; - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall = { - enable = true; - allowedTCPPorts = [ 80 ]; - }; - }; - }; + # containers.wasabi = { + # ephemeral = true; + # autoStart = true; + # privateNetwork = true; + # hostAddress = "10.0.0.1"; + # localAddress = "10.0.0.111"; + # config = + # { config, pkgs, ... }: + # { + # system.stateVersion = "24.11"; + # services.httpd.enable = true; + # services.httpd.adminAddr = "foo@example.org"; + # networking.firewall = { + # enable = true; + # allowedTCPPorts = [ 80 ]; + # }; + # }; + # }; - virtualisation.oci-containers.containers = { - ntest = { - image = "nginx:alpine"; - ports = [ - "127.0.0.1:8085:80" - ]; - }; - }; + # virtualisation.oci-containers.containers = { + # ntest = { + # image = "nginx:alpine"; + # ports = [ + # "127.0.0.1:8085:80" + # ]; + # }; + # }; virtualisation.oci-containers.backend = "docker"; @@ -63,45 +62,13 @@ recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { - # "local.belljm.com" = { - # # enableACME = true; - # # forceSSL = true; - # locations."/".proxyPass = "http://${config.containers.wasabi.localAddress}:80"; - # }; - # "127.0.0.1" = { - # locations."/wasabi/" = { - # extraConfig = '' - # rewrite ^/wasabi/(.*) /$1 break; - # ''; - # proxyPass = "http://${config.containers.wasabi.localAddress}:80/"; - # }; - # locations."/" = { - # return = "404"; # or 444 for drop - # }; - # }; - "git.joshuabell.xyz" = { - # GIT passthrough - locations."/" = { - proxyPass = "http://10.0.0.2:3000"; - }; - }; - "_" = { default = true; locations."/" = { - return = "404"; # or 444 for drop + return = "444"; # or 444 for drop }; }; }; - - # STREAMS - streamConfig = '' - server { - listen 3032; - proxy_pass 10.0.0.2:3032; - } - ''; - }; networking.firewall.allowedTCPPorts = [ diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 157fe4b..974b2e0 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -32,11 +32,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745957989, - "narHash": "sha256-mLYJXPri4DVRa6exEPtzlkje5FZVSYAteObHOxcAvfA=", + "lastModified": 1745977922, + "narHash": "sha256-Rufv1nlw2OlAzpN+Iz2wf+3RKWRkGVHWaXP+PCtyug0=", "ref": "refs/heads/master", - "rev": "6277d06b4dcaa6665e92aaf5f20eee49a8362556", - "revCount": 426, + "rev": "38fde325abbec819b876998ff006fe31a8f4e228", + "revCount": 431, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, From 3478c743cee4e890ab649dc5e9e16cc952dfb882 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 10:27:12 -0500 Subject: [PATCH 06/73] reduce swap file and add other drive to h001 --- hosts/h001/hardware-configuration.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts/h001/hardware-configuration.nix b/hosts/h001/hardware-configuration.nix index 9a0573e..a3b417a 100644 --- a/hosts/h001/hardware-configuration.nix +++ b/hosts/h001/hardware-configuration.nix @@ -36,10 +36,15 @@ ]; }; + fileSystems."/drives/wd10" = { + device = "/dev/sda"; + fsType = "ext4"; + }; + swapDevices = [ { device = "/.swapfile"; - size = 64 * 1024; # 64GB + size = 4 * 1024; # 4GB } ]; networking.useDHCP = lib.mkDefault true; From ae22a081c8bb9861c09da4a24beb04c0628792f6 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 14:26:41 -0500 Subject: [PATCH 07/73] adguardhome in h001 --- hosts/h001/flake.nix | 1 + hosts/h001/mods/adguardhome.nix | 12 ++++++++++++ hosts/h001/mods/default.nix | 8 ++++++++ 3 files changed, 21 insertions(+) create mode 100644 hosts/h001/mods/adguardhome.nix create mode 100644 hosts/h001/mods/default.nix diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index e9643ae..be29882 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -30,6 +30,7 @@ ros_neovim.nixosModules.default ./configuration.nix ./hardware-configuration.nix + ./mods (import ./containers { inherit common; }) ( { config, pkgs, ... }: diff --git a/hosts/h001/mods/adguardhome.nix b/hosts/h001/mods/adguardhome.nix new file mode 100644 index 0000000..a631614 --- /dev/null +++ b/hosts/h001/mods/adguardhome.nix @@ -0,0 +1,12 @@ +{ + ... +}: +{ + config = { + services.adguardhome = { + enable = true; + allowDHCP = true; + openFirewall = true; + }; + }; +} diff --git a/hosts/h001/mods/default.nix b/hosts/h001/mods/default.nix new file mode 100644 index 0000000..f4a4450 --- /dev/null +++ b/hosts/h001/mods/default.nix @@ -0,0 +1,8 @@ +{ + ... +}: +{ + imports = [ + ./adguardhome.nix + ]; +} From 0a16ebf428d366d0a0282cf457b2d574f38b7dfc Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 14:53:00 -0500 Subject: [PATCH 08/73] enable adguard home --- hosts/h001/flake.nix | 1 + hosts/h001/mods/adguardhome.nix | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index be29882..e224050 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -37,6 +37,7 @@ { environment.systemPackages = with pkgs; [ lua + sqlite ]; ringofstorms_common = { diff --git a/hosts/h001/mods/adguardhome.nix b/hosts/h001/mods/adguardhome.nix index a631614..8f3d86b 100644 --- a/hosts/h001/mods/adguardhome.nix +++ b/hosts/h001/mods/adguardhome.nix @@ -6,7 +6,33 @@ services.adguardhome = { enable = true; allowDHCP = true; - openFirewall = true; + openFirewall = false; + }; + + networking.firewall.allowedTCPPorts = [ + 53 + 67 + 68 + 5543 + ]; + networking.firewall.allowedUDPPorts = [ + 53 + 67 + 68 + 784 + 853 + 8853 + 5443 + ]; + + services.nginx = { + virtualHosts = { + "h001.net.joshuabell.xyz " = { + locations."/" = { + proxyPass = "http://localhost:3000"; + }; + }; + }; }; }; } From 7ae93579413e6bfcc6a55d1fae05ef77dc224676 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 17:31:05 -0500 Subject: [PATCH 09/73] not sure on dhcp server in adguard home reverting back to router for now --- hosts/h001/mods/adguardhome.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hosts/h001/mods/adguardhome.nix b/hosts/h001/mods/adguardhome.nix index 8f3d86b..24d4436 100644 --- a/hosts/h001/mods/adguardhome.nix +++ b/hosts/h001/mods/adguardhome.nix @@ -25,6 +25,20 @@ 5443 ]; + # networking = { + # interfaces = { + # enp0s31f6 = { + # useDHCP = true; + # ipv4.addresses = [ + # { + # address = "10.12.14.2"; + # prefixLength = 24; + # } + # ]; + # }; + # }; + # }; + services.nginx = { virtualHosts = { "h001.net.joshuabell.xyz " = { From ddd64258a23944c160167675d486e089cfe2ae7f Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 17:51:47 -0500 Subject: [PATCH 10/73] move open gist to h001 from o001 --- hosts/h001/containers/default.nix | 1 + .../o001 => h001}/containers/opengist.nix | 3 --- hosts/lio/flake.nix | 1 + hosts/oracle/o001/flake.lock | 24 +++++++++---------- hosts/oracle/o001/flake.nix | 1 - 5 files changed, 14 insertions(+), 16 deletions(-) rename hosts/{oracle/o001 => h001}/containers/opengist.nix (87%) diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix index 4d82b81..c18778a 100644 --- a/hosts/h001/containers/default.nix +++ b/hosts/h001/containers/default.nix @@ -6,6 +6,7 @@ imports = [ # common.nixosModules.containers.librechat common.nixosModules.containers.forgejo + ./opengist.nix ]; config = { diff --git a/hosts/oracle/o001/containers/opengist.nix b/hosts/h001/containers/opengist.nix similarity index 87% rename from hosts/oracle/o001/containers/opengist.nix rename to hosts/h001/containers/opengist.nix index 444e443..fe8fa6c 100644 --- a/hosts/oracle/o001/containers/opengist.nix +++ b/hosts/h001/containers/opengist.nix @@ -8,7 +8,6 @@ let v_port = 6157; in { - virtualisation.oci-containers.backend = "docker"; virtualisation.oci-containers.containers = { opengist = { user = "root"; @@ -26,8 +25,6 @@ in }; services.nginx.virtualHosts."gist.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; locations = { "/" = { proxyWebsockets = true; diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 627e69d..1e62772 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -45,6 +45,7 @@ ffmpeg-full appimage-run rustdesk-flutter + element-desktop ]; # Also allow this key to work for root user, this will let us use this as a remote builder easier diff --git a/hosts/oracle/o001/flake.lock b/hosts/oracle/o001/flake.lock index a025c25..9ed0a31 100644 --- a/hosts/oracle/o001/flake.lock +++ b/hosts/oracle/o001/flake.lock @@ -32,17 +32,17 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745444238, - "narHash": "sha256-zT1T9zC7dr+HApuC390eQHPpCJq4vYvOwYSq507DtFA=", + "lastModified": 1746052265, + "narHash": "sha256-/cb1BPEUb1O/clHP101M52hvUZ2zo8FAyJS7BF/M3Mg=", "ref": "refs/heads/master", - "rev": "214e6f289da1e888ff547aff173aaffc8517092b", - "revCount": 399, + "rev": "7ae93579413e6bfcc6a55d1fae05ef77dc224676", + "revCount": 436, "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, "crane": { @@ -1263,17 +1263,17 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744648171, - "narHash": "sha256-DodI1yschNbktPZiGKM6Gke2pgEM0J4wkVaM+Ygk0Cs=", + "lastModified": 1745585761, + "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", "ref": "refs/heads/master", - "rev": "0a14d0e7451d17a2f368749cf269c6a59aa35059", - "revCount": 274, + "rev": "e5523910a0c07c88d026d006f5962434bfa53548", + "revCount": 277, "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" } }, "rust-overlay": { diff --git a/hosts/oracle/o001/flake.nix b/hosts/oracle/o001/flake.nix index f18005e..f18dbfc 100644 --- a/hosts/oracle/o001/flake.nix +++ b/hosts/oracle/o001/flake.nix @@ -47,7 +47,6 @@ ./hardware-configuration.nix ./nginx.nix ./containers/vaultwarden.nix - ./containers/opengist.nix ./mods/postgresql.nix ./mods/atuin.nix ./mods/rustdesk-server.nix From a3977aa0db623cb537fe9adc0f7579f17f7ad428 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 18:10:52 -0500 Subject: [PATCH 11/73] fix routing --- hosts/h001/containers/opengist.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/h001/containers/opengist.nix b/hosts/h001/containers/opengist.nix index fe8fa6c..6a6dfb5 100644 --- a/hosts/h001/containers/opengist.nix +++ b/hosts/h001/containers/opengist.nix @@ -10,7 +10,6 @@ in { virtualisation.oci-containers.containers = { opengist = { - user = "root"; image = "ghcr.io/thomiceli/opengist:1"; ports = [ "127.0.0.1:${toString v_port}:${toString v_port}" @@ -23,6 +22,11 @@ in }; }; }; + system.activationScripts."${name}_directories" = '' + mkdir -p ${hostDataDir} + chown -R root:root ${hostDataDir} + chmod -R 777 ${hostDataDir} + ''; services.nginx.virtualHosts."gist.joshuabell.xyz" = { locations = { From db3af41809e1f85af140bca25f54f5ac9c37dd1e Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 18:11:03 -0500 Subject: [PATCH 12/73] update routing for gist --- hosts/linode/l002/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix index e786e9d..b7270ae 100644 --- a/hosts/linode/l002/nginx.nix +++ b/hosts/linode/l002/nginx.nix @@ -65,7 +65,7 @@ enableACME = true; forceSSL = true; locations."/" = { - proxyPass = "http://100.64.0.2:6157"; + proxyPass = "http://100.64.0.13"; }; }; "git.joshuabell.xyz" = { From 7fd871e3ef8254f1975877b31e77c790d9c3f0f4 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 22:46:01 -0500 Subject: [PATCH 13/73] move proxy routes to o001 from l002 --- hosts/linode/l002/nginx.nix | 8 ------ hosts/lio/flake.lock | 8 +++--- hosts/oracle/o001/nginx.nix | 57 +++++++++++++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix index b7270ae..90bd7e8 100644 --- a/hosts/linode/l002/nginx.nix +++ b/hosts/linode/l002/nginx.nix @@ -53,14 +53,6 @@ proxyPass = "http://100.64.0.1:3080"; }; }; - "db.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://100.64.0.1:3085"; - }; - }; "gist.joshuabell.xyz" = { enableACME = true; forceSSL = true; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 974b2e0..5c9bde7 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -1210,11 +1210,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745585761, - "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", + "lastModified": 1746068171, + "narHash": "sha256-QmZ0oKt8AHpkOUnD8i+Zr278J+t7kZLYAWUs8s5QOF0=", "ref": "refs/heads/master", - "rev": "e5523910a0c07c88d026d006f5962434bfa53548", - "revCount": 277, + "rev": "46dbdc77583ea181c7ca4836f46888d1f8e2a704", + "revCount": 278, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index e9901d3..ba8d491 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -52,11 +52,21 @@ # Redirect self IP to domain "64.181.210.7" = { locations."/" = { - return = "301 https://o001.joshuabell.xyz"; + return = "301 https://joshuabell.xyz"; }; }; - "o001.joshuabell.xyz" = { + "100.64.0.11" = tailnetConfig; + "o001.net.joshuabell.xyz" = tailnetConfig; + + "www.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + return = "301 https://joshuabell.xyz"; + }; + }; + "joshuabell.xyz" = { enableACME = true; forceSSL = true; locations = { @@ -74,7 +84,6 @@
- In the void you roam,
A page that cannot be found-
Turn back, seek anew. @@ -87,13 +96,49 @@ }; }; - "100.64.0.11" = tailnetConfig; - "o001.net.joshuabell.xyz" = tailnetConfig; + "www.ellalala.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + return = "301 https://ellalala.com"; + }; + }; + "ellalala.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + return = "444"; + }; + }; + + # PROXY HOSTS + "chat.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://100.64.0.1:3080"; + }; + }; + "gist.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://100.64.0.13"; + }; + }; + "git.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://100.64.0.13"; + }; + }; "_" = { default = true; locations."/" = { - return = "404"; # 404 for not found or 444 for drop + return = "444"; # 404 for not found or 444 for drop }; }; }; From 30c31db1822b570ce29af0ee04c15083ea601ccc Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 1 May 2025 12:07:12 -0500 Subject: [PATCH 14/73] remove l002 --- hosts/linode/l002/configuration.nix | 7 - hosts/linode/l002/flake.lock | 1388 ------------------ hosts/linode/l002/flake.nix | 100 -- hosts/linode/l002/hardware-configuration.nix | 34 - hosts/linode/l002/linode.nix | 32 - hosts/linode/l002/nginx.nix | 150 -- 6 files changed, 1711 deletions(-) delete mode 100644 hosts/linode/l002/configuration.nix delete mode 100644 hosts/linode/l002/flake.lock delete mode 100644 hosts/linode/l002/flake.nix delete mode 100644 hosts/linode/l002/hardware-configuration.nix delete mode 100644 hosts/linode/l002/linode.nix delete mode 100644 hosts/linode/l002/nginx.nix diff --git a/hosts/linode/l002/configuration.nix b/hosts/linode/l002/configuration.nix deleted file mode 100644 index 016d4ad..0000000 --- a/hosts/linode/l002/configuration.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - ... -}: -{ - boot.loader.grub.enable = true; - system.stateVersion = "24.11"; -} diff --git a/hosts/linode/l002/flake.lock b/hosts/linode/l002/flake.lock deleted file mode 100644 index 9c883c7..0000000 --- a/hosts/linode/l002/flake.lock +++ /dev/null @@ -1,1388 +0,0 @@ -{ - "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager_2", - "nixpkgs": [ - "common", - "ragenix", - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", - "owner": "ryantm", - "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "common": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", - "ragenix": "ragenix" - }, - "locked": { - "lastModified": 1745965414, - "narHash": "sha256-Vn/sXOtIj5y09jGKw3iaLIrpqW5h37vW1vFBmFehRx8=", - "ref": "refs/heads/master", - "rev": "3d4d7d88290dd1f55542691d3ac45b2a5f021709", - "revCount": 430, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - }, - "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } - }, - "crane": { - "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "common", - "ragenix", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4", - "utils": "utils" - }, - "locked": { - "lastModified": 1727447169, - "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", - "owner": "rycee", - "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", - "type": "github" - }, - "original": { - "owner": "rycee", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "common", - "ragenix", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1742225912, - "narHash": "sha256-HCD3GrAAJb1jYTEc221DPlBk2VDkBt43hww7DXC1tyc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9df17ad16500057b7b081137ff7af1a8a6a32f6e", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nvim_plugin-Almo7aya/openingh.nvim": { - "flake": false, - "locked": { - "lastModified": 1733158448, - "narHash": "sha256-JP3+goMgs3SiMHS9IVE7NAV/iKxyXi0fZgJb8hojtNQ=", - "owner": "Almo7aya", - "repo": "openingh.nvim", - "rev": "9131016c1167e23522a8e874b62217829fd327b8", - "type": "github" - }, - "original": { - "owner": "Almo7aya", - "repo": "openingh.nvim", - "type": "github" - } - }, - "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { - "flake": false, - "locked": { - "lastModified": 1742210958, - "narHash": "sha256-+1dSGYeUpW/EUbP0scgGz48UB5RAPZYIWCglTFyntaU=", - "owner": "CopilotC-Nvim", - "repo": "CopilotChat.nvim", - "rev": "62b1249aa4a4fc7afe11c7e647cba0cef743826f", - "type": "github" - }, - "original": { - "owner": "CopilotC-Nvim", - "repo": "CopilotChat.nvim", - "type": "github" - } - }, - "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": { - "flake": false, - "locked": { - "lastModified": 1733574156, - "narHash": "sha256-AjDM3+n4+lNBQi8P2Yrh0Ab06uYCndBQT9TX36rDbOM=", - "owner": "JoosepAlviste", - "repo": "nvim-ts-context-commentstring", - "rev": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f", - "type": "github" - }, - "original": { - "owner": "JoosepAlviste", - "repo": "nvim-ts-context-commentstring", - "type": "github" - } - }, - "nvim_plugin-L3MON4D3/LuaSnip": { - "flake": false, - "locked": { - "lastModified": 1736009707, - "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=", - "owner": "L3MON4D3", - "repo": "LuaSnip", - "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817", - "type": "github" - }, - "original": { - "owner": "L3MON4D3", - "repo": "LuaSnip", - "type": "github" - } - }, - "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { - "flake": false, - "locked": { - "lastModified": 1742156824, - "narHash": "sha256-n+pT7FiQONHhiZQH4BGjERrikGNSFTNciMx92oQGA1c=", - "owner": "MeanderingProgrammer", - "repo": "render-markdown.nvim", - "rev": "9721ffe230ec90e49c49ee33b5ca44c3fc689214", - "type": "github" - }, - "original": { - "owner": "MeanderingProgrammer", - "repo": "render-markdown.nvim", - "type": "github" - } - }, - "nvim_plugin-MunifTanjim/nui.nvim": { - "flake": false, - "locked": { - "lastModified": 1741233810, - "narHash": "sha256-BYTY2ezYuxsneAl/yQbwL1aQvVWKSsN3IVqzTlrBSEU=", - "owner": "MunifTanjim", - "repo": "nui.nvim", - "rev": "8d3bce9764e627b62b07424e0df77f680d47ffdb", - "type": "github" - }, - "original": { - "owner": "MunifTanjim", - "repo": "nui.nvim", - "type": "github" - } - }, - "nvim_plugin-RRethy/vim-illuminate": { - "flake": false, - "locked": { - "lastModified": 1740540215, - "narHash": "sha256-jSny+5RHgxcsoxWwIaFUZ022dk3mDRKZ7dibvE6I2fE=", - "owner": "RRethy", - "repo": "vim-illuminate", - "rev": "19cb21f513fc2b02f0c66be70107741e837516a1", - "type": "github" - }, - "original": { - "owner": "RRethy", - "repo": "vim-illuminate", - "type": "github" - } - }, - "nvim_plugin-Saecki/crates.nvim": { - "flake": false, - "locked": { - "lastModified": 1741644182, - "narHash": "sha256-hmUqhAVLBiCUl16+S/hvRxqA/pTXcWejpLtwvqxBPaY=", - "owner": "Saecki", - "repo": "crates.nvim", - "rev": "403a0abef0e2aec12749a534dc468d6fd50c6741", - "type": "github" - }, - "original": { - "owner": "Saecki", - "repo": "crates.nvim", - "type": "github" - } - }, - "nvim_plugin-aznhe21/actions-preview.nvim": { - "flake": false, - "locked": { - "lastModified": 1740589350, - "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=", - "owner": "aznhe21", - "repo": "actions-preview.nvim", - "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2", - "type": "github" - }, - "original": { - "owner": "aznhe21", - "repo": "actions-preview.nvim", - "type": "github" - } - }, - "nvim_plugin-b0o/schemastore.nvim": { - "flake": false, - "locked": { - "lastModified": 1741996938, - "narHash": "sha256-eAqM/n0DDwl3WUO987c2mk3z7uJ4gAE0hkPg4Twyr4w=", - "owner": "b0o", - "repo": "schemastore.nvim", - "rev": "56d8ed0fa1516242085ba5e95d7f49fad50d5754", - "type": "github" - }, - "original": { - "owner": "b0o", - "repo": "schemastore.nvim", - "type": "github" - } - }, - "nvim_plugin-catppuccin/nvim": { - "flake": false, - "locked": { - "lastModified": 1740764472, - "narHash": "sha256-4h/fzFY8JR9r+QnoiWEqgQKPMuu8i9HTC4v0Jp7iuUo=", - "owner": "catppuccin", - "repo": "nvim", - "rev": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "nvim", - "type": "github" - } - }, - "nvim_plugin-chrisgrieser/nvim-early-retirement": { - "flake": false, - "locked": { - "lastModified": 1735588187, - "narHash": "sha256-ZjXG+POJFRsc79i1BuAJB9K6UBUfHT05oYvZaUr+RqA=", - "owner": "chrisgrieser", - "repo": "nvim-early-retirement", - "rev": "9ae6fcc933fc865ddf2728460194b67985e06e27", - "type": "github" - }, - "original": { - "owner": "chrisgrieser", - "repo": "nvim-early-retirement", - "type": "github" - } - }, - "nvim_plugin-declancm/cinnamon.nvim": { - "flake": false, - "locked": { - "lastModified": 1722992123, - "narHash": "sha256-kccQ4iFMSQ8kvE7hYz90hBrsDLo7VohFj/6lEZZiAO8=", - "owner": "declancm", - "repo": "cinnamon.nvim", - "rev": "450cb3247765fed7871b41ef4ce5fa492d834215", - "type": "github" - }, - "original": { - "owner": "declancm", - "repo": "cinnamon.nvim", - "type": "github" - } - }, - "nvim_plugin-folke/lazy.nvim": { - "flake": false, - "locked": { - "lastModified": 1740511197, - "narHash": "sha256-nQ8PR9DTdzg6Z2rViuVD6Pswc2VvDQwS3uMNgyDh5ls=", - "owner": "folke", - "repo": "lazy.nvim", - "rev": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "lazy.nvim", - "type": "github" - } - }, - "nvim_plugin-folke/neodev.nvim": { - "flake": false, - "locked": { - "lastModified": 1720260306, - "narHash": "sha256-hOjzlo/IqmV8tYjGwfmcCPEmHYsWnEIwtHZdhpwA1kM=", - "owner": "folke", - "repo": "neodev.nvim", - "rev": "46aa467dca16cf3dfe27098042402066d2ae242d", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "neodev.nvim", - "type": "github" - } - }, - "nvim_plugin-folke/which-key.nvim": { - "flake": false, - "locked": { - "lastModified": 1740233407, - "narHash": "sha256-uvMcSduMr7Kd2oUmIOYzvWF4FIl6bZxIYm9FSw/3pCo=", - "owner": "folke", - "repo": "which-key.nvim", - "rev": "370ec46f710e058c9c1646273e6b225acf47cbed", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "which-key.nvim", - "type": "github" - } - }, - "nvim_plugin-hrsh7th/cmp-buffer": { - "flake": false, - "locked": { - "lastModified": 1660101488, - "narHash": "sha256-dG4U7MtnXThoa/PD+qFtCt76MQ14V1wX8GMYcvxEnbM=", - "owner": "hrsh7th", - "repo": "cmp-buffer", - "rev": "3022dbc9166796b644a841a02de8dd1cc1d311fa", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-buffer", - "type": "github" - } - }, - "nvim_plugin-hrsh7th/cmp-nvim-lsp": { - "flake": false, - "locked": { - "lastModified": 1733823748, - "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=", - "owner": "hrsh7th", - "repo": "cmp-nvim-lsp", - "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-nvim-lsp", - "type": "github" - } - }, - "nvim_plugin-hrsh7th/cmp-path": { - "flake": false, - "locked": { - "lastModified": 1664784283, - "narHash": "sha256-thppiiV3wjIaZnAXmsh7j3DUc6ceSCvGzviwFUnoPaI=", - "owner": "hrsh7th", - "repo": "cmp-path", - "rev": "91ff86cd9c29299a64f968ebb45846c485725f23", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-path", - "type": "github" - } - }, - "nvim_plugin-hrsh7th/nvim-cmp": { - "flake": false, - "locked": { - "lastModified": 1741936119, - "narHash": "sha256-zl/rgbZF3+nsLI7Sd6xzQFlcpa5n/8pyganS+u0jD/s=", - "owner": "hrsh7th", - "repo": "nvim-cmp", - "rev": "1e1900b0769324a9675ef85b38f99cca29e203b3", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "nvim-cmp", - "type": "github" - } - }, - "nvim_plugin-j-hui/fidget.nvim": { - "flake": false, - "locked": { - "lastModified": 1738817426, - "narHash": "sha256-AFUx/ZQVWV7s5Wlppjk6N9QXoJKNKqxtf990FFlTEhw=", - "owner": "j-hui", - "repo": "fidget.nvim", - "rev": "d9ba6b7bfe29b3119a610892af67602641da778e", - "type": "github" - }, - "original": { - "owner": "j-hui", - "repo": "fidget.nvim", - "type": "github" - } - }, - "nvim_plugin-johmsalas/text-case.nvim": { - "flake": false, - "locked": { - "lastModified": 1722628320, - "narHash": "sha256-2IMufSMy9JW50VzZ3SgOtp8kYs81ANwV0eP0ZH3rTFo=", - "owner": "johmsalas", - "repo": "text-case.nvim", - "rev": "e898cfd46fa6cde0e83abb624a16e67d2ffc6457", - "type": "github" - }, - "original": { - "owner": "johmsalas", - "repo": "text-case.nvim", - "type": "github" - } - }, - "nvim_plugin-lewis6991/gitsigns.nvim": { - "flake": false, - "locked": { - "lastModified": 1742140868, - "narHash": "sha256-qWusbKY+3d1dkW5oLYDyfSLdt1qFlJdDeXgFWqQ4hUI=", - "owner": "lewis6991", - "repo": "gitsigns.nvim", - "rev": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9", - "type": "github" - }, - "original": { - "owner": "lewis6991", - "repo": "gitsigns.nvim", - "type": "github" - } - }, - "nvim_plugin-lnc3l0t/glow.nvim": { - "flake": false, - "locked": { - "lastModified": 1693233815, - "narHash": "sha256-vdlwkIK2EkFviJmSiOqPWvc15xqJ9F2gHCC4ObJ5Qjk=", - "owner": "lnc3l0t", - "repo": "glow.nvim", - "rev": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5", - "type": "github" - }, - "original": { - "owner": "lnc3l0t", - "repo": "glow.nvim", - "type": "github" - } - }, - "nvim_plugin-lukas-reineke/indent-blankline.nvim": { - "flake": false, - "locked": { - "lastModified": 1742224677, - "narHash": "sha256-0q/V+b4UrDRnaC/eRWOi9HU9a61vQSAM9/C8ZQyKt+Y=", - "owner": "lukas-reineke", - "repo": "indent-blankline.nvim", - "rev": "005b56001b2cb30bfa61b7986bc50657816ba4ba", - "type": "github" - }, - "original": { - "owner": "lukas-reineke", - "repo": "indent-blankline.nvim", - "type": "github" - } - }, - "nvim_plugin-m4xshen/hardtime.nvim": { - "flake": false, - "locked": { - "lastModified": 1741414159, - "narHash": "sha256-tigKgK1yGc5JEHd4RLXCd6Hq7ia3en3Xtk8X6L5+ef4=", - "owner": "m4xshen", - "repo": "hardtime.nvim", - "rev": "f87c86d1aa1e05dcf3c6ecd97fbfd237e2de0bf5", - "type": "github" - }, - "original": { - "owner": "m4xshen", - "repo": "hardtime.nvim", - "type": "github" - } - }, - "nvim_plugin-mbbill/undotree": { - "flake": false, - "locked": { - "lastModified": 1741878850, - "narHash": "sha256-HGf4Toe+12YZtIalvANDXAtksCsnxQkZbcevOAnl5G4=", - "owner": "mbbill", - "repo": "undotree", - "rev": "b951b87b46c34356d44aa71886aecf9dd7f5788a", - "type": "github" - }, - "original": { - "owner": "mbbill", - "repo": "undotree", - "type": "github" - } - }, - "nvim_plugin-mfussenegger/nvim-lint": { - "flake": false, - "locked": { - "lastModified": 1738838825, - "narHash": "sha256-E/KcQr4RM4gz+ItENI9e7hMicyBKyzoIaDO5D1VDYSw=", - "owner": "mfussenegger", - "repo": "nvim-lint", - "rev": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8", - "type": "github" - }, - "original": { - "owner": "mfussenegger", - "repo": "nvim-lint", - "type": "github" - } - }, - "nvim_plugin-mrcjkb/rustaceanvim": { - "flake": false, - "locked": { - "lastModified": 1742147378, - "narHash": "sha256-I2H/0VNKWKK49EReXT81SVTHHHW9hT1+6n7h1cbLD0A=", - "owner": "mrcjkb", - "repo": "rustaceanvim", - "rev": "448c76451ecf3c0edabcde427b7f1c8c219be2dd", - "type": "github" - }, - "original": { - "owner": "mrcjkb", - "repo": "rustaceanvim", - "type": "github" - } - }, - "nvim_plugin-neovim/nvim-lspconfig": { - "flake": false, - "locked": { - "lastModified": 1742142850, - "narHash": "sha256-CppHawmKEopPbK6HO4RFd7Kc1iMoCVwpIyN2Z6wiMfo=", - "owner": "neovim", - "repo": "nvim-lspconfig", - "rev": "2574ad38c6ee4f0bef3a1ca305cd5df627a52bb3", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "nvim-lspconfig", - "type": "github" - } - }, - "nvim_plugin-nosduco/remote-sshfs.nvim": { - "flake": false, - "locked": { - "lastModified": 1724901856, - "narHash": "sha256-vFEIISxhTIGSl9LzDYHuEIkjLGkU0y5XhfWI/i5DgN4=", - "owner": "nosduco", - "repo": "remote-sshfs.nvim", - "rev": "03f6c40c4032eeb1ab91368e06db9c3f3a97a75d", - "type": "github" - }, - "original": { - "owner": "nosduco", - "repo": "remote-sshfs.nvim", - "type": "github" - } - }, - "nvim_plugin-numToStr/Comment.nvim": { - "flake": false, - "locked": { - "lastModified": 1717957420, - "narHash": "sha256-h0kPue5Eqd5aeu4VoLH45pF0DmWWo1d8SnLICSQ63zc=", - "owner": "numToStr", - "repo": "Comment.nvim", - "rev": "e30b7f2008e52442154b66f7c519bfd2f1e32acb", - "type": "github" - }, - "original": { - "owner": "numToStr", - "repo": "Comment.nvim", - "type": "github" - } - }, - "nvim_plugin-nvim-lua/plenary.nvim": { - "flake": false, - "locked": { - "lastModified": 1739311008, - "narHash": "sha256-8FV5RjF7QbDmQOQynpK7uRKONKbPRYbOPugf9ZxNvUs=", - "owner": "nvim-lua", - "repo": "plenary.nvim", - "rev": "857c5ac632080dba10aae49dba902ce3abf91b35", - "type": "github" - }, - "original": { - "owner": "nvim-lua", - "repo": "plenary.nvim", - "type": "github" - } - }, - "nvim_plugin-nvim-lualine/lualine.nvim": { - "flake": false, - "locked": { - "lastModified": 1742039150, - "narHash": "sha256-qYKykdCcXd+OHmK3WvsUCbn0zDKTQDj49VYsQ8iVvgs=", - "owner": "nvim-lualine", - "repo": "lualine.nvim", - "rev": "b8b60c7f1d0d95ad74ee215b2291280b30482476", - "type": "github" - }, - "original": { - "owner": "nvim-lualine", - "repo": "lualine.nvim", - "type": "github" - } - }, - "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { - "flake": false, - "locked": { - "lastModified": 1729728595, - "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=", - "owner": "nvim-telescope", - "repo": "telescope-file-browser.nvim", - "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb", - "type": "github" - }, - "original": { - "owner": "nvim-telescope", - "repo": "telescope-file-browser.nvim", - "type": "github" - } - }, - "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim": { - "flake": false, - "locked": { - "lastModified": 1741765009, - "narHash": "sha256-Zyv8ikxdwoUiDD0zsqLzfhBVOm/nKyJdZpndxXEB6ow=", - "owner": "nvim-telescope", - "repo": "telescope-fzf-native.nvim", - "rev": "1f08ed60cafc8f6168b72b80be2b2ea149813e55", - "type": "github" - }, - "original": { - "owner": "nvim-telescope", - "repo": "telescope-fzf-native.nvim", - "type": "github" - } - }, - "nvim_plugin-nvim-telescope/telescope-ui-select.nvim": { - "flake": false, - "locked": { - "lastModified": 1701723223, - "narHash": "sha256-YRhNmmG4gx9Ht8JwjQfbTjJyTHEuZmtP6lqnhOsk8bE=", - "owner": "nvim-telescope", - "repo": "telescope-ui-select.nvim", - "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2", - "type": "github" - }, - "original": { - "owner": "nvim-telescope", - "repo": "telescope-ui-select.nvim", - "type": "github" - } - }, - "nvim_plugin-nvim-telescope/telescope.nvim": { - "flake": false, - "locked": { - "lastModified": 1742171408, - "narHash": "sha256-mHucOyrgQc3wVdK7lUQANW8Jka+m5gQ2z8JWtwo99bU=", - "owner": "nvim-telescope", - "repo": "telescope.nvim", - "rev": "a17d611a0e111836a1db5295f04945df407c5135", - "type": "github" - }, - "original": { - "owner": "nvim-telescope", - "repo": "telescope.nvim", - "type": "github" - } - }, - "nvim_plugin-nvim-tree/nvim-tree.lua": { - "flake": false, - "locked": { - "lastModified": 1740787655, - "narHash": "sha256-KSrY1K64yC6dPDd3DF15bVWs2N7B0BPS9enfmJgTzC4=", - "owner": "nvim-tree", - "repo": "nvim-tree.lua", - "rev": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4", - "type": "github" - }, - "original": { - "owner": "nvim-tree", - "repo": "nvim-tree.lua", - "type": "github" - } - }, - "nvim_plugin-nvim-tree/nvim-web-devicons": { - "flake": false, - "locked": { - "lastModified": 1742215722, - "narHash": "sha256-JKOvXJr1s2lpP5aeRE7OC3IeOrF5uJxg/Tal3eScd6g=", - "owner": "nvim-tree", - "repo": "nvim-web-devicons", - "rev": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c", - "type": "github" - }, - "original": { - "owner": "nvim-tree", - "repo": "nvim-web-devicons", - "type": "github" - } - }, - "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { - "flake": false, - "locked": { - "lastModified": 1742201688, - "narHash": "sha256-rpmHIOXiD/mh0PHBdo1k1Wdb213KtBevmyCFrP89tME=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-context", - "rev": "83ded3bbff8bc13abc9704bf1c5e426f3ba343c4", - "type": "github" - }, - "original": { - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-context", - "type": "github" - } - }, - "nvim_plugin-rafamadriz/friendly-snippets": { - "flake": false, - "locked": { - "lastModified": 1733106470, - "narHash": "sha256-I8SRZxnoNC6SOWW+scoA77Jwyxcb4eUczppLdyOiZe0=", - "owner": "rafamadriz", - "repo": "friendly-snippets", - "rev": "efff286dd74c22f731cdec26a70b46e5b203c619", - "type": "github" - }, - "original": { - "owner": "rafamadriz", - "repo": "friendly-snippets", - "type": "github" - } - }, - "nvim_plugin-rcarriga/nvim-notify": { - "flake": false, - "locked": { - "lastModified": 1737405174, - "narHash": "sha256-6vNfc7E9DMXF0IBXJCLA8Rp+uOgbDch/Q7beW0ys3Vo=", - "owner": "rcarriga", - "repo": "nvim-notify", - "rev": "22f29093eae7785773ee9d543f8750348b1a195c", - "type": "github" - }, - "original": { - "owner": "rcarriga", - "repo": "nvim-notify", - "type": "github" - } - }, - "nvim_plugin-rmagatti/auto-session": { - "flake": false, - "locked": { - "lastModified": 1742136796, - "narHash": "sha256-Tc4EfcucGAR+5qURjoYqG5gW24PCYJLVd47OrFhyfRo=", - "owner": "rmagatti", - "repo": "auto-session", - "rev": "317412742990371f8e4709074da5c378456a27ff", - "type": "github" - }, - "original": { - "owner": "rmagatti", - "repo": "auto-session", - "type": "github" - } - }, - "nvim_plugin-ron/ron.vim": { - "flake": false, - "locked": { - "lastModified": 1660904719, - "narHash": "sha256-8/xJmymtVGVz2avzlamgK1cNflZ3NRL+B3c7xxbI964=", - "owner": "ron-rs", - "repo": "ron.vim", - "rev": "f749e543975a82e8dd9a6e7df9600a1c098ae800", - "type": "github" - }, - "original": { - "owner": "ron-rs", - "repo": "ron.vim", - "type": "github" - } - }, - "nvim_plugin-saadparwaiz1/cmp_luasnip": { - "flake": false, - "locked": { - "lastModified": 1730707109, - "narHash": "sha256-86lKQPPyqFz8jzuLajjHMKHrYnwW6+QOcPyQEx6B+gw=", - "owner": "saadparwaiz1", - "repo": "cmp_luasnip", - "rev": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90", - "type": "github" - }, - "original": { - "owner": "saadparwaiz1", - "repo": "cmp_luasnip", - "type": "github" - } - }, - "nvim_plugin-sindrets/diffview.nvim": { - "flake": false, - "locked": { - "lastModified": 1718279802, - "narHash": "sha256-SX+ybIzL/w6uyCy4iZKnWnzTFwqB1oXSgyYVAdpdKi8=", - "owner": "sindrets", - "repo": "diffview.nvim", - "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a", - "type": "github" - }, - "original": { - "owner": "sindrets", - "repo": "diffview.nvim", - "type": "github" - } - }, - "nvim_plugin-stevearc/conform.nvim": { - "flake": false, - "locked": { - "lastModified": 1741136809, - "narHash": "sha256-8uC+6rQdLqpfF/lf25mppqK/xgM1+6RGIyZaheaPd48=", - "owner": "stevearc", - "repo": "conform.nvim", - "rev": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d", - "type": "github" - }, - "original": { - "owner": "stevearc", - "repo": "conform.nvim", - "type": "github" - } - }, - "nvim_plugin-stevearc/dressing.nvim": { - "flake": false, - "locked": { - "lastModified": 1739381641, - "narHash": "sha256-dBz+/gZA6O6fJy/GSgM6ZHGAR3MTGt/W1olzzTYRlgM=", - "owner": "stevearc", - "repo": "dressing.nvim", - "rev": "2d7c2db2507fa3c4956142ee607431ddb2828639", - "type": "github" - }, - "original": { - "owner": "stevearc", - "repo": "dressing.nvim", - "type": "github" - } - }, - "nvim_plugin-tpope/vim-sleuth": { - "flake": false, - "locked": { - "lastModified": 1726718493, - "narHash": "sha256-2Cr3h3uJvUL3CSoJs3aBFrkBeOBURSQItgQ4ep9sHXM=", - "owner": "tpope", - "repo": "vim-sleuth", - "rev": "be69bff86754b1aa5adcbb527d7fcd1635a84080", - "type": "github" - }, - "original": { - "owner": "tpope", - "repo": "vim-sleuth", - "type": "github" - } - }, - "nvim_plugin-tpope/vim-surround": { - "flake": false, - "locked": { - "lastModified": 1666730476, - "narHash": "sha256-DZE5tkmnT+lAvx/RQHaDEgEJXRKsy56KJY919xiH1lE=", - "owner": "tpope", - "repo": "vim-surround", - "rev": "3d188ed2113431cf8dac77be61b842acb64433d9", - "type": "github" - }, - "original": { - "owner": "tpope", - "repo": "vim-surround", - "type": "github" - } - }, - "nvim_plugin-uga-rosa/ccc.nvim": { - "flake": false, - "locked": { - "lastModified": 1735970087, - "narHash": "sha256-53WsxOfWULlO4VbSXA4DW6wjkbCzpQjkzv4O8pReuEc=", - "owner": "uga-rosa", - "repo": "ccc.nvim", - "rev": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed", - "type": "github" - }, - "original": { - "owner": "uga-rosa", - "repo": "ccc.nvim", - "type": "github" - } - }, - "nvim_plugin-windwp/nvim-ts-autotag": { - "flake": false, - "locked": { - "lastModified": 1739910276, - "narHash": "sha256-a3Bcql68mp3y5bH9XMiDTQB0e75T+qFB593objIGg/I=", - "owner": "windwp", - "repo": "nvim-ts-autotag", - "rev": "a1d526af391f6aebb25a8795cbc05351ed3620b5", - "type": "github" - }, - "original": { - "owner": "windwp", - "repo": "nvim-ts-autotag", - "type": "github" - } - }, - "nvim_plugin-yetone/avante.nvim": { - "flake": false, - "locked": { - "lastModified": 1742209600, - "narHash": "sha256-XmyRo20+VhyjP5CLgSy0Tr/7R031EJSmMEN/wK9JNk8=", - "owner": "yetone", - "repo": "avante.nvim", - "rev": "540cc53f0c30214e3e4b5688f030bb2d8277b8ce", - "type": "github" - }, - "original": { - "owner": "yetone", - "repo": "avante.nvim", - "type": "github" - } - }, - "nvim_plugin-zbirenbaum/copilot-cmp": { - "flake": false, - "locked": { - "lastModified": 1733947099, - "narHash": "sha256-erRL8bY/zuwuCZfttw+avTrFV7pjv2H6v73NzY2bymM=", - "owner": "zbirenbaum", - "repo": "copilot-cmp", - "rev": "15fc12af3d0109fa76b60b5cffa1373697e261d1", - "type": "github" - }, - "original": { - "owner": "zbirenbaum", - "repo": "copilot-cmp", - "type": "github" - } - }, - "nvim_plugin-zbirenbaum/copilot.lua": { - "flake": false, - "locked": { - "lastModified": 1739230958, - "narHash": "sha256-632UIbG1jwam+tug5+jODkT509+uBfJgUN21C3ppnEo=", - "owner": "zbirenbaum", - "repo": "copilot.lua", - "rev": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9", - "type": "github" - }, - "original": { - "owner": "zbirenbaum", - "repo": "copilot.lua", - "type": "github" - } - }, - "ragenix": { - "inputs": { - "agenix": "agenix", - "crane": "crane", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1741508717, - "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=", - "owner": "yaxitech", - "repo": "ragenix", - "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9", - "type": "github" - }, - "original": { - "owner": "yaxitech", - "repo": "ragenix", - "type": "github" - } - }, - "root": { - "inputs": { - "common": "common", - "deploy-rs": "deploy-rs", - "nixpkgs": "nixpkgs_5", - "ros_neovim": "ros_neovim" - } - }, - "ros_neovim": { - "inputs": { - "nixpkgs": "nixpkgs_6", - "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", - "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", - "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", - "nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip", - "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": "nvim_plugin-MeanderingProgrammer/render-markdown.nvim", - "nvim_plugin-MunifTanjim/nui.nvim": "nvim_plugin-MunifTanjim/nui.nvim", - "nvim_plugin-RRethy/vim-illuminate": "nvim_plugin-RRethy/vim-illuminate", - "nvim_plugin-Saecki/crates.nvim": "nvim_plugin-Saecki/crates.nvim", - "nvim_plugin-aznhe21/actions-preview.nvim": "nvim_plugin-aznhe21/actions-preview.nvim", - "nvim_plugin-b0o/schemastore.nvim": "nvim_plugin-b0o/schemastore.nvim", - "nvim_plugin-catppuccin/nvim": "nvim_plugin-catppuccin/nvim", - "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement", - "nvim_plugin-declancm/cinnamon.nvim": "nvim_plugin-declancm/cinnamon.nvim", - "nvim_plugin-folke/lazy.nvim": "nvim_plugin-folke/lazy.nvim", - "nvim_plugin-folke/neodev.nvim": "nvim_plugin-folke/neodev.nvim", - "nvim_plugin-folke/which-key.nvim": "nvim_plugin-folke/which-key.nvim", - "nvim_plugin-hrsh7th/cmp-buffer": "nvim_plugin-hrsh7th/cmp-buffer", - "nvim_plugin-hrsh7th/cmp-nvim-lsp": "nvim_plugin-hrsh7th/cmp-nvim-lsp", - "nvim_plugin-hrsh7th/cmp-path": "nvim_plugin-hrsh7th/cmp-path", - "nvim_plugin-hrsh7th/nvim-cmp": "nvim_plugin-hrsh7th/nvim-cmp", - "nvim_plugin-j-hui/fidget.nvim": "nvim_plugin-j-hui/fidget.nvim", - "nvim_plugin-johmsalas/text-case.nvim": "nvim_plugin-johmsalas/text-case.nvim", - "nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim", - "nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim", - "nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim", - "nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim", - "nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree", - "nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint", - "nvim_plugin-mrcjkb/rustaceanvim": "nvim_plugin-mrcjkb/rustaceanvim", - "nvim_plugin-neovim/nvim-lspconfig": "nvim_plugin-neovim/nvim-lspconfig", - "nvim_plugin-nosduco/remote-sshfs.nvim": "nvim_plugin-nosduco/remote-sshfs.nvim", - "nvim_plugin-numToStr/Comment.nvim": "nvim_plugin-numToStr/Comment.nvim", - "nvim_plugin-nvim-lua/plenary.nvim": "nvim_plugin-nvim-lua/plenary.nvim", - "nvim_plugin-nvim-lualine/lualine.nvim": "nvim_plugin-nvim-lualine/lualine.nvim", - "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": "nvim_plugin-nvim-telescope/telescope-file-browser.nvim", - "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim": "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim", - "nvim_plugin-nvim-telescope/telescope-ui-select.nvim": "nvim_plugin-nvim-telescope/telescope-ui-select.nvim", - "nvim_plugin-nvim-telescope/telescope.nvim": "nvim_plugin-nvim-telescope/telescope.nvim", - "nvim_plugin-nvim-tree/nvim-tree.lua": "nvim_plugin-nvim-tree/nvim-tree.lua", - "nvim_plugin-nvim-tree/nvim-web-devicons": "nvim_plugin-nvim-tree/nvim-web-devicons", - "nvim_plugin-nvim-treesitter/nvim-treesitter-context": "nvim_plugin-nvim-treesitter/nvim-treesitter-context", - "nvim_plugin-rafamadriz/friendly-snippets": "nvim_plugin-rafamadriz/friendly-snippets", - "nvim_plugin-rcarriga/nvim-notify": "nvim_plugin-rcarriga/nvim-notify", - "nvim_plugin-rmagatti/auto-session": "nvim_plugin-rmagatti/auto-session", - "nvim_plugin-ron/ron.vim": "nvim_plugin-ron/ron.vim", - "nvim_plugin-saadparwaiz1/cmp_luasnip": "nvim_plugin-saadparwaiz1/cmp_luasnip", - "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", - "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", - "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim", - "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth", - "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", - "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", - "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", - "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", - "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", - "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1745585761, - "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", - "ref": "refs/heads/master", - "rev": "e5523910a0c07c88d026d006f5962434bfa53548", - "revCount": 277, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/nvim" - }, - "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/nvim" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "common", - "ragenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "ros_neovim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742178793, - "narHash": "sha256-S2onMdoDS4tIYd3/Jc5oFEZBr2dJOgPrh9KzSO/bfDw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "954582a766a50ebef5695a9616c93b5386418c08", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/linode/l002/flake.nix b/hosts/linode/l002/flake.nix deleted file mode 100644 index 30436eb..0000000 --- a/hosts/linode/l002/flake.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - deploy-rs.url = "github:serokell/deploy-rs"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; - ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; - }; - - outputs = - { - self, - nixpkgs, - common, - ros_neovim, - deploy-rs, - ... - }: - let - configuration_name = "l002"; - lib = nixpkgs.lib; - in - { - deploy = { - sshUser = "root"; - sshOpts = [ - "-i" - "/run/agenix/nix2linode" - ]; - nodes.${configuration_name} = { - hostname = "172.234.26.141"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configuration_name}; - }; - }; - }; - - nixosConfigurations = { - nixos = self.nixosConfigurations.${configuration_name}; - "${configuration_name}" = lib.nixosSystem { - modules = [ - common.nixosModules.default - ros_neovim.nixosModules.default - ./configuration.nix - ./hardware-configuration.nix - ./linode.nix - ./nginx.nix - ( - { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - bitwarden - vaultwarden - ]; - - ringofstorms_common = { - systemName = configuration_name; - general = { - disableRemoteBuildsOnLio = true; - readWindowsDrives = false; - jetbrainsMonoFont = false; - ttyCapsEscape = false; - }; - programs = { - tailnet.enable = true; - ssh.enable = true; - }; - users = { - users = { - root = { - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode" - ]; - shell = pkgs.zsh; - }; - }; - }; - homeManager = { - users = { - root = { - imports = with common.homeManagerModules; [ - tmux - atuin - git - postgres - starship - zoxide - zsh - ]; - }; - }; - }; - }; - } - ) - ]; - }; - }; - }; -} diff --git a/hosts/linode/l002/hardware-configuration.nix b/hosts/linode/l002/hardware-configuration.nix deleted file mode 100644 index 6507949..0000000 --- a/hosts/linode/l002/hardware-configuration.nix +++ /dev/null @@ -1,34 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/3612d65e-719c-4b33-af08-561b790d6d33"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/f1408ea6-59a0-11ed-bc9d-525400000001"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s5.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} - diff --git a/hosts/linode/l002/linode.nix b/hosts/linode/l002/linode.nix deleted file mode 100644 index b0f8894..0000000 --- a/hosts/linode/l002/linode.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, pkgs, ... }: -{ - # https://www.linode.com/docs/guides/install-nixos-on-linode/#configure-nixos - boot.kernelParams = [ "console=ttyS0,19200n8" ]; - boot.loader.grub.enable = true; - boot.loader.grub.extraConfig = '' - serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1; - terminal_input serial; - terminal_output serial - ''; - - boot.loader.grub.forceInstall = true; - boot.loader.grub.device = "nodev"; - boot.loader.timeout = 10; - - services.openssh = { - enable = true; - settings.PermitRootLogin = "yes"; - settings.PasswordAuthentication = false; - }; - - networking.usePredictableInterfaceNames = false; - networking.useDHCP = false; # Disable DHCP globally as we will not need it. - # required for ssh? - networking.interfaces.eth0.useDHCP = true; - - environment.systemPackages = with pkgs; [ - inetutils - mtr - sysstat - ]; -} diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix deleted file mode 100644 index 90bd7e8..0000000 --- a/hosts/linode/l002/nginx.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ - ... -}: -{ - - # JUST A TEST TODO remove - containers.wasabi = { - ephemeral = true; - autoStart = true; - privateNetwork = true; - hostAddress = "192.168.100.2"; - localAddress = "192.168.100.11"; - config = - { config, pkgs, ... }: - { - system.stateVersion = "24.11"; - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall = { - enable = true; - allowedTCPPorts = [ 80 ]; - }; - }; - }; - - security.acme.acceptTerms = true; - security.acme.defaults.email = "admin@joshuabell.xyz"; - services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts = { - # default that is put first for fallbacks - # Note that order here doesn't matter it orders alphabetically so `0` puts it first - # I had an issue tha the first SSL port 443 site would catch any https traffic instead - # of hitting my default fallback and this fixes that issue and ensure this is hit instead - "002.linodes.joshuabell.xyz" = { - default = true; - enableACME = true; - forceSSL = true; - locations."/" = { - return = "444"; # 404 for not found or 444 for drop - }; - }; - # PROXY HOSTS - "chat.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://100.64.0.1:3080"; - }; - }; - "gist.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://100.64.0.13"; - }; - }; - "git.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://100.64.0.13"; - }; - }; - - # Redirect self IP to domain - "172.234.26.141" = { - locations."/" = { - return = "301 https://joshuabell.xyz"; - }; - }; - "2600:3c06::f03c:95ff:fe2c:2806" = { - locations."/" = { - return = "301 https://joshuabell.xyz"; - }; - }; - - "www.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; - locations."/" = { - return = "301 https://joshuabell.xyz"; - }; - }; - "joshuabell.xyz" = { - enableACME = true; - forceSSL = true; - locations = { - "/wasabi" = { - proxyPass = "http://192.168.100.11/"; - extraConfig = '' - rewrite ^/wasabi/(.*) /$1 break; - ''; - }; - "/" = { - # return = "200 'Hello World'"; - extraConfig = '' - default_type text/html; - return 200 ' - - -
- In the void you roam,
- A page that cannot be found-
- Turn back, seek anew. -
- - - '; - ''; - }; - }; - }; - - "www.ellalala.com" = { - enableACME = true; - forceSSL = true; - locations."/" = { - return = "301 https://ellalala.com"; - }; - }; - "ellalala.com" = { - enableACME = true; - forceSSL = true; - locations."/" = { - return = "444"; - }; - }; - }; - - # STREAMS - streamConfig = '' - server { - listen 3032; - proxy_pass 100.64.0.13:3032; - } - ''; - }; - - networking.firewall.allowedTCPPorts = [ - 80 # web http - 443 # web https - 3032 # git ssh stream - ]; -} From ef4ade27d446add15049e0fe84889e49ad856dcc Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 1 May 2025 12:13:05 -0500 Subject: [PATCH 15/73] forgot to add the ssh stream proxy --- hosts/oracle/o001/nginx.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index ba8d491..22e2dfe 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -142,6 +142,14 @@ }; }; }; + + # STREAMS + streamConfig = '' + server { + listen 3032; + proxy_pass 100.64.0.13:3032; + } + ''; }; networking.firewall.allowedTCPPorts = [ From 8c19c971e1ba9aee0b166ec4e79b457709bbb282 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 1 May 2025 12:14:42 -0500 Subject: [PATCH 16/73] open port for ssh on o001 --- hosts/oracle/o001/nginx.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index 22e2dfe..b858e96 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -155,5 +155,7 @@ networking.firewall.allowedTCPPorts = [ 80 # web http 443 # web https + + 3032 # ssh for git server ]; } From c0a86636d236a4501c5bf9f661177c1f3ae6ca87 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 1 May 2025 12:19:04 -0500 Subject: [PATCH 17/73] add comment note to remind myself that oracle cloud console also need port exposed --- hosts/oracle/o001/nginx.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index b858e96..65c0bb7 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -152,6 +152,7 @@ ''; }; + # NOTE Oracle also has security rules that must expose these ports so this alone will not work! See readme networking.firewall.allowedTCPPorts = [ 80 # web http 443 # web https From 9039afca2a9f1eef4e5167557d1306e9bde8c095 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sat, 3 May 2025 12:44:38 -0500 Subject: [PATCH 18/73] turn off backupos for now --- common/_containers/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/_containers/forgejo.nix b/common/_containers/forgejo.nix index 40e0bbe..0cb91a5 100644 --- a/common/_containers/forgejo.nix +++ b/common/_containers/forgejo.nix @@ -138,7 +138,7 @@ in services.forgejo = { enable = true; dump = { - enable = true; + enable = false; type = "tar.gz"; }; database = { From 54ab52a783d7cc84942b5502d24d5d2d6516ca95 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sat, 3 May 2025 12:45:51 -0500 Subject: [PATCH 19/73] update forgejo remove backup for now, it filled up my harddrive --- hosts/h001/flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index 9a82927..4f34705 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -32,11 +32,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745965414, - "narHash": "sha256-Vn/sXOtIj5y09jGKw3iaLIrpqW5h37vW1vFBmFehRx8=", + "lastModified": 1746294278, + "narHash": "sha256-9QKEwS915nNTnubx5cs3L9c6E2vjvqK5bT3o79p6pvE=", "ref": "refs/heads/master", - "rev": "3d4d7d88290dd1f55542691d3ac45b2a5f021709", - "revCount": 430, + "rev": "9039afca2a9f1eef4e5167557d1306e9bde8c095", + "revCount": 445, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, From 2d3204290ae0a62cc997c9a45af82caab23aa20a Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 7 May 2025 13:04:51 -0500 Subject: [PATCH 20/73] update add rotate ability' --- common/desktop_environment/gnome/dconf.nix | 2 + common/desktop_environment/gnome/default.nix | 3 + hosts/gpdPocket3/flake.lock | 206 +++++++++---------- hosts/gpdPocket3/flake.nix | 5 +- 4 files changed, 101 insertions(+), 115 deletions(-) diff --git a/common/desktop_environment/gnome/dconf.nix b/common/desktop_environment/gnome/dconf.nix index dec16ef..141baa7 100644 --- a/common/desktop_environment/gnome/dconf.nix +++ b/common/desktop_environment/gnome/dconf.nix @@ -25,6 +25,8 @@ compact-top-bar.extensionUuid tray-icons-reloaded.extensionUuid vitals.extensionUuid + ] ++ lib.optionals cfg.enableRotate [ + screen-rotate.extensionUuid ]; }; diff --git a/common/desktop_environment/gnome/default.nix b/common/desktop_environment/gnome/default.nix index a520e49..c963672 100644 --- a/common/desktop_environment/gnome/default.nix +++ b/common/desktop_environment/gnome/default.nix @@ -24,6 +24,7 @@ with lib; default = "kitty"; description = "The terminal command to use."; }; + enableRotate = lib.mkEnableOption "enable screen rotation"; }; imports = [ @@ -65,6 +66,8 @@ with lib; gnomeExtensions.compact-top-bar gnomeExtensions.tray-icons-reloaded gnomeExtensions.vitals + ] ++ lib.optionals cfg.enableRotate [ + gnomeExtensions.screen-rotate ]; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; diff --git a/hosts/gpdPocket3/flake.lock b/hosts/gpdPocket3/flake.lock index d98b754..4f4c7d3 100644 --- a/hosts/gpdPocket3/flake.lock +++ b/hosts/gpdPocket3/flake.lock @@ -28,21 +28,17 @@ "common": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1745956280, - "narHash": "sha256-HK9LEPCJAKbD3NK8FJGBgjoTDxA7/6GIkSomvPGFzgo=", - "ref": "refs/heads/master", - "rev": "78fc771750b08f24eddfda25cf4f24a6daa7ddf0", - "revCount": 424, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "lastModified": 1, + "narHash": "sha256-YW1uJ/oT2OSo0cpg7BCo5PGR/c9G6UL7hV4vTi26ub8=", + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" } }, "crane": { @@ -161,22 +157,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -192,13 +172,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -208,13 +188,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1745250177, - "narHash": "sha256-NPkMDgRHLVuNHs7y/MK3qYbE/5uo42mskUIygSHEOLM=", + "lastModified": 1746564043, + "narHash": "sha256-uxRpim5I0BxpRGvmcFgwlZqeq8GYTbCWGbnBcaet1Yk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1e61a9c582ec2f701b36d4600ae19b8099c5211", + "rev": "70267e3f4cbfcd8f18fb5353d1efe5edb101a33a", "type": "github" }, "original": { @@ -226,11 +206,11 @@ "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { - "lastModified": 1744327913, - "narHash": "sha256-WQ7GbrjtikpMnzzME59QSibZI0hjzt/KAGDmXa677Rw=", + "lastModified": 1746139196, + "narHash": "sha256-/FlNLWOSIrOYiWzAcgOdu9//QTorCDV1KWb+h6eqLwk=", "owner": "Almo7aya", "repo": "openingh.nvim", - "rev": "ce19b5ffe09e35cec600ba794df280cbb72c015f", + "rev": "7cc8c897cb6b34d8ed28e99d95baccef609ed251", "type": "github" }, "original": { @@ -242,11 +222,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1745008876, - "narHash": "sha256-/GdJNqoDpdsPCOjcESbtEEDCz5TYkvbPRY1/T0gF7IY=", + "lastModified": 1745364432, + "narHash": "sha256-Tz9lwUtcbN+7AFsQ6nqk9DRU4S+peamNzeHSQzijCq8=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "634aa58117a9b70b3f08a0b150f11afd64f1c0eb", + "rev": "75653259442a8eb895abfc70d7064e07aeb7134c", "type": "github" }, "original": { @@ -274,11 +254,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1736009707, - "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=", + "lastModified": 1746469318, + "narHash": "sha256-UCGEymqZ66TFMvj2L+605Y1juJwQOpU/606Q5dhHhw0=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817", + "rev": "d474d67848006fc3fea201c77d408e1ed25123f0", "type": "github" }, "original": { @@ -290,11 +270,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1744934679, - "narHash": "sha256-rTX+CCVOOU6ZzM5NvymJvOfJF10BRMfl8hdSJz0zw+Q=", + "lastModified": 1746490409, + "narHash": "sha256-+P+2S6CpCW+QWxjihna1Xo4O2d69DkJSvon2eJuHxbE=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f", + "rev": "b4016e812c9a18784d8c1c6b4f0b2858a4cf502d", "type": "github" }, "original": { @@ -306,11 +286,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1741233810, - "narHash": "sha256-BYTY2ezYuxsneAl/yQbwL1aQvVWKSsN3IVqzTlrBSEU=", + "lastModified": 1746270059, + "narHash": "sha256-SJc9nfV6cnBKYwRWsv0iHy+RbET8frNV85reICf+pt8=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "8d3bce9764e627b62b07424e0df77f680d47ffdb", + "rev": "f535005e6ad1016383f24e39559833759453564e", "type": "github" }, "original": { @@ -322,11 +302,11 @@ "nvim_plugin-RRethy/vim-illuminate": { "flake": false, "locked": { - "lastModified": 1744859423, - "narHash": "sha256-zqXKkrUNTH/EIx3PBRN8+mQcbWa6fO9i/UoSeav5R/w=", + "lastModified": 1745787714, + "narHash": "sha256-MSX0obp+DDQ5c+r6QxPnV46uLTC0fzY1JFiyA097Uxw=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "1fa4b23409e22a03823648e344c77f260e2572cb", + "rev": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf", "type": "github" }, "original": { @@ -338,11 +318,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1744379189, - "narHash": "sha256-HsdDeV3mMQwrzlP23bJnNkiSL5OELgn0WBTERxehviE=", + "lastModified": 1745932659, + "narHash": "sha256-Oh3krtXo38wwrcc9YWLS0uw3q7tuw8eU/QG+sUmqtDU=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "73d2c590c74a0c582144987a4decb4a642755859", + "rev": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397", "type": "github" }, "original": { @@ -354,11 +334,11 @@ "nvim_plugin-aznhe21/actions-preview.nvim": { "flake": false, "locked": { - "lastModified": 1740589350, - "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=", + "lastModified": 1745779150, + "narHash": "sha256-rQjwlu5gQcOvxF72lr9ugPRl0W78wCWGWPhpN1oOMbs=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2", + "rev": "36513ad213855d497b7dd3391a24d1d75d58e36f", "type": "github" }, "original": { @@ -370,11 +350,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1745020938, - "narHash": "sha256-qDcVJ2RovKSIcUdVnXNcQZHoAf75IqsTMlsclDFrT2U=", + "lastModified": 1746551282, + "narHash": "sha256-9/Mvr3qHMRS+TKhZHDVVVBMqK5mgc1w5SZIu5XkV3Og=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "e623e30df4053cacc67fb7eb04e1bd0fadba52b4", + "rev": "cdf5cb7ba40fcebdd5c14f47c4a2644f36663a2d", "type": "github" }, "original": { @@ -386,11 +366,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1740764472, - "narHash": "sha256-4h/fzFY8JR9r+QnoiWEqgQKPMuu8i9HTC4v0Jp7iuUo=", + "lastModified": 1746365232, + "narHash": "sha256-4GpFqo1IDxikmsY6muTJ55+AYPURLMHt7L6lmboyYvI=", "owner": "catppuccin", "repo": "nvim", - "rev": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", + "rev": "1bf070129c0b6f77cc23f6a2212dcdc868308c52", "type": "github" }, "original": { @@ -402,11 +382,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1744450582, - "narHash": "sha256-ybs65ObtjcUBaGglxP3SIpYjlGSEk/MQI9nSN8S3Q1w=", + "lastModified": 1746272865, + "narHash": "sha256-xWtmP92u+PB1dtL7MRbndzJQnTCkDD/8DpuXNJEJhAA=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "3b14762a0186b1922cb5ddf3a760d8521c7b3d7e", + "rev": "0a320915970f8b505918f446b538af50c513e97e", "type": "github" }, "original": { @@ -578,11 +558,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1745219545, - "narHash": "sha256-7WQ428oPr43z01HvNpArZJcUov61/pDtLqJtkEKnBAY=", + "lastModified": 1746525958, + "narHash": "sha256-bvqdHKlGBSOyjoyVAjThIPGRyprLgVifCfPLP/eg1FI=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "2149fc2009d1117d58e86e56836f70c969f60a82", + "rev": "5624b5ebe6988c75d3f4eb588b9f31f3847a721c", "type": "github" }, "original": { @@ -658,11 +638,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1745090089, - "narHash": "sha256-Pwxk2C5WaaaW7Ookbq2edvLSJh6ZQc3iWMxowHyQkFQ=", + "lastModified": 1745420086, + "narHash": "sha256-QN2gnCx5cSpFOi8dkq9wM4iFD1iCxbvh3pnJBOhb4hw=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63", + "rev": "9dfb77ef6c5092a19502883c02dc5a02ec648729", "type": "github" }, "original": { @@ -674,11 +654,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1745050087, - "narHash": "sha256-nkCVQ+TXiaKm17HXaAMVuRMV3Jbxv8aRIO6re4zEgDw=", + "lastModified": 1746560536, + "narHash": "sha256-yvzJHM/lo5CG5uKS5KFuMa8Uwepzqfh6YtoQiRkz5c8=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d", + "rev": "ae0e8edb9b5f4f7a178581429797ca49ed66a7e5", "type": "github" }, "original": { @@ -690,11 +670,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1745247686, - "narHash": "sha256-rnm/BJNMVxcYH/ZXf1HciXgG0UWhAeQQniOaSvi0E40=", + "lastModified": 1746393086, + "narHash": "sha256-l1yocpqchfL6xjBK+VERI7ezi0Qx5dfCOkCYjNoNsf4=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b335f1c72877f101248d3b085d4b7da7576361d7", + "rev": "4bc481b6f0c0cf3671fc894debd0e00347089a4e", "type": "github" }, "original": { @@ -754,11 +734,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1744482854, - "narHash": "sha256-XeAFXg6GWzMJV/HzfdCXtv/effAHVU7mioFKTf1kDc8=", + "lastModified": 1745335540, + "narHash": "sha256-wfNEDR3uR8Y6hZhzcnuukQ2yMz7rCvuc4li/0rkPRTA=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "86fe39534b7da729a1ac56c0466e76f2c663dc42", + "rev": "15884cee63a8c205334ab13ab1c891cd4d27101a", "type": "github" }, "original": { @@ -834,11 +814,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1745201081, - "narHash": "sha256-zQsqyJgqlvxniKOtwPSzArUaOwvIgo6Xm+oAjAbPda4=", + "lastModified": 1746409889, + "narHash": "sha256-TQPnCZHMs1pTTPADrFR8cHCyGtJuZXznuDzipBFz/t8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "be5b788f2dc1522c73fb7afad9092331c8aebe80", + "rev": "ea5097a1e2702b4827cb7380e7fa0bd6da87699c", "type": "github" }, "original": { @@ -850,11 +830,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1745131674, - "narHash": "sha256-uoT45oaeY5c1+A7pVQIS+Bj9JnrSy9rQAecvaWZht+c=", + "lastModified": 1746138512, + "narHash": "sha256-gt/DzZjIrAB8QTwQzeSeYhJwrMxjtmwUru0B874A14c=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "855c97005c8eebcdd19846f2e54706bffd40ee96", + "rev": "2c2b4eafce6cdd0cb165036faa17396eff18f847", "type": "github" }, "original": { @@ -882,11 +862,11 @@ "nvim_plugin-rafamadriz/friendly-snippets": { "flake": false, "locked": { - "lastModified": 1745202387, - "narHash": "sha256-R6xE5vwgFtyEYpET0E4ecZejuV/lNHFkumk+wGf3lbI=", + "lastModified": 1745949052, + "narHash": "sha256-FzApcTbWfFkBD9WsYMhaCyn6ky8UmpUC2io/co/eByM=", "owner": "rafamadriz", "repo": "friendly-snippets", - "rev": "fc8f183479a472df60aa86f00e295462f2308178", + "rev": "572f5660cf05f8cd8834e096d7b4c921ba18e175", "type": "github" }, "original": { @@ -914,11 +894,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745009508, - "narHash": "sha256-NCytp+DiOo3obZeQ9bpaEaNMfstf1Ytn0OR5mAWodLw=", + "lastModified": 1745435920, + "narHash": "sha256-XU4zB4hUkwV7OVkQNggBxqv9AOOuwGj50kzkGq3GaF4=", "owner": "rmagatti", "repo": "auto-session", - "rev": "71c8af9a99e96b9d2533cf4bac4dfed1eafab923", + "rev": "00334ee24b9a05001ad50221c8daffbeedaa0842", "type": "github" }, "original": { @@ -1042,11 +1022,11 @@ "nvim_plugin-uga-rosa/ccc.nvim": { "flake": false, "locked": { - "lastModified": 1744103477, - "narHash": "sha256-MSh9tJv9UNfceO1yQIvID36x/fLGmgFcnIzJ9LOog0A=", + "lastModified": 1746537659, + "narHash": "sha256-3TZ8VmvdgQ9n63m78C3r4OIUkVQHTHBvC24ixBdhTig=", "owner": "uga-rosa", "repo": "ccc.nvim", - "rev": "af2cf5a963f401aad868c065222ee13d4bbc9050", + "rev": "9d1a256e006decc574789dfc7d628ca11644d4c2", "type": "github" }, "original": { @@ -1074,11 +1054,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1744881650, - "narHash": "sha256-BzRFgcBG4vn7mamwLvviMl4erTPwg+1AkAb3Ss4Kq8E=", + "lastModified": 1746551795, + "narHash": "sha256-64X1LfgSGVidmVIgtg8tFOkjE6d2eI02ZXCjDupt6QY=", "owner": "yetone", "repo": "avante.nvim", - "rev": "eb1cd44731783024621beafe4e46204cbc9a4320", + "rev": "93aa961fc4fe45f69c68f1e336fbefbe4112be77", "type": "github" }, "original": { @@ -1106,11 +1086,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1745111203, - "narHash": "sha256-PaWWT0mSsTfnBMrmHagHgemGN5Be6rbikVVW4ZBK/Zs=", + "lastModified": 1746490840, + "narHash": "sha256-PDFqHMgYG7RDWVV54Tjh6Vv6B3usS0sSCrFKmIaMzGQ=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "dc579f98536029610cfa32c6bad86c0d24363679", + "rev": "7ba73866b9b3c696f80579c470c6eec374d3acec", "type": "github" }, "original": { @@ -1124,7 +1104,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1144,13 +1124,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1210,11 +1190,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745585761, - "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", + "lastModified": 1746566324, + "narHash": "sha256-c7uPHm2W/ykWWT6tbLYmfrTC9Nuw+cFNqwswt3vPaJg=", "ref": "refs/heads/master", - "rev": "e5523910a0c07c88d026d006f5962434bfa53548", - "revCount": 277, + "rev": "f506f811847c73cc0876a759c6fc93f791060d34", + "revCount": 280, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1233,11 @@ ] }, "locked": { - "lastModified": 1745207416, - "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=", + "lastModified": 1746498961, + "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a", + "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", "type": "github" }, "original": { diff --git a/hosts/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix index bbf4d86..c780a6a 100644 --- a/hosts/gpdPocket3/flake.nix +++ b/hosts/gpdPocket3/flake.nix @@ -3,8 +3,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; # for local testing. - # common.url = "path:../../common - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -36,6 +36,7 @@ lua qdirstat rustdesk-flutter + styluslabs-write ]; ringofstorms_common = { From 62dd56d23b506a5512f11c8a3ed357cd2293ace0 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 23 May 2025 07:11:47 -0500 Subject: [PATCH 21/73] add both for routing feature when using exit node --- common/programs/tailnet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/programs/tailnet.nix b/common/programs/tailnet.nix index 98944ab..df25e37 100644 --- a/common/programs/tailnet.nix +++ b/common/programs/tailnet.nix @@ -35,7 +35,7 @@ in services.tailscale = { enable = true; openFirewall = true; - useRoutingFeatures = "client"; + useRoutingFeatures = if cfg.enableExitNode then "both" else "client"; authKeyFile = lib.mkIf ( config ? age && config.age ? secrets && config.age.secrets ? headscale_auth ) config.age.secrets.headscale_auth.path; From 23950fee07892effb3cdb9165189a8c87b10e933 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 26 May 2025 20:41:54 -0500 Subject: [PATCH 22/73] update lio --- flake.lock | 24 +++--- hosts/lio/flake.lock | 172 +++++++++++++++++++++---------------------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/flake.lock b/flake.lock index d061bf2..d369c36 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "rycee", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -123,11 +123,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741508717, - "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=", + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", "owner": "yaxitech", "repo": "ragenix", - "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", "type": "github" }, "original": { diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 5c9bde7..e1c63ec 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -32,11 +32,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745977922, - "narHash": "sha256-Rufv1nlw2OlAzpN+Iz2wf+3RKWRkGVHWaXP+PCtyug0=", + "lastModified": 1748002307, + "narHash": "sha256-D9JXI1wBc2zIhy7gzUIdr8gz7PhSRvm/xJUN3cci5n0=", "ref": "refs/heads/master", - "rev": "38fde325abbec819b876998ff006fe31a8f4e228", - "revCount": 431, + "rev": "62dd56d23b506a5512f11c8a3ed357cd2293ace0", + "revCount": 448, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -194,11 +194,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1745250177, - "narHash": "sha256-NPkMDgRHLVuNHs7y/MK3qYbE/5uo42mskUIygSHEOLM=", + "lastModified": 1746564043, + "narHash": "sha256-uxRpim5I0BxpRGvmcFgwlZqeq8GYTbCWGbnBcaet1Yk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1e61a9c582ec2f701b36d4600ae19b8099c5211", + "rev": "70267e3f4cbfcd8f18fb5353d1efe5edb101a33a", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { - "lastModified": 1744327913, - "narHash": "sha256-WQ7GbrjtikpMnzzME59QSibZI0hjzt/KAGDmXa677Rw=", + "lastModified": 1746139196, + "narHash": "sha256-/FlNLWOSIrOYiWzAcgOdu9//QTorCDV1KWb+h6eqLwk=", "owner": "Almo7aya", "repo": "openingh.nvim", - "rev": "ce19b5ffe09e35cec600ba794df280cbb72c015f", + "rev": "7cc8c897cb6b34d8ed28e99d95baccef609ed251", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1745008876, - "narHash": "sha256-/GdJNqoDpdsPCOjcESbtEEDCz5TYkvbPRY1/T0gF7IY=", + "lastModified": 1745364432, + "narHash": "sha256-Tz9lwUtcbN+7AFsQ6nqk9DRU4S+peamNzeHSQzijCq8=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "634aa58117a9b70b3f08a0b150f11afd64f1c0eb", + "rev": "75653259442a8eb895abfc70d7064e07aeb7134c", "type": "github" }, "original": { @@ -274,11 +274,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1736009707, - "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=", + "lastModified": 1746469318, + "narHash": "sha256-UCGEymqZ66TFMvj2L+605Y1juJwQOpU/606Q5dhHhw0=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817", + "rev": "d474d67848006fc3fea201c77d408e1ed25123f0", "type": "github" }, "original": { @@ -290,11 +290,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1744934679, - "narHash": "sha256-rTX+CCVOOU6ZzM5NvymJvOfJF10BRMfl8hdSJz0zw+Q=", + "lastModified": 1746490409, + "narHash": "sha256-+P+2S6CpCW+QWxjihna1Xo4O2d69DkJSvon2eJuHxbE=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f", + "rev": "b4016e812c9a18784d8c1c6b4f0b2858a4cf502d", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1741233810, - "narHash": "sha256-BYTY2ezYuxsneAl/yQbwL1aQvVWKSsN3IVqzTlrBSEU=", + "lastModified": 1746270059, + "narHash": "sha256-SJc9nfV6cnBKYwRWsv0iHy+RbET8frNV85reICf+pt8=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "8d3bce9764e627b62b07424e0df77f680d47ffdb", + "rev": "f535005e6ad1016383f24e39559833759453564e", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "nvim_plugin-RRethy/vim-illuminate": { "flake": false, "locked": { - "lastModified": 1744859423, - "narHash": "sha256-zqXKkrUNTH/EIx3PBRN8+mQcbWa6fO9i/UoSeav5R/w=", + "lastModified": 1745787714, + "narHash": "sha256-MSX0obp+DDQ5c+r6QxPnV46uLTC0fzY1JFiyA097Uxw=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "1fa4b23409e22a03823648e344c77f260e2572cb", + "rev": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1744379189, - "narHash": "sha256-HsdDeV3mMQwrzlP23bJnNkiSL5OELgn0WBTERxehviE=", + "lastModified": 1745932659, + "narHash": "sha256-Oh3krtXo38wwrcc9YWLS0uw3q7tuw8eU/QG+sUmqtDU=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "73d2c590c74a0c582144987a4decb4a642755859", + "rev": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397", "type": "github" }, "original": { @@ -354,11 +354,11 @@ "nvim_plugin-aznhe21/actions-preview.nvim": { "flake": false, "locked": { - "lastModified": 1740589350, - "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=", + "lastModified": 1745779150, + "narHash": "sha256-rQjwlu5gQcOvxF72lr9ugPRl0W78wCWGWPhpN1oOMbs=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2", + "rev": "36513ad213855d497b7dd3391a24d1d75d58e36f", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1745020938, - "narHash": "sha256-qDcVJ2RovKSIcUdVnXNcQZHoAf75IqsTMlsclDFrT2U=", + "lastModified": 1746551282, + "narHash": "sha256-9/Mvr3qHMRS+TKhZHDVVVBMqK5mgc1w5SZIu5XkV3Og=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "e623e30df4053cacc67fb7eb04e1bd0fadba52b4", + "rev": "cdf5cb7ba40fcebdd5c14f47c4a2644f36663a2d", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1740764472, - "narHash": "sha256-4h/fzFY8JR9r+QnoiWEqgQKPMuu8i9HTC4v0Jp7iuUo=", + "lastModified": 1746365232, + "narHash": "sha256-4GpFqo1IDxikmsY6muTJ55+AYPURLMHt7L6lmboyYvI=", "owner": "catppuccin", "repo": "nvim", - "rev": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", + "rev": "1bf070129c0b6f77cc23f6a2212dcdc868308c52", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1744450582, - "narHash": "sha256-ybs65ObtjcUBaGglxP3SIpYjlGSEk/MQI9nSN8S3Q1w=", + "lastModified": 1746272865, + "narHash": "sha256-xWtmP92u+PB1dtL7MRbndzJQnTCkDD/8DpuXNJEJhAA=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "3b14762a0186b1922cb5ddf3a760d8521c7b3d7e", + "rev": "0a320915970f8b505918f446b538af50c513e97e", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1745219545, - "narHash": "sha256-7WQ428oPr43z01HvNpArZJcUov61/pDtLqJtkEKnBAY=", + "lastModified": 1746525958, + "narHash": "sha256-bvqdHKlGBSOyjoyVAjThIPGRyprLgVifCfPLP/eg1FI=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "2149fc2009d1117d58e86e56836f70c969f60a82", + "rev": "5624b5ebe6988c75d3f4eb588b9f31f3847a721c", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1745090089, - "narHash": "sha256-Pwxk2C5WaaaW7Ookbq2edvLSJh6ZQc3iWMxowHyQkFQ=", + "lastModified": 1745420086, + "narHash": "sha256-QN2gnCx5cSpFOi8dkq9wM4iFD1iCxbvh3pnJBOhb4hw=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63", + "rev": "9dfb77ef6c5092a19502883c02dc5a02ec648729", "type": "github" }, "original": { @@ -674,11 +674,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1745050087, - "narHash": "sha256-nkCVQ+TXiaKm17HXaAMVuRMV3Jbxv8aRIO6re4zEgDw=", + "lastModified": 1746560536, + "narHash": "sha256-yvzJHM/lo5CG5uKS5KFuMa8Uwepzqfh6YtoQiRkz5c8=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d", + "rev": "ae0e8edb9b5f4f7a178581429797ca49ed66a7e5", "type": "github" }, "original": { @@ -690,11 +690,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1745247686, - "narHash": "sha256-rnm/BJNMVxcYH/ZXf1HciXgG0UWhAeQQniOaSvi0E40=", + "lastModified": 1746393086, + "narHash": "sha256-l1yocpqchfL6xjBK+VERI7ezi0Qx5dfCOkCYjNoNsf4=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b335f1c72877f101248d3b085d4b7da7576361d7", + "rev": "4bc481b6f0c0cf3671fc894debd0e00347089a4e", "type": "github" }, "original": { @@ -754,11 +754,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1744482854, - "narHash": "sha256-XeAFXg6GWzMJV/HzfdCXtv/effAHVU7mioFKTf1kDc8=", + "lastModified": 1745335540, + "narHash": "sha256-wfNEDR3uR8Y6hZhzcnuukQ2yMz7rCvuc4li/0rkPRTA=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "86fe39534b7da729a1ac56c0466e76f2c663dc42", + "rev": "15884cee63a8c205334ab13ab1c891cd4d27101a", "type": "github" }, "original": { @@ -834,11 +834,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1745201081, - "narHash": "sha256-zQsqyJgqlvxniKOtwPSzArUaOwvIgo6Xm+oAjAbPda4=", + "lastModified": 1746409889, + "narHash": "sha256-TQPnCZHMs1pTTPADrFR8cHCyGtJuZXznuDzipBFz/t8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "be5b788f2dc1522c73fb7afad9092331c8aebe80", + "rev": "ea5097a1e2702b4827cb7380e7fa0bd6da87699c", "type": "github" }, "original": { @@ -850,11 +850,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1745131674, - "narHash": "sha256-uoT45oaeY5c1+A7pVQIS+Bj9JnrSy9rQAecvaWZht+c=", + "lastModified": 1746138512, + "narHash": "sha256-gt/DzZjIrAB8QTwQzeSeYhJwrMxjtmwUru0B874A14c=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "855c97005c8eebcdd19846f2e54706bffd40ee96", + "rev": "2c2b4eafce6cdd0cb165036faa17396eff18f847", "type": "github" }, "original": { @@ -882,11 +882,11 @@ "nvim_plugin-rafamadriz/friendly-snippets": { "flake": false, "locked": { - "lastModified": 1745202387, - "narHash": "sha256-R6xE5vwgFtyEYpET0E4ecZejuV/lNHFkumk+wGf3lbI=", + "lastModified": 1745949052, + "narHash": "sha256-FzApcTbWfFkBD9WsYMhaCyn6ky8UmpUC2io/co/eByM=", "owner": "rafamadriz", "repo": "friendly-snippets", - "rev": "fc8f183479a472df60aa86f00e295462f2308178", + "rev": "572f5660cf05f8cd8834e096d7b4c921ba18e175", "type": "github" }, "original": { @@ -914,11 +914,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745009508, - "narHash": "sha256-NCytp+DiOo3obZeQ9bpaEaNMfstf1Ytn0OR5mAWodLw=", + "lastModified": 1745435920, + "narHash": "sha256-XU4zB4hUkwV7OVkQNggBxqv9AOOuwGj50kzkGq3GaF4=", "owner": "rmagatti", "repo": "auto-session", - "rev": "71c8af9a99e96b9d2533cf4bac4dfed1eafab923", + "rev": "00334ee24b9a05001ad50221c8daffbeedaa0842", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ "nvim_plugin-uga-rosa/ccc.nvim": { "flake": false, "locked": { - "lastModified": 1744103477, - "narHash": "sha256-MSh9tJv9UNfceO1yQIvID36x/fLGmgFcnIzJ9LOog0A=", + "lastModified": 1746537659, + "narHash": "sha256-3TZ8VmvdgQ9n63m78C3r4OIUkVQHTHBvC24ixBdhTig=", "owner": "uga-rosa", "repo": "ccc.nvim", - "rev": "af2cf5a963f401aad868c065222ee13d4bbc9050", + "rev": "9d1a256e006decc574789dfc7d628ca11644d4c2", "type": "github" }, "original": { @@ -1074,11 +1074,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1744881650, - "narHash": "sha256-BzRFgcBG4vn7mamwLvviMl4erTPwg+1AkAb3Ss4Kq8E=", + "lastModified": 1746551795, + "narHash": "sha256-64X1LfgSGVidmVIgtg8tFOkjE6d2eI02ZXCjDupt6QY=", "owner": "yetone", "repo": "avante.nvim", - "rev": "eb1cd44731783024621beafe4e46204cbc9a4320", + "rev": "93aa961fc4fe45f69c68f1e336fbefbe4112be77", "type": "github" }, "original": { @@ -1106,11 +1106,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1745111203, - "narHash": "sha256-PaWWT0mSsTfnBMrmHagHgemGN5Be6rbikVVW4ZBK/Zs=", + "lastModified": 1746490840, + "narHash": "sha256-PDFqHMgYG7RDWVV54Tjh6Vv6B3usS0sSCrFKmIaMzGQ=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "dc579f98536029610cfa32c6bad86c0d24363679", + "rev": "7ba73866b9b3c696f80579c470c6eec374d3acec", "type": "github" }, "original": { @@ -1210,11 +1210,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1746068171, - "narHash": "sha256-QmZ0oKt8AHpkOUnD8i+Zr278J+t7kZLYAWUs8s5QOF0=", + "lastModified": 1746566324, + "narHash": "sha256-c7uPHm2W/ykWWT6tbLYmfrTC9Nuw+cFNqwswt3vPaJg=", "ref": "refs/heads/master", - "rev": "46dbdc77583ea181c7ca4836f46888d1f8e2a704", - "revCount": 278, + "rev": "f506f811847c73cc0876a759c6fc93f791060d34", + "revCount": 280, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1253,11 @@ ] }, "locked": { - "lastModified": 1745207416, - "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=", + "lastModified": 1746498961, + "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a", + "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", "type": "github" }, "original": { From 8a761c5a60782e2d789711b71133be238aee801d Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 29 May 2025 17:02:16 -0500 Subject: [PATCH 23/73] Update from 24.11 to 25.05 --- common/flake.lock | 238 +++++++++++++++++++++++++++++++++++++++++++ common/flake.nix | 2 +- hosts/lio/flake.lock | 230 +++++++++++++++++++---------------------- hosts/lio/flake.nix | 7 +- 4 files changed, 347 insertions(+), 130 deletions(-) create mode 100644 common/flake.lock diff --git a/common/flake.lock b/common/flake.lock new file mode 100644 index 0000000..ebbbc85 --- /dev/null +++ b/common/flake.lock @@ -0,0 +1,238 @@ +{ + "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager_2", + "nixpkgs": [ + "ragenix", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "owner": "ryantm", + "repo": "agenix", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "crane": { + "locked": { + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "owner": "rycee", + "repo": "home-manager", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "type": "github" + }, + "original": { + "owner": "rycee", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "ragenix": { + "inputs": { + "agenix": "agenix", + "crane": "crane", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "ragenix": "ragenix" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741400194, + "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/common/flake.nix b/common/flake.nix index 49a182c..2dcfc0e 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -1,6 +1,6 @@ { inputs = { - home-manager.url = "github:rycee/home-manager/release-24.11"; + home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; # hyprland.url = "github:hyprwm/Hyprland"; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index e1c63ec..5ee12aa 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,21 +28,17 @@ "common": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1748002307, - "narHash": "sha256-D9JXI1wBc2zIhy7gzUIdr8gz7PhSRvm/xJUN3cci5n0=", - "ref": "refs/heads/master", - "rev": "62dd56d23b506a5512f11c8a3ed357cd2293ace0", - "revCount": 448, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "lastModified": 1, + "narHash": "sha256-ZMMYuJqLYqqFc/bHjjRi7wpd9N9+1w4xN0ByLCPvLBQ=", + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" } }, "crane": { @@ -107,16 +103,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", "owner": "rycee", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -146,37 +142,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -192,29 +172,29 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1746564043, - "narHash": "sha256-uxRpim5I0BxpRGvmcFgwlZqeq8GYTbCWGbnBcaet1Yk=", + "lastModified": 1748389978, + "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70267e3f4cbfcd8f18fb5353d1efe5edb101a33a", + "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", "type": "github" }, "original": { @@ -242,11 +222,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1745364432, - "narHash": "sha256-Tz9lwUtcbN+7AFsQ6nqk9DRU4S+peamNzeHSQzijCq8=", + "lastModified": 1747103074, + "narHash": "sha256-BvuQImJ1XxXAZ7QjbK8hUjWqnSk90B6Vx57k11UFqtU=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "75653259442a8eb895abfc70d7064e07aeb7134c", + "rev": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a", "type": "github" }, "original": { @@ -274,11 +254,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1746469318, - "narHash": "sha256-UCGEymqZ66TFMvj2L+605Y1juJwQOpU/606Q5dhHhw0=", + "lastModified": 1747860236, + "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "d474d67848006fc3fea201c77d408e1ed25123f0", + "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", "type": "github" }, "original": { @@ -290,11 +270,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1746490409, - "narHash": "sha256-+P+2S6CpCW+QWxjihna1Xo4O2d69DkJSvon2eJuHxbE=", + "lastModified": 1748376831, + "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "b4016e812c9a18784d8c1c6b4f0b2858a4cf502d", + "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", "type": "github" }, "original": { @@ -306,11 +286,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1746270059, - "narHash": "sha256-SJc9nfV6cnBKYwRWsv0iHy+RbET8frNV85reICf+pt8=", + "lastModified": 1748258625, + "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "f535005e6ad1016383f24e39559833759453564e", + "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", "type": "github" }, "original": { @@ -322,11 +302,11 @@ "nvim_plugin-RRethy/vim-illuminate": { "flake": false, "locked": { - "lastModified": 1745787714, - "narHash": "sha256-MSX0obp+DDQ5c+r6QxPnV46uLTC0fzY1JFiyA097Uxw=", + "lastModified": 1748105647, + "narHash": "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf", + "rev": "0d1e93684da00ab7c057410fecfc24f434698898", "type": "github" }, "original": { @@ -338,11 +318,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1745932659, - "narHash": "sha256-Oh3krtXo38wwrcc9YWLS0uw3q7tuw8eU/QG+sUmqtDU=", + "lastModified": 1748380727, + "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397", + "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", "type": "github" }, "original": { @@ -370,11 +350,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1746551282, - "narHash": "sha256-9/Mvr3qHMRS+TKhZHDVVVBMqK5mgc1w5SZIu5XkV3Og=", + "lastModified": 1748365238, + "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "cdf5cb7ba40fcebdd5c14f47c4a2644f36663a2d", + "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", "type": "github" }, "original": { @@ -386,11 +366,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1746365232, - "narHash": "sha256-4GpFqo1IDxikmsY6muTJ55+AYPURLMHt7L6lmboyYvI=", + "lastModified": 1748270776, + "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", "owner": "catppuccin", "repo": "nvim", - "rev": "1bf070129c0b6f77cc23f6a2212dcdc868308c52", + "rev": "56a9dfd1e05868cf3189369aad87242941396563", "type": "github" }, "original": { @@ -402,11 +382,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1746272865, - "narHash": "sha256-xWtmP92u+PB1dtL7MRbndzJQnTCkDD/8DpuXNJEJhAA=", + "lastModified": 1747690845, + "narHash": "sha256-0qZhfxRhY8kR33X9/a9lNt1Slce8oSHeC8bJ7bSbYpQ=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "0a320915970f8b505918f446b538af50c513e97e", + "rev": "6db15a859cf73d4027e919f5a49cc795ee96831a", "type": "github" }, "original": { @@ -578,11 +558,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1746525958, - "narHash": "sha256-bvqdHKlGBSOyjoyVAjThIPGRyprLgVifCfPLP/eg1FI=", + "lastModified": 1747829807, + "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "5624b5ebe6988c75d3f4eb588b9f31f3847a721c", + "rev": "8b729e489f1475615dc6c9737da917b3bc163605", "type": "github" }, "original": { @@ -626,11 +606,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1744007533, - "narHash": "sha256-KCz8UNL7SkI4cP7wKmQPJgkI4TsQftnHjaMSBYCgrOY=", + "lastModified": 1748004396, + "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "9aaec65de041bddfc4c0af66919030d2950bcea8", + "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", "type": "github" }, "original": { @@ -658,11 +638,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1745420086, - "narHash": "sha256-QN2gnCx5cSpFOi8dkq9wM4iFD1iCxbvh3pnJBOhb4hw=", + "lastModified": 1747924806, + "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "9dfb77ef6c5092a19502883c02dc5a02ec648729", + "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", "type": "github" }, "original": { @@ -674,11 +654,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1746560536, - "narHash": "sha256-yvzJHM/lo5CG5uKS5KFuMa8Uwepzqfh6YtoQiRkz5c8=", + "lastModified": 1748287881, + "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "ae0e8edb9b5f4f7a178581429797ca49ed66a7e5", + "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", "type": "github" }, "original": { @@ -690,11 +670,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1746393086, - "narHash": "sha256-l1yocpqchfL6xjBK+VERI7ezi0Qx5dfCOkCYjNoNsf4=", + "lastModified": 1748350935, + "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "4bc481b6f0c0cf3671fc894debd0e00347089a4e", + "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", "type": "github" }, "original": { @@ -706,11 +686,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1743352525, - "narHash": "sha256-YNqj1vPc2oyVrSgp+huoMkrUAp2Lx3G4W52liOujP6A=", + "lastModified": 1747719337, + "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "1ae5784bf0729c8b03cb7fe6561508a673c9adc8", + "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", "type": "github" }, "original": { @@ -754,11 +734,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1745335540, - "narHash": "sha256-wfNEDR3uR8Y6hZhzcnuukQ2yMz7rCvuc4li/0rkPRTA=", + "lastModified": 1747786963, + "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "15884cee63a8c205334ab13ab1c891cd4d27101a", + "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", "type": "github" }, "original": { @@ -818,11 +798,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1742346322, - "narHash": "sha256-GF1zOHZItVZm3bx2wqI4hPj7EXQJ2F9KS4MtaEt2gm0=", + "lastModified": 1747012888, + "narHash": "sha256-JpW0ehsX81yVbKNzrYOe1hdgVMs6oaaxMLH6lECnOJg=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5", + "rev": "b4da76be54691e854d3e0e02c36b0245f945c2c7", "type": "github" }, "original": { @@ -834,11 +814,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1746409889, - "narHash": "sha256-TQPnCZHMs1pTTPADrFR8cHCyGtJuZXznuDzipBFz/t8=", + "lastModified": 1748230341, + "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ea5097a1e2702b4827cb7380e7fa0bd6da87699c", + "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", "type": "github" }, "original": { @@ -850,11 +830,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1746138512, - "narHash": "sha256-gt/DzZjIrAB8QTwQzeSeYhJwrMxjtmwUru0B874A14c=", + "lastModified": 1747360641, + "narHash": "sha256-+RHeFaeCF/iwAf8qAOjbEIl3YcnrBMVfkQnnzDNhyTA=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "2c2b4eafce6cdd0cb165036faa17396eff18f847", + "rev": "1fb58cca9aebbc4fd32b086cb413548ce132c127", "type": "github" }, "original": { @@ -866,11 +846,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1744921782, - "narHash": "sha256-w3I3w1SGqtpUnu4KQyaLue+k96XmkgA3+DpxSEjj+WI=", + "lastModified": 1748354888, + "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "6daca3ad780f045550b820f262002f35175a6c04", + "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", "type": "github" }, "original": { @@ -978,11 +958,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1745180802, - "narHash": "sha256-J/GKqn2VHv/ydaFXWCFduV2B7iwZzHtUvFArszxf2Cw=", + "lastModified": 1747884293, + "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "372fc521f8421b7830ea6db4d6ea3bae1c77548c", + "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", "type": "github" }, "original": { @@ -1074,11 +1054,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1746551795, - "narHash": "sha256-64X1LfgSGVidmVIgtg8tFOkjE6d2eI02ZXCjDupt6QY=", + "lastModified": 1748339096, + "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", "owner": "yetone", "repo": "avante.nvim", - "rev": "93aa961fc4fe45f69c68f1e336fbefbe4112be77", + "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", "type": "github" }, "original": { @@ -1106,11 +1086,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1746490840, - "narHash": "sha256-PDFqHMgYG7RDWVV54Tjh6Vv6B3usS0sSCrFKmIaMzGQ=", + "lastModified": 1748023521, + "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "7ba73866b9b3c696f80579c470c6eec374d3acec", + "rev": "a620a5a97b73faba009a8160bab2885316e1451c", "type": "github" }, "original": { @@ -1124,15 +1104,15 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741508717, - "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=", + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", "owner": "yaxitech", "repo": "ragenix", - "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", "type": "github" }, "original": { @@ -1144,13 +1124,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1210,11 +1190,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1746566324, - "narHash": "sha256-c7uPHm2W/ykWWT6tbLYmfrTC9Nuw+cFNqwswt3vPaJg=", + "lastModified": 1748390377, + "narHash": "sha256-oGkDMCJ7V2gncBsBb/D8L3HIPee9gnIwm7FrPZvOpRw=", "ref": "refs/heads/master", - "rev": "f506f811847c73cc0876a759c6fc93f791060d34", - "revCount": 280, + "rev": "7f7fb6c15bd2d0d0992a3955498551aef22af4d1", + "revCount": 281, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1233,11 @@ ] }, "locked": { - "lastModified": 1746498961, - "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", + "lastModified": 1748313401, + "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", + "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", "type": "github" }, "original": { diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 1e62772..e08c2a6 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -1,11 +1,11 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - # common.url = "path:../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -91,7 +91,6 @@ spotify blender google-chrome - discordo discord firefox-esr openscad From cf8583305086d6248871a7d2ae70efb3090858de Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 2 Jun 2025 13:44:49 -0500 Subject: [PATCH 24/73] update gp3 to 25.05 --- hosts/gpdPocket3/configuration.nix | 3 + hosts/gpdPocket3/flake.lock | 226 ++++++++++++++++------------- hosts/gpdPocket3/flake.nix | 12 +- 3 files changed, 134 insertions(+), 107 deletions(-) diff --git a/hosts/gpdPocket3/configuration.nix b/hosts/gpdPocket3/configuration.nix index 0217349..c501ab9 100644 --- a/hosts/gpdPocket3/configuration.nix +++ b/hosts/gpdPocket3/configuration.nix @@ -42,6 +42,9 @@ # }; # }; + # accelerometer + hardware.sensor.iio.enable = true; + # TODO evaluate if any of this kernal/hardware stuff is actually needed for our pocket. This is a hodge podge of shit from online # The GPD Pocket3 uses a tablet OLED display, that is mounted rotated 90° counter-clockwise. # This requires cusotm kernal params. diff --git a/hosts/gpdPocket3/flake.lock b/hosts/gpdPocket3/flake.lock index 4f4c7d3..6783b1e 100644 --- a/hosts/gpdPocket3/flake.lock +++ b/hosts/gpdPocket3/flake.lock @@ -28,17 +28,21 @@ "common": { "inputs": { "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1, - "narHash": "sha256-YW1uJ/oT2OSo0cpg7BCo5PGR/c9G6UL7hV4vTi26ub8=", - "path": "../../common", - "type": "path" + "lastModified": 1748556136, + "narHash": "sha256-p+Y1HW9cKoxbvCRYJ3tOedCM+7lRgUV7ukJOIFGKQ/w=", + "ref": "refs/heads/master", + "rev": "8a761c5a60782e2d789711b71133be238aee801d", + "revCount": 450, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, "crane": { @@ -103,11 +107,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "rycee", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -142,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -157,6 +161,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -172,29 +192,29 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1746564043, - "narHash": "sha256-uxRpim5I0BxpRGvmcFgwlZqeq8GYTbCWGbnBcaet1Yk=", + "lastModified": 1748389978, + "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70267e3f4cbfcd8f18fb5353d1efe5edb101a33a", + "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", "type": "github" }, "original": { @@ -222,11 +242,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1745364432, - "narHash": "sha256-Tz9lwUtcbN+7AFsQ6nqk9DRU4S+peamNzeHSQzijCq8=", + "lastModified": 1747103074, + "narHash": "sha256-BvuQImJ1XxXAZ7QjbK8hUjWqnSk90B6Vx57k11UFqtU=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "75653259442a8eb895abfc70d7064e07aeb7134c", + "rev": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a", "type": "github" }, "original": { @@ -254,11 +274,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1746469318, - "narHash": "sha256-UCGEymqZ66TFMvj2L+605Y1juJwQOpU/606Q5dhHhw0=", + "lastModified": 1747860236, + "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "d474d67848006fc3fea201c77d408e1ed25123f0", + "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", "type": "github" }, "original": { @@ -270,11 +290,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1746490409, - "narHash": "sha256-+P+2S6CpCW+QWxjihna1Xo4O2d69DkJSvon2eJuHxbE=", + "lastModified": 1748376831, + "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "b4016e812c9a18784d8c1c6b4f0b2858a4cf502d", + "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", "type": "github" }, "original": { @@ -286,11 +306,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1746270059, - "narHash": "sha256-SJc9nfV6cnBKYwRWsv0iHy+RbET8frNV85reICf+pt8=", + "lastModified": 1748258625, + "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "f535005e6ad1016383f24e39559833759453564e", + "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", "type": "github" }, "original": { @@ -302,11 +322,11 @@ "nvim_plugin-RRethy/vim-illuminate": { "flake": false, "locked": { - "lastModified": 1745787714, - "narHash": "sha256-MSX0obp+DDQ5c+r6QxPnV46uLTC0fzY1JFiyA097Uxw=", + "lastModified": 1748105647, + "narHash": "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf", + "rev": "0d1e93684da00ab7c057410fecfc24f434698898", "type": "github" }, "original": { @@ -318,11 +338,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1745932659, - "narHash": "sha256-Oh3krtXo38wwrcc9YWLS0uw3q7tuw8eU/QG+sUmqtDU=", + "lastModified": 1748380727, + "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397", + "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", "type": "github" }, "original": { @@ -350,11 +370,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1746551282, - "narHash": "sha256-9/Mvr3qHMRS+TKhZHDVVVBMqK5mgc1w5SZIu5XkV3Og=", + "lastModified": 1748365238, + "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "cdf5cb7ba40fcebdd5c14f47c4a2644f36663a2d", + "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", "type": "github" }, "original": { @@ -366,11 +386,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1746365232, - "narHash": "sha256-4GpFqo1IDxikmsY6muTJ55+AYPURLMHt7L6lmboyYvI=", + "lastModified": 1748270776, + "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", "owner": "catppuccin", "repo": "nvim", - "rev": "1bf070129c0b6f77cc23f6a2212dcdc868308c52", + "rev": "56a9dfd1e05868cf3189369aad87242941396563", "type": "github" }, "original": { @@ -382,11 +402,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1746272865, - "narHash": "sha256-xWtmP92u+PB1dtL7MRbndzJQnTCkDD/8DpuXNJEJhAA=", + "lastModified": 1747690845, + "narHash": "sha256-0qZhfxRhY8kR33X9/a9lNt1Slce8oSHeC8bJ7bSbYpQ=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "0a320915970f8b505918f446b538af50c513e97e", + "rev": "6db15a859cf73d4027e919f5a49cc795ee96831a", "type": "github" }, "original": { @@ -558,11 +578,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1746525958, - "narHash": "sha256-bvqdHKlGBSOyjoyVAjThIPGRyprLgVifCfPLP/eg1FI=", + "lastModified": 1747829807, + "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "5624b5ebe6988c75d3f4eb588b9f31f3847a721c", + "rev": "8b729e489f1475615dc6c9737da917b3bc163605", "type": "github" }, "original": { @@ -606,11 +626,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1744007533, - "narHash": "sha256-KCz8UNL7SkI4cP7wKmQPJgkI4TsQftnHjaMSBYCgrOY=", + "lastModified": 1748004396, + "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "9aaec65de041bddfc4c0af66919030d2950bcea8", + "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", "type": "github" }, "original": { @@ -638,11 +658,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1745420086, - "narHash": "sha256-QN2gnCx5cSpFOi8dkq9wM4iFD1iCxbvh3pnJBOhb4hw=", + "lastModified": 1747924806, + "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "9dfb77ef6c5092a19502883c02dc5a02ec648729", + "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", "type": "github" }, "original": { @@ -654,11 +674,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1746560536, - "narHash": "sha256-yvzJHM/lo5CG5uKS5KFuMa8Uwepzqfh6YtoQiRkz5c8=", + "lastModified": 1748287881, + "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "ae0e8edb9b5f4f7a178581429797ca49ed66a7e5", + "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", "type": "github" }, "original": { @@ -670,11 +690,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1746393086, - "narHash": "sha256-l1yocpqchfL6xjBK+VERI7ezi0Qx5dfCOkCYjNoNsf4=", + "lastModified": 1748350935, + "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "4bc481b6f0c0cf3671fc894debd0e00347089a4e", + "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", "type": "github" }, "original": { @@ -686,11 +706,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1743352525, - "narHash": "sha256-YNqj1vPc2oyVrSgp+huoMkrUAp2Lx3G4W52liOujP6A=", + "lastModified": 1747719337, + "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "1ae5784bf0729c8b03cb7fe6561508a673c9adc8", + "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", "type": "github" }, "original": { @@ -734,11 +754,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1745335540, - "narHash": "sha256-wfNEDR3uR8Y6hZhzcnuukQ2yMz7rCvuc4li/0rkPRTA=", + "lastModified": 1747786963, + "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "15884cee63a8c205334ab13ab1c891cd4d27101a", + "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", "type": "github" }, "original": { @@ -798,11 +818,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1742346322, - "narHash": "sha256-GF1zOHZItVZm3bx2wqI4hPj7EXQJ2F9KS4MtaEt2gm0=", + "lastModified": 1747012888, + "narHash": "sha256-JpW0ehsX81yVbKNzrYOe1hdgVMs6oaaxMLH6lECnOJg=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5", + "rev": "b4da76be54691e854d3e0e02c36b0245f945c2c7", "type": "github" }, "original": { @@ -814,11 +834,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1746409889, - "narHash": "sha256-TQPnCZHMs1pTTPADrFR8cHCyGtJuZXznuDzipBFz/t8=", + "lastModified": 1748230341, + "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ea5097a1e2702b4827cb7380e7fa0bd6da87699c", + "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", "type": "github" }, "original": { @@ -830,11 +850,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1746138512, - "narHash": "sha256-gt/DzZjIrAB8QTwQzeSeYhJwrMxjtmwUru0B874A14c=", + "lastModified": 1747360641, + "narHash": "sha256-+RHeFaeCF/iwAf8qAOjbEIl3YcnrBMVfkQnnzDNhyTA=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "2c2b4eafce6cdd0cb165036faa17396eff18f847", + "rev": "1fb58cca9aebbc4fd32b086cb413548ce132c127", "type": "github" }, "original": { @@ -846,11 +866,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1744921782, - "narHash": "sha256-w3I3w1SGqtpUnu4KQyaLue+k96XmkgA3+DpxSEjj+WI=", + "lastModified": 1748354888, + "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "6daca3ad780f045550b820f262002f35175a6c04", + "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", "type": "github" }, "original": { @@ -958,11 +978,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1745180802, - "narHash": "sha256-J/GKqn2VHv/ydaFXWCFduV2B7iwZzHtUvFArszxf2Cw=", + "lastModified": 1747884293, + "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "372fc521f8421b7830ea6db4d6ea3bae1c77548c", + "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", "type": "github" }, "original": { @@ -1054,11 +1074,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1746551795, - "narHash": "sha256-64X1LfgSGVidmVIgtg8tFOkjE6d2eI02ZXCjDupt6QY=", + "lastModified": 1748339096, + "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", "owner": "yetone", "repo": "avante.nvim", - "rev": "93aa961fc4fe45f69c68f1e336fbefbe4112be77", + "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", "type": "github" }, "original": { @@ -1086,11 +1106,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1746490840, - "narHash": "sha256-PDFqHMgYG7RDWVV54Tjh6Vv6B3usS0sSCrFKmIaMzGQ=", + "lastModified": 1748023521, + "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "7ba73866b9b3c696f80579c470c6eec374d3acec", + "rev": "a620a5a97b73faba009a8160bab2885316e1451c", "type": "github" }, "original": { @@ -1104,15 +1124,15 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741508717, - "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=", + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", "owner": "yaxitech", "repo": "ragenix", - "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", "type": "github" }, "original": { @@ -1124,13 +1144,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1190,11 +1210,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1746566324, - "narHash": "sha256-c7uPHm2W/ykWWT6tbLYmfrTC9Nuw+cFNqwswt3vPaJg=", + "lastModified": 1748390377, + "narHash": "sha256-oGkDMCJ7V2gncBsBb/D8L3HIPee9gnIwm7FrPZvOpRw=", "ref": "refs/heads/master", - "rev": "f506f811847c73cc0876a759c6fc93f791060d34", - "revCount": 280, + "rev": "7f7fb6c15bd2d0d0992a3955498551aef22af4d1", + "revCount": 281, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1233,11 +1253,11 @@ ] }, "locked": { - "lastModified": 1746498961, - "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", + "lastModified": 1748313401, + "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", + "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", "type": "github" }, "original": { diff --git a/hosts/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix index c780a6a..fbc6472 100644 --- a/hosts/gpdPocket3/flake.nix +++ b/hosts/gpdPocket3/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # for local testing. - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -37,12 +37,16 @@ qdirstat rustdesk-flutter styluslabs-write + xournalpp ]; ringofstorms_common = { systemName = configuration_name; boot.systemd.enable = true; - desktopEnvironment.gnome.enable = true; + desktopEnvironment.gnome = { + enable = true; + enableRotate = true; + }; secrets.enable = true; general.enableSleep = true; programs = { From 7329683b06be32822a38a842662bb6435c10fdf3 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 2 Jun 2025 13:59:37 -0500 Subject: [PATCH 25/73] update oren --- hosts/oren/flake.lock | 234 +++++++++++++++++++++--------------------- hosts/oren/flake.nix | 2 +- 2 files changed, 118 insertions(+), 118 deletions(-) diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index e7044e3..05d3ec0 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -32,11 +32,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745957654, - "narHash": "sha256-7srBa6eMbDzR5zD1TFmSOw5gBy+vRsoEC3DrlQD8Vig=", + "lastModified": 1748889889, + "narHash": "sha256-EYK1MXVf/JmFQt8p6dq1aJ68ndIrEfpA0gVMkwouhhI=", "ref": "refs/heads/master", - "rev": "46d5748992a9cbbf42f3c6e501288d5cf97de706", - "revCount": 425, + "rev": "cf8583305086d6248871a7d2ae70efb3090858de", + "revCount": 451, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -107,11 +107,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "rycee", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -178,11 +178,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -210,27 +210,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1745250177, - "narHash": "sha256-NPkMDgRHLVuNHs7y/MK3qYbE/5uo42mskUIygSHEOLM=", + "lastModified": 1748389978, + "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1e61a9c582ec2f701b36d4600ae19b8099c5211", + "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { - "lastModified": 1744327913, - "narHash": "sha256-WQ7GbrjtikpMnzzME59QSibZI0hjzt/KAGDmXa677Rw=", + "lastModified": 1746139196, + "narHash": "sha256-/FlNLWOSIrOYiWzAcgOdu9//QTorCDV1KWb+h6eqLwk=", "owner": "Almo7aya", "repo": "openingh.nvim", - "rev": "ce19b5ffe09e35cec600ba794df280cbb72c015f", + "rev": "7cc8c897cb6b34d8ed28e99d95baccef609ed251", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1745008876, - "narHash": "sha256-/GdJNqoDpdsPCOjcESbtEEDCz5TYkvbPRY1/T0gF7IY=", + "lastModified": 1747103074, + "narHash": "sha256-BvuQImJ1XxXAZ7QjbK8hUjWqnSk90B6Vx57k11UFqtU=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "634aa58117a9b70b3f08a0b150f11afd64f1c0eb", + "rev": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a", "type": "github" }, "original": { @@ -290,11 +290,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1736009707, - "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=", + "lastModified": 1747860236, + "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817", + "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1744934679, - "narHash": "sha256-rTX+CCVOOU6ZzM5NvymJvOfJF10BRMfl8hdSJz0zw+Q=", + "lastModified": 1748376831, + "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f", + "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1741233810, - "narHash": "sha256-BYTY2ezYuxsneAl/yQbwL1aQvVWKSsN3IVqzTlrBSEU=", + "lastModified": 1748258625, + "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "8d3bce9764e627b62b07424e0df77f680d47ffdb", + "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "nvim_plugin-RRethy/vim-illuminate": { "flake": false, "locked": { - "lastModified": 1744859423, - "narHash": "sha256-zqXKkrUNTH/EIx3PBRN8+mQcbWa6fO9i/UoSeav5R/w=", + "lastModified": 1748105647, + "narHash": "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "1fa4b23409e22a03823648e344c77f260e2572cb", + "rev": "0d1e93684da00ab7c057410fecfc24f434698898", "type": "github" }, "original": { @@ -354,11 +354,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1744379189, - "narHash": "sha256-HsdDeV3mMQwrzlP23bJnNkiSL5OELgn0WBTERxehviE=", + "lastModified": 1748380727, + "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "73d2c590c74a0c582144987a4decb4a642755859", + "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "nvim_plugin-aznhe21/actions-preview.nvim": { "flake": false, "locked": { - "lastModified": 1740589350, - "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=", + "lastModified": 1745779150, + "narHash": "sha256-rQjwlu5gQcOvxF72lr9ugPRl0W78wCWGWPhpN1oOMbs=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2", + "rev": "36513ad213855d497b7dd3391a24d1d75d58e36f", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1745020938, - "narHash": "sha256-qDcVJ2RovKSIcUdVnXNcQZHoAf75IqsTMlsclDFrT2U=", + "lastModified": 1748365238, + "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "e623e30df4053cacc67fb7eb04e1bd0fadba52b4", + "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1740764472, - "narHash": "sha256-4h/fzFY8JR9r+QnoiWEqgQKPMuu8i9HTC4v0Jp7iuUo=", + "lastModified": 1748270776, + "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", "owner": "catppuccin", "repo": "nvim", - "rev": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", + "rev": "56a9dfd1e05868cf3189369aad87242941396563", "type": "github" }, "original": { @@ -418,11 +418,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1744450582, - "narHash": "sha256-ybs65ObtjcUBaGglxP3SIpYjlGSEk/MQI9nSN8S3Q1w=", + "lastModified": 1747690845, + "narHash": "sha256-0qZhfxRhY8kR33X9/a9lNt1Slce8oSHeC8bJ7bSbYpQ=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "3b14762a0186b1922cb5ddf3a760d8521c7b3d7e", + "rev": "6db15a859cf73d4027e919f5a49cc795ee96831a", "type": "github" }, "original": { @@ -594,11 +594,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1745219545, - "narHash": "sha256-7WQ428oPr43z01HvNpArZJcUov61/pDtLqJtkEKnBAY=", + "lastModified": 1747829807, + "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "2149fc2009d1117d58e86e56836f70c969f60a82", + "rev": "8b729e489f1475615dc6c9737da917b3bc163605", "type": "github" }, "original": { @@ -642,11 +642,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1744007533, - "narHash": "sha256-KCz8UNL7SkI4cP7wKmQPJgkI4TsQftnHjaMSBYCgrOY=", + "lastModified": 1748004396, + "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "9aaec65de041bddfc4c0af66919030d2950bcea8", + "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", "type": "github" }, "original": { @@ -674,11 +674,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1745090089, - "narHash": "sha256-Pwxk2C5WaaaW7Ookbq2edvLSJh6ZQc3iWMxowHyQkFQ=", + "lastModified": 1747924806, + "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63", + "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", "type": "github" }, "original": { @@ -690,11 +690,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1745050087, - "narHash": "sha256-nkCVQ+TXiaKm17HXaAMVuRMV3Jbxv8aRIO6re4zEgDw=", + "lastModified": 1748287881, + "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d", + "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", "type": "github" }, "original": { @@ -706,11 +706,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1745247686, - "narHash": "sha256-rnm/BJNMVxcYH/ZXf1HciXgG0UWhAeQQniOaSvi0E40=", + "lastModified": 1748350935, + "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b335f1c72877f101248d3b085d4b7da7576361d7", + "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", "type": "github" }, "original": { @@ -722,11 +722,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1743352525, - "narHash": "sha256-YNqj1vPc2oyVrSgp+huoMkrUAp2Lx3G4W52liOujP6A=", + "lastModified": 1747719337, + "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "1ae5784bf0729c8b03cb7fe6561508a673c9adc8", + "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1744482854, - "narHash": "sha256-XeAFXg6GWzMJV/HzfdCXtv/effAHVU7mioFKTf1kDc8=", + "lastModified": 1747786963, + "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "86fe39534b7da729a1ac56c0466e76f2c663dc42", + "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", "type": "github" }, "original": { @@ -834,11 +834,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1742346322, - "narHash": "sha256-GF1zOHZItVZm3bx2wqI4hPj7EXQJ2F9KS4MtaEt2gm0=", + "lastModified": 1747012888, + "narHash": "sha256-JpW0ehsX81yVbKNzrYOe1hdgVMs6oaaxMLH6lECnOJg=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5", + "rev": "b4da76be54691e854d3e0e02c36b0245f945c2c7", "type": "github" }, "original": { @@ -850,11 +850,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1745201081, - "narHash": "sha256-zQsqyJgqlvxniKOtwPSzArUaOwvIgo6Xm+oAjAbPda4=", + "lastModified": 1748230341, + "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "be5b788f2dc1522c73fb7afad9092331c8aebe80", + "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", "type": "github" }, "original": { @@ -866,11 +866,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1745131674, - "narHash": "sha256-uoT45oaeY5c1+A7pVQIS+Bj9JnrSy9rQAecvaWZht+c=", + "lastModified": 1747360641, + "narHash": "sha256-+RHeFaeCF/iwAf8qAOjbEIl3YcnrBMVfkQnnzDNhyTA=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "855c97005c8eebcdd19846f2e54706bffd40ee96", + "rev": "1fb58cca9aebbc4fd32b086cb413548ce132c127", "type": "github" }, "original": { @@ -882,11 +882,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1744921782, - "narHash": "sha256-w3I3w1SGqtpUnu4KQyaLue+k96XmkgA3+DpxSEjj+WI=", + "lastModified": 1748354888, + "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "6daca3ad780f045550b820f262002f35175a6c04", + "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nvim_plugin-rafamadriz/friendly-snippets": { "flake": false, "locked": { - "lastModified": 1745202387, - "narHash": "sha256-R6xE5vwgFtyEYpET0E4ecZejuV/lNHFkumk+wGf3lbI=", + "lastModified": 1745949052, + "narHash": "sha256-FzApcTbWfFkBD9WsYMhaCyn6ky8UmpUC2io/co/eByM=", "owner": "rafamadriz", "repo": "friendly-snippets", - "rev": "fc8f183479a472df60aa86f00e295462f2308178", + "rev": "572f5660cf05f8cd8834e096d7b4c921ba18e175", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745009508, - "narHash": "sha256-NCytp+DiOo3obZeQ9bpaEaNMfstf1Ytn0OR5mAWodLw=", + "lastModified": 1745435920, + "narHash": "sha256-XU4zB4hUkwV7OVkQNggBxqv9AOOuwGj50kzkGq3GaF4=", "owner": "rmagatti", "repo": "auto-session", - "rev": "71c8af9a99e96b9d2533cf4bac4dfed1eafab923", + "rev": "00334ee24b9a05001ad50221c8daffbeedaa0842", "type": "github" }, "original": { @@ -994,11 +994,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1745180802, - "narHash": "sha256-J/GKqn2VHv/ydaFXWCFduV2B7iwZzHtUvFArszxf2Cw=", + "lastModified": 1747884293, + "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "372fc521f8421b7830ea6db4d6ea3bae1c77548c", + "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", "type": "github" }, "original": { @@ -1058,11 +1058,11 @@ "nvim_plugin-uga-rosa/ccc.nvim": { "flake": false, "locked": { - "lastModified": 1744103477, - "narHash": "sha256-MSh9tJv9UNfceO1yQIvID36x/fLGmgFcnIzJ9LOog0A=", + "lastModified": 1746537659, + "narHash": "sha256-3TZ8VmvdgQ9n63m78C3r4OIUkVQHTHBvC24ixBdhTig=", "owner": "uga-rosa", "repo": "ccc.nvim", - "rev": "af2cf5a963f401aad868c065222ee13d4bbc9050", + "rev": "9d1a256e006decc574789dfc7d628ca11644d4c2", "type": "github" }, "original": { @@ -1090,11 +1090,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1744881650, - "narHash": "sha256-BzRFgcBG4vn7mamwLvviMl4erTPwg+1AkAb3Ss4Kq8E=", + "lastModified": 1748339096, + "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", "owner": "yetone", "repo": "avante.nvim", - "rev": "eb1cd44731783024621beafe4e46204cbc9a4320", + "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", "type": "github" }, "original": { @@ -1122,11 +1122,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1745111203, - "narHash": "sha256-PaWWT0mSsTfnBMrmHagHgemGN5Be6rbikVVW4ZBK/Zs=", + "lastModified": 1748023521, + "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "dc579f98536029610cfa32c6bad86c0d24363679", + "rev": "a620a5a97b73faba009a8160bab2885316e1451c", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741508717, - "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=", + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", "owner": "yaxitech", "repo": "ragenix", - "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", "type": "github" }, "original": { @@ -1227,11 +1227,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745585761, - "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", + "lastModified": 1748390377, + "narHash": "sha256-oGkDMCJ7V2gncBsBb/D8L3HIPee9gnIwm7FrPZvOpRw=", "ref": "refs/heads/master", - "rev": "e5523910a0c07c88d026d006f5962434bfa53548", - "revCount": 277, + "rev": "7f7fb6c15bd2d0d0992a3955498551aef22af4d1", + "revCount": 281, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1270,11 +1270,11 @@ ] }, "locked": { - "lastModified": 1745207416, - "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=", + "lastModified": 1748313401, + "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a", + "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", "type": "github" }, "original": { diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 9701075..3ed9d26 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing From 5e573d7f144ea40395f0a0ccd3e300af37608303 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 11:32:49 -0500 Subject: [PATCH 26/73] add obsidian --- hosts/lio/flake.lock | 5 ++--- hosts/lio/flake.nix | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 5ee12aa..bfc4d85 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -31,15 +31,14 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1, - "narHash": "sha256-ZMMYuJqLYqqFc/bHjjRi7wpd9N9+1w4xN0ByLCPvLBQ=", "path": "../../common", "type": "path" }, "original": { "path": "../../common", "type": "path" - } + }, + "parent": [] }, "crane": { "locked": { diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index e08c2a6..c482ad0 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -46,6 +46,7 @@ appimage-run rustdesk-flutter element-desktop + obsidian ]; # Also allow this key to work for root user, this will let us use this as a remote builder easier From 9548cde7ec390959a704b2d1d4c8c25ccc74d9f8 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 12:13:18 -0500 Subject: [PATCH 27/73] add obsidian sync test --- common/_containers/obsidian_sync.nix | 55 ++++++++++++++++++++++++++++ common/flake.nix | 1 + 2 files changed, 56 insertions(+) create mode 100644 common/_containers/obsidian_sync.nix diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix new file mode 100644 index 0000000..c5c9b54 --- /dev/null +++ b/common/_containers/obsidian_sync.nix @@ -0,0 +1,55 @@ +{ + config, + pkgs, + ... +}: +let + cfg = config.services.obsidian_sync; +in +{ + options.services.obsidian_sync = + let + lib = pkgs.lib; + in + { + port = lib.mkOption { + type = lib.types.port; + default = 5984; + description = "Port number for Obsidian Sync CouchDB server"; + }; + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/obsidian_sync"; + description = "Directory to store Obsidian Sync data"; + }; + serverUrl = lib.mkOption { + type = lib.types.str; + description = "URL of the Obsidian Sync server"; + }; + }; + + config = { + virtualisation.oci-containers.containers = { + ############# + # obsidian_sync # + ############# + obsidian_sync = { + user = "root"; + image = "ghcr.io/danny-avila/obsidian_sync-dev:latest"; + ports = [ + "${toString cfg.port}:${toString cfg.port}" + ]; + environment = { + SERVER_URL = cfg.serverUrl; + COUCHDB_USER = "adminu"; + COUCHDB_PASSWORD = "Password123"; # TODO move to a secret and link to it via envFiles + COUCHDB_DATABASE = "obsidian_sync"; + }; + # environmentFiles = [ "${cfg.dataDir}/.env" ]; $ TODO see above todo + volumes = [ + "${cfg.dataDir}/data:/opt/couchdb/data" + ]; + }; + }; + }; +} diff --git a/common/flake.nix b/common/flake.nix index 2dcfc0e..d6f164c 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -43,6 +43,7 @@ containers = { librechat = import ./_containers/librechat.nix; forgejo = import ./_containers/forgejo.nix; + obsidian_sync = import ./_containers/obsidian_sync.nix; }; }; homeManagerModules = { From fde1dd27ad740e0404192fa36ac44abd04e513b7 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 12:18:49 -0500 Subject: [PATCH 28/73] fix image name for obsidian --- common/_containers/obsidian_sync.nix | 2 +- hosts/lio/containers.nix | 7 ++++++- hosts/lio/flake.lock | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix index c5c9b54..8197a9c 100644 --- a/common/_containers/obsidian_sync.nix +++ b/common/_containers/obsidian_sync.nix @@ -35,7 +35,7 @@ in ############# obsidian_sync = { user = "root"; - image = "ghcr.io/danny-avila/obsidian_sync-dev:latest"; + image = "docker.io/oleduc/docker-obsidian-livesync-couchdb:master"; ports = [ "${toString cfg.port}:${toString cfg.port}" ]; diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index 008cb7f..8b62eef 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -10,10 +10,15 @@ imports = [ common.nixosModules.containers.librechat - # common.nixosModules.containers.forgejo + common.nixosModules.containers.obsidian_sync ]; config = { + # Obsidian Sync settings + services.obsidian_sync = { + serverUrl = "https://obsidiansync.joshuabell.xyz"; + }; + ## Give internet access networking = { nat = { diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index bfc4d85..5ffccf4 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -1189,11 +1189,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1748390377, - "narHash": "sha256-oGkDMCJ7V2gncBsBb/D8L3HIPee9gnIwm7FrPZvOpRw=", + "lastModified": 1749227663, + "narHash": "sha256-0Jyh6aeouZuqyOArBi9rxUMCsas1hwYdyg854r4vxxA=", "ref": "refs/heads/master", - "rev": "7f7fb6c15bd2d0d0992a3955498551aef22af4d1", - "revCount": 281, + "rev": "56252ddbb09ea0395b857424edf1e745ace7653b", + "revCount": 282, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, From 3708ad76a1f3cb0fb8e7635aecb520cfb84fdfb8 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 17:05:58 -0500 Subject: [PATCH 29/73] add obsidian_sync secret --- common/_containers/obsidian_sync.nix | 9 ++++- common/secrets/default.nix | 4 ++ common/secrets/secrets/obsidian_sync_env.age | 40 ++++++++++++++++++++ common/secrets/secrets/secrets.nix | 3 ++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 common/secrets/secrets/obsidian_sync_env.age diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix index 8197a9c..48e45c7 100644 --- a/common/_containers/obsidian_sync.nix +++ b/common/_containers/obsidian_sync.nix @@ -26,6 +26,11 @@ in type = lib.types.str; description = "URL of the Obsidian Sync server"; }; + dockerEnvFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = "List of environment files to be used by the Obsidian Sync container"; + }; }; config = { @@ -41,11 +46,11 @@ in ]; environment = { SERVER_URL = cfg.serverUrl; + COUCHDB_DATABASE = "obsidian_sync"; COUCHDB_USER = "adminu"; COUCHDB_PASSWORD = "Password123"; # TODO move to a secret and link to it via envFiles - COUCHDB_DATABASE = "obsidian_sync"; }; - # environmentFiles = [ "${cfg.dataDir}/.env" ]; $ TODO see above todo + environmentFiles = cfg.dockerEnvFiles; volumes = [ "${cfg.dataDir}/data:/opt/couchdb/data" ]; diff --git a/common/secrets/default.nix b/common/secrets/default.nix index dad0858..f26b811 100644 --- a/common/secrets/default.nix +++ b/common/secrets/default.nix @@ -102,6 +102,10 @@ in file = ./secrets/headscale_auth.age; owner = users_cfg.primary; }; + obsidian_sync_env = { + file = ./secrets/obsidian_sync_env.age; + owner = users_cfg.primary; + }; }; }; }; diff --git a/common/secrets/secrets/obsidian_sync_env.age b/common/secrets/secrets/obsidian_sync_env.age new file mode 100644 index 0000000..b00492c --- /dev/null +++ b/common/secrets/secrets/obsidian_sync_env.age @@ -0,0 +1,40 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA3VHM4 +ekJTSmJvT2lTTHRBMzFXdFFHaytJK1lHemVmNnRnSURVbjVVK2lFCkxZNFZLUW1R +R055ZGNLNTZLcDg3Y0wzbUdRWVFFd1pjVlpVdVJVOVdBd0EKLT4gc3NoLWVkMjU1 +MTkgSmh2TCtRIHFwVE1aKytFYndQdHN4U0lDVjlIR3Q0STNrN3RkcTBLbVRxczM4 +dDBUV2cKcUd0cldLQTJ5Ti9uQjJFdC9YeDFmSUM2cTB3eWFwSXhqY0JQR0hOOTJi +awotPiBzc2gtZWQyNTUxOSBTcENqQlEgSkZuVVh6VlRORXZCR01LSU1uN3ViU0ln +Vko2a09kaWhHNEREMkIyQjd6awpCd3liSkN6cERtbERnTENTQm5Lcm1XcGl2QVJw +MHR6VWZQUjZJd2Zud2UwCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBkOTYvVkN6Q2ht +ZGNlVWJpdGs3Q1pFT2ZmV25mYzE0cFB3Nzd6Tk11emxvCjRIVEJvdXU1dXNxSXhM +a0JJanRtMUVjT3d3VTEyTHJRN3laVXdtVWZjdkUKLT4gc3NoLWVkMjU1MTkgWHpm +bWFRIGdrRTJJNFRud2JCcnZNWW9sanlaRTNxWmgxV0ErVVdDQXNTQU5IeFl2SE0K +QUUxQ2NrWjJ4MUpobzBQRStVRGtZY1Q4QTdteWsrL3UwVm1EQVlnbTN0SQotPiBz +c2gtZWQyNTUxOSBSNSt4ZncgMDNBTW1UNUx3OWxmU2ZGdUtoWmc5ak0vWjV0RmFB +MWgxcVB3bC9QdlVRcwpyeWVSTkN3aHRBUkRybzF0S2MxcCtWRTBZVWsra1MvWVBX +cVVvampybkdVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBnSHhUTlpscUNLSjJYSTNu +KzF2TzZ3V3IwZDBnRloySXVaMzJ5b3JlYUdJCjg2bVZDREpVcTY1TE8xR2h4OXlz +QWtrRXZzS01XT01JSlJQZnU3Tm93bDQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFYx +YW9iUWJNRGY5dFdkY2pCMm5sdTl4dHBIZXpqL0ZhWTA1V2FSZHoyd2MKWm0xdmFp +aGJWZDBLRURDZ21vT0F5NGlaVGw0Tml3dml0S3FpUkRiZGNGQQotPiBzc2gtZWQy +NTUxOSB3ZHJaSkEgcWhhT2sxQVJpMklMbmhpaHFVZU1BYi94aEhyVkVlN2Y2dHAr +Vmtmak9pbwpMUk0xNHpCWHJFVTJSSkdzTTVwalFSQThjWmM2T1FWTEtzclIvMGMy +V3J3Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyA1d0tZUzJIcTNMY0ViaDdrcmJzRHZh +ZThlK2E1Y091U1V2WXVDYTZvOXlrCmdlTGlMUG9FekExSHlkTFhUR2d5KzZDcnd1 +TFEzUUJlcGtaVzhJUkhrSmMKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHVHc1dYZjJC +dnRac2tBc2lqZmNaZ0NFYnozWm94VktEcEU0UGdiOFBsemMKU0hGQXZGTU9oNyt2 +SGZwTWViUVo5NCtWcGVNdHNnUGhFeGZhY044aTJSVQotPiBzc2gtZWQyNTUxOSBw +ZUZCUWcgUitGb1pRNEh5eTdldU5OaDNwYzFxRm1sZzRYVk8vT1crdTRjSVlDSUFU +SQo5MnhVZjMzMHlDZ3R3QnhXL2VsQmU4WHhlT1A0QmV4blFld3ozbDZLUVJzCi0+ +IHNzaC1lZDI1NTE5IDl2LzJIQSBKTjBaTWtTb2JHbXFqTGMxamx2WkkxY0VPQ3Jz +cVIvdnBnMXFSK0FnVlR3CjF6c2llYkZDTk9yY1E3Vjk2K2ZpbVFQVmJEMlV3cXNw +dkM0Sm81am1nMUkKLT4gTj5sLWdyZWFzZSBbQSwxRGc4CldWVUNsT1lITkFqOUpG +TEFUTHB3TkZJU2hQUGtuZ0ZNOFNEd0poQ1VGOXZyTnh5RTA0SGI2M0dpOHpBYzkz +eUYKS1Rjb1lsaE13WTByUFRSbGN5aFQwcVdsVy8xcVY3aUo4Q2kxbk1iMTFLOUx6 +TGllbkR6QwotLS0gbncyWWhJdDN1QnlSR09WbnBSbUg5YVd3Y2swSVd6eW9OU3Js +Q1RObmR1dwqLMWIo7EfqRCDm9i7SEQEumyTsTrO85HdRhcn7MmM50cMJVhA0Evsp +tYUVfj1UWvL9w7r3AVzHr4Kcgz5dlVpgXQ/K3QL5Bxzx87KXdafJWkxzMMDE1dDM +94mu+/CErH7oFTE0LNEDDvhSZfNPC6+SvMuffAwUoEXExec8plSDBoCYIz0qz3Ci +95WU/HTXQ2om3FiCDxJJO+Tg4FjJDgxHwQ3Ldg== +-----END AGE ENCRYPTED FILE----- diff --git a/common/secrets/secrets/secrets.nix b/common/secrets/secrets/secrets.nix index 6d32978..c2c73f2 100644 --- a/common/secrets/secrets/secrets.nix +++ b/common/secrets/secrets/secrets.nix @@ -84,4 +84,7 @@ in "headscale_auth.age" = { inherit publicKeys; }; + "obsidian_sync_env.age" = { + inherit publicKeys; + }; } From 1416caa1611e899269a02989e10097f57ca0cbd1 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 17:11:44 -0500 Subject: [PATCH 30/73] update sync admin env --- common/_containers/obsidian_sync.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix index 48e45c7..7bab65f 100644 --- a/common/_containers/obsidian_sync.nix +++ b/common/_containers/obsidian_sync.nix @@ -29,7 +29,7 @@ in dockerEnvFiles = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ]; - description = "List of environment files to be used by the Obsidian Sync container"; + description = "List of environment files to be used by the Obsidian Sync container. When provided you must supply chouchdb user/password env files they will not be supplied by default."; }; }; @@ -47,8 +47,8 @@ in environment = { SERVER_URL = cfg.serverUrl; COUCHDB_DATABASE = "obsidian_sync"; - COUCHDB_USER = "adminu"; - COUCHDB_PASSWORD = "Password123"; # TODO move to a secret and link to it via envFiles + COUCHDB_USER = pkgs.lib.mkIf cfg.dockerEnvFiles != [] "adminu"; + COUCHDB_PASSWORD = pkgs.lib.mkIf cfg.dockerEnvFiles != [] "Password123"; }; environmentFiles = cfg.dockerEnvFiles; volumes = [ From b1a69f696c814aa87bf69d64f2a7f6baf1bfdd65 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 17:14:22 -0500 Subject: [PATCH 31/73] fix env if statement --- common/_containers/obsidian_sync.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix index 7bab65f..59a2be2 100644 --- a/common/_containers/obsidian_sync.nix +++ b/common/_containers/obsidian_sync.nix @@ -47,8 +47,8 @@ in environment = { SERVER_URL = cfg.serverUrl; COUCHDB_DATABASE = "obsidian_sync"; - COUCHDB_USER = pkgs.lib.mkIf cfg.dockerEnvFiles != [] "adminu"; - COUCHDB_PASSWORD = pkgs.lib.mkIf cfg.dockerEnvFiles != [] "Password123"; + COUCHDB_USER = if cfg.dockerEnvFiles != [] then "adminu" else null; + COUCHDB_PASSWORD = if cfg.dockerEnvFiles != [] then "Password123" else null; }; environmentFiles = cfg.dockerEnvFiles; volumes = [ From 71116eddbcf75299c027de964345d9879ca62f28 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 17:17:33 -0500 Subject: [PATCH 32/73] wrong assertion :facepalm: --- common/_containers/obsidian_sync.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix index 59a2be2..6d4baf4 100644 --- a/common/_containers/obsidian_sync.nix +++ b/common/_containers/obsidian_sync.nix @@ -47,8 +47,8 @@ in environment = { SERVER_URL = cfg.serverUrl; COUCHDB_DATABASE = "obsidian_sync"; - COUCHDB_USER = if cfg.dockerEnvFiles != [] then "adminu" else null; - COUCHDB_PASSWORD = if cfg.dockerEnvFiles != [] then "Password123" else null; + COUCHDB_USER = if cfg.dockerEnvFiles == [] then "adminu" else null; + COUCHDB_PASSWORD = if cfg.dockerEnvFiles == [] then "Password123" else null; }; environmentFiles = cfg.dockerEnvFiles; volumes = [ From c0c8391339b638cf79273c1c9ed59cc02ae49903 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 17:30:11 -0500 Subject: [PATCH 33/73] obsidian sync stuyff --- common/_containers/obsidian_sync.md | 7 ++ common/_containers/obsidian_sync.nix | 4 +- common/secrets/secrets/obsidian_sync_env.age | 74 ++++++++++---------- hosts/lio/containers.nix | 2 + hosts/oracle/o001/nginx.nix | 7 ++ 5 files changed, 54 insertions(+), 40 deletions(-) create mode 100644 common/_containers/obsidian_sync.md diff --git a/common/_containers/obsidian_sync.md b/common/_containers/obsidian_sync.md new file mode 100644 index 0000000..98f7e11 --- /dev/null +++ b/common/_containers/obsidian_sync.md @@ -0,0 +1,7 @@ +docker run \ + -e hostname=https://obsidiansync.joshuabell.xyz \ + -e database=obsidian_sync \ + -e username=obsidian_admin \ + -e password=$REPLACE \ + docker.io/oleduc/docker-obsidian-livesync-couchdb:master \ + deno -A /scripts/generate_setupuri.ts diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix index 6d4baf4..94c12af 100644 --- a/common/_containers/obsidian_sync.nix +++ b/common/_containers/obsidian_sync.nix @@ -47,8 +47,8 @@ in environment = { SERVER_URL = cfg.serverUrl; COUCHDB_DATABASE = "obsidian_sync"; - COUCHDB_USER = if cfg.dockerEnvFiles == [] then "adminu" else null; - COUCHDB_PASSWORD = if cfg.dockerEnvFiles == [] then "Password123" else null; + COUCHDB_USER = pkgs.lib.mkIf (cfg.dockerEnvFiles == []) "adminu"; + COUCHDB_PASSWORD = pkgs.lib.mkIf (cfg.dockerEnvFiles == []) "Password123"; }; environmentFiles = cfg.dockerEnvFiles; volumes = [ diff --git a/common/secrets/secrets/obsidian_sync_env.age b/common/secrets/secrets/obsidian_sync_env.age index b00492c..25e4a12 100644 --- a/common/secrets/secrets/obsidian_sync_env.age +++ b/common/secrets/secrets/obsidian_sync_env.age @@ -1,40 +1,38 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA3VHM4 -ekJTSmJvT2lTTHRBMzFXdFFHaytJK1lHemVmNnRnSURVbjVVK2lFCkxZNFZLUW1R -R055ZGNLNTZLcDg3Y0wzbUdRWVFFd1pjVlpVdVJVOVdBd0EKLT4gc3NoLWVkMjU1 -MTkgSmh2TCtRIHFwVE1aKytFYndQdHN4U0lDVjlIR3Q0STNrN3RkcTBLbVRxczM4 -dDBUV2cKcUd0cldLQTJ5Ti9uQjJFdC9YeDFmSUM2cTB3eWFwSXhqY0JQR0hOOTJi -awotPiBzc2gtZWQyNTUxOSBTcENqQlEgSkZuVVh6VlRORXZCR01LSU1uN3ViU0ln -Vko2a09kaWhHNEREMkIyQjd6awpCd3liSkN6cERtbERnTENTQm5Lcm1XcGl2QVJw -MHR6VWZQUjZJd2Zud2UwCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBkOTYvVkN6Q2ht -ZGNlVWJpdGs3Q1pFT2ZmV25mYzE0cFB3Nzd6Tk11emxvCjRIVEJvdXU1dXNxSXhM -a0JJanRtMUVjT3d3VTEyTHJRN3laVXdtVWZjdkUKLT4gc3NoLWVkMjU1MTkgWHpm -bWFRIGdrRTJJNFRud2JCcnZNWW9sanlaRTNxWmgxV0ErVVdDQXNTQU5IeFl2SE0K -QUUxQ2NrWjJ4MUpobzBQRStVRGtZY1Q4QTdteWsrL3UwVm1EQVlnbTN0SQotPiBz -c2gtZWQyNTUxOSBSNSt4ZncgMDNBTW1UNUx3OWxmU2ZGdUtoWmc5ak0vWjV0RmFB -MWgxcVB3bC9QdlVRcwpyeWVSTkN3aHRBUkRybzF0S2MxcCtWRTBZVWsra1MvWVBX -cVVvampybkdVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBnSHhUTlpscUNLSjJYSTNu -KzF2TzZ3V3IwZDBnRloySXVaMzJ5b3JlYUdJCjg2bVZDREpVcTY1TE8xR2h4OXlz -QWtrRXZzS01XT01JSlJQZnU3Tm93bDQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFYx -YW9iUWJNRGY5dFdkY2pCMm5sdTl4dHBIZXpqL0ZhWTA1V2FSZHoyd2MKWm0xdmFp -aGJWZDBLRURDZ21vT0F5NGlaVGw0Tml3dml0S3FpUkRiZGNGQQotPiBzc2gtZWQy -NTUxOSB3ZHJaSkEgcWhhT2sxQVJpMklMbmhpaHFVZU1BYi94aEhyVkVlN2Y2dHAr -Vmtmak9pbwpMUk0xNHpCWHJFVTJSSkdzTTVwalFSQThjWmM2T1FWTEtzclIvMGMy -V3J3Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyA1d0tZUzJIcTNMY0ViaDdrcmJzRHZh -ZThlK2E1Y091U1V2WXVDYTZvOXlrCmdlTGlMUG9FekExSHlkTFhUR2d5KzZDcnd1 -TFEzUUJlcGtaVzhJUkhrSmMKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHVHc1dYZjJC -dnRac2tBc2lqZmNaZ0NFYnozWm94VktEcEU0UGdiOFBsemMKU0hGQXZGTU9oNyt2 -SGZwTWViUVo5NCtWcGVNdHNnUGhFeGZhY044aTJSVQotPiBzc2gtZWQyNTUxOSBw -ZUZCUWcgUitGb1pRNEh5eTdldU5OaDNwYzFxRm1sZzRYVk8vT1crdTRjSVlDSUFU -SQo5MnhVZjMzMHlDZ3R3QnhXL2VsQmU4WHhlT1A0QmV4blFld3ozbDZLUVJzCi0+ -IHNzaC1lZDI1NTE5IDl2LzJIQSBKTjBaTWtTb2JHbXFqTGMxamx2WkkxY0VPQ3Jz -cVIvdnBnMXFSK0FnVlR3CjF6c2llYkZDTk9yY1E3Vjk2K2ZpbVFQVmJEMlV3cXNw -dkM0Sm81am1nMUkKLT4gTj5sLWdyZWFzZSBbQSwxRGc4CldWVUNsT1lITkFqOUpG -TEFUTHB3TkZJU2hQUGtuZ0ZNOFNEd0poQ1VGOXZyTnh5RTA0SGI2M0dpOHpBYzkz -eUYKS1Rjb1lsaE13WTByUFRSbGN5aFQwcVdsVy8xcVY3aUo4Q2kxbk1iMTFLOUx6 -TGllbkR6QwotLS0gbncyWWhJdDN1QnlSR09WbnBSbUg5YVd3Y2swSVd6eW9OU3Js -Q1RObmR1dwqLMWIo7EfqRCDm9i7SEQEumyTsTrO85HdRhcn7MmM50cMJVhA0Evsp -tYUVfj1UWvL9w7r3AVzHr4Kcgz5dlVpgXQ/K3QL5Bxzx87KXdafJWkxzMMDE1dDM -94mu+/CErH7oFTE0LNEDDvhSZfNPC6+SvMuffAwUoEXExec8plSDBoCYIz0qz3Ci -95WU/HTXQ2om3FiCDxJJO+Tg4FjJDgxHwQ3Ldg== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBrcmlF +OFVrOTNvTHJ6d1ZqNDVIb3pNSUMyMzNsU241MXVKM3hxNHp6ZTIwCmtVcWVxbVIv +UXRLdFkyOWU5Ty8wZ2djRnBKRWFYMlliTXF5eUozc25NL1UKLT4gc3NoLWVkMjU1 +MTkgSmh2TCtRIHJXTzFaU2tERGxuak5Kc0NjbXZWbENJRG51YTFLMitldjJwa1Vk +ZUlRbUkKNGgxbFQ1bTVUMFJIck42eHUvYmcrREJzMDlvTVAwdFVhU1pTZEZTQXNE +ZwotPiBzc2gtZWQyNTUxOSBTcENqQlEgQ1BrZ2hoZEJadW1YdGNRZUxGZVI4VEJG +c0taTkM2Qmg1YXFWTG1idjJEYwpoRTlMcWNTMmU3M0JCU01PbEJ5aUxhOVZFUXJi +YkRqUHdnS1QzWTFsUHRvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBPN3RKdW1Ib2Qx +bXVzMzlBOXlUMXFCU24yVmoycUlWcU82UUx6eFEvYkNRCk1WWUswM0xlUWkzeUpt +VnQxR21OU1pGSTByLzRZNlBsL25iQkR2c3VQcGcKLT4gc3NoLWVkMjU1MTkgWHpm +bWFRIEM1UGIzZDExOWllOStvWmxUcXZGYTN1SEM3TDUyNWF1R2JEcm9CREZaMUEK +aE5iSG5zQ2JKanJGMlNiRnNZUVQ5TVNObFo5SWM5OThERS9Ga0ZnYU9SdwotPiBz +c2gtZWQyNTUxOSBSNSt4ZncgYi80anJ0WDNRTnhTeGw4ZGhiMzZHUHB5UkdicWp0 +aDJQQ0pIZXNwZ3hEYwpldkE5WmRQenV3TzdXSzZaT2xkK2hIMUpjNzFaam84dStu +ZzFCeTBxTHE4Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSAxdmowRWJyZytwUkJqRkJm +RWNRUUxsdXhXcDdVTTZkM1k0M1VPZkFteDBZCmp0WmZpK25Vc0t4NzVrQVZEZks1 +cXVnQzA0cWliS0hSSWRXblQzRjU5Z2cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFB0 +Y1dwT2RzYkVsSE5FSHRYbEYwNThvK2NUcWd6WGJzdEZiaGJBNG00bGcKQXphcy90 +TElUN1g4RXVGa1NOSXhjREM5eE9mOHJHOGU5K2x1djlvUnJWawotPiBzc2gtZWQy +NTUxOSB3ZHJaSkEgRWhmNUZxN0NxcllHT3V6TFVLbkhkVVFiUHorREFuZHkvYkFK +czViMTJTSQo5YzR1d3FRVFBIWDgzdXZOVGJVSGd0Rk5sZGtESUZ5LzVWdVhUMnJl +MUpzCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyAxbi9WWnc3ZVhMa2kyQ1JXU1FTUDF5 +N1pJOXhVQXBPc3E3cmtaZVcvOFVNClkyQ3UvcGNQTm1OZTJSZ0JNZXVzRWNUUU9Y +ZnJsMm9iaDRIN1V6bUhTSDgKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFJpT2lSMUdI +Z25NdnRaVHJwWW9uQ25WcWVoVnN1bW9DVUxra0Z2RlRQeWsKWUdNbEp3dDJTcHBp +TUlzUE5mTVkwREE2b2NlMTdHVUFSMmpkRkFwcDJ5QQotPiBzc2gtZWQyNTUxOSBw +ZUZCUWcgN0N2ZDJuSFRRSk4zZGVaSTJ1aGd4blVJVm9oY0s2ZHpVNXhWRXdCMFkw +dwpBYU85cnV0bkE1NjhUWVBzeGI1MFRtcG5uVlp6aTIyNFYzTmxqOEE0OWdrCi0+ +IHNzaC1lZDI1NTE5IDl2LzJIQSAxS3VZUkxPZHNtYlJ4TGYrQ0pIOHBSZWMwOXlN +VnNyTmNQcjRCS3FObDNvCngrQ0ZTQ21XUkdKZURDaWJ1elNRc2VEYjNicXQxajFk +WFh2c010Z3NOUU0KLT4gc2w1N1FpLWdyZWFzZQpkZjA2bUlqNFh5eDNLZDIvT3VM +YnJVKzI3OEcyU3ZwaHBEWQotLS0gbC9sUHZDeFVNV0pXQkR6SnBCYjFYZnUzQkN3 +eVhFVTVQd0cxOGF2K1BKVQoklAHBGEN9x6Tefj2B8he2iEFKipCl+nkkizdrMWTw +j9ugsysqFomNM1CLn2LgRTzi75MK6rAZsFFX6K02SxISRU6XotyLXvJM+w/nh0Ev +knPLAxAPmgC+ES0tIVuTpUDG0sM9+iwGrEQ4w72pULmW0JjjskmM/xFPiI4fTlTY +tAsRaOui0Qgxg3Du34d44U16ThEq3yLItEITRl6dJJv1 -----END AGE ENCRYPTED FILE----- diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index 8b62eef..8854431 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -1,5 +1,6 @@ { common }: { + config, ... }: { @@ -17,6 +18,7 @@ # Obsidian Sync settings services.obsidian_sync = { serverUrl = "https://obsidiansync.joshuabell.xyz"; + dockerEnvFiles = [ config.age.secrets.obsidian_sync_env.path ]; }; ## Give internet access diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index 65c0bb7..543351a 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -134,6 +134,13 @@ proxyPass = "http://100.64.0.13"; }; }; + "obsidiansync.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://100.64.0.1:5984"; + }; + }; "_" = { default = true; From 0d2c44d2d808c4501566a1f7a32cb598a58a116c Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 17:30:47 -0500 Subject: [PATCH 34/73] update lio flake --- hosts/lio/flake.lock | 59 ++++++++++++++++++++++++++++++-------------- hosts/lio/flake.nix | 4 +-- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 5ffccf4..808507c 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,17 +28,22 @@ "common": { "inputs": { "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "path": "../../common", - "type": "path" + "lastModified": 1749249011, + "narHash": "sha256-WMkuZlAsarSVMxDcNU+KZXEJlArmDPvUpBrHoKeOmoI=", + "ref": "refs/heads/master", + "rev": "c0c8391339b638cf79273c1c9ed59cc02ae49903", + "revCount": 460, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -102,16 +107,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748487945, - "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "rycee", "repo": "home-manager", - "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-25.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -141,21 +146,37 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -171,7 +192,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1748302896, "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", @@ -187,7 +208,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1748389978, "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", @@ -1103,7 +1124,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1123,13 +1144,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index c482ad0..c5d862d 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; From 9e7f27f5de4678418cecd42eb4faadb6e5d9fb87 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 18:02:20 -0500 Subject: [PATCH 35/73] update obsidian pass --- common/secrets/secrets/obsidian_sync_env.age | 72 ++++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/common/secrets/secrets/obsidian_sync_env.age b/common/secrets/secrets/obsidian_sync_env.age index 25e4a12..50b1152 100644 --- a/common/secrets/secrets/obsidian_sync_env.age +++ b/common/secrets/secrets/obsidian_sync_env.age @@ -1,38 +1,38 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBrcmlF -OFVrOTNvTHJ6d1ZqNDVIb3pNSUMyMzNsU241MXVKM3hxNHp6ZTIwCmtVcWVxbVIv -UXRLdFkyOWU5Ty8wZ2djRnBKRWFYMlliTXF5eUozc25NL1UKLT4gc3NoLWVkMjU1 -MTkgSmh2TCtRIHJXTzFaU2tERGxuak5Kc0NjbXZWbENJRG51YTFLMitldjJwa1Vk -ZUlRbUkKNGgxbFQ1bTVUMFJIck42eHUvYmcrREJzMDlvTVAwdFVhU1pTZEZTQXNE -ZwotPiBzc2gtZWQyNTUxOSBTcENqQlEgQ1BrZ2hoZEJadW1YdGNRZUxGZVI4VEJG -c0taTkM2Qmg1YXFWTG1idjJEYwpoRTlMcWNTMmU3M0JCU01PbEJ5aUxhOVZFUXJi -YkRqUHdnS1QzWTFsUHRvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBPN3RKdW1Ib2Qx -bXVzMzlBOXlUMXFCU24yVmoycUlWcU82UUx6eFEvYkNRCk1WWUswM0xlUWkzeUpt -VnQxR21OU1pGSTByLzRZNlBsL25iQkR2c3VQcGcKLT4gc3NoLWVkMjU1MTkgWHpm -bWFRIEM1UGIzZDExOWllOStvWmxUcXZGYTN1SEM3TDUyNWF1R2JEcm9CREZaMUEK -aE5iSG5zQ2JKanJGMlNiRnNZUVQ5TVNObFo5SWM5OThERS9Ga0ZnYU9SdwotPiBz -c2gtZWQyNTUxOSBSNSt4ZncgYi80anJ0WDNRTnhTeGw4ZGhiMzZHUHB5UkdicWp0 -aDJQQ0pIZXNwZ3hEYwpldkE5WmRQenV3TzdXSzZaT2xkK2hIMUpjNzFaam84dStu -ZzFCeTBxTHE4Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSAxdmowRWJyZytwUkJqRkJm -RWNRUUxsdXhXcDdVTTZkM1k0M1VPZkFteDBZCmp0WmZpK25Vc0t4NzVrQVZEZks1 -cXVnQzA0cWliS0hSSWRXblQzRjU5Z2cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFB0 -Y1dwT2RzYkVsSE5FSHRYbEYwNThvK2NUcWd6WGJzdEZiaGJBNG00bGcKQXphcy90 -TElUN1g4RXVGa1NOSXhjREM5eE9mOHJHOGU5K2x1djlvUnJWawotPiBzc2gtZWQy -NTUxOSB3ZHJaSkEgRWhmNUZxN0NxcllHT3V6TFVLbkhkVVFiUHorREFuZHkvYkFK -czViMTJTSQo5YzR1d3FRVFBIWDgzdXZOVGJVSGd0Rk5sZGtESUZ5LzVWdVhUMnJl -MUpzCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyAxbi9WWnc3ZVhMa2kyQ1JXU1FTUDF5 -N1pJOXhVQXBPc3E3cmtaZVcvOFVNClkyQ3UvcGNQTm1OZTJSZ0JNZXVzRWNUUU9Y -ZnJsMm9iaDRIN1V6bUhTSDgKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFJpT2lSMUdI -Z25NdnRaVHJwWW9uQ25WcWVoVnN1bW9DVUxra0Z2RlRQeWsKWUdNbEp3dDJTcHBp -TUlzUE5mTVkwREE2b2NlMTdHVUFSMmpkRkFwcDJ5QQotPiBzc2gtZWQyNTUxOSBw -ZUZCUWcgN0N2ZDJuSFRRSk4zZGVaSTJ1aGd4blVJVm9oY0s2ZHpVNXhWRXdCMFkw -dwpBYU85cnV0bkE1NjhUWVBzeGI1MFRtcG5uVlp6aTIyNFYzTmxqOEE0OWdrCi0+ -IHNzaC1lZDI1NTE5IDl2LzJIQSAxS3VZUkxPZHNtYlJ4TGYrQ0pIOHBSZWMwOXlN -VnNyTmNQcjRCS3FObDNvCngrQ0ZTQ21XUkdKZURDaWJ1elNRc2VEYjNicXQxajFk -WFh2c010Z3NOUU0KLT4gc2w1N1FpLWdyZWFzZQpkZjA2bUlqNFh5eDNLZDIvT3VM -YnJVKzI3OEcyU3ZwaHBEWQotLS0gbC9sUHZDeFVNV0pXQkR6SnBCYjFYZnUzQkN3 -eVhFVTVQd0cxOGF2K1BKVQoklAHBGEN9x6Tefj2B8he2iEFKipCl+nkkizdrMWTw -j9ugsysqFomNM1CLn2LgRTzi75MK6rAZsFFX6K02SxISRU6XotyLXvJM+w/nh0Ev -knPLAxAPmgC+ES0tIVuTpUDG0sM9+iwGrEQ4w72pULmW0JjjskmM/xFPiI4fTlTY -tAsRaOui0Qgxg3Du34d44U16ThEq3yLItEITRl6dJJv1 +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBFSG9R +akdvQzNiRjgzc1pIZ09zdGIvUld1RmdHRUxnT3o3L3F2UlVxZlZNCmhpZUhWUHFO +cXFhcjgzb3VJM24ySDNQNkZLOEFWTkMrK0QyYkV0YlZDY3MKLT4gc3NoLWVkMjU1 +MTkgSmh2TCtRIG5CMlNyTjhCZDI5cHBYOE1nNGtMc3g1bzlJT0JNc0l1TVNzK0p2 +ZHhJVDAKRUFieUlUdmhTVWtaUGpJa0cxamorMmZDRDV3ZGtRU0pvVzJxL29oRzJK +NAotPiBzc2gtZWQyNTUxOSBTcENqQlEgc1JLOTF6ZFUxaXpmWGlLYWFEdzAydDYv +aW9NZjZEVENnVzYzUU14UHhSYwpQQ055RkVUTThWekwvMFlSWjhjUWx4Qmlrdm9M +M0RibjZTVnFlN1doN0RnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyB5cTI4UnRVK01M +TU80WC80TFNGTW10TmdVbXJGeVAyS25oL0pkWVNGRkZjCjUrcUc2bjkxY3lXd2Ix +YUhFSk4raXcvcFBnT0dKeVVaK1E2MTBFd3dxbGMKLT4gc3NoLWVkMjU1MTkgWHpm +bWFRIHRsWEZBVE5TUkYwNHZFOStPNVFac0pCWnN2aDJPMVI1bVFXMW9JbjFzR0UK +djFneHk0OS9rYVlpd1FDNWFUakViOVhsQjhoZTdoTXI1RXUxRVQ1OTBxYwotPiBz +c2gtZWQyNTUxOSBSNSt4ZncgcU5mUTYyUG1Ob0dkN1FkRDZBMFI2QXRoZlNhbXc5 +N01TL3hSbFY5b1MzbwpBN3R5NG9LM0ZOS0hHZkppbXRyam5zYnRUMXB3YjduOU5p +ZmMxOUxXMnBnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBKMHNyeHI3ODhOQzNPQ2xG +QnQwUFM1cGt4QjdPTkF5TSsvajNqRkx1VmhJCngxWFk4S1R0OXFYV1loU2kyRWVa +UjBrN05McmhtcW9wOU4wY3pxcmlKZVkKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFFT +YkRlM0EvYVhWbmVqQjFhQU5Zak42MjI1cTU1dE8zR1p2bmFkRmYzRFkKSGc3elpl +NVBKMlZYalF4VTYwV3VLaGxramJ3ZlVwOXdud3hCd1BTS2JPUQotPiBzc2gtZWQy +NTUxOSB3ZHJaSkEgSFg1Q2xJR1dNY0xmYUhaY3psUkE5TG4vOXU3Znhac1ZmVFdn +L0JQdUtSdwptMDd1TmpPSnB0TENqOHBVM0p6a2l6NlBQRFRtZ3V5YnY2eVhsNlBu +c0ljCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA4WWNXT1VPZy9leFVrK0o2ZThHZTEr +bUNwKytnc3ZiM0t2NGJPNFdRZWowCk81QzN5ODYyT3hNVkVWMEtYbTlQclpwMkl3 +SjBZZ09FYVMvNG0rV1BKamMKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGw4UitKVU44 +S1BjSzFYUlNPMDEraFM4cGxhTk9KYlZJVnIxdmJZSlluQTQKR21yN2hyVlM1L3hB +V012dUUrQjVIeXBWbUZ1QzZNYVFYSm5PeGs5dVR3WQotPiBzc2gtZWQyNTUxOSBw +ZUZCUWcgeEhjL2F5RllRVlZ1UElxL0w3MmlmQXc3TlBaUEt0cTU4VThUbHVWVlhD +SQpncStaK2lDeE9FMVpYVmZzVmlkOWdxQUs0MVA3YU5ZSEorVXFwMndwdkpvCi0+ +IHNzaC1lZDI1NTE5IDl2LzJIQSBwUHhzTUE2WFo5anYzTlFuM1FkdHh3T2ZOT2V5 +V3lxZDhMMEVWVkwxN0hVClNxa3hEczJmSUJpYS94bzg5Nnk3NUtWSXQ3SEdLQkJG +b3hFbmN1VjhWUG8KLT4gUUktZ3JlYXNlIF0gbkpjKWlEIDRmTEBrIkg8CmxURW80 +dmRhZ1UvSkhzd1lqOVZTTlpxYnNQbDllUFUKLS0tIGN5SzhpY3VFM3NBUzlFK3gx +dFhmN0dscWE5REVQMTVZa3NzRXFrZVhOU0kKUdr7OyUzs5iQwWX7rDucmC1sbRfe +AulfGi+K/ajK0R39JnJVE/WERNANzanPLOwk/7pI69HPQm/irA5HaX/JK6q5bxP5 +mgdhR+5KF6uk7QXjU+w5uKN+ypVzZX29kO6p3cw8hOODtebUvP10QK7jYURxlo6g +o4Q= -----END AGE ENCRYPTED FILE----- From e46716582fd975ca9ce05baecd12c5ef73f5b125 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 18:30:58 -0500 Subject: [PATCH 36/73] idk but im pushing --- common/_containers/obsidian_sync.nix | 5 ++- hosts/lio/containers.nix | 2 +- hosts/lio/flake.lock | 59 +++++++++------------------- hosts/lio/flake.nix | 4 +- 4 files changed, 25 insertions(+), 45 deletions(-) diff --git a/common/_containers/obsidian_sync.nix b/common/_containers/obsidian_sync.nix index 94c12af..42f8b52 100644 --- a/common/_containers/obsidian_sync.nix +++ b/common/_containers/obsidian_sync.nix @@ -47,12 +47,13 @@ in environment = { SERVER_URL = cfg.serverUrl; COUCHDB_DATABASE = "obsidian_sync"; - COUCHDB_USER = pkgs.lib.mkIf (cfg.dockerEnvFiles == []) "adminu"; - COUCHDB_PASSWORD = pkgs.lib.mkIf (cfg.dockerEnvFiles == []) "Password123"; + COUCHDB_USER = pkgs.lib.mkIf (cfg.dockerEnvFiles == [ ]) "adminu"; + COUCHDB_PASSWORD = pkgs.lib.mkIf (cfg.dockerEnvFiles == [ ]) "Password123"; }; environmentFiles = cfg.dockerEnvFiles; volumes = [ "${cfg.dataDir}/data:/opt/couchdb/data" + "${cfg.dataDir}/config:/opt/couchdb/etc/local.d" ]; }; }; diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index 8854431..df74920 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -11,7 +11,7 @@ imports = [ common.nixosModules.containers.librechat - common.nixosModules.containers.obsidian_sync + # common.nixosModules.containers.obsidian_sync ]; config = { diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 808507c..5ffccf4 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,22 +28,17 @@ "common": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1749249011, - "narHash": "sha256-WMkuZlAsarSVMxDcNU+KZXEJlArmDPvUpBrHoKeOmoI=", - "ref": "refs/heads/master", - "rev": "c0c8391339b638cf79273c1c9ed59cc02ae49903", - "revCount": 460, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } + "path": "../../common", + "type": "path" + }, + "parent": [] }, "crane": { "locked": { @@ -107,16 +102,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -146,37 +141,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -192,7 +171,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1748302896, "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", @@ -208,7 +187,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1748389978, "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", @@ -1124,7 +1103,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1144,13 +1123,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index c5d862d..c482ad0 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - # common.url = "path:../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; From 52e452720bd0808b6a855e699f6950310665403e Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 6 Jun 2025 18:39:51 -0500 Subject: [PATCH 37/73] it works finally --- hosts/lio/containers.nix | 2 +- hosts/lio/flake.lock | 59 +++++++++++++++++++++++++++------------- hosts/lio/flake.nix | 4 +-- 3 files changed, 43 insertions(+), 22 deletions(-) diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index df74920..8854431 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -11,7 +11,7 @@ imports = [ common.nixosModules.containers.librechat - # common.nixosModules.containers.obsidian_sync + common.nixosModules.containers.obsidian_sync ]; config = { diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 5ffccf4..0ac338c 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,17 +28,22 @@ "common": { "inputs": { "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "path": "../../common", - "type": "path" + "lastModified": 1749252658, + "narHash": "sha256-/Zkbq7RkMvGSj6w+JBCVHPTS+csbbBAM1XvAgh09e0c=", + "ref": "refs/heads/master", + "rev": "e46716582fd975ca9ce05baecd12c5ef73f5b125", + "revCount": 463, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -102,16 +107,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748487945, - "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "rycee", "repo": "home-manager", - "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-25.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -141,21 +146,37 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -171,7 +192,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1748302896, "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", @@ -187,7 +208,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1748389978, "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", @@ -1103,7 +1124,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1123,13 +1144,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index c482ad0..c5d862d 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; From 85958c75ce099276dea64e5ebc80c776bb7a9dde Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sat, 7 Jun 2025 11:25:48 -0500 Subject: [PATCH 38/73] update max files for obsi sync --- hosts/oracle/o001/nginx.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index 543351a..cc634d9 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -140,6 +140,13 @@ locations."/" = { proxyPass = "http://100.64.0.1:5984"; }; + extraConfig = '' + client_max_body_size 100M; + proxy_redirect off; + proxy_buffering off; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + ''; }; "_" = { From 49e7478ae3521f8550e878d14bc872434f70b48e Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sun, 8 Jun 2025 10:32:33 -0500 Subject: [PATCH 39/73] update oren --- hosts/oren/flake.lock | 8 ++++---- hosts/oren/flake.nix | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index 05d3ec0..82b549b 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -32,11 +32,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1748889889, - "narHash": "sha256-EYK1MXVf/JmFQt8p6dq1aJ68ndIrEfpA0gVMkwouhhI=", + "lastModified": 1749249047, + "narHash": "sha256-wqM4JKZJZxmJHBQ3z9n9SZraCZjnjpYmCsKv4h3jYpU=", "ref": "refs/heads/master", - "rev": "cf8583305086d6248871a7d2ae70efb3090858de", - "revCount": 451, + "rev": "0d2c44d2d808c4501566a1f7a32cb598a58a116c", + "revCount": 461, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 3ed9d26..6893ab2 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -41,6 +41,7 @@ environment.systemPackages = with pkgs; [ lua qdirstat + obsidian ]; services.ollama = { From 06fa31248c5aa255370068abbf26013c6c92abbe Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 10 Jun 2025 08:35:49 -0500 Subject: [PATCH 40/73] fix librechat meilisearch --- common/_containers/librechat.nix | 7 +- common/general/shell/common.sh | 2 +- hosts/lio/flake.lock | 198 +++++++++++++------------------ hosts/lio/flake.nix | 4 +- 4 files changed, 88 insertions(+), 123 deletions(-) diff --git a/common/_containers/librechat.nix b/common/_containers/librechat.nix index e33cd35..ca3d470 100644 --- a/common/_containers/librechat.nix +++ b/common/_containers/librechat.nix @@ -61,6 +61,8 @@ in MONGO_URI = "mongodb://librechat_mongodb:27017/LibreChat"; SEARCH = "true"; MEILI_HOST = "http://librechat_meilisearch:7700"; + MEILI_NO_ANALYTICS = "true"; + MEILI_MASTER_KEY = "ringofstormsLibreChat"; RAG_PORT = toString cfg.ragPort; RAG_API_URL = "http://librechat_rag_api:${toString cfg.ragPort}"; # DEBUG_CONSOLE = "true"; @@ -95,13 +97,14 @@ in librechat_meilisearch = { user = "root"; - image = "getmeili/meilisearch:v1.13"; + image = "getmeili/meilisearch:v1.12.3"; environment = { MEILI_HOST = "http://librechat_meilisearch:7700"; MEILI_NO_ANALYTICS = "true"; + MEILI_MASTER_KEY = "ringofstormsLibreChat"; }; volumes = [ - "${cfg.dataDir}/meili_data_v1.13:/meili_data" + "${cfg.dataDir}/meili_data_v1.12:/meili_data" ]; extraOptions = [ "--network=librechat-network" ]; }; diff --git a/common/general/shell/common.sh b/common/general/shell/common.sh index 8b8d9c7..9b94acf 100644 --- a/common/general/shell/common.sh +++ b/common/general/shell/common.sh @@ -184,5 +184,5 @@ alias gintentnix_undo="gintent_undo .envrc flake.lock flake.nix" # Aider aider () { - http_proxy="" all_proxy="" https_proxy="" AZURE_API_BASE=http://100.64.0.8 AZURE_API_VERSION=2024-02-15-preview AZURE_API_KEY=1 nix run "nixpkgs#aider-chat" -- aider --dark-mode --no-gitignore --no-check-update --no-auto-commits --model azure/gpt-4o-2024-05-13 $@ + http_proxy="" all_proxy="" https_proxy="" AZURE_API_BASE=http://100.64.0.8 AZURE_API_VERSION=2025-01-01-preview AZURE_API_KEY=1 nix run "nixpkgs#aider-chat-full" -- aider --dark-mode --no-gitignore --no-check-update --no-auto-commits --model azure/gpt-4.1-2025-04-14 $@ } diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 0ac338c..b6ad52d 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,22 +28,17 @@ "common": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1749252658, - "narHash": "sha256-/Zkbq7RkMvGSj6w+JBCVHPTS+csbbBAM1XvAgh09e0c=", - "ref": "refs/heads/master", - "rev": "e46716582fd975ca9ce05baecd12c5ef73f5b125", - "revCount": 463, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } + "path": "../../common", + "type": "path" + }, + "parent": [] }, "crane": { "locked": { @@ -107,16 +102,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -146,37 +141,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -192,7 +171,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1748302896, "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", @@ -208,13 +187,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1748389978, - "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", + "lastModified": 1749553941, + "narHash": "sha256-FBEOaw/L33Ld39Q5I7ENVlT0qqH1CSU1q/zlZKrJKs0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", + "rev": "150e5130886f2368f9b303bc8a312a48ab7b0ead", "type": "github" }, "original": { @@ -274,11 +253,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1747860236, - "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", + "lastModified": 1749127971, + "narHash": "sha256-x3WRiZnF2JhurxgN8N2xAG4gWi2VcDZz8QUBoqmmghE=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", + "rev": "5271933f7cea9f6b1c7de953379469010ed4553a", "type": "github" }, "original": { @@ -290,11 +269,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1748376831, - "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", + "lastModified": 1749074056, + "narHash": "sha256-sGdT9KvBwK1alV4ocapnhRwJhNT7KfzrNJnqzpMJCJc=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", + "rev": "6f5a4c36d9383b2a916facaa63dcd573afa11ee8", "type": "github" }, "original": { @@ -306,11 +285,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1748258625, - "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", + "lastModified": 1749392788, + "narHash": "sha256-41slmnvt1z7sCxvpiVuFmQ9g7eCaxQi1dDCL3AxSL1A=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", + "rev": "de740991c12411b663994b2860f1a4fd0937c130", "type": "github" }, "original": { @@ -338,11 +317,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1748380727, - "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", + "lastModified": 1748637634, + "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", + "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", "type": "github" }, "original": { @@ -370,11 +349,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1748365238, - "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", + "lastModified": 1749502840, + "narHash": "sha256-3Tn4xIgjE+subR8nEp8yB01mMPExsO8UaRWYud5tLYo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", + "rev": "98543263f95dd191fd6d3b08500680d18bebe214", "type": "github" }, "original": { @@ -386,11 +365,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1748270776, - "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", + "lastModified": 1749271780, + "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", "owner": "catppuccin", "repo": "nvim", - "rev": "56a9dfd1e05868cf3189369aad87242941396563", + "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", "type": "github" }, "original": { @@ -578,11 +557,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1747829807, - "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", + "lastModified": 1748967690, + "narHash": "sha256-L2ccr8gquqGBVP/KDfbSjV2AKAEG/x+go6cjHRqxrbA=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "8b729e489f1475615dc6c9737da917b3bc163605", + "rev": "d0f90ef51d4be86b824b012ec52ed715b5622e51", "type": "github" }, "original": { @@ -626,11 +605,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1748004396, - "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", + "lastModified": 1748532608, + "narHash": "sha256-1bUp5YPXJ4Smc2unn7IN5tNv7UVFZvKPcxd5wnDt3Ig=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", + "rev": "145b930954a3146cfb5b8a73cdcad42eb7d2740c", "type": "github" }, "original": { @@ -658,11 +637,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1747924806, - "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", + "lastModified": 1749125183, + "narHash": "sha256-+Ma1QG4CcAxHhXuBwIpFhv+uFC8hY0azTOfzj/jDV0s=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", + "rev": "cc26ae6a620298bb3f33b0e0681f99a10ae57781", "type": "github" }, "original": { @@ -674,11 +653,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1748287881, - "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", + "lastModified": 1748737685, + "narHash": "sha256-ndndReTxl8qZYgIXA++XWC9JA+JSNjfkTBXZQNXFw8g=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", + "rev": "a0c8e9698ef90bcfdf42806a38bf55b612b65b18", "type": "github" }, "original": { @@ -690,11 +669,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1748350935, - "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", + "lastModified": 1749345812, + "narHash": "sha256-gO7QDAYmU6ez1TAYuS2VCf9V3C2AYIj6yynQNGNa9Jw=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", + "rev": "a182334ba933e58240c2c45e6ae2d9c7ae313e00", "type": "github" }, "original": { @@ -706,11 +685,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1747719337, - "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", + "lastModified": 1748880705, + "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", + "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", "type": "github" }, "original": { @@ -754,11 +733,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1747786963, - "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", + "lastModified": 1749383457, + "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", + "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", "type": "github" }, "original": { @@ -834,11 +813,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1748230341, - "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", + "lastModified": 1748820067, + "narHash": "sha256-iCtFRqBhgpjHnTPNN3jagfm+qAGkb3glMxqRHJb+Iqk=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", + "rev": "1c733e8c1957dc67f47580fe9c458a13b5612d5b", "type": "github" }, "original": { @@ -866,11 +845,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1748354888, - "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", + "lastModified": 1748856318, + "narHash": "sha256-GPaujTCGmVWF15YhzzVouf+XkzrIfJky3ILhN6mhFOE=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", + "rev": "464a443b5a6657f39772b20baa95d02ffe97b268", "type": "github" }, "original": { @@ -978,11 +957,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1747884293, - "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", + "lastModified": 1749498876, + "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", + "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", "type": "github" }, "original": { @@ -1071,22 +1050,6 @@ "type": "github" } }, - "nvim_plugin-yetone/avante.nvim": { - "flake": false, - "locked": { - "lastModified": 1748339096, - "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", - "owner": "yetone", - "repo": "avante.nvim", - "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", - "type": "github" - }, - "original": { - "owner": "yetone", - "repo": "avante.nvim", - "type": "github" - } - }, "nvim_plugin-zbirenbaum/copilot-cmp": { "flake": false, "locked": { @@ -1106,11 +1069,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1748023521, - "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", + "lastModified": 1749137204, + "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "a620a5a97b73faba009a8160bab2885316e1451c", + "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", "type": "github" }, "original": { @@ -1124,7 +1087,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1144,13 +1107,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1204,17 +1167,16 @@ "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", - "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749227663, - "narHash": "sha256-0Jyh6aeouZuqyOArBi9rxUMCsas1hwYdyg854r4vxxA=", + "lastModified": 1749560624, + "narHash": "sha256-y5stOzkG/FB0UQGXX8IO38ev4Zm1jxpoJ5RHerVnzJU=", "ref": "refs/heads/master", - "rev": "56252ddbb09ea0395b857424edf1e745ace7653b", - "revCount": 282, + "rev": "47104ea033551412d7c8c76facd03d6f3bffe998", + "revCount": 285, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1215,11 @@ ] }, "locked": { - "lastModified": 1748313401, - "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", + "lastModified": 1749523120, + "narHash": "sha256-lEhEK8qE8xto2Wnj4f7R+VRSg7M6tgTTkJVTZ2QxXOI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", + "rev": "d0727dbab79c5a28289f3c03e4fac7d5b95bafb3", "type": "github" }, "original": { diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index c5d862d..c482ad0 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - # common.url = "path:../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; From 37e662fb55969dd04f56434c53346a9ed1d9b661 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 10 Jun 2025 08:56:27 -0500 Subject: [PATCH 41/73] update lio --- hosts/lio/flake.lock | 84 ++++++++++++++++++++++++++++++++------------ hosts/lio/flake.nix | 4 +-- 2 files changed, 63 insertions(+), 25 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index b6ad52d..2d16e51 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,17 +28,22 @@ "common": { "inputs": { "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "path": "../../common", - "type": "path" + "lastModified": 1749562551, + "narHash": "sha256-xZVEYv9N8kSxM1cR0E5vNp2cn70pfC7cDlmZS4N4BV4=", + "ref": "refs/heads/master", + "rev": "ee3fd2dcbba3268188f5d8460b4169e571eed5ae", + "revCount": 468, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -102,16 +107,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748487945, - "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "rycee", "repo": "home-manager", - "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-25.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -141,21 +146,37 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -171,7 +192,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1748302896, "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", @@ -187,7 +208,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1749553941, "narHash": "sha256-FBEOaw/L33Ld39Q5I7ENVlT0qqH1CSU1q/zlZKrJKs0=", @@ -986,6 +1007,22 @@ "type": "github" } }, + "nvim_plugin-supermaven-inc/supermaven-nvim": { + "flake": false, + "locked": { + "lastModified": 1728314930, + "narHash": "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=", + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", + "type": "github" + }, + "original": { + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "type": "github" + } + }, "nvim_plugin-tpope/vim-sleuth": { "flake": false, "locked": { @@ -1087,7 +1124,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1107,13 +1144,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1163,6 +1200,7 @@ "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim", + "nvim_plugin-supermaven-inc/supermaven-nvim": "nvim_plugin-supermaven-inc/supermaven-nvim", "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth", "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", @@ -1172,11 +1210,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749560624, - "narHash": "sha256-y5stOzkG/FB0UQGXX8IO38ev4Zm1jxpoJ5RHerVnzJU=", + "lastModified": 1749563667, + "narHash": "sha256-0Dylc2IzymWjqovXfK224h2xRA0Z8hJPmdlfXWI5T+Q=", "ref": "refs/heads/master", - "rev": "47104ea033551412d7c8c76facd03d6f3bffe998", - "revCount": 285, + "rev": "19e2019f2f9868bb08d377ef921dd65fb749268f", + "revCount": 286, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index c482ad0..c5d862d 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; From b9cdbd90c5b1ca9c35160678e286c6fa537be2a0 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sun, 15 Jun 2025 11:56:52 -0500 Subject: [PATCH 42/73] add flatpaks --- common/_home_manager/default.nix | 2 +- common/_home_manager/mods/zsh.nix | 2 +- common/flake.nix | 4 ++ common/programs/default.nix | 1 + common/programs/flatpaks.nix | 58 +++++++++++++++++++++ hosts/lio/flake.lock | 84 +++++++++++++++---------------- hosts/lio/flake.nix | 37 +++++++------- 7 files changed, 125 insertions(+), 63 deletions(-) create mode 100644 common/programs/flatpaks.nix diff --git a/common/_home_manager/default.nix b/common/_home_manager/default.nix index d93e235..5b76221 100644 --- a/common/_home_manager/default.nix +++ b/common/_home_manager/default.nix @@ -22,7 +22,7 @@ in }; stateVersion = lib.mkOption { type = lib.types.str; - default = "23.11"; + default = "25.05"; description = "Home manager state version"; }; }; diff --git a/common/_home_manager/mods/zsh.nix b/common/_home_manager/mods/zsh.nix index 1fdc3bb..41a32a9 100644 --- a/common/_home_manager/mods/zsh.nix +++ b/common/_home_manager/mods/zsh.nix @@ -8,7 +8,7 @@ defaultKeymap = "emacs"; - initExtra = '' + initContent = '' # Set editor to neovim, TODO only do this if mod.neovim is enabled export EDITOR=nvim export VISUAL=nvim diff --git a/common/flake.nix b/common/flake.nix index d6f164c..3b0b0ea 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -2,6 +2,7 @@ inputs = { home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; # hyprland.url = "github:hyprwm/Hyprland"; # cosmic.url = "github:lilyinstarlight/nixos-cosmic"; @@ -11,6 +12,7 @@ { home-manager, ragenix, + nix-flatpak, ... }: { @@ -25,6 +27,7 @@ imports = [ home-manager.nixosModules.home-manager ragenix.nixosModules.age + nix-flatpak.nixosModules.nix-flatpak ./_home_manager ./options.nix ./general @@ -37,6 +40,7 @@ config = { _module.args = { inherit ragenix; + inherit nix-flatpak; }; }; }; diff --git a/common/programs/default.nix b/common/programs/default.nix index 83e7271..ff08a58 100644 --- a/common/programs/default.nix +++ b/common/programs/default.nix @@ -13,6 +13,7 @@ in ./docker.nix ./podman.nix ./incus.nix + ./flatpaks.nix ]; config = { assertions = [ diff --git a/common/programs/flatpaks.nix b/common/programs/flatpaks.nix new file mode 100644 index 0000000..bc3beb6 --- /dev/null +++ b/common/programs/flatpaks.nix @@ -0,0 +1,58 @@ +{ + config, + lib, + ... +}: +let + ccfg = import ../config.nix; + cfg_path = [ + ccfg.custom_config_key + "programs" + "flatpaks" + ]; + cfg = lib.attrsets.getAttrFromPath cfg_path config; +in +{ + options = + { } + // lib.attrsets.setAttrByPath cfg_path { + enable = lib.mkEnableOption "flatpaks"; + packages = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "List of Flatpak package names to install."; + }; + }; + + config = lib.mkIf cfg.enable { + services.flatpak = { + enable = true; + packages = cfg.packages; + overrides = { + global = { + Context.sockets = [ + "wayland" + "x11" + ]; + + Environment = { + XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons"; + GTK_THEME = "Adwaita:dark"; + # Force wayland as much as possible. + ELECTRON_OZONE_PLATFORM_HINT = "wayland"; # or 'auto' + }; + }; + "org.signal.Signal" = { + Environment = { + SIGNAL_PASSWORD_STORE = "gnome-libsecret"; + }; + Context = { + sockets = [ + "xfg-settings" + ]; + }; + }; + }; + }; + }; +} diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 2d16e51..0e26889 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,22 +28,18 @@ "common": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "nix-flatpak": "nix-flatpak", "ragenix": "ragenix" }, "locked": { - "lastModified": 1749562551, - "narHash": "sha256-xZVEYv9N8kSxM1cR0E5vNp2cn70pfC7cDlmZS4N4BV4=", - "ref": "refs/heads/master", - "rev": "ee3fd2dcbba3268188f5d8460b4169e571eed5ae", - "revCount": 468, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } + "path": "../../common", + "type": "path" + }, + "parent": [] }, "crane": { "locked": { @@ -107,16 +103,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -144,39 +140,39 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -192,7 +188,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1748302896, "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", @@ -208,7 +204,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1749553941, "narHash": "sha256-FBEOaw/L33Ld39Q5I7ENVlT0qqH1CSU1q/zlZKrJKs0=", @@ -1124,7 +1120,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1144,13 +1140,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1210,11 +1206,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749563667, - "narHash": "sha256-0Dylc2IzymWjqovXfK224h2xRA0Z8hJPmdlfXWI5T+Q=", + "lastModified": 1749563872, + "narHash": "sha256-ba60Ejo5WoZ9GMmqbw4QqLLn5d3VKHXMotgT0NPnvTg=", "ref": "refs/heads/master", - "rev": "19e2019f2f9868bb08d377ef921dd65fb749268f", - "revCount": 286, + "rev": "ff863bc6bbfdfdbe0b7773ba4495163f46335e97", + "revCount": 287, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index c5d862d..a2d2f73 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - # common.url = "path:../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -44,9 +44,6 @@ steam ffmpeg-full appimage-run - rustdesk-flutter - element-desktop - obsidian ]; # Also allow this key to work for root user, this will let us use this as a remote builder easier @@ -72,6 +69,22 @@ tailnet.enableExitNode = true; ssh.enable = true; docker.enable = true; + flatpaks = { + enable = true; + packages = [ + "org.signal.Signal" + "com.discordapp.Discord" + "md.obsidian.Obsidian" + "com.spotify.Client" + "org.videolan.VLC" + "com.bitwarden.desktop" + "org.openscad.OpenSCAD" + "org.blender.Blender" + "im.riot.Riot" + "com.rustdesk.RustDesk" + "com.google.Chrome" + ]; + }; }; users = { # Users are all normal users and default password is password1 @@ -87,18 +100,8 @@ "input" ]; shell = pkgs.zsh; - packages = with pkgs; [ - signal-desktop - spotify - blender - google-chrome - discord - firefox-esr - openscad - vlc - bitwarden - vaultwarden - ]; + # packages = with pkgs; [ + # ]; }; }; }; From 8740638ed4898b882f1d1032fa6f1d70a08be355 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sun, 15 Jun 2025 12:02:00 -0500 Subject: [PATCH 43/73] update common flake lock --- common/flake.lock | 29 +++++++++++--- hosts/lio/flake.lock | 90 +++++++++++++++++++++++--------------------- hosts/lio/flake.nix | 4 +- 3 files changed, 72 insertions(+), 51 deletions(-) diff --git a/common/flake.lock b/common/flake.lock index ebbbc85..f079961 100644 --- a/common/flake.lock +++ b/common/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748487945, - "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "rycee", "repo": "home-manager", - "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { @@ -121,13 +121,29 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { @@ -178,6 +194,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "ragenix": "ragenix" } }, diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 0e26889..e6ad1e2 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,18 +28,22 @@ "common": { "inputs": { "home-manager": "home-manager", - "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "path": "../../common", - "type": "path" + "lastModified": 1750006612, + "narHash": "sha256-6tzWeEE+2VyXsgQiZ4ArWER3ypHRKOKa2ugq7sH4af4=", + "ref": "refs/heads/master", + "rev": "b9cdbd90c5b1ca9c35160678e286c6fa537be2a0", + "revCount": 470, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -103,16 +107,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748487945, - "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "rycee", "repo": "home-manager", - "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-25.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -140,39 +144,39 @@ "type": "github" } }, - "nix-flatpak": { - "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "latest", - "repo": "nix-flatpak", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -188,13 +192,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1749857119, + "narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", "type": "github" }, "original": { @@ -204,7 +208,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1749553941, "narHash": "sha256-FBEOaw/L33Ld39Q5I7ENVlT0qqH1CSU1q/zlZKrJKs0=", @@ -1120,7 +1124,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1140,13 +1144,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1206,11 +1210,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749563872, - "narHash": "sha256-ba60Ejo5WoZ9GMmqbw4QqLLn5d3VKHXMotgT0NPnvTg=", + "lastModified": 1749766120, + "narHash": "sha256-jQM9PBxwlTPrF2J0BFZqNQL3i3maLE7ZrAMAjXVT3/0=", "ref": "refs/heads/master", - "rev": "ff863bc6bbfdfdbe0b7773ba4495163f46335e97", - "revCount": 287, + "rev": "191f1f1059a35f30d2407993b68790a406ee7319", + "revCount": 289, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index a2d2f73..9f4e08e 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; From 653f87958c29ca3dc23f83c8a9c5d503e9d0cf51 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Jun 2025 12:04:17 -0500 Subject: [PATCH 44/73] common update --- common/flake.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/flake.nix b/common/flake.nix index 3b0b0ea..d870fa8 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -3,9 +3,6 @@ home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - - # hyprland.url = "github:hyprwm/Hyprland"; - # cosmic.url = "github:lilyinstarlight/nixos-cosmic"; }; outputs = From cd4943a2d143582d634ea5ab61032c0a1f129e84 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Jun 2025 12:10:50 -0500 Subject: [PATCH 45/73] update flake --- common/flake.lock | 4 ++-- common/flake.nix | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/flake.lock b/common/flake.lock index f079961..fa5eb1b 100644 --- a/common/flake.lock +++ b/common/flake.lock @@ -121,7 +121,7 @@ "type": "github" } }, - "nix-flatpak": { + "nix_flatpak": { "locked": { "lastModified": 1739444422, "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", @@ -194,7 +194,7 @@ "root": { "inputs": { "home-manager": "home-manager", - "nix-flatpak": "nix-flatpak", + "nix_flatpak": "nix_flatpak", "ragenix": "ragenix" } }, diff --git a/common/flake.nix b/common/flake.nix index d870fa8..a7d2079 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -2,14 +2,14 @@ inputs = { home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + nix_flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; }; outputs = { home-manager, ragenix, - nix-flatpak, + nix_flatpak, ... }: { @@ -24,7 +24,7 @@ imports = [ home-manager.nixosModules.home-manager ragenix.nixosModules.age - nix-flatpak.nixosModules.nix-flatpak + nix_flatpak.nixosModules.nix-flatpak ./_home_manager ./options.nix ./general @@ -37,7 +37,6 @@ config = { _module.args = { inherit ragenix; - inherit nix-flatpak; }; }; }; From 0cd4c87119c5a3f722c7a3fa0125107d347c296e Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Jun 2025 12:17:40 -0500 Subject: [PATCH 46/73] fix flakes --- common/flake.lock | 4 ++-- common/flake.nix | 7 ++++--- flake.nix | 5 ++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/flake.lock b/common/flake.lock index fa5eb1b..f079961 100644 --- a/common/flake.lock +++ b/common/flake.lock @@ -121,7 +121,7 @@ "type": "github" } }, - "nix_flatpak": { + "nix-flatpak": { "locked": { "lastModified": 1739444422, "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", @@ -194,7 +194,7 @@ "root": { "inputs": { "home-manager": "home-manager", - "nix_flatpak": "nix_flatpak", + "nix-flatpak": "nix-flatpak", "ragenix": "ragenix" } }, diff --git a/common/flake.nix b/common/flake.nix index a7d2079..38a570a 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -1,15 +1,16 @@ { inputs = { + # NOTE if you add any inputs here also add them in the TOP level repo's flake.nix home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; - nix_flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; }; outputs = { home-manager, ragenix, - nix_flatpak, + nix-flatpak, ... }: { @@ -24,7 +25,7 @@ imports = [ home-manager.nixosModules.home-manager ragenix.nixosModules.age - nix_flatpak.nixosModules.nix-flatpak + nix-flatpak.nixosModules.nix-flatpak ./_home_manager ./options.nix ./general diff --git a/flake.nix b/flake.nix index 9f4d0e7..00b8145 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,7 @@ # ===== home-manager.url = "github:rycee/home-manager/release-24.11"; ragenix.url = "github:yaxitech/ragenix"; - - # hyprland.url = "github:hyprwm/Hyprland"; - # cosmic.url = "github:lilyinstarlight/nixos-cosmic"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; # ====== }; @@ -17,6 +15,7 @@ nixpkgs, home-manager, ragenix, + nix-flatpak, ... }@inputs: let From 05134601f105bc66b6e0ab2961893182a313c1c4 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Jun 2025 12:18:45 -0500 Subject: [PATCH 47/73] update flake lock --- flake.lock | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d369c36..f85babe 100644 --- a/flake.lock +++ b/flake.lock @@ -121,6 +121,22 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1746055187, @@ -139,11 +155,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -194,6 +210,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" } From 81531b88054eb7ccfe5266f49be070739c63522e Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Jun 2025 12:19:53 -0500 Subject: [PATCH 48/73] fix all the inputs --- common/flake.nix | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/flake.nix b/common/flake.nix index 38a570a..f95574c 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -1,6 +1,6 @@ { inputs = { - # NOTE if you add any inputs here also add them in the TOP level repo's flake.nix + # NOTE if you add/change any inputs here also add them in the TOP level repo's flake.nix home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; diff --git a/flake.lock b/flake.lock index f85babe..c00d3af 100644 --- a/flake.lock +++ b/flake.lock @@ -85,16 +85,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -139,16 +139,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 00b8145..8dab2ba 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ # Manually synced with common/flake.nix inputs # ===== - home-manager.url = "github:rycee/home-manager/release-24.11"; + home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; # ====== From 94bbf24a3929d700076f5debe78aa9c1393652d5 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Jun 2025 12:21:29 -0500 Subject: [PATCH 49/73] woop flakpak works now --- hosts/lio/flake.lock | 47 ++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index e6ad1e2..6d34997 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,15 +28,16 @@ "common": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1750006612, - "narHash": "sha256-6tzWeEE+2VyXsgQiZ4ArWER3ypHRKOKa2ugq7sH4af4=", + "lastModified": 1750094393, + "narHash": "sha256-JI7GMAkeSRpLFe1I/Mwm9s25FEG0SqwMgk/yeQ/Jly4=", "ref": "refs/heads/master", - "rev": "b9cdbd90c5b1ca9c35160678e286c6fa537be2a0", - "revCount": 470, + "rev": "81531b88054eb7ccfe5266f49be070739c63522e", + "revCount": 476, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -107,16 +108,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -144,29 +145,45 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { From 577add613a5c2c2cf0764d088c05f98fd807028c Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 17 Jun 2025 14:59:14 -0500 Subject: [PATCH 50/73] update lio --- hosts/lio/flake.lock | 104 +++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 6d34997..2ffa03b 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -227,11 +227,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1749553941, - "narHash": "sha256-FBEOaw/L33Ld39Q5I7ENVlT0qqH1CSU1q/zlZKrJKs0=", + "lastModified": 1750188666, + "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "150e5130886f2368f9b303bc8a312a48ab7b0ead", + "rev": "aa36c6c05d04f90cf890f87845be9380cf7b83c2", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1747103074, - "narHash": "sha256-BvuQImJ1XxXAZ7QjbK8hUjWqnSk90B6Vx57k11UFqtU=", + "lastModified": 1750069301, + "narHash": "sha256-lIAsudDunKOY69r00czO+rmMbM+woIdIGroT4dUZAFc=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a", + "rev": "5df0b668d23c05c173f6bc79bb19642215b8b66a", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1749127971, - "narHash": "sha256-x3WRiZnF2JhurxgN8N2xAG4gWi2VcDZz8QUBoqmmghE=", + "lastModified": 1749564222, + "narHash": "sha256-StttV19d5gWbFPxerCOX3dXIaRwg1oeUANIbNztALps=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "5271933f7cea9f6b1c7de953379469010ed4553a", + "rev": "fb525166ccc30296fb3457441eb979113de46b00", "type": "github" }, "original": { @@ -307,11 +307,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1749074056, - "narHash": "sha256-sGdT9KvBwK1alV4ocapnhRwJhNT7KfzrNJnqzpMJCJc=", + "lastModified": 1749846779, + "narHash": "sha256-j1aslQ3SPD9ZuhQDEt9e5GD+VZ6N6Re7IjVFXycaxWI=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "6f5a4c36d9383b2a916facaa63dcd573afa11ee8", + "rev": "76f7ce56ccb913632745714f160faa53164c5574", "type": "github" }, "original": { @@ -387,11 +387,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1749502840, - "narHash": "sha256-3Tn4xIgjE+subR8nEp8yB01mMPExsO8UaRWYud5tLYo=", + "lastModified": 1750179699, + "narHash": "sha256-EGt75z/NbjzDXxsyXT9Qj2wWOf06ijUr1If5ljmfLqo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "98543263f95dd191fd6d3b08500680d18bebe214", + "rev": "45fd6c22f30487586c771072dc8c5230931e4c7b", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1747690845, - "narHash": "sha256-0qZhfxRhY8kR33X9/a9lNt1Slce8oSHeC8bJ7bSbYpQ=", + "lastModified": 1750108178, + "narHash": "sha256-3I7Xup+v9Yq9/nJQ1F5CDW99oFQcxbinv7VQcKeA16Y=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "6db15a859cf73d4027e919f5a49cc795ee96831a", + "rev": "d9ffd8f70ed6d466cecd3e7e2dd1425b0010932f", "type": "github" }, "original": { @@ -595,11 +595,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1748967690, - "narHash": "sha256-L2ccr8gquqGBVP/KDfbSjV2AKAEG/x+go6cjHRqxrbA=", + "lastModified": 1750058704, + "narHash": "sha256-V9aXXR9ZP2G/XInHt07RylC4rS+AyMXAAfODvC6pVxw=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "d0f90ef51d4be86b824b012ec52ed715b5622e51", + "rev": "88205953bd748322b49b26e1dfb0389932520dc9", "type": "github" }, "original": { @@ -643,11 +643,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1748532608, - "narHash": "sha256-1bUp5YPXJ4Smc2unn7IN5tNv7UVFZvKPcxd5wnDt3Ig=", + "lastModified": 1750160168, + "narHash": "sha256-hzFX5mZRxTDDIp/iBVl4lqEaQryLQOe7jFJmXDwq4J8=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "145b930954a3146cfb5b8a73cdcad42eb7d2740c", + "rev": "b9a989191b3a97c9316a0efea02341c4cdab845a", "type": "github" }, "original": { @@ -675,11 +675,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1749125183, - "narHash": "sha256-+Ma1QG4CcAxHhXuBwIpFhv+uFC8hY0azTOfzj/jDV0s=", + "lastModified": 1749731021, + "narHash": "sha256-V4JJ1VQXoIsUBTxe6ykbkyo6LxEAr+QEIqIV3mA9phs=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "cc26ae6a620298bb3f33b0e0681f99a10ae57781", + "rev": "2b0039b8be9583704591a13129c600891ac2c596", "type": "github" }, "original": { @@ -691,11 +691,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1748737685, - "narHash": "sha256-ndndReTxl8qZYgIXA++XWC9JA+JSNjfkTBXZQNXFw8g=", + "lastModified": 1750024924, + "narHash": "sha256-gmOqCnSLGDNerXyuuNhkyL/pSJitnyqBdWC3LejZoS4=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "a0c8e9698ef90bcfdf42806a38bf55b612b65b18", + "rev": "2fdf224107e5bc29fb5c3a175f5f2c9161b34741", "type": "github" }, "original": { @@ -707,11 +707,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1749345812, - "narHash": "sha256-gO7QDAYmU6ez1TAYuS2VCf9V3C2AYIj6yynQNGNa9Jw=", + "lastModified": 1750169575, + "narHash": "sha256-lJWMFgQLQhKUuv50WrYXlJ3TFqT04nVbmcBGVDaSz0k=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "a182334ba933e58240c2c45e6ae2d9c7ae313e00", + "rev": "99d3a0f26bfe402f45257c1398287aef252cbe2d", "type": "github" }, "original": { @@ -787,11 +787,11 @@ "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "flake": false, "locked": { - "lastModified": 1729728595, - "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=", + "lastModified": 1750040034, + "narHash": "sha256-NHcU3c+1pLeypHr9xXKmqvdwB1QM/vj5axzjpFEQCLQ=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb", + "rev": "7bf55ed0ff5be182ad3301cff266581fc1c56cce", "type": "github" }, "original": { @@ -851,11 +851,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1748820067, - "narHash": "sha256-iCtFRqBhgpjHnTPNN3jagfm+qAGkb3glMxqRHJb+Iqk=", + "lastModified": 1750143568, + "narHash": "sha256-E2YdGlvvpnT/PiayfQldwpbCnjsyNDcoTzxgMf2ajV8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "1c733e8c1957dc67f47580fe9c458a13b5612d5b", + "rev": "d54a1875a91e1a705795ea26074795210b92ce7f", "type": "github" }, "original": { @@ -883,11 +883,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1748856318, - "narHash": "sha256-GPaujTCGmVWF15YhzzVouf+XkzrIfJky3ILhN6mhFOE=", + "lastModified": 1749893617, + "narHash": "sha256-QJAfpVdTHTxjUgggQekRLvNYuvG12gjtfTGybfcFdyo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "464a443b5a6657f39772b20baa95d02ffe97b268", + "rev": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f", "type": "github" }, "original": { @@ -931,11 +931,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745435920, - "narHash": "sha256-XU4zB4hUkwV7OVkQNggBxqv9AOOuwGj50kzkGq3GaF4=", + "lastModified": 1749967462, + "narHash": "sha256-1pIGu/GJ4FiMH/yHhoo6Gu0HLC3rFQiesJBuv8uE7Vw=", "owner": "rmagatti", "repo": "auto-session", - "rev": "00334ee24b9a05001ad50221c8daffbeedaa0842", + "rev": "fffb13dcbe8731b8650e5bf1caa749a485d20556", "type": "github" }, "original": { @@ -1227,11 +1227,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749766120, - "narHash": "sha256-jQM9PBxwlTPrF2J0BFZqNQL3i3maLE7ZrAMAjXVT3/0=", + "lastModified": 1750190298, + "narHash": "sha256-ero30lVvCzmdKkY0lZR/RO+oTNTY1WXQh6vhfbcbTIk=", "ref": "refs/heads/master", - "rev": "191f1f1059a35f30d2407993b68790a406ee7319", - "revCount": 289, + "rev": "1ed03dac446683ef42035b53a410d857855d82d9", + "revCount": 291, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1270,11 +1270,11 @@ ] }, "locked": { - "lastModified": 1749523120, - "narHash": "sha256-lEhEK8qE8xto2Wnj4f7R+VRSg7M6tgTTkJVTZ2QxXOI=", + "lastModified": 1750127910, + "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d0727dbab79c5a28289f3c03e4fac7d5b95bafb3", + "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", "type": "github" }, "original": { From fb0bd219d146d0e99c40787fdaaf608204c1e9ed Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 18 Jun 2025 09:30:38 -0500 Subject: [PATCH 51/73] update oren --- hosts/oren/flake.lock | 239 ++++++++++++++++++++++-------------------- 1 file changed, 128 insertions(+), 111 deletions(-) diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index 82b549b..075d36e 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -28,15 +28,16 @@ "common": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1749249047, - "narHash": "sha256-wqM4JKZJZxmJHBQ3z9n9SZraCZjnjpYmCsKv4h3jYpU=", + "lastModified": 1750190354, + "narHash": "sha256-L7byp6TR0PHcjxMfjXoML9YiLhM/f+bAwgfP93Q3C3w=", "ref": "refs/heads/master", - "rev": "0d2c44d2d808c4501566a1f7a32cb598a58a116c", - "revCount": 461, + "rev": "577add613a5c2c2cf0764d088c05f98fd807028c", + "revCount": 478, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -107,16 +108,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -144,29 +145,45 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -178,11 +195,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -210,11 +227,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1748708770, - "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { @@ -226,11 +243,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1748389978, - "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", + "lastModified": 1750188666, + "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", + "rev": "aa36c6c05d04f90cf890f87845be9380cf7b83c2", "type": "github" }, "original": { @@ -258,11 +275,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1747103074, - "narHash": "sha256-BvuQImJ1XxXAZ7QjbK8hUjWqnSk90B6Vx57k11UFqtU=", + "lastModified": 1750069301, + "narHash": "sha256-lIAsudDunKOY69r00czO+rmMbM+woIdIGroT4dUZAFc=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a", + "rev": "5df0b668d23c05c173f6bc79bb19642215b8b66a", "type": "github" }, "original": { @@ -290,11 +307,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1747860236, - "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", + "lastModified": 1749564222, + "narHash": "sha256-StttV19d5gWbFPxerCOX3dXIaRwg1oeUANIbNztALps=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", + "rev": "fb525166ccc30296fb3457441eb979113de46b00", "type": "github" }, "original": { @@ -306,11 +323,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1748376831, - "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", + "lastModified": 1749846779, + "narHash": "sha256-j1aslQ3SPD9ZuhQDEt9e5GD+VZ6N6Re7IjVFXycaxWI=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", + "rev": "76f7ce56ccb913632745714f160faa53164c5574", "type": "github" }, "original": { @@ -322,11 +339,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1748258625, - "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", + "lastModified": 1749392788, + "narHash": "sha256-41slmnvt1z7sCxvpiVuFmQ9g7eCaxQi1dDCL3AxSL1A=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", + "rev": "de740991c12411b663994b2860f1a4fd0937c130", "type": "github" }, "original": { @@ -354,11 +371,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1748380727, - "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", + "lastModified": 1748637634, + "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", + "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", "type": "github" }, "original": { @@ -386,11 +403,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1748365238, - "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", + "lastModified": 1750179699, + "narHash": "sha256-EGt75z/NbjzDXxsyXT9Qj2wWOf06ijUr1If5ljmfLqo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", + "rev": "45fd6c22f30487586c771072dc8c5230931e4c7b", "type": "github" }, "original": { @@ -402,11 +419,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1748270776, - "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", + "lastModified": 1749271780, + "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", "owner": "catppuccin", "repo": "nvim", - "rev": "56a9dfd1e05868cf3189369aad87242941396563", + "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", "type": "github" }, "original": { @@ -418,11 +435,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1747690845, - "narHash": "sha256-0qZhfxRhY8kR33X9/a9lNt1Slce8oSHeC8bJ7bSbYpQ=", + "lastModified": 1750108178, + "narHash": "sha256-3I7Xup+v9Yq9/nJQ1F5CDW99oFQcxbinv7VQcKeA16Y=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "6db15a859cf73d4027e919f5a49cc795ee96831a", + "rev": "d9ffd8f70ed6d466cecd3e7e2dd1425b0010932f", "type": "github" }, "original": { @@ -594,11 +611,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1747829807, - "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", + "lastModified": 1750058704, + "narHash": "sha256-V9aXXR9ZP2G/XInHt07RylC4rS+AyMXAAfODvC6pVxw=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "8b729e489f1475615dc6c9737da917b3bc163605", + "rev": "88205953bd748322b49b26e1dfb0389932520dc9", "type": "github" }, "original": { @@ -642,11 +659,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1748004396, - "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", + "lastModified": 1750160168, + "narHash": "sha256-hzFX5mZRxTDDIp/iBVl4lqEaQryLQOe7jFJmXDwq4J8=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", + "rev": "b9a989191b3a97c9316a0efea02341c4cdab845a", "type": "github" }, "original": { @@ -674,11 +691,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1747924806, - "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", + "lastModified": 1749731021, + "narHash": "sha256-V4JJ1VQXoIsUBTxe6ykbkyo6LxEAr+QEIqIV3mA9phs=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", + "rev": "2b0039b8be9583704591a13129c600891ac2c596", "type": "github" }, "original": { @@ -690,11 +707,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1748287881, - "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", + "lastModified": 1750024924, + "narHash": "sha256-gmOqCnSLGDNerXyuuNhkyL/pSJitnyqBdWC3LejZoS4=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", + "rev": "2fdf224107e5bc29fb5c3a175f5f2c9161b34741", "type": "github" }, "original": { @@ -706,11 +723,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1748350935, - "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", + "lastModified": 1750169575, + "narHash": "sha256-lJWMFgQLQhKUuv50WrYXlJ3TFqT04nVbmcBGVDaSz0k=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", + "rev": "99d3a0f26bfe402f45257c1398287aef252cbe2d", "type": "github" }, "original": { @@ -722,11 +739,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1747719337, - "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", + "lastModified": 1748880705, + "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", + "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", "type": "github" }, "original": { @@ -770,11 +787,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1747786963, - "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", + "lastModified": 1749383457, + "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", + "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", "type": "github" }, "original": { @@ -786,11 +803,11 @@ "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "flake": false, "locked": { - "lastModified": 1729728595, - "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=", + "lastModified": 1750040034, + "narHash": "sha256-NHcU3c+1pLeypHr9xXKmqvdwB1QM/vj5axzjpFEQCLQ=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb", + "rev": "7bf55ed0ff5be182ad3301cff266581fc1c56cce", "type": "github" }, "original": { @@ -850,11 +867,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1748230341, - "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", + "lastModified": 1750143568, + "narHash": "sha256-E2YdGlvvpnT/PiayfQldwpbCnjsyNDcoTzxgMf2ajV8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", + "rev": "d54a1875a91e1a705795ea26074795210b92ce7f", "type": "github" }, "original": { @@ -882,11 +899,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1748354888, - "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", + "lastModified": 1749893617, + "narHash": "sha256-QJAfpVdTHTxjUgggQekRLvNYuvG12gjtfTGybfcFdyo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", + "rev": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f", "type": "github" }, "original": { @@ -930,11 +947,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745435920, - "narHash": "sha256-XU4zB4hUkwV7OVkQNggBxqv9AOOuwGj50kzkGq3GaF4=", + "lastModified": 1749967462, + "narHash": "sha256-1pIGu/GJ4FiMH/yHhoo6Gu0HLC3rFQiesJBuv8uE7Vw=", "owner": "rmagatti", "repo": "auto-session", - "rev": "00334ee24b9a05001ad50221c8daffbeedaa0842", + "rev": "fffb13dcbe8731b8650e5bf1caa749a485d20556", "type": "github" }, "original": { @@ -994,11 +1011,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1747884293, - "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", + "lastModified": 1749498876, + "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", + "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", "type": "github" }, "original": { @@ -1023,6 +1040,22 @@ "type": "github" } }, + "nvim_plugin-supermaven-inc/supermaven-nvim": { + "flake": false, + "locked": { + "lastModified": 1728314930, + "narHash": "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=", + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", + "type": "github" + }, + "original": { + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "type": "github" + } + }, "nvim_plugin-tpope/vim-sleuth": { "flake": false, "locked": { @@ -1087,22 +1120,6 @@ "type": "github" } }, - "nvim_plugin-yetone/avante.nvim": { - "flake": false, - "locked": { - "lastModified": 1748339096, - "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", - "owner": "yetone", - "repo": "avante.nvim", - "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", - "type": "github" - }, - "original": { - "owner": "yetone", - "repo": "avante.nvim", - "type": "github" - } - }, "nvim_plugin-zbirenbaum/copilot-cmp": { "flake": false, "locked": { @@ -1122,11 +1139,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1748023521, - "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", + "lastModified": 1749137204, + "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "a620a5a97b73faba009a8160bab2885316e1451c", + "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", "type": "github" }, "original": { @@ -1217,21 +1234,21 @@ "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim", + "nvim_plugin-supermaven-inc/supermaven-nvim": "nvim_plugin-supermaven-inc/supermaven-nvim", "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth", "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", - "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1748390377, - "narHash": "sha256-oGkDMCJ7V2gncBsBb/D8L3HIPee9gnIwm7FrPZvOpRw=", + "lastModified": 1750190298, + "narHash": "sha256-ero30lVvCzmdKkY0lZR/RO+oTNTY1WXQh6vhfbcbTIk=", "ref": "refs/heads/master", - "rev": "7f7fb6c15bd2d0d0992a3955498551aef22af4d1", - "revCount": 281, + "rev": "1ed03dac446683ef42035b53a410d857855d82d9", + "revCount": 291, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1270,11 +1287,11 @@ ] }, "locked": { - "lastModified": 1748313401, - "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", + "lastModified": 1750127910, + "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", + "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", "type": "github" }, "original": { From adf4428008d62c3b602f7be6937bdbdf4b737fa6 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 18 Jun 2025 09:30:49 -0500 Subject: [PATCH 52/73] update to gpd --- hosts/gpdPocket3/flake.lock | 233 +++++++++++++++++++----------------- 1 file changed, 125 insertions(+), 108 deletions(-) diff --git a/hosts/gpdPocket3/flake.lock b/hosts/gpdPocket3/flake.lock index 6783b1e..fbc6440 100644 --- a/hosts/gpdPocket3/flake.lock +++ b/hosts/gpdPocket3/flake.lock @@ -28,15 +28,16 @@ "common": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1748556136, - "narHash": "sha256-p+Y1HW9cKoxbvCRYJ3tOedCM+7lRgUV7ukJOIFGKQ/w=", + "lastModified": 1750190354, + "narHash": "sha256-L7byp6TR0PHcjxMfjXoML9YiLhM/f+bAwgfP93Q3C3w=", "ref": "refs/heads/master", - "rev": "8a761c5a60782e2d789711b71133be238aee801d", - "revCount": 450, + "rev": "577add613a5c2c2cf0764d088c05f98fd807028c", + "revCount": 478, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -107,16 +108,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -144,29 +145,45 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -194,11 +211,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1748708770, - "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { @@ -210,11 +227,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1748389978, - "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", + "lastModified": 1750188666, + "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", + "rev": "aa36c6c05d04f90cf890f87845be9380cf7b83c2", "type": "github" }, "original": { @@ -242,11 +259,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1747103074, - "narHash": "sha256-BvuQImJ1XxXAZ7QjbK8hUjWqnSk90B6Vx57k11UFqtU=", + "lastModified": 1750069301, + "narHash": "sha256-lIAsudDunKOY69r00czO+rmMbM+woIdIGroT4dUZAFc=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a", + "rev": "5df0b668d23c05c173f6bc79bb19642215b8b66a", "type": "github" }, "original": { @@ -274,11 +291,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1747860236, - "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", + "lastModified": 1749564222, + "narHash": "sha256-StttV19d5gWbFPxerCOX3dXIaRwg1oeUANIbNztALps=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", + "rev": "fb525166ccc30296fb3457441eb979113de46b00", "type": "github" }, "original": { @@ -290,11 +307,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1748376831, - "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", + "lastModified": 1749846779, + "narHash": "sha256-j1aslQ3SPD9ZuhQDEt9e5GD+VZ6N6Re7IjVFXycaxWI=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", + "rev": "76f7ce56ccb913632745714f160faa53164c5574", "type": "github" }, "original": { @@ -306,11 +323,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1748258625, - "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", + "lastModified": 1749392788, + "narHash": "sha256-41slmnvt1z7sCxvpiVuFmQ9g7eCaxQi1dDCL3AxSL1A=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", + "rev": "de740991c12411b663994b2860f1a4fd0937c130", "type": "github" }, "original": { @@ -338,11 +355,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1748380727, - "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", + "lastModified": 1748637634, + "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", + "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", "type": "github" }, "original": { @@ -370,11 +387,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1748365238, - "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", + "lastModified": 1750179699, + "narHash": "sha256-EGt75z/NbjzDXxsyXT9Qj2wWOf06ijUr1If5ljmfLqo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", + "rev": "45fd6c22f30487586c771072dc8c5230931e4c7b", "type": "github" }, "original": { @@ -386,11 +403,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1748270776, - "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", + "lastModified": 1749271780, + "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", "owner": "catppuccin", "repo": "nvim", - "rev": "56a9dfd1e05868cf3189369aad87242941396563", + "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", "type": "github" }, "original": { @@ -402,11 +419,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1747690845, - "narHash": "sha256-0qZhfxRhY8kR33X9/a9lNt1Slce8oSHeC8bJ7bSbYpQ=", + "lastModified": 1750108178, + "narHash": "sha256-3I7Xup+v9Yq9/nJQ1F5CDW99oFQcxbinv7VQcKeA16Y=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "6db15a859cf73d4027e919f5a49cc795ee96831a", + "rev": "d9ffd8f70ed6d466cecd3e7e2dd1425b0010932f", "type": "github" }, "original": { @@ -578,11 +595,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1747829807, - "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", + "lastModified": 1750058704, + "narHash": "sha256-V9aXXR9ZP2G/XInHt07RylC4rS+AyMXAAfODvC6pVxw=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "8b729e489f1475615dc6c9737da917b3bc163605", + "rev": "88205953bd748322b49b26e1dfb0389932520dc9", "type": "github" }, "original": { @@ -626,11 +643,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1748004396, - "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", + "lastModified": 1750160168, + "narHash": "sha256-hzFX5mZRxTDDIp/iBVl4lqEaQryLQOe7jFJmXDwq4J8=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", + "rev": "b9a989191b3a97c9316a0efea02341c4cdab845a", "type": "github" }, "original": { @@ -658,11 +675,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1747924806, - "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", + "lastModified": 1749731021, + "narHash": "sha256-V4JJ1VQXoIsUBTxe6ykbkyo6LxEAr+QEIqIV3mA9phs=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", + "rev": "2b0039b8be9583704591a13129c600891ac2c596", "type": "github" }, "original": { @@ -674,11 +691,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1748287881, - "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", + "lastModified": 1750024924, + "narHash": "sha256-gmOqCnSLGDNerXyuuNhkyL/pSJitnyqBdWC3LejZoS4=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", + "rev": "2fdf224107e5bc29fb5c3a175f5f2c9161b34741", "type": "github" }, "original": { @@ -690,11 +707,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1748350935, - "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", + "lastModified": 1750169575, + "narHash": "sha256-lJWMFgQLQhKUuv50WrYXlJ3TFqT04nVbmcBGVDaSz0k=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", + "rev": "99d3a0f26bfe402f45257c1398287aef252cbe2d", "type": "github" }, "original": { @@ -706,11 +723,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1747719337, - "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", + "lastModified": 1748880705, + "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", + "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", "type": "github" }, "original": { @@ -754,11 +771,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1747786963, - "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", + "lastModified": 1749383457, + "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", + "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", "type": "github" }, "original": { @@ -770,11 +787,11 @@ "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "flake": false, "locked": { - "lastModified": 1729728595, - "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=", + "lastModified": 1750040034, + "narHash": "sha256-NHcU3c+1pLeypHr9xXKmqvdwB1QM/vj5axzjpFEQCLQ=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb", + "rev": "7bf55ed0ff5be182ad3301cff266581fc1c56cce", "type": "github" }, "original": { @@ -834,11 +851,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1748230341, - "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", + "lastModified": 1750143568, + "narHash": "sha256-E2YdGlvvpnT/PiayfQldwpbCnjsyNDcoTzxgMf2ajV8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", + "rev": "d54a1875a91e1a705795ea26074795210b92ce7f", "type": "github" }, "original": { @@ -866,11 +883,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1748354888, - "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", + "lastModified": 1749893617, + "narHash": "sha256-QJAfpVdTHTxjUgggQekRLvNYuvG12gjtfTGybfcFdyo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", + "rev": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f", "type": "github" }, "original": { @@ -914,11 +931,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745435920, - "narHash": "sha256-XU4zB4hUkwV7OVkQNggBxqv9AOOuwGj50kzkGq3GaF4=", + "lastModified": 1749967462, + "narHash": "sha256-1pIGu/GJ4FiMH/yHhoo6Gu0HLC3rFQiesJBuv8uE7Vw=", "owner": "rmagatti", "repo": "auto-session", - "rev": "00334ee24b9a05001ad50221c8daffbeedaa0842", + "rev": "fffb13dcbe8731b8650e5bf1caa749a485d20556", "type": "github" }, "original": { @@ -978,11 +995,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1747884293, - "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", + "lastModified": 1749498876, + "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", + "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", "type": "github" }, "original": { @@ -1007,6 +1024,22 @@ "type": "github" } }, + "nvim_plugin-supermaven-inc/supermaven-nvim": { + "flake": false, + "locked": { + "lastModified": 1728314930, + "narHash": "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=", + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", + "type": "github" + }, + "original": { + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "type": "github" + } + }, "nvim_plugin-tpope/vim-sleuth": { "flake": false, "locked": { @@ -1071,22 +1104,6 @@ "type": "github" } }, - "nvim_plugin-yetone/avante.nvim": { - "flake": false, - "locked": { - "lastModified": 1748339096, - "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", - "owner": "yetone", - "repo": "avante.nvim", - "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", - "type": "github" - }, - "original": { - "owner": "yetone", - "repo": "avante.nvim", - "type": "github" - } - }, "nvim_plugin-zbirenbaum/copilot-cmp": { "flake": false, "locked": { @@ -1106,11 +1123,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1748023521, - "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", + "lastModified": 1749137204, + "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "a620a5a97b73faba009a8160bab2885316e1451c", + "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", "type": "github" }, "original": { @@ -1200,21 +1217,21 @@ "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim", + "nvim_plugin-supermaven-inc/supermaven-nvim": "nvim_plugin-supermaven-inc/supermaven-nvim", "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth", "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", - "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1748390377, - "narHash": "sha256-oGkDMCJ7V2gncBsBb/D8L3HIPee9gnIwm7FrPZvOpRw=", + "lastModified": 1750190298, + "narHash": "sha256-ero30lVvCzmdKkY0lZR/RO+oTNTY1WXQh6vhfbcbTIk=", "ref": "refs/heads/master", - "rev": "7f7fb6c15bd2d0d0992a3955498551aef22af4d1", - "revCount": 281, + "rev": "1ed03dac446683ef42035b53a410d857855d82d9", + "revCount": 291, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1270,11 @@ ] }, "locked": { - "lastModified": 1748313401, - "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", + "lastModified": 1750127910, + "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", + "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", "type": "github" }, "original": { From 54c0aec842a16748d8c59c1e094d4c00581d7805 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 18 Jun 2025 09:33:35 -0500 Subject: [PATCH 53/73] update lio --- hosts/lio/flake.lock | 14 +++++++------- hosts/lio/flake.nix | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 2ffa03b..122ad62 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -33,11 +33,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1750094393, - "narHash": "sha256-JI7GMAkeSRpLFe1I/Mwm9s25FEG0SqwMgk/yeQ/Jly4=", + "lastModified": 1750257055, + "narHash": "sha256-Fuyc23OIqNy+HkesAeqAWje0/yuuvJEjTQUpayA3iDw=", "ref": "refs/heads/master", - "rev": "81531b88054eb7ccfe5266f49be070739c63522e", - "revCount": 476, + "rev": "c04e866c3f604e4adc530c4a3c92a61fa9368386", + "revCount": 481, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -211,11 +211,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1749857119, - "narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 9f4e08e..b038ebb 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -100,8 +100,6 @@ "input" ]; shell = pkgs.zsh; - # packages = with pkgs; [ - # ]; }; }; }; From b715d8b5335b2302fefde329723bd3b4a0986c70 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 18 Jun 2025 09:36:45 -0500 Subject: [PATCH 54/73] use flatpaks on oren and gpd --- hosts/gpdPocket3/flake.nix | 28 ++++++++++++++++------------ hosts/oren/flake.nix | 28 ++++++++++++++++------------ 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/hosts/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix index fbc6472..866957a 100644 --- a/hosts/gpdPocket3/flake.nix +++ b/hosts/gpdPocket3/flake.nix @@ -35,9 +35,6 @@ environment.systemPackages = with pkgs; [ lua qdirstat - rustdesk-flutter - styluslabs-write - xournalpp ]; ringofstorms_common = { @@ -55,6 +52,22 @@ tailnet.enable = true; ssh.enable = true; docker.enable = true; + flatpaks = { + enable = true; + packages = [ + "org.signal.Signal" + "com.discordapp.Discord" + "md.obsidian.Obsidian" + "com.spotify.Client" + "org.videolan.VLC" + "com.bitwarden.desktop" + "org.openscad.OpenSCAD" + "org.blender.Blender" + "im.riot.Riot" + "com.rustdesk.RustDesk" + "com.google.Chrome" + ]; + }; }; users = { # Users are all normal users and default password is password1 @@ -70,15 +83,6 @@ "input" ]; shell = pkgs.zsh; - packages = with pkgs; [ - google-chrome - discordo - discord - vlc - spotify - bitwarden - vaultwarden - ]; }; }; }; diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 6893ab2..b29042f 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -41,7 +41,6 @@ environment.systemPackages = with pkgs; [ lua qdirstat - obsidian ]; services.ollama = { @@ -54,7 +53,6 @@ systemName = configuration_name; boot.systemd.enable = true; general = { - # disableRemoteBuildsOnLio = true; enableSleep = true; }; secrets.enable = true; @@ -66,6 +64,22 @@ tailnet.enable = true; ssh.enable = true; docker.enable = true; + flatpaks = { + enable = true; + packages = [ + "org.signal.Signal" + "com.discordapp.Discord" + "md.obsidian.Obsidian" + "com.spotify.Client" + "org.videolan.VLC" + "com.bitwarden.desktop" + "org.openscad.OpenSCAD" + "org.blender.Blender" + "im.riot.Riot" + "com.rustdesk.RustDesk" + "com.google.Chrome" + ]; + }; }; users = { # Users are all normal users and default password is password1 @@ -81,16 +95,6 @@ "input" ]; shell = pkgs.zsh; - packages = with pkgs; [ - signal-desktop - google-chrome - discordo - discord - spotify - vlc - vaultwarden - bitwarden - ]; }; }; }; From f3fc6f6f302d54d497f3c33b7454a1fabe4c7855 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 18 Jun 2025 10:00:03 -0500 Subject: [PATCH 55/73] update oren --- hosts/oren/flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index 075d36e..f62f595 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -33,11 +33,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1750190354, - "narHash": "sha256-L7byp6TR0PHcjxMfjXoML9YiLhM/f+bAwgfP93Q3C3w=", + "lastModified": 1750257405, + "narHash": "sha256-Ztt+5z2BmPqxvpQT4yLV/8gaWD5Txedr3Gd38gTXOGU=", "ref": "refs/heads/master", - "rev": "577add613a5c2c2cf0764d088c05f98fd807028c", - "revCount": 478, + "rev": "b715d8b5335b2302fefde329723bd3b4a0986c70", + "revCount": 483, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, From 1ccd1f23d81236309c0b5bd33c7b4c5fcdb54e19 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 18 Jun 2025 10:01:57 -0500 Subject: [PATCH 56/73] update gp3 --- hosts/gpdPocket3/flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/gpdPocket3/flake.lock b/hosts/gpdPocket3/flake.lock index fbc6440..70016b0 100644 --- a/hosts/gpdPocket3/flake.lock +++ b/hosts/gpdPocket3/flake.lock @@ -33,11 +33,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1750190354, - "narHash": "sha256-L7byp6TR0PHcjxMfjXoML9YiLhM/f+bAwgfP93Q3C3w=", + "lastModified": 1750257405, + "narHash": "sha256-Ztt+5z2BmPqxvpQT4yLV/8gaWD5Txedr3Gd38gTXOGU=", "ref": "refs/heads/master", - "rev": "577add613a5c2c2cf0764d088c05f98fd807028c", - "revCount": 478, + "rev": "b715d8b5335b2302fefde329723bd3b4a0986c70", + "revCount": 483, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, From efbc368db377bb9d4e16d4d0228f0881add2bcd9 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 20 Jun 2025 16:01:24 -0500 Subject: [PATCH 57/73] working on media server --- hosts/lio/containers.nix | 78 ++++++++++++++++++++++++++++++++++++++- hosts/lio/flake.lock | 79 ++++++++++++++++++++++++++++++++++++++-- hosts/lio/flake.nix | 56 +++++++++++++++++++++++++++- hosts/lio/media_test.md | 12 ++++++ 4 files changed, 219 insertions(+), 6 deletions(-) create mode 100644 hosts/lio/media_test.md diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index 8854431..240ea85 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -1,4 +1,8 @@ -{ common }: +{ inputs }: +let + common = inputs.common; + nixarr = inputs.nixarr; +in { config, ... @@ -32,6 +36,78 @@ firewall.trustedInterfaces = [ "ve-*" ]; }; + # containers.nixarr = + # let + # name = "nixarr"; + # # hostDataDir = "/var/lib/${name}"; + # hostAddress = "10.0.0.1"; + # containerAddress = "10.0.0.3"; + # hostAddress6 = "fc00::1"; + # containerAddress6 = "fc00::3"; + # in + # { + # ephemeral = true; + # autoStart = true; + # privateNetwork = true; + # hostAddress = hostAddress; + # localAddress = containerAddress; + # hostAddress6 = hostAddress6; + # localAddress6 = containerAddress6; + # config = + # { config, pkgs, ... }: + # { + # imports = [ + # nixarr.nixosModules.default + # ]; + # system.stateVersion = "25.05"; + # nixpkgs.config.allowUnfree = true; + # + # nixarr = { + # enable = true; + # # These two values are also the default, but you can set them to whatever + # # else you want + # # WARNING: Do _not_ set them to `/home/user/whatever`, it will not work! + # mediaDir = "/var/lib/nixarr_test/media"; + # stateDir = "/var/lib/nixarr_test/state"; + # + # # vpn = { + # # enable = true; + # # # WARNING: This file must _not_ be in the config git directory + # # # You can usually get this wireguard file from your VPN provider + # # wgConf = "/data/.secret/wg.conf"; + # # }; + # + # jellyfin = { + # enable = true; + # # These options set up a nginx HTTPS reverse proxy, so you can access + # # Jellyfin on your domain with HTTPS + # # expose.https = { + # # enable = true; + # # domainName = "your.domain.com"; + # # acmeMail = "your@email.com"; # Required for ACME-bot + # # }; + # }; + # + # # transmission = { + # # enable = true; + # # vpn.enable = true; + # # peerPort = 50000; # Set this to the port forwarded by your VPN + # # }; + # + # # It is possible for this module to run the *Arrs through a VPN, but it + # # is generally not recommended, as it can cause rate-limiting issues. + # sabnzbd.enable = true; # Usenet downloader + # prowlarr.enable = true; # Index manager + # sonarr.enable = true; # TV + # radarr.enable = true; # Movies + # bazarr.enable = true; # subtitles for sonarr and radarr + # lidarr.enable = true; # music + # readarr.enable = true; # books + # jellyseerr.enable = true; # request manager for media + # }; + # }; + # }; + # containers.wasabi = { # ephemeral = true; # autoStart = true; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 122ad62..bf260a4 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -161,6 +161,26 @@ "type": "github" } }, + "nixarr": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "vpnconfinement": "vpnconfinement", + "website-builder": "website-builder" + }, + "locked": { + "lastModified": 1750367617, + "narHash": "sha256-1kz35TbeqhJMdo1s/WHidoUT64IuoKCGlngv5/JCHiw=", + "owner": "rasmus-kirk", + "repo": "nixarr", + "rev": "450d76583ae6ec025577bde7da2a38cfc7fb0510", + "type": "github" + }, + "original": { + "owner": "rasmus-kirk", + "repo": "nixarr", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1749024892, @@ -210,6 +230,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1748662220, + "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1750133334, "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", @@ -225,7 +261,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1750188666, "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", @@ -1161,13 +1197,14 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixarr": "nixarr", + "nixpkgs": "nixpkgs_5", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1312,6 +1349,42 @@ "repo": "default", "type": "github" } + }, + "vpnconfinement": { + "locked": { + "lastModified": 1743810720, + "narHash": "sha256-kbv/W4gizUSa6qH2rUQdgPj9AJaeN9k2XSWUYqj7IMU=", + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "rev": "74ae51e6d18b972ecc918ab43e8bde60c21a65d8", + "type": "github" + }, + "original": { + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "type": "github" + } + }, + "website-builder": { + "inputs": { + "nixpkgs": [ + "nixarr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750317638, + "narHash": "sha256-B4RWcXXOLO6gMeYyV+K4olu+kGGsYamKH+JAm0cIXqI=", + "owner": "rasmus-kirk", + "repo": "website-builder", + "rev": "b54192000a00e865947f45bacf3184d56363ee38", + "type": "github" + }, + "original": { + "owner": "rasmus-kirk", + "repo": "website-builder", + "type": "github" + } } }, "root": "root", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index b038ebb..db51cd8 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -8,6 +8,8 @@ common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; + + nixarr.url = "github:rasmus-kirk/nixarr"; }; outputs = @@ -15,8 +17,9 @@ nixpkgs, common, ros_neovim, + nixarr, ... - }: + }@inputs: let configuration_name = "lio"; lib = nixpkgs.lib; @@ -25,15 +28,61 @@ nixosConfigurations = { "${configuration_name}" = ( lib.nixosSystem { + specialArgs = { inherit inputs; }; modules = [ common.nixosModules.default ros_neovim.nixosModules.default + nixarr.nixosModules.default ./configuration.nix ./hardware-configuration.nix - (import ./containers.nix { inherit common; }) + (import ./containers.nix { inherit inputs; }) ( { config, pkgs, ... }: { + # nixarr = { + # enable = true; + # # These two values are also the default, but you can set them to whatever + # # else you want + # # WARNING: Do _not_ set them to `/home/user/whatever`, it will not work! + # mediaDir = "/var/lib/nixarr_test/media"; + # stateDir = "/var/lib/nixarr_test/state"; + # + # # vpn = { + # # enable = true; + # # # WARNING: This file must _not_ be in the config git directory + # # # You can usually get this wireguard file from your VPN provider + # # wgConf = "/data/.secret/wg.conf"; + # # }; + # + # jellyfin = { + # enable = true; + # # These options set up a nginx HTTPS reverse proxy, so you can access + # # Jellyfin on your domain with HTTPS + # expose.https = { + # enable = true; + # domainName = "your.domain.com"; + # acmeMail = "your@email.com"; # Required for ACME-bot + # }; + # }; + # + # # transmission = { + # # enable = true; + # # vpn.enable = true; + # # peerPort = 50000; # Set this to the port forwarded by your VPN + # # }; + # + # # It is possible for this module to run the *Arrs through a VPN, but it + # # is generally not recommended, as it can cause rate-limiting issues. + # sabnzbd.enable = true; # Usenet downloader + # prowlarr.enable = true; # Index manager + # sonarr.enable = true; # TV + # radarr.enable = true; # Movies + # bazarr.enable = true; # subtitles for sonarr and radarr + # lidarr.enable = true; # music + # readarr.enable = true; # books + # jellyseerr.enable = true; # request manager for media + # }; + programs = { steam.enable = true; }; @@ -100,6 +149,9 @@ "input" ]; shell = pkgs.zsh; + packages = with pkgs; [ + sabnzbd + ]; }; }; }; diff --git a/hosts/lio/media_test.md b/hosts/lio/media_test.md new file mode 100644 index 0000000..4819b37 --- /dev/null +++ b/hosts/lio/media_test.md @@ -0,0 +1,12 @@ +[jellyfin](http://10.0.0.3:8096) +[sabnzbd](http://10.0.0.3:6336) +[prowlarr](http://10.0.0.3:9696/) +[radarr](http://10.0.0.3:7878/) +[sonarr](http://10.0.0.3:8989/) +[lidarr](http://10.0.0.3:8686/) +[readarr](http://10.0.0.3:8787/) +[bazarr](http://10.0.0.3:6767) +[jellyseer](http://10.0.0.3:5055/) + + +[reference for setup](https://www.youtube.com/watch?v=twJDyoj0tDc&t=1172s) From 7f246410227203680436e1ffaeb253bd37bca05b Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 20 Jun 2025 16:02:55 -0500 Subject: [PATCH 58/73] update docs for wip media --- hosts/lio/media_test.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/lio/media_test.md b/hosts/lio/media_test.md index 4819b37..f633bf6 100644 --- a/hosts/lio/media_test.md +++ b/hosts/lio/media_test.md @@ -9,4 +9,6 @@ [jellyseer](http://10.0.0.3:5055/) +[nixarr wiki](https://nixarr.com/wiki/) + [reference for setup](https://www.youtube.com/watch?v=twJDyoj0tDc&t=1172s) From c53ab4f310ec110d41556291477d8a091587d410 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 20 Jun 2025 16:31:03 -0500 Subject: [PATCH 59/73] update to 25.05 for home server --- hosts/h001/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index e224050..45af014 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing From 1b02f9ea95ec7e81a45ec40159991065856482b7 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 20 Jun 2025 17:43:15 -0500 Subject: [PATCH 60/73] add nixarr to h001 --- hosts/h001/containers/default.nix | 5 ++- hosts/h001/flake.lock | 8 ++-- hosts/h001/flake.nix | 8 +++- hosts/h001/mods/default.nix | 1 + hosts/h001/mods/nixarr.nix | 22 ++++++++++ hosts/lio/containers.nix | 73 ------------------------------- hosts/lio/flake.nix | 47 -------------------- 7 files changed, 37 insertions(+), 127 deletions(-) create mode 100644 hosts/h001/mods/nixarr.nix diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix index c18778a..7f188a9 100644 --- a/hosts/h001/containers/default.nix +++ b/hosts/h001/containers/default.nix @@ -1,4 +1,7 @@ -{ common }: +{ inputs }: +let + common = inputs.common; +in { ... }: diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index 4f34705..8c56ac2 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -194,16 +194,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1750259320, + "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index 45af014..e064c42 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -8,6 +8,8 @@ common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; + + nixarr.url = "github:rasmus-kirk/nixarr"; }; outputs = @@ -15,8 +17,9 @@ nixpkgs, common, ros_neovim, + nixarr, ... - }: + }@inputs: let configuration_name = "h001"; lib = nixpkgs.lib; @@ -28,10 +31,11 @@ modules = [ common.nixosModules.default ros_neovim.nixosModules.default + nixarr.nixosModules.default ./configuration.nix ./hardware-configuration.nix ./mods - (import ./containers { inherit common; }) + (import ./containers { inherit inputs; }) ( { config, pkgs, ... }: { diff --git a/hosts/h001/mods/default.nix b/hosts/h001/mods/default.nix index f4a4450..873e964 100644 --- a/hosts/h001/mods/default.nix +++ b/hosts/h001/mods/default.nix @@ -4,5 +4,6 @@ { imports = [ ./adguardhome.nix + ./nixarr.nix ]; } diff --git a/hosts/h001/mods/nixarr.nix b/hosts/h001/mods/nixarr.nix new file mode 100644 index 0000000..352f549 --- /dev/null +++ b/hosts/h001/mods/nixarr.nix @@ -0,0 +1,22 @@ +{ + ... +}: +{ + config = { + nixarr = { + enable = true; + mediaDir = "/var/lib/nixarr/media"; + stateDir = "/var/lib/nixarr/state"; + + jellyfin.enable = true; # jellyfinnnnnn! + sabnzbd.enable = true; # Usenet downloader + prowlarr.enable = true; # Index manager + sonarr.enable = true; # TV + radarr.enable = true; # Movies + bazarr.enable = true; # subtitles for sonarr and radarr + lidarr.enable = true; # music + readarr.enable = true; # books + jellyseerr.enable = true; # request manager for media + }; + }; +} diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix index 240ea85..5c3961d 100644 --- a/hosts/lio/containers.nix +++ b/hosts/lio/containers.nix @@ -1,7 +1,6 @@ { inputs }: let common = inputs.common; - nixarr = inputs.nixarr; in { config, @@ -36,78 +35,6 @@ in firewall.trustedInterfaces = [ "ve-*" ]; }; - # containers.nixarr = - # let - # name = "nixarr"; - # # hostDataDir = "/var/lib/${name}"; - # hostAddress = "10.0.0.1"; - # containerAddress = "10.0.0.3"; - # hostAddress6 = "fc00::1"; - # containerAddress6 = "fc00::3"; - # in - # { - # ephemeral = true; - # autoStart = true; - # privateNetwork = true; - # hostAddress = hostAddress; - # localAddress = containerAddress; - # hostAddress6 = hostAddress6; - # localAddress6 = containerAddress6; - # config = - # { config, pkgs, ... }: - # { - # imports = [ - # nixarr.nixosModules.default - # ]; - # system.stateVersion = "25.05"; - # nixpkgs.config.allowUnfree = true; - # - # nixarr = { - # enable = true; - # # These two values are also the default, but you can set them to whatever - # # else you want - # # WARNING: Do _not_ set them to `/home/user/whatever`, it will not work! - # mediaDir = "/var/lib/nixarr_test/media"; - # stateDir = "/var/lib/nixarr_test/state"; - # - # # vpn = { - # # enable = true; - # # # WARNING: This file must _not_ be in the config git directory - # # # You can usually get this wireguard file from your VPN provider - # # wgConf = "/data/.secret/wg.conf"; - # # }; - # - # jellyfin = { - # enable = true; - # # These options set up a nginx HTTPS reverse proxy, so you can access - # # Jellyfin on your domain with HTTPS - # # expose.https = { - # # enable = true; - # # domainName = "your.domain.com"; - # # acmeMail = "your@email.com"; # Required for ACME-bot - # # }; - # }; - # - # # transmission = { - # # enable = true; - # # vpn.enable = true; - # # peerPort = 50000; # Set this to the port forwarded by your VPN - # # }; - # - # # It is possible for this module to run the *Arrs through a VPN, but it - # # is generally not recommended, as it can cause rate-limiting issues. - # sabnzbd.enable = true; # Usenet downloader - # prowlarr.enable = true; # Index manager - # sonarr.enable = true; # TV - # radarr.enable = true; # Movies - # bazarr.enable = true; # subtitles for sonarr and radarr - # lidarr.enable = true; # music - # readarr.enable = true; # books - # jellyseerr.enable = true; # request manager for media - # }; - # }; - # }; - # containers.wasabi = { # ephemeral = true; # autoStart = true; diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index db51cd8..1082387 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -8,8 +8,6 @@ common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; - - nixarr.url = "github:rasmus-kirk/nixarr"; }; outputs = @@ -32,57 +30,12 @@ modules = [ common.nixosModules.default ros_neovim.nixosModules.default - nixarr.nixosModules.default ./configuration.nix ./hardware-configuration.nix (import ./containers.nix { inherit inputs; }) ( { config, pkgs, ... }: { - # nixarr = { - # enable = true; - # # These two values are also the default, but you can set them to whatever - # # else you want - # # WARNING: Do _not_ set them to `/home/user/whatever`, it will not work! - # mediaDir = "/var/lib/nixarr_test/media"; - # stateDir = "/var/lib/nixarr_test/state"; - # - # # vpn = { - # # enable = true; - # # # WARNING: This file must _not_ be in the config git directory - # # # You can usually get this wireguard file from your VPN provider - # # wgConf = "/data/.secret/wg.conf"; - # # }; - # - # jellyfin = { - # enable = true; - # # These options set up a nginx HTTPS reverse proxy, so you can access - # # Jellyfin on your domain with HTTPS - # expose.https = { - # enable = true; - # domainName = "your.domain.com"; - # acmeMail = "your@email.com"; # Required for ACME-bot - # }; - # }; - # - # # transmission = { - # # enable = true; - # # vpn.enable = true; - # # peerPort = 50000; # Set this to the port forwarded by your VPN - # # }; - # - # # It is possible for this module to run the *Arrs through a VPN, but it - # # is generally not recommended, as it can cause rate-limiting issues. - # sabnzbd.enable = true; # Usenet downloader - # prowlarr.enable = true; # Index manager - # sonarr.enable = true; # TV - # radarr.enable = true; # Movies - # bazarr.enable = true; # subtitles for sonarr and radarr - # lidarr.enable = true; # music - # readarr.enable = true; # books - # jellyseerr.enable = true; # request manager for media - # }; - programs = { steam.enable = true; }; From 7d0baae2c1d86bebde3940b49752e17a27c91be9 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 20 Jun 2025 22:43:46 -0500 Subject: [PATCH 61/73] update h001 for media --- hosts/h001/flake.lock | 360 ++++++++++++++++++++------------ hosts/h001/mods/adguardhome.nix | 2 +- hosts/h001/mods/nixarr.nix | 79 ++++++- hosts/lio/media_test.md | 14 -- 4 files changed, 303 insertions(+), 152 deletions(-) delete mode 100644 hosts/lio/media_test.md diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index 8c56ac2..e7e5257 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -28,15 +28,16 @@ "common": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1746294278, - "narHash": "sha256-9QKEwS915nNTnubx5cs3L9c6E2vjvqK5bT3o79p6pvE=", + "lastModified": 1750459395, + "narHash": "sha256-i6Khg4dcHXl6keWUW8vv7+aUAFdM+1rahFg59qx2xQ8=", "ref": "refs/heads/master", - "rev": "9039afca2a9f1eef4e5167557d1306e9bde8c095", - "revCount": 445, + "rev": "1b02f9ea95ec7e81a45ec40159991065856482b7", + "revCount": 489, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -107,16 +108,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "rycee", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -144,29 +145,65 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, + "nixarr": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "vpnconfinement": "vpnconfinement", + "website-builder": "website-builder" + }, + "locked": { + "lastModified": 1750367617, + "narHash": "sha256-1kz35TbeqhJMdo1s/WHidoUT64IuoKCGlngv5/JCHiw=", + "owner": "rasmus-kirk", + "repo": "nixarr", + "rev": "450d76583ae6ec025577bde7da2a38cfc7fb0510", + "type": "github" + }, + "original": { + "owner": "rasmus-kirk", + "repo": "nixarr", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -194,11 +231,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1750259320, - "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=", + "lastModified": 1748662220, + "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", + "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { @@ -208,13 +261,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1745250177, - "narHash": "sha256-NPkMDgRHLVuNHs7y/MK3qYbE/5uo42mskUIygSHEOLM=", + "lastModified": 1750188666, + "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1e61a9c582ec2f701b36d4600ae19b8099c5211", + "rev": "aa36c6c05d04f90cf890f87845be9380cf7b83c2", "type": "github" }, "original": { @@ -226,11 +279,11 @@ "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { - "lastModified": 1744327913, - "narHash": "sha256-WQ7GbrjtikpMnzzME59QSibZI0hjzt/KAGDmXa677Rw=", + "lastModified": 1746139196, + "narHash": "sha256-/FlNLWOSIrOYiWzAcgOdu9//QTorCDV1KWb+h6eqLwk=", "owner": "Almo7aya", "repo": "openingh.nvim", - "rev": "ce19b5ffe09e35cec600ba794df280cbb72c015f", + "rev": "7cc8c897cb6b34d8ed28e99d95baccef609ed251", "type": "github" }, "original": { @@ -242,11 +295,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1745008876, - "narHash": "sha256-/GdJNqoDpdsPCOjcESbtEEDCz5TYkvbPRY1/T0gF7IY=", + "lastModified": 1750069301, + "narHash": "sha256-lIAsudDunKOY69r00czO+rmMbM+woIdIGroT4dUZAFc=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "634aa58117a9b70b3f08a0b150f11afd64f1c0eb", + "rev": "5df0b668d23c05c173f6bc79bb19642215b8b66a", "type": "github" }, "original": { @@ -274,11 +327,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1736009707, - "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=", + "lastModified": 1749564222, + "narHash": "sha256-StttV19d5gWbFPxerCOX3dXIaRwg1oeUANIbNztALps=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817", + "rev": "fb525166ccc30296fb3457441eb979113de46b00", "type": "github" }, "original": { @@ -290,11 +343,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1744934679, - "narHash": "sha256-rTX+CCVOOU6ZzM5NvymJvOfJF10BRMfl8hdSJz0zw+Q=", + "lastModified": 1749846779, + "narHash": "sha256-j1aslQ3SPD9ZuhQDEt9e5GD+VZ6N6Re7IjVFXycaxWI=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f", + "rev": "76f7ce56ccb913632745714f160faa53164c5574", "type": "github" }, "original": { @@ -306,11 +359,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1741233810, - "narHash": "sha256-BYTY2ezYuxsneAl/yQbwL1aQvVWKSsN3IVqzTlrBSEU=", + "lastModified": 1749392788, + "narHash": "sha256-41slmnvt1z7sCxvpiVuFmQ9g7eCaxQi1dDCL3AxSL1A=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "8d3bce9764e627b62b07424e0df77f680d47ffdb", + "rev": "de740991c12411b663994b2860f1a4fd0937c130", "type": "github" }, "original": { @@ -322,11 +375,11 @@ "nvim_plugin-RRethy/vim-illuminate": { "flake": false, "locked": { - "lastModified": 1744859423, - "narHash": "sha256-zqXKkrUNTH/EIx3PBRN8+mQcbWa6fO9i/UoSeav5R/w=", + "lastModified": 1748105647, + "narHash": "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "1fa4b23409e22a03823648e344c77f260e2572cb", + "rev": "0d1e93684da00ab7c057410fecfc24f434698898", "type": "github" }, "original": { @@ -338,11 +391,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1744379189, - "narHash": "sha256-HsdDeV3mMQwrzlP23bJnNkiSL5OELgn0WBTERxehviE=", + "lastModified": 1748637634, + "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "73d2c590c74a0c582144987a4decb4a642755859", + "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", "type": "github" }, "original": { @@ -354,11 +407,11 @@ "nvim_plugin-aznhe21/actions-preview.nvim": { "flake": false, "locked": { - "lastModified": 1740589350, - "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=", + "lastModified": 1745779150, + "narHash": "sha256-rQjwlu5gQcOvxF72lr9ugPRl0W78wCWGWPhpN1oOMbs=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2", + "rev": "36513ad213855d497b7dd3391a24d1d75d58e36f", "type": "github" }, "original": { @@ -370,11 +423,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1745020938, - "narHash": "sha256-qDcVJ2RovKSIcUdVnXNcQZHoAf75IqsTMlsclDFrT2U=", + "lastModified": 1750179699, + "narHash": "sha256-EGt75z/NbjzDXxsyXT9Qj2wWOf06ijUr1If5ljmfLqo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "e623e30df4053cacc67fb7eb04e1bd0fadba52b4", + "rev": "45fd6c22f30487586c771072dc8c5230931e4c7b", "type": "github" }, "original": { @@ -386,11 +439,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1740764472, - "narHash": "sha256-4h/fzFY8JR9r+QnoiWEqgQKPMuu8i9HTC4v0Jp7iuUo=", + "lastModified": 1749271780, + "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", "owner": "catppuccin", "repo": "nvim", - "rev": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", + "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", "type": "github" }, "original": { @@ -402,11 +455,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1744450582, - "narHash": "sha256-ybs65ObtjcUBaGglxP3SIpYjlGSEk/MQI9nSN8S3Q1w=", + "lastModified": 1750108178, + "narHash": "sha256-3I7Xup+v9Yq9/nJQ1F5CDW99oFQcxbinv7VQcKeA16Y=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "3b14762a0186b1922cb5ddf3a760d8521c7b3d7e", + "rev": "d9ffd8f70ed6d466cecd3e7e2dd1425b0010932f", "type": "github" }, "original": { @@ -578,11 +631,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1745219545, - "narHash": "sha256-7WQ428oPr43z01HvNpArZJcUov61/pDtLqJtkEKnBAY=", + "lastModified": 1750058704, + "narHash": "sha256-V9aXXR9ZP2G/XInHt07RylC4rS+AyMXAAfODvC6pVxw=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "2149fc2009d1117d58e86e56836f70c969f60a82", + "rev": "88205953bd748322b49b26e1dfb0389932520dc9", "type": "github" }, "original": { @@ -626,11 +679,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1744007533, - "narHash": "sha256-KCz8UNL7SkI4cP7wKmQPJgkI4TsQftnHjaMSBYCgrOY=", + "lastModified": 1750160168, + "narHash": "sha256-hzFX5mZRxTDDIp/iBVl4lqEaQryLQOe7jFJmXDwq4J8=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "9aaec65de041bddfc4c0af66919030d2950bcea8", + "rev": "b9a989191b3a97c9316a0efea02341c4cdab845a", "type": "github" }, "original": { @@ -658,11 +711,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1745090089, - "narHash": "sha256-Pwxk2C5WaaaW7Ookbq2edvLSJh6ZQc3iWMxowHyQkFQ=", + "lastModified": 1749731021, + "narHash": "sha256-V4JJ1VQXoIsUBTxe6ykbkyo6LxEAr+QEIqIV3mA9phs=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63", + "rev": "2b0039b8be9583704591a13129c600891ac2c596", "type": "github" }, "original": { @@ -674,11 +727,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1745050087, - "narHash": "sha256-nkCVQ+TXiaKm17HXaAMVuRMV3Jbxv8aRIO6re4zEgDw=", + "lastModified": 1750024924, + "narHash": "sha256-gmOqCnSLGDNerXyuuNhkyL/pSJitnyqBdWC3LejZoS4=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d", + "rev": "2fdf224107e5bc29fb5c3a175f5f2c9161b34741", "type": "github" }, "original": { @@ -690,11 +743,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1745247686, - "narHash": "sha256-rnm/BJNMVxcYH/ZXf1HciXgG0UWhAeQQniOaSvi0E40=", + "lastModified": 1750169575, + "narHash": "sha256-lJWMFgQLQhKUuv50WrYXlJ3TFqT04nVbmcBGVDaSz0k=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b335f1c72877f101248d3b085d4b7da7576361d7", + "rev": "99d3a0f26bfe402f45257c1398287aef252cbe2d", "type": "github" }, "original": { @@ -706,11 +759,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1743352525, - "narHash": "sha256-YNqj1vPc2oyVrSgp+huoMkrUAp2Lx3G4W52liOujP6A=", + "lastModified": 1748880705, + "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "1ae5784bf0729c8b03cb7fe6561508a673c9adc8", + "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", "type": "github" }, "original": { @@ -754,11 +807,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1744482854, - "narHash": "sha256-XeAFXg6GWzMJV/HzfdCXtv/effAHVU7mioFKTf1kDc8=", + "lastModified": 1749383457, + "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "86fe39534b7da729a1ac56c0466e76f2c663dc42", + "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", "type": "github" }, "original": { @@ -770,11 +823,11 @@ "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "flake": false, "locked": { - "lastModified": 1729728595, - "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=", + "lastModified": 1750040034, + "narHash": "sha256-NHcU3c+1pLeypHr9xXKmqvdwB1QM/vj5axzjpFEQCLQ=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb", + "rev": "7bf55ed0ff5be182ad3301cff266581fc1c56cce", "type": "github" }, "original": { @@ -818,11 +871,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1742346322, - "narHash": "sha256-GF1zOHZItVZm3bx2wqI4hPj7EXQJ2F9KS4MtaEt2gm0=", + "lastModified": 1747012888, + "narHash": "sha256-JpW0ehsX81yVbKNzrYOe1hdgVMs6oaaxMLH6lECnOJg=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5", + "rev": "b4da76be54691e854d3e0e02c36b0245f945c2c7", "type": "github" }, "original": { @@ -834,11 +887,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1745201081, - "narHash": "sha256-zQsqyJgqlvxniKOtwPSzArUaOwvIgo6Xm+oAjAbPda4=", + "lastModified": 1750143568, + "narHash": "sha256-E2YdGlvvpnT/PiayfQldwpbCnjsyNDcoTzxgMf2ajV8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "be5b788f2dc1522c73fb7afad9092331c8aebe80", + "rev": "d54a1875a91e1a705795ea26074795210b92ce7f", "type": "github" }, "original": { @@ -850,11 +903,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1745131674, - "narHash": "sha256-uoT45oaeY5c1+A7pVQIS+Bj9JnrSy9rQAecvaWZht+c=", + "lastModified": 1747360641, + "narHash": "sha256-+RHeFaeCF/iwAf8qAOjbEIl3YcnrBMVfkQnnzDNhyTA=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "855c97005c8eebcdd19846f2e54706bffd40ee96", + "rev": "1fb58cca9aebbc4fd32b086cb413548ce132c127", "type": "github" }, "original": { @@ -866,11 +919,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1744921782, - "narHash": "sha256-w3I3w1SGqtpUnu4KQyaLue+k96XmkgA3+DpxSEjj+WI=", + "lastModified": 1749893617, + "narHash": "sha256-QJAfpVdTHTxjUgggQekRLvNYuvG12gjtfTGybfcFdyo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "6daca3ad780f045550b820f262002f35175a6c04", + "rev": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f", "type": "github" }, "original": { @@ -882,11 +935,11 @@ "nvim_plugin-rafamadriz/friendly-snippets": { "flake": false, "locked": { - "lastModified": 1745202387, - "narHash": "sha256-R6xE5vwgFtyEYpET0E4ecZejuV/lNHFkumk+wGf3lbI=", + "lastModified": 1745949052, + "narHash": "sha256-FzApcTbWfFkBD9WsYMhaCyn6ky8UmpUC2io/co/eByM=", "owner": "rafamadriz", "repo": "friendly-snippets", - "rev": "fc8f183479a472df60aa86f00e295462f2308178", + "rev": "572f5660cf05f8cd8834e096d7b4c921ba18e175", "type": "github" }, "original": { @@ -914,11 +967,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745009508, - "narHash": "sha256-NCytp+DiOo3obZeQ9bpaEaNMfstf1Ytn0OR5mAWodLw=", + "lastModified": 1749967462, + "narHash": "sha256-1pIGu/GJ4FiMH/yHhoo6Gu0HLC3rFQiesJBuv8uE7Vw=", "owner": "rmagatti", "repo": "auto-session", - "rev": "71c8af9a99e96b9d2533cf4bac4dfed1eafab923", + "rev": "fffb13dcbe8731b8650e5bf1caa749a485d20556", "type": "github" }, "original": { @@ -978,11 +1031,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1745180802, - "narHash": "sha256-J/GKqn2VHv/ydaFXWCFduV2B7iwZzHtUvFArszxf2Cw=", + "lastModified": 1749498876, + "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "372fc521f8421b7830ea6db4d6ea3bae1c77548c", + "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", "type": "github" }, "original": { @@ -1007,6 +1060,22 @@ "type": "github" } }, + "nvim_plugin-supermaven-inc/supermaven-nvim": { + "flake": false, + "locked": { + "lastModified": 1728314930, + "narHash": "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=", + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", + "type": "github" + }, + "original": { + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "type": "github" + } + }, "nvim_plugin-tpope/vim-sleuth": { "flake": false, "locked": { @@ -1042,11 +1111,11 @@ "nvim_plugin-uga-rosa/ccc.nvim": { "flake": false, "locked": { - "lastModified": 1744103477, - "narHash": "sha256-MSh9tJv9UNfceO1yQIvID36x/fLGmgFcnIzJ9LOog0A=", + "lastModified": 1746537659, + "narHash": "sha256-3TZ8VmvdgQ9n63m78C3r4OIUkVQHTHBvC24ixBdhTig=", "owner": "uga-rosa", "repo": "ccc.nvim", - "rev": "af2cf5a963f401aad868c065222ee13d4bbc9050", + "rev": "9d1a256e006decc574789dfc7d628ca11644d4c2", "type": "github" }, "original": { @@ -1071,22 +1140,6 @@ "type": "github" } }, - "nvim_plugin-yetone/avante.nvim": { - "flake": false, - "locked": { - "lastModified": 1744881650, - "narHash": "sha256-BzRFgcBG4vn7mamwLvviMl4erTPwg+1AkAb3Ss4Kq8E=", - "owner": "yetone", - "repo": "avante.nvim", - "rev": "eb1cd44731783024621beafe4e46204cbc9a4320", - "type": "github" - }, - "original": { - "owner": "yetone", - "repo": "avante.nvim", - "type": "github" - } - }, "nvim_plugin-zbirenbaum/copilot-cmp": { "flake": false, "locked": { @@ -1106,11 +1159,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1745111203, - "narHash": "sha256-PaWWT0mSsTfnBMrmHagHgemGN5Be6rbikVVW4ZBK/Zs=", + "lastModified": 1749137204, + "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "dc579f98536029610cfa32c6bad86c0d24363679", + "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", "type": "github" }, "original": { @@ -1128,11 +1181,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741508717, - "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=", + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", "owner": "yaxitech", "repo": "ragenix", - "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", "type": "github" }, "original": { @@ -1144,13 +1197,14 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixarr": "nixarr", + "nixpkgs": "nixpkgs_5", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1200,21 +1254,21 @@ "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim", + "nvim_plugin-supermaven-inc/supermaven-nvim": "nvim_plugin-supermaven-inc/supermaven-nvim", "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth", "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", - "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745585761, - "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", + "lastModified": 1750190298, + "narHash": "sha256-ero30lVvCzmdKkY0lZR/RO+oTNTY1WXQh6vhfbcbTIk=", "ref": "refs/heads/master", - "rev": "e5523910a0c07c88d026d006f5962434bfa53548", - "revCount": 277, + "rev": "1ed03dac446683ef42035b53a410d857855d82d9", + "revCount": 291, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1307,11 @@ ] }, "locked": { - "lastModified": 1745207416, - "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=", + "lastModified": 1750127910, + "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a", + "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", "type": "github" }, "original": { @@ -1295,6 +1349,42 @@ "repo": "default", "type": "github" } + }, + "vpnconfinement": { + "locked": { + "lastModified": 1743810720, + "narHash": "sha256-kbv/W4gizUSa6qH2rUQdgPj9AJaeN9k2XSWUYqj7IMU=", + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "rev": "74ae51e6d18b972ecc918ab43e8bde60c21a65d8", + "type": "github" + }, + "original": { + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "type": "github" + } + }, + "website-builder": { + "inputs": { + "nixpkgs": [ + "nixarr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750317638, + "narHash": "sha256-B4RWcXXOLO6gMeYyV+K4olu+kGGsYamKH+JAm0cIXqI=", + "owner": "rasmus-kirk", + "repo": "website-builder", + "rev": "b54192000a00e865947f45bacf3184d56363ee38", + "type": "github" + }, + "original": { + "owner": "rasmus-kirk", + "repo": "website-builder", + "type": "github" + } } }, "root": "root", diff --git a/hosts/h001/mods/adguardhome.nix b/hosts/h001/mods/adguardhome.nix index 24d4436..d6d7c71 100644 --- a/hosts/h001/mods/adguardhome.nix +++ b/hosts/h001/mods/adguardhome.nix @@ -41,7 +41,7 @@ services.nginx = { virtualHosts = { - "h001.net.joshuabell.xyz " = { + "h001.net.joshuabell.xyz" = { locations."/" = { proxyPass = "http://localhost:3000"; }; diff --git a/hosts/h001/mods/nixarr.nix b/hosts/h001/mods/nixarr.nix index 352f549..ea06e5e 100644 --- a/hosts/h001/mods/nixarr.nix +++ b/hosts/h001/mods/nixarr.nix @@ -5,10 +5,11 @@ config = { nixarr = { enable = true; - mediaDir = "/var/lib/nixarr/media"; + mediaDir = "/drives/wd10/nixarr/media"; stateDir = "/var/lib/nixarr/state"; jellyfin.enable = true; # jellyfinnnnnn! + jellyseerr.enable = true; # request manager for media sabnzbd.enable = true; # Usenet downloader prowlarr.enable = true; # Index manager sonarr.enable = true; # TV @@ -16,7 +17,81 @@ bazarr.enable = true; # subtitles for sonarr and radarr lidarr.enable = true; # music readarr.enable = true; # books - jellyseerr.enable = true; # request manager for media + }; + + services.nginx = { + virtualHosts = { + "jellyfin.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:8096"; + }; + }; + "media.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:5055"; + }; + }; + "100.64.0.13" = { + locations = { + "/jellyfin" = { + proxyPass = "http://localhost:8096"; + extraConfig = '' + rewrite ^/jellyfin/(.*) /$1 break; + ''; + }; + "/jellyseerr" = { + proxyPass = "http://localhost:5055"; + extraConfig = '' + rewrite ^/jellyseerr/(.*) /$1 break; + ''; + }; + "/sabnzbd" = { + proxyPass = "http://localhost:6336"; + extraConfig = '' + rewrite ^/sabnzbd/(.*) /$1 break; + ''; + }; + "/prowlarr" = { + proxyPass = "http://localhost:9696"; + extraConfig = '' + rewrite ^/prowlarr/(.*) /$1 break; + ''; + }; + "/radarr" = { + proxyPass = "http://localhost:7878"; + extraConfig = '' + rewrite ^/radarr/(.*) /$1 break; + ''; + }; + "/sonarr" = { + proxyPass = "http://localhost:8989"; + extraConfig = '' + rewrite ^/sonarr/(.*) /$1 break; + ''; + }; + "/lidarr" = { + proxyPass = "http://localhost:8686"; + extraConfig = '' + rewrite ^/lidarr/(.*) /$1 break; + ''; + }; + "/readarr" = { + proxyPass = "http://localhost:8787"; + extraConfig = '' + rewrite ^/readarr/(.*) /$1 break; + ''; + }; + "/bazarr" = { + proxyPass = "http://localhost:6767"; + extraConfig = '' + rewrite ^/bazarr/(.*) /$1 break; + ''; + }; + }; + }; + }; }; }; } diff --git a/hosts/lio/media_test.md b/hosts/lio/media_test.md deleted file mode 100644 index f633bf6..0000000 --- a/hosts/lio/media_test.md +++ /dev/null @@ -1,14 +0,0 @@ -[jellyfin](http://10.0.0.3:8096) -[sabnzbd](http://10.0.0.3:6336) -[prowlarr](http://10.0.0.3:9696/) -[radarr](http://10.0.0.3:7878/) -[sonarr](http://10.0.0.3:8989/) -[lidarr](http://10.0.0.3:8686/) -[readarr](http://10.0.0.3:8787/) -[bazarr](http://10.0.0.3:6767) -[jellyseer](http://10.0.0.3:5055/) - - -[nixarr wiki](https://nixarr.com/wiki/) - -[reference for setup](https://www.youtube.com/watch?v=twJDyoj0tDc&t=1172s) From e909b1f5e3a31beaf1bcd004ef516e5c998b6f09 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 23 Jun 2025 10:28:24 -0500 Subject: [PATCH 62/73] wip nixarr --- hosts/h001/containers/default.nix | 2 + hosts/h001/mods/nixarr.nix | 120 ++++++++++++++++-------------- hosts/oracle/o001/nginx.nix | 1 - 3 files changed, 66 insertions(+), 57 deletions(-) diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix index 7f188a9..fc34091 100644 --- a/hosts/h001/containers/default.nix +++ b/hosts/h001/containers/default.nix @@ -54,6 +54,8 @@ in virtualisation.oci-containers.backend = "podman"; + security.acme.acceptTerms = true; + security.acme.defaults.email = "admin@joshuabell.xyz"; services.nginx = { enable = true; recommendedGzipSettings = true; diff --git a/hosts/h001/mods/nixarr.nix b/hosts/h001/mods/nixarr.nix index ea06e5e..7ff24a5 100644 --- a/hosts/h001/mods/nixarr.nix +++ b/hosts/h001/mods/nixarr.nix @@ -33,62 +33,70 @@ proxyPass = "http://localhost:5055"; }; }; - "100.64.0.13" = { - locations = { - "/jellyfin" = { - proxyPass = "http://localhost:8096"; - extraConfig = '' - rewrite ^/jellyfin/(.*) /$1 break; - ''; - }; - "/jellyseerr" = { - proxyPass = "http://localhost:5055"; - extraConfig = '' - rewrite ^/jellyseerr/(.*) /$1 break; - ''; - }; - "/sabnzbd" = { - proxyPass = "http://localhost:6336"; - extraConfig = '' - rewrite ^/sabnzbd/(.*) /$1 break; - ''; - }; - "/prowlarr" = { - proxyPass = "http://localhost:9696"; - extraConfig = '' - rewrite ^/prowlarr/(.*) /$1 break; - ''; - }; - "/radarr" = { - proxyPass = "http://localhost:7878"; - extraConfig = '' - rewrite ^/radarr/(.*) /$1 break; - ''; - }; - "/sonarr" = { - proxyPass = "http://localhost:8989"; - extraConfig = '' - rewrite ^/sonarr/(.*) /$1 break; - ''; - }; - "/lidarr" = { - proxyPass = "http://localhost:8686"; - extraConfig = '' - rewrite ^/lidarr/(.*) /$1 break; - ''; - }; - "/readarr" = { - proxyPass = "http://localhost:8787"; - extraConfig = '' - rewrite ^/readarr/(.*) /$1 break; - ''; - }; - "/bazarr" = { - proxyPass = "http://localhost:6767"; - extraConfig = '' - rewrite ^/bazarr/(.*) /$1 break; - ''; - }; + "jellyfin.h001.local.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:8096"; + }; + }; + "media.h001.local.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:5055"; + }; + }; + "jellyfin.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:8096"; + }; + }; + "media.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:5055"; + }; + }; + "sabnzbd.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:6336"; + }; + }; + "prowlarr.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:9696"; + }; + }; + "radarr.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:7878"; + }; + }; + "sonarr.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:8989"; + }; + }; + "lidarr.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:8686"; + }; + }; + "readarr.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:8787"; + }; + }; + "bazarr.h001.n.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:6767"; }; }; }; diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index cc634d9..bc02ffb 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -45,7 +45,6 @@ ''; }; }; - }; in { From 7b56869d2716617baf260842336c7cc830c1da96 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 23 Jun 2025 10:28:49 -0500 Subject: [PATCH 63/73] add jelly and media --- hosts/oracle/o001/nginx.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index cc634d9..b780bff 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -148,6 +148,21 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; ''; }; + "jellyfin.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://100.64.0.13"; + }; + }; + "media.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://100.64.0.13"; + }; + }; + "_" = { default = true; From c51987536a16e8139a6b27ca5100f7e8dfdf192f Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 23 Jun 2025 17:50:09 -0500 Subject: [PATCH 64/73] fix up nixarr links and add homarr for nav --- hosts/h001/containers/default.nix | 14 +++----- hosts/h001/containers/homarr.nix | 47 ++++++++++++++++++++++++++ hosts/h001/containers/opengist.nix | 2 +- hosts/h001/mods/adguardhome.nix | 25 +------------- hosts/h001/mods/nixarr.nix | 54 ------------------------------ 5 files changed, 54 insertions(+), 88 deletions(-) create mode 100644 hosts/h001/containers/homarr.nix diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix index fc34091..fcef362 100644 --- a/hosts/h001/containers/default.nix +++ b/hosts/h001/containers/default.nix @@ -10,6 +10,7 @@ in # common.nixosModules.containers.librechat common.nixosModules.containers.forgejo ./opengist.nix + ./homarr.nix ]; config = { @@ -54,8 +55,8 @@ in virtualisation.oci-containers.backend = "podman"; - security.acme.acceptTerms = true; - security.acme.defaults.email = "admin@joshuabell.xyz"; + security.acme.acceptTerms = true; + security.acme.defaults.email = "admin@joshuabell.xyz"; services.nginx = { enable = true; recommendedGzipSettings = true; @@ -69,19 +70,13 @@ in }; }; + # forgejo http traffic "git.joshuabell.xyz" = { locations."/" = { proxyPass = "http://10.0.0.2:3000"; }; }; - # "git.joshuabell.xyz" = { - # # GIT passthrough - # locations."/" = { - # proxyPass = "http://10.0.0.2:3000"; - # }; - # }; - "_" = { default = true; locations."/" = { @@ -91,6 +86,7 @@ in }; # STREAMS + # Forgejo ssh streamConfig = '' server { listen 3032; diff --git a/hosts/h001/containers/homarr.nix b/hosts/h001/containers/homarr.nix new file mode 100644 index 0000000..29aa69e --- /dev/null +++ b/hosts/h001/containers/homarr.nix @@ -0,0 +1,47 @@ +{ + ... +}: +let + name = "homarr"; + hostDataDir = "/var/lib/${name}"; + + v_port = 7575; +in +{ + virtualisation.oci-containers.containers = { + "${name}" = { + image = "ghcr.io/homarr-labs/homarr:latest"; + ports = [ + "127.0.0.1:${toString v_port}:${toString v_port}" + ]; + volumes = [ + "${hostDataDir}:/appdata" + "/var/run/docker.sock:/var/run/docker.sock" + ]; + environment = { + SECRET_ENCRYPTION_KEY = "0b7e80116a742d16a8f07452a2d9b206b1997d32a6dd2c29cfe4df676e281295"; + }; + }; + }; + system.activationScripts."${name}_directories" = '' + mkdir -p ${hostDataDir} + chown -R root:root ${hostDataDir} + chmod -R 777 ${hostDataDir} + ''; + + services.nginx.virtualHosts = { + "100.64.0.13" = { + locations."/" = { + return = "301 http://h001.net.joshuabell.xyz"; + }; + }; + "h001.net.joshuabell.xyz" = { + locations = { + "/" = { + proxyWebsockets = true; + proxyPass = "http://127.0.0.1:${builtins.toString v_port}"; + }; + }; + }; + }; +} diff --git a/hosts/h001/containers/opengist.nix b/hosts/h001/containers/opengist.nix index 6a6dfb5..e529b94 100644 --- a/hosts/h001/containers/opengist.nix +++ b/hosts/h001/containers/opengist.nix @@ -9,7 +9,7 @@ let in { virtualisation.oci-containers.containers = { - opengist = { + "${name}" = { image = "ghcr.io/thomiceli/opengist:1"; ports = [ "127.0.0.1:${toString v_port}:${toString v_port}" diff --git a/hosts/h001/mods/adguardhome.nix b/hosts/h001/mods/adguardhome.nix index d6d7c71..314e469 100644 --- a/hosts/h001/mods/adguardhome.nix +++ b/hosts/h001/mods/adguardhome.nix @@ -14,6 +14,7 @@ 67 68 5543 + 3000 ]; networking.firewall.allowedUDPPorts = [ 53 @@ -24,29 +25,5 @@ 8853 5443 ]; - - # networking = { - # interfaces = { - # enp0s31f6 = { - # useDHCP = true; - # ipv4.addresses = [ - # { - # address = "10.12.14.2"; - # prefixLength = 24; - # } - # ]; - # }; - # }; - # }; - - services.nginx = { - virtualHosts = { - "h001.net.joshuabell.xyz" = { - locations."/" = { - proxyPass = "http://localhost:3000"; - }; - }; - }; - }; }; } diff --git a/hosts/h001/mods/nixarr.nix b/hosts/h001/mods/nixarr.nix index 7ff24a5..92dd4c0 100644 --- a/hosts/h001/mods/nixarr.nix +++ b/hosts/h001/mods/nixarr.nix @@ -45,60 +45,6 @@ proxyPass = "http://localhost:5055"; }; }; - "jellyfin.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:8096"; - }; - }; - "media.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:5055"; - }; - }; - "sabnzbd.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:6336"; - }; - }; - "prowlarr.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:9696"; - }; - }; - "radarr.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:7878"; - }; - }; - "sonarr.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:8989"; - }; - }; - "lidarr.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:8686"; - }; - }; - "readarr.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:8787"; - }; - }; - "bazarr.h001.n.joshuabell.xyz" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:6767"; - }; - }; }; }; }; From 0aba3aac809fdcdf73f5568fa10747a7c01d048c Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 23 Jun 2025 22:18:38 -0500 Subject: [PATCH 65/73] got grafana working --- hosts/h001/containers/homarr.nix | 17 +------------- hosts/h001/flake.nix | 1 + hosts/h001/mods/default.nix | 2 ++ hosts/h001/mods/monitoring.nix | 32 +++++++++++++++++++++++++ hosts/h001/mods/reporting.nix | 8 +++++++ hosts/h001/nginx.nix | 40 ++++++++++++++++++++++++++++++++ 6 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 hosts/h001/mods/monitoring.nix create mode 100644 hosts/h001/mods/reporting.nix create mode 100644 hosts/h001/nginx.nix diff --git a/hosts/h001/containers/homarr.nix b/hosts/h001/containers/homarr.nix index 29aa69e..9ebed37 100644 --- a/hosts/h001/containers/homarr.nix +++ b/hosts/h001/containers/homarr.nix @@ -23,25 +23,10 @@ in }; }; }; + system.activationScripts."${name}_directories" = '' mkdir -p ${hostDataDir} chown -R root:root ${hostDataDir} chmod -R 777 ${hostDataDir} ''; - - services.nginx.virtualHosts = { - "100.64.0.13" = { - locations."/" = { - return = "301 http://h001.net.joshuabell.xyz"; - }; - }; - "h001.net.joshuabell.xyz" = { - locations = { - "/" = { - proxyWebsockets = true; - proxyPass = "http://127.0.0.1:${builtins.toString v_port}"; - }; - }; - }; - }; } diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index e064c42..109440d 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -35,6 +35,7 @@ ./configuration.nix ./hardware-configuration.nix ./mods + ./nginx.nix (import ./containers { inherit inputs; }) ( { config, pkgs, ... }: diff --git a/hosts/h001/mods/default.nix b/hosts/h001/mods/default.nix index 873e964..5d1fb62 100644 --- a/hosts/h001/mods/default.nix +++ b/hosts/h001/mods/default.nix @@ -5,5 +5,7 @@ imports = [ ./adguardhome.nix ./nixarr.nix + ./monitoring.nix + ./reporting.nix ]; } diff --git a/hosts/h001/mods/monitoring.nix b/hosts/h001/mods/monitoring.nix new file mode 100644 index 0000000..04cc962 --- /dev/null +++ b/hosts/h001/mods/monitoring.nix @@ -0,0 +1,32 @@ +{ + ... +}: +{ + config = { + services.prometheus = { + enable = true; + scrapeConfigs = [ + { + job_name = "node"; + static_configs = [ + { targets = [ "localhost:9100" ]; } + ]; + } + ]; + }; + + services.grafana = { + enable = true; + settings = { + server = { + http_port = 3001; + serve_from_sub_path = true; + domain = "h001.net.joshuabell.xyz"; + root_url = "http://h001.net.joshuabell.xyz/grafana/"; + enforce_domain = true; + enable_gzip = true; + }; + }; + }; + }; +} diff --git a/hosts/h001/mods/reporting.nix b/hosts/h001/mods/reporting.nix new file mode 100644 index 0000000..48e19e1 --- /dev/null +++ b/hosts/h001/mods/reporting.nix @@ -0,0 +1,8 @@ +{ + ... +}: +{ + config = { + services.prometheus.exporters.node.enable = true; + }; +} diff --git a/hosts/h001/nginx.nix b/hosts/h001/nginx.nix new file mode 100644 index 0000000..fa0373b --- /dev/null +++ b/hosts/h001/nginx.nix @@ -0,0 +1,40 @@ +{ + ... +}: +let + homarr = { + proxyWebsockets = true; + proxyPass = "http://localhost:7575"; + }; +in +{ + services.nginx.virtualHosts = { + "10.12.14.2" = { + locations = { + "/" = { + return = "301 http://h001.local.joshuabell.xyz"; + }; + }; + }; + "h001.local.joshuabell.xyz" = { + locations = { + "/" = homarr; + }; + }; + "100.64.0.13" = { + locations."/" = { + return = "301 http://h001.net.joshuabell.xyz"; + }; + }; + "h001.net.joshuabell.xyz" = { + locations = { + "/grafana/" = { + proxyPass = "http://localhost:3001"; + proxyWebsockets = true; + recommendedProxySettings = true; + }; + "/" = homarr; + }; + }; + }; +} From 7f63bb2d0540661b732e4531235a2950de8caa30 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 00:25:24 -0500 Subject: [PATCH 66/73] got monitoring working --- hosts/h001/mods/monitoring.nix | 111 ++++++++++++++++++++++++++++++++- hosts/h001/mods/reporting.nix | 63 ++++++++++++++++++- 2 files changed, 172 insertions(+), 2 deletions(-) diff --git a/hosts/h001/mods/monitoring.nix b/hosts/h001/mods/monitoring.nix index 04cc962..f9b31bc 100644 --- a/hosts/h001/mods/monitoring.nix +++ b/hosts/h001/mods/monitoring.nix @@ -1,4 +1,5 @@ { + config, ... }: { @@ -9,7 +10,14 @@ { job_name = "node"; static_configs = [ - { targets = [ "localhost:9100" ]; } + { + targets = [ "localhost:9100" ]; + labels.instance = config.networking.hostName; # h001 + } + # { + # targets = [ "http://lio.net.joshuabell.xyz:9100" ]; + # labels.instance = "lio"; + # } ]; } ]; @@ -17,9 +25,11 @@ services.grafana = { enable = true; + dataDir = "/var/lib/grafana"; settings = { server = { http_port = 3001; + http_addr = "127.0.0.1"; serve_from_sub_path = true; domain = "h001.net.joshuabell.xyz"; root_url = "http://h001.net.joshuabell.xyz/grafana/"; @@ -27,6 +37,105 @@ enable_gzip = true; }; }; + provision = { + datasources.settings.datasources = [ + { + name = "Prometheus"; + type = "prometheus"; + url = "http://localhost:9090"; + access = "proxy"; + isDefault = true; # Set as default, if you want + } + { + name = "Loki"; + type = "loki"; + url = "http://localhost:3100"; + access = "proxy"; + isDefault = false; + } + ]; + }; + }; + + # Loki for log aggregation + systemd.tmpfiles.rules = [ + "d /var/lib/loki 0755 loki loki -" + "d /var/lib/loki/chunks 0755 loki loki -" + "d /var/lib/loki/rules 0755 loki loki -" + "d /var/lib/loki/compactor 0755 loki loki -" + ]; + services.loki = { + enable = true; + configuration = { + auth_enabled = false; + + server = { + http_listen_port = 3100; + }; + + common = { + path_prefix = "/var/lib/loki"; + storage = { + filesystem = { + chunks_directory = "/var/lib/loki/chunks"; + rules_directory = "/var/lib/loki/rules"; + }; + }; + replication_factor = 1; + ring = { + kvstore = { + store = "inmemory"; + }; + }; + }; + + schema_config = { + configs = [ + { + from = "2023-01-01"; + store = "boltdb-shipper"; + object_store = "filesystem"; + schema = "v12"; # Updated schema version + index = { + prefix = "index_"; + period = "24h"; # Set to 24h period as recommended + }; + } + ]; + }; + + limits_config = { + allow_structured_metadata = false; # Disable structured metadata until we upgrade to v13 + }; + + ruler = { + alertmanager_url = "http://localhost:9093"; + storage = { + type = "local"; + local = { + directory = "/var/lib/loki/rules"; + }; + }; + rule_path = "/var/lib/loki/rules"; + ring = { + kvstore = { + store = "inmemory"; + }; + }; + }; + + compactor = { + working_directory = "/var/lib/loki/compactor"; # Set working directory + retention_enabled = true; + compaction_interval = "5m"; + delete_request_store = "filesystem"; # Add this line for retention configuration + delete_request_cancel_period = "24h"; + }; + + analytics = { + reporting_enabled = false; + }; + }; }; }; } diff --git a/hosts/h001/mods/reporting.nix b/hosts/h001/mods/reporting.nix index 48e19e1..dc6a3a0 100644 --- a/hosts/h001/mods/reporting.nix +++ b/hosts/h001/mods/reporting.nix @@ -1,8 +1,69 @@ { + config, ... }: { config = { - services.prometheus.exporters.node.enable = true; + services.prometheus.exporters.node.enable = true; # port 9080 + # Create necessary directories with appropriate permissions + systemd.tmpfiles.rules = [ + "d /tmp/positions 1777 - - -" # World-writable directory for positions file + "f /tmp/positions.yaml 0666 - - -" # World-writable positions file + ]; + users.groups.systemd-journal.members = [ "promtail" ]; + services.promtail = { + enable = true; + extraFlags = [ + "-config.expand-env=true" + ]; + configuration = { + server = { + http_listen_port = 9080; + grpc_listen_port = 0; + }; + positions = { + filename = "/tmp/positions.yaml"; # Changed from /var/lib/promtail/positions.yaml + }; + clients = [ + { + url = "http://localhost:3100/loki/api/v1/push"; # Points to your Loki instance + } + ]; + scrape_configs = [ + { + job_name = "journal"; + journal = { + json = false; + max_age = "12h"; + path = "/var/log/journal"; + labels = { + job = "systemd-journal"; + host = "${config.networking.hostName}"; + }; + }; + relabel_configs = [ + { + source_labels = [ "__journal__systemd_unit" ]; + target_label = "unit"; + } + ]; + } + # Simple file-based logs as a fallback + { + job_name = "system"; + static_configs = [ + { + targets = [ "localhost" ]; + labels = { + job = "syslog"; + host = "${config.networking.hostName}"; + __path__ = "/var/log/syslog"; + }; + } + ]; + } + ]; + }; + }; }; } From c83736eae08b978b3ce15b5b007e6a3e2f727f4b Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 09:53:21 -0500 Subject: [PATCH 67/73] update metrics reporting --- hosts/h001/mods/monitoring.nix | 3 +-- hosts/h001/mods/reporting.nix | 23 ++++++----------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/hosts/h001/mods/monitoring.nix b/hosts/h001/mods/monitoring.nix index f9b31bc..cc2811e 100644 --- a/hosts/h001/mods/monitoring.nix +++ b/hosts/h001/mods/monitoring.nix @@ -11,7 +11,7 @@ job_name = "node"; static_configs = [ { - targets = [ "localhost:9100" ]; + targets = [ "100.64.0.13:9100" ]; labels.instance = config.networking.hostName; # h001 } # { @@ -109,7 +109,6 @@ }; ruler = { - alertmanager_url = "http://localhost:9093"; storage = { type = "local"; local = { diff --git a/hosts/h001/mods/reporting.nix b/hosts/h001/mods/reporting.nix index dc6a3a0..7a9eadb 100644 --- a/hosts/h001/mods/reporting.nix +++ b/hosts/h001/mods/reporting.nix @@ -4,7 +4,10 @@ }: { config = { - services.prometheus.exporters.node.enable = true; # port 9080 + services.prometheus.exporters.node = { + enable = true; + port = 9100; + }; # Create necessary directories with appropriate permissions systemd.tmpfiles.rules = [ "d /tmp/positions 1777 - - -" # World-writable directory for positions file @@ -26,7 +29,7 @@ }; clients = [ { - url = "http://localhost:3100/loki/api/v1/push"; # Points to your Loki instance + url = "http://100.64.0.13:3100/loki/api/v1/push"; # Points to your Loki instance } ]; scrape_configs = [ @@ -38,7 +41,7 @@ path = "/var/log/journal"; labels = { job = "systemd-journal"; - host = "${config.networking.hostName}"; + host = config.networking.hostName; }; }; relabel_configs = [ @@ -48,20 +51,6 @@ } ]; } - # Simple file-based logs as a fallback - { - job_name = "system"; - static_configs = [ - { - targets = [ "localhost" ]; - labels = { - job = "syslog"; - host = "${config.networking.hostName}"; - __path__ = "/var/log/syslog"; - }; - } - ]; - } ]; }; }; From cbfffdda03fd204fc91f9c8635c8ef32f1e29a8c Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 09:55:49 -0500 Subject: [PATCH 68/73] add reporting to general --- common/general/default.nix | 1 + common/general/reporting.nix | 74 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 common/general/reporting.nix diff --git a/common/general/default.nix b/common/general/default.nix index 0e882e8..c172e28 100644 --- a/common/general/default.nix +++ b/common/general/default.nix @@ -57,6 +57,7 @@ in ./shell/common.nix ./fonts.nix ./tty_caps_esc.nix + ./reporting.nix ]; config = { # name this computer diff --git a/common/general/reporting.nix b/common/general/reporting.nix new file mode 100644 index 0000000..8042c3d --- /dev/null +++ b/common/general/reporting.nix @@ -0,0 +1,74 @@ +{ + lib, + config, + ... +}: +let + ccfg = import ../config.nix; + cfg_path = [ + ccfg.custom_config_key + "reporting" + ]; + cfg = lib.attrsets.getAttrFromPath cfg_path config; +in +{ + options = + { } + // lib.attrsets.setAttrByPath cfg_path { + enable = lib.mkEnabledOption true "Reporting node and logs"; + }; + + config = lib.mkIf cfg.enable { + services.prometheus.exporters.node = { + enable = true; + port = 9100; + }; + + # Create necessary directories with appropriate permissions + systemd.tmpfiles.rules = [ + "d /tmp/positions 1777 - - -" # World-writable directory for positions file + "f /tmp/positions.yaml 0666 - - -" # World-writable positions file + ]; + users.groups.systemd-journal.members = [ "promtail" ]; + services.promtail = { + enable = true; + extraFlags = [ + "-config.expand-env=true" + ]; + configuration = { + server = { + http_listen_port = 9080; + grpc_listen_port = 0; + }; + positions = { + filename = "/tmp/positions.yaml"; # Changed from /var/lib/promtail/positions.yaml + }; + clients = [ + { + url = "http://100.64.0.13:3100/loki/api/v1/push"; # Points to your Loki instance + } + ]; + scrape_configs = [ + { + job_name = "journal"; + journal = { + json = false; + max_age = "12h"; + path = "/var/log/journal"; + labels = { + job = "systemd-journal"; + host = config.networking.hostName; + }; + }; + relabel_configs = [ + { + source_labels = [ "__journal__systemd_unit" ]; + target_label = "unit"; + } + ]; + } + ]; + }; + }; + }; +} From 5f363050c958a5f051e56ca799b76b0ff2a8abff Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 10:01:36 -0500 Subject: [PATCH 69/73] update option in reporting --- common/general/reporting.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/general/reporting.nix b/common/general/reporting.nix index 8042c3d..24fd48b 100644 --- a/common/general/reporting.nix +++ b/common/general/reporting.nix @@ -15,7 +15,12 @@ in options = { } // lib.attrsets.setAttrByPath cfg_path { - enable = lib.mkEnabledOption true "Reporting node and logs"; + enable = lib.mkEnableOption "Reporting node info and logs to grafana"; + lokiUrl = lib.mkOption { + type = lib.types.str; + default = "http://100.64.0.13:3100/loki/api/v1/push"; + description = "URL of the Loki instance to send logs to"; + }; }; config = lib.mkIf cfg.enable { @@ -45,7 +50,7 @@ in }; clients = [ { - url = "http://100.64.0.13:3100/loki/api/v1/push"; # Points to your Loki instance + url = cfg.lokiUrl; } ]; scrape_configs = [ From 2004734c7b7d77638874b63e147970199830c3fd Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 10:58:41 -0500 Subject: [PATCH 70/73] add reporting fix --- common/general/fonts.nix | 1 - common/general/reporting.nix | 3 +- hosts/lio/flake.lock | 122 ++++------------------------------- hosts/lio/flake.nix | 7 +- 4 files changed, 19 insertions(+), 114 deletions(-) diff --git a/common/general/fonts.nix b/common/general/fonts.nix index 1f7a238..3b58b08 100644 --- a/common/general/fonts.nix +++ b/common/general/fonts.nix @@ -33,7 +33,6 @@ in default = true; description = "Enable jetbrains mono font"; }; - }; config = lib.mkIf cfg.jetbrainsMonoFont { diff --git a/common/general/reporting.nix b/common/general/reporting.nix index 24fd48b..f769402 100644 --- a/common/general/reporting.nix +++ b/common/general/reporting.nix @@ -7,6 +7,7 @@ let ccfg = import ../config.nix; cfg_path = [ ccfg.custom_config_key + "general" "reporting" ]; cfg = lib.attrsets.getAttrFromPath cfg_path config; @@ -18,7 +19,7 @@ in enable = lib.mkEnableOption "Reporting node info and logs to grafana"; lokiUrl = lib.mkOption { type = lib.types.str; - default = "http://100.64.0.13:3100/loki/api/v1/push"; + default = "http://h001.net.joshuabell.xyz:3100/loki/api/v1/push"; description = "URL of the Loki instance to send logs to"; }; }; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index bf260a4..fa25b98 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -29,22 +29,17 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1750257055, - "narHash": "sha256-Fuyc23OIqNy+HkesAeqAWje0/yuuvJEjTQUpayA3iDw=", - "ref": "refs/heads/master", - "rev": "c04e866c3f604e4adc530c4a3c92a61fa9368386", - "revCount": 481, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } + "path": "../../common", + "type": "path" + }, + "parent": [] }, "crane": { "locked": { @@ -161,26 +156,6 @@ "type": "github" } }, - "nixarr": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "vpnconfinement": "vpnconfinement", - "website-builder": "website-builder" - }, - "locked": { - "lastModified": 1750367617, - "narHash": "sha256-1kz35TbeqhJMdo1s/WHidoUT64IuoKCGlngv5/JCHiw=", - "owner": "rasmus-kirk", - "repo": "nixarr", - "rev": "450d76583ae6ec025577bde7da2a38cfc7fb0510", - "type": "github" - }, - "original": { - "owner": "rasmus-kirk", - "repo": "nixarr", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1749024892, @@ -198,22 +173,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -229,29 +188,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1748662220, - "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { @@ -261,7 +204,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1750188666, "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", @@ -1177,7 +1120,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1197,14 +1140,13 @@ "root": { "inputs": { "common": "common", - "nixarr": "nixarr", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1349,42 +1291,6 @@ "repo": "default", "type": "github" } - }, - "vpnconfinement": { - "locked": { - "lastModified": 1743810720, - "narHash": "sha256-kbv/W4gizUSa6qH2rUQdgPj9AJaeN9k2XSWUYqj7IMU=", - "owner": "Maroka-chan", - "repo": "VPN-Confinement", - "rev": "74ae51e6d18b972ecc918ab43e8bde60c21a65d8", - "type": "github" - }, - "original": { - "owner": "Maroka-chan", - "repo": "VPN-Confinement", - "type": "github" - } - }, - "website-builder": { - "inputs": { - "nixpkgs": [ - "nixarr", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750317638, - "narHash": "sha256-B4RWcXXOLO6gMeYyV+K4olu+kGGsYamKH+JAm0cIXqI=", - "owner": "rasmus-kirk", - "repo": "website-builder", - "rev": "b54192000a00e865947f45bacf3184d56363ee38", - "type": "github" - }, - "original": { - "owner": "rasmus-kirk", - "repo": "website-builder", - "type": "github" - } } }, "root": "root", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 1082387..853d248 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -1,11 +1,10 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - # common.url = "path:../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -15,7 +14,6 @@ nixpkgs, common, ros_neovim, - nixarr, ... }@inputs: let @@ -60,6 +58,7 @@ boot.systemd.enable = true; secrets.enable = true; general = { + reporting.enable = true; disableRemoteBuildsOnLio = true; }; desktopEnvironment.gnome.enable = true; From ea9da15c3892981d02cc6a2fabd863dc940e5da5 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 10:59:43 -0500 Subject: [PATCH 71/73] update to use common ver --- hosts/lio/flake.lock | 43 ++++++++++++++++++++++++++++++++----------- hosts/lio/flake.nix | 4 ++-- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index fa25b98..6a5181b 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -29,17 +29,22 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "path": "../../common", - "type": "path" + "lastModified": 1750780721, + "narHash": "sha256-EgWdBolm8wPXY9iuTHPXykJiQRzSnfXzkCXpNooxEB8=", + "ref": "refs/heads/master", + "rev": "2004734c7b7d77638874b63e147970199830c3fd", + "revCount": 500, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -173,6 +178,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -188,7 +209,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1750622754, "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", @@ -204,7 +225,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1750188666, "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", @@ -1120,7 +1141,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1140,13 +1161,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 853d248..bd71054 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -3,8 +3,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # Use relative to get current version for testing - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; From c23d993f9f9f568fe5e0ac4d25763908017ba766 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 11:01:43 -0500 Subject: [PATCH 72/73] update h001 to use reporting from common --- hosts/h001/flake.lock | 8 ++--- hosts/h001/flake.nix | 3 ++ hosts/h001/mods/default.nix | 1 - hosts/h001/mods/reporting.nix | 58 ----------------------------------- 4 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 hosts/h001/mods/reporting.nix diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index e7e5257..987af3b 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -33,11 +33,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1750459395, - "narHash": "sha256-i6Khg4dcHXl6keWUW8vv7+aUAFdM+1rahFg59qx2xQ8=", + "lastModified": 1750780721, + "narHash": "sha256-EgWdBolm8wPXY9iuTHPXykJiQRzSnfXzkCXpNooxEB8=", "ref": "refs/heads/master", - "rev": "1b02f9ea95ec7e81a45ec40159991065856482b7", - "revCount": 489, + "rev": "2004734c7b7d77638874b63e147970199830c3fd", + "revCount": 500, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index 109440d..3f5c1ff 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -49,6 +49,9 @@ systemName = configuration_name; boot.systemd.enable = true; secrets.enable = true; + general = { + reporting.enable = true; + }; programs = { tailnet.enable = true; ssh.enable = true; diff --git a/hosts/h001/mods/default.nix b/hosts/h001/mods/default.nix index 5d1fb62..dbd2ac6 100644 --- a/hosts/h001/mods/default.nix +++ b/hosts/h001/mods/default.nix @@ -6,6 +6,5 @@ ./adguardhome.nix ./nixarr.nix ./monitoring.nix - ./reporting.nix ]; } diff --git a/hosts/h001/mods/reporting.nix b/hosts/h001/mods/reporting.nix deleted file mode 100644 index 7a9eadb..0000000 --- a/hosts/h001/mods/reporting.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - config, - ... -}: -{ - config = { - services.prometheus.exporters.node = { - enable = true; - port = 9100; - }; - # Create necessary directories with appropriate permissions - systemd.tmpfiles.rules = [ - "d /tmp/positions 1777 - - -" # World-writable directory for positions file - "f /tmp/positions.yaml 0666 - - -" # World-writable positions file - ]; - users.groups.systemd-journal.members = [ "promtail" ]; - services.promtail = { - enable = true; - extraFlags = [ - "-config.expand-env=true" - ]; - configuration = { - server = { - http_listen_port = 9080; - grpc_listen_port = 0; - }; - positions = { - filename = "/tmp/positions.yaml"; # Changed from /var/lib/promtail/positions.yaml - }; - clients = [ - { - url = "http://100.64.0.13:3100/loki/api/v1/push"; # Points to your Loki instance - } - ]; - scrape_configs = [ - { - job_name = "journal"; - journal = { - json = false; - max_age = "12h"; - path = "/var/log/journal"; - labels = { - job = "systemd-journal"; - host = config.networking.hostName; - }; - }; - relabel_configs = [ - { - source_labels = [ "__journal__systemd_unit" ]; - target_label = "unit"; - } - ]; - } - ]; - }; - }; - }; -} From a3be6f71fb0570f8e2ac60fd3f3ad436b8a6bf90 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 24 Jun 2025 11:11:00 -0500 Subject: [PATCH 73/73] update get from lio --- hosts/h001/mods/monitoring.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hosts/h001/mods/monitoring.nix b/hosts/h001/mods/monitoring.nix index cc2811e..cf4431a 100644 --- a/hosts/h001/mods/monitoring.nix +++ b/hosts/h001/mods/monitoring.nix @@ -11,13 +11,13 @@ job_name = "node"; static_configs = [ { - targets = [ "100.64.0.13:9100" ]; + targets = [ "localhost:9100" ]; labels.instance = config.networking.hostName; # h001 } - # { - # targets = [ "http://lio.net.joshuabell.xyz:9100" ]; - # labels.instance = "lio"; - # } + { + targets = [ "lio.net.joshuabell.xyz:9100" ]; + labels.instance = "lio"; + } ]; } ];