diff --git a/hosts/gpdPocket3/flake.lock b/hosts/gpdPocket3/flake.lock
index b5959f7..f2defaa 100644
--- a/hosts/gpdPocket3/flake.lock
+++ b/hosts/gpdPocket3/flake.lock
@@ -3,9 +3,9 @@
"agenix": {
"inputs": {
"darwin": "darwin",
- "home-manager": "home-manager",
+ "home-manager": "home-manager_2",
"nixpkgs": [
- "mod_common",
+ "mod_secrets",
"ragenix",
"nixpkgs"
],
@@ -35,15 +35,14 @@
"nixpkgs-stable": [
"mod_de_cosmic",
"nixpkgs-stable"
- ],
- "rust-overlay": "rust-overlay_2"
+ ]
},
"locked": {
- "lastModified": 1735781836,
- "narHash": "sha256-3QBrsbyM1DyyXruthYJVAiK7kijJP4Mx996q1NC5FWE=",
+ "lastModified": 1736513564,
+ "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
- "rev": "553e7a4b77c4ddf8ed700776f9d71982a14e23c4",
+ "rev": "0855bf33427209e4f5e3d2d0968a14784525e929",
"type": "github"
},
"original": {
@@ -70,7 +69,7 @@
"darwin": {
"inputs": {
"nixpkgs": [
- "mod_common",
+ "mod_secrets",
"ragenix",
"agenix",
"nixpkgs"
@@ -128,7 +127,29 @@
"home-manager": {
"inputs": {
"nixpkgs": [
- "mod_common",
+ "mod_home-manager",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1736373539,
+ "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+ "owner": "rycee",
+ "repo": "home-manager",
+ "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+ "type": "github"
+ },
+ "original": {
+ "owner": "rycee",
+ "ref": "release-24.11",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
+ "home-manager_2": {
+ "inputs": {
+ "nixpkgs": [
+ "mod_secrets",
"ragenix",
"agenix",
"nixpkgs"
@@ -148,28 +169,6 @@
"type": "github"
}
},
- "home-manager_2": {
- "inputs": {
- "nixpkgs": [
- "mod_home-manager",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1735344290,
- "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
- "owner": "rycee",
- "repo": "home-manager",
- "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
- "type": "github"
- },
- "original": {
- "owner": "rycee",
- "ref": "release-24.11",
- "repo": "home-manager",
- "type": "github"
- }
- },
"mod_boot_systemd": {
"locked": {
"lastModified": 1735793935,
@@ -190,15 +189,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
- ],
- "ragenix": "ragenix"
+ ]
},
"locked": {
- "lastModified": 1735795919,
- "narHash": "sha256-vreq5NKH6dCj9nAsR59KTHfT+i9SLDbtGbsEcv0Heuw=",
+ "lastModified": 1736544147,
+ "narHash": "sha256-WijrrGDuY8O0VUgsIbZK6PrvCMdgUGPex23hv1FmmHs=",
"ref": "mod_common",
- "rev": "b693858091a4a1e1135393b941ad16cbf21fa5fe",
- "revCount": 1,
+ "rev": "780bcb7c44a274e4128af656dafce6d26463d6b8",
+ "revCount": 6,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -219,11 +217,11 @@
]
},
"locked": {
- "lastModified": 1735839171,
- "narHash": "sha256-yXTT8Lwbsm2ujIeK8NiVb0YUdjPT//3NK8vhXd9x8KE=",
+ "lastModified": 1736544162,
+ "narHash": "sha256-C1pkQDar5XSdZtir3EfMWtW9gX3z8vaucGg800YzMvw=",
"ref": "mod_de_cosmic",
- "rev": "ce85513ec5b69279aed6859bc37c78c22e5e944f",
- "revCount": 2,
+ "rev": "6d8795b3c6ce2a640abe36801959e3af37d85a2e",
+ "revCount": 3,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -235,17 +233,17 @@
},
"mod_home-manager": {
"inputs": {
- "home-manager": "home-manager_2",
+ "home-manager": "home-manager",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1735796212,
- "narHash": "sha256-8aN/3ioMsr8IhBvo/Ym98bkFbHQ/4ODrww15W9b0i2g=",
+ "lastModified": 1736544172,
+ "narHash": "sha256-5Zp1Fg5A827aIjKrhtW84vvJmwRQqBHWzKButnaD14E=",
"ref": "mod_home_manager",
- "rev": "c3bcacb4ff5697c2f186c8d645c135356f68bc11",
- "revCount": 1,
+ "rev": "df0c4e95ac6b056202c4ec6fabfcfa5bd205a0b4",
+ "revCount": 2,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -276,11 +274,11 @@
"ringofstorms-stormd": "ringofstorms-stormd"
},
"locked": {
- "lastModified": 1735796563,
- "narHash": "sha256-YjXJu/5Hcl7YpcpiHLd5wqCFUlJp39MM9CfQKhdpkk8=",
+ "lastModified": 1736544199,
+ "narHash": "sha256-OWboCDCBHFy+PuWsFVShEqEaLEgVdZR98k9zrNIb+3s=",
"ref": "mod_stormd",
- "rev": "a184895fd3f32051499dfad8eb2cb18faaec4188",
- "revCount": 1,
+ "rev": "765c7f4436db03936960373ff77dc2d41f0c4cd5",
+ "revCount": 2,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -290,6 +288,25 @@
"url": "https://git.joshuabell.xyz/dotfiles"
}
},
+ "mod_secrets": {
+ "inputs": {
+ "ragenix": "ragenix"
+ },
+ "locked": {
+ "lastModified": 1736544189,
+ "narHash": "sha256-itFFi1SGZRdmREBhcDpuSD93bInq2Juoj3JQ7Q/oF+8=",
+ "ref": "mod_secrets",
+ "rev": "17777b25238d4cb84b903252c49c75bd7030a3f6",
+ "revCount": 8,
+ "type": "git",
+ "url": "https://git.joshuabell.xyz/dotfiles"
+ },
+ "original": {
+ "ref": "mod_secrets",
+ "type": "git",
+ "url": "https://git.joshuabell.xyz/dotfiles"
+ }
+ },
"nix-filter": {
"locked": {
"lastModified": 1710156097,
@@ -323,11 +340,27 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1735669367,
- "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
+ "lastModified": 1725634671,
+ "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+ "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1736200483,
+ "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github"
},
"original": {
@@ -337,18 +370,17 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
- "lastModified": 1735697839,
- "narHash": "sha256-0Acw0UaLi+VNThsmeX8zOKi000DFrYXNnrgpOpk2+MM=",
+ "lastModified": 1735854365,
+ "narHash": "sha256-pNb03vdsQmn0jS5dKAdx2DFZ2QH4RRvrIzZxqpfMcS8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5eaa5fdf06d2b15d373b82c0f3a1ec1c6cab02ae",
+ "rev": "cd9f495ef7584a714938915d3fe9327c2735d7e4",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "master",
"repo": "nixpkgs",
"type": "github"
}
@@ -1270,11 +1302,8 @@
"agenix": "agenix",
"crane": "crane",
"flake-utils": "flake-utils",
- "nixpkgs": [
- "mod_common",
- "nixpkgs"
- ],
- "rust-overlay": "rust-overlay"
+ "nixpkgs": "nixpkgs_2",
+ "rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1726755133,
@@ -1294,7 +1323,7 @@
"inputs": {
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs",
- "rust-overlay": "rust-overlay_3"
+ "rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1735420577,
@@ -1318,13 +1347,14 @@
"mod_home-manager": "mod_home-manager",
"mod_nebula": "mod_nebula",
"mod_ros_stormd": "mod_ros_stormd",
- "nixpkgs": "nixpkgs_2",
+ "mod_secrets": "mod_secrets",
+ "nixpkgs": "nixpkgs_3",
"ros_neovim": "ros_neovim"
}
},
"ros_neovim": {
"inputs": {
- "nixpkgs": "nixpkgs_3",
+ "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",
@@ -1382,14 +1412,14 @@
"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_4"
+ "rust-overlay": "rust-overlay_3"
},
"locked": {
- "lastModified": 1735841437,
- "narHash": "sha256-ZwmlaFhOlQ7f6Rq6VxRup7giPiwQlwe71HcoO/laRJo=",
+ "lastModified": 1735857201,
+ "narHash": "sha256-zyljmBv1FegF4kF2ZWdSdBCIktSHxJljPipwLOOyjrk=",
"ref": "refs/heads/master",
- "rev": "71d82c875fff85ae250804f45f1acf65f42cdc1e",
- "revCount": 253,
+ "rev": "31220281739c7b6432f3533313a0fa0164f232c0",
+ "revCount": 254,
"type": "git",
"url": "https://git.joshuabell.xyz/nvim"
},
@@ -1399,50 +1429,6 @@
}
},
"rust-overlay": {
- "inputs": {
- "nixpkgs": [
- "mod_common",
- "ragenix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1725675754,
- "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_2": {
- "inputs": {
- "nixpkgs": [
- "mod_de_cosmic",
- "cosmic",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1735698720,
- "narHash": "sha256-+skLL6mq/T7s6J5YmSp89ivQOHBPQ40GEU2n8yqp6bs=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "a00807363a8a6cae6c3fa84ff494bf9d96333674",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_3": {
"inputs": {
"nixpkgs": [
"mod_ros_stormd",
@@ -1464,7 +1450,29 @@
"type": "github"
}
},
- "rust-overlay_4": {
+ "rust-overlay_2": {
+ "inputs": {
+ "nixpkgs": [
+ "mod_secrets",
+ "ragenix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1725675754,
+ "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
+ "rust-overlay_3": {
"inputs": {
"nixpkgs": [
"ros_neovim",
diff --git a/hosts/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix
index 63af207..30576bf 100644
--- a/hosts/gpdPocket3/flake.nix
+++ b/hosts/gpdPocket3/flake.nix
@@ -5,6 +5,7 @@
ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
mod_common.inputs.nixpkgs.follows = "nixpkgs";
+ mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets";
mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd";
mod_de_cosmic.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_cosmic";
mod_de_cosmic.inputs.nixpkgs-stable.follows = "nixpkgs";
diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix
index 21d9483..34873e5 100644
--- a/hosts/linode/l002/nginx.nix
+++ b/hosts/linode/l002/nginx.nix
@@ -24,21 +24,6 @@
};
};
- virtualisation.oci-containers = {
- backend = "docker";
- # TODO remove test
- containers = {
- # Example of defining a container from the compose file
- "test_nginx" = {
- # autoStart = true; this is default true
- image = "nginx:latest";
- ports = [
- "127.0.0.1:8085:80"
- ];
- };
- };
- };
-
security.acme.acceptTerms = true;
security.acme.email = "admin@joshuabell.xyz";
services.nginx = {
@@ -104,20 +89,30 @@
"joshuabell.xyz" = {
enableACME = true;
forceSSL = true;
- locations."/" = {
- # 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.
-
-
- ';
- '';
+ 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.
+
+
+
+ ';
+ '';
+ };
};
};
diff --git a/hosts/linode/l004/flake.nix b/hosts/linode/l004/flake.nix
index 8f80c2f..d208e3c 100644
--- a/hosts/linode/l004/flake.nix
+++ b/hosts/linode/l004/flake.nix
@@ -26,7 +26,7 @@
"/run/agenix/nix2linode"
];
nodes.${configuration_name} = {
- hostname = "172.232.11.143";
+ hostname = "LINODE_IP_HERE_TODO";
profiles.system = {
user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configuration_name};
diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock
index 7139eaa..f2defaa 100644
--- a/hosts/lio/flake.lock
+++ b/hosts/lio/flake.lock
@@ -35,15 +35,14 @@
"nixpkgs-stable": [
"mod_de_cosmic",
"nixpkgs-stable"
- ],
- "rust-overlay": "rust-overlay"
+ ]
},
"locked": {
- "lastModified": 1736188510,
- "narHash": "sha256-9gUz9t43aPHHPNfSnqqb5R1ZLs4nd5DWFeJwJS4Y+L0=",
+ "lastModified": 1736513564,
+ "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
- "rev": "e127ad3374836982730aa094d2b3f7268c025b02",
+ "rev": "0855bf33427209e4f5e3d2d0968a14784525e929",
"type": "github"
},
"original": {
@@ -133,11 +132,11 @@
]
},
"locked": {
- "lastModified": 1735344290,
- "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+ "lastModified": 1736373539,
+ "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "rycee",
"repo": "home-manager",
- "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+ "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github"
},
"original": {
@@ -193,11 +192,11 @@
]
},
"locked": {
- "lastModified": 1736191002,
- "narHash": "sha256-t39PCeJFgIXzniqjUIIFnbv6AE15WyoPTCE3k3Xuyz0=",
+ "lastModified": 1736544147,
+ "narHash": "sha256-WijrrGDuY8O0VUgsIbZK6PrvCMdgUGPex23hv1FmmHs=",
"ref": "mod_common",
- "rev": "ac3c0c2422842edba1887279bddd02b895ec5ed2",
- "revCount": 4,
+ "rev": "780bcb7c44a274e4128af656dafce6d26463d6b8",
+ "revCount": 6,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -218,11 +217,11 @@
]
},
"locked": {
- "lastModified": 1735839171,
- "narHash": "sha256-yXTT8Lwbsm2ujIeK8NiVb0YUdjPT//3NK8vhXd9x8KE=",
+ "lastModified": 1736544162,
+ "narHash": "sha256-C1pkQDar5XSdZtir3EfMWtW9gX3z8vaucGg800YzMvw=",
"ref": "mod_de_cosmic",
- "rev": "ce85513ec5b69279aed6859bc37c78c22e5e944f",
- "revCount": 2,
+ "rev": "6d8795b3c6ce2a640abe36801959e3af37d85a2e",
+ "revCount": 3,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -240,11 +239,11 @@
]
},
"locked": {
- "lastModified": 1735796212,
- "narHash": "sha256-8aN/3ioMsr8IhBvo/Ym98bkFbHQ/4ODrww15W9b0i2g=",
+ "lastModified": 1736544172,
+ "narHash": "sha256-5Zp1Fg5A827aIjKrhtW84vvJmwRQqBHWzKButnaD14E=",
"ref": "mod_home_manager",
- "rev": "c3bcacb4ff5697c2f186c8d645c135356f68bc11",
- "revCount": 1,
+ "rev": "df0c4e95ac6b056202c4ec6fabfcfa5bd205a0b4",
+ "revCount": 2,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -275,11 +274,11 @@
"ringofstorms-stormd": "ringofstorms-stormd"
},
"locked": {
- "lastModified": 1735796563,
- "narHash": "sha256-YjXJu/5Hcl7YpcpiHLd5wqCFUlJp39MM9CfQKhdpkk8=",
+ "lastModified": 1736544199,
+ "narHash": "sha256-OWboCDCBHFy+PuWsFVShEqEaLEgVdZR98k9zrNIb+3s=",
"ref": "mod_stormd",
- "rev": "a184895fd3f32051499dfad8eb2cb18faaec4188",
- "revCount": 1,
+ "rev": "765c7f4436db03936960373ff77dc2d41f0c4cd5",
+ "revCount": 2,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -294,11 +293,11 @@
"ragenix": "ragenix"
},
"locked": {
- "lastModified": 1736491821,
- "narHash": "sha256-KGWlfhNd2mGLV4X6R7hZBnij9HjbccIWDN63M3wUZ8g=",
+ "lastModified": 1736544189,
+ "narHash": "sha256-itFFi1SGZRdmREBhcDpuSD93bInq2Juoj3JQ7Q/oF+8=",
"ref": "mod_secrets",
- "rev": "cb240dc1177f44b63e719abac5ea94a198f6dd13",
- "revCount": 7,
+ "rev": "17777b25238d4cb84b903252c49c75bd7030a3f6",
+ "revCount": 8,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -357,11 +356,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1736061677,
- "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
+ "lastModified": 1736200483,
+ "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
+ "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github"
},
"original": {
@@ -1304,7 +1303,7 @@
"crane": "crane",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2",
- "rust-overlay": "rust-overlay_3"
+ "rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1726755133,
@@ -1324,7 +1323,7 @@
"inputs": {
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs",
- "rust-overlay": "rust-overlay_2"
+ "rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1735420577,
@@ -1413,7 +1412,7 @@
"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_4"
+ "rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1735857201,
@@ -1430,28 +1429,6 @@
}
},
"rust-overlay": {
- "inputs": {
- "nixpkgs": [
- "mod_de_cosmic",
- "cosmic",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1736044260,
- "narHash": "sha256-DTAr0mAd8AZwWgRtU9ZZFPz3DwNeoH/Oi/1QMSqc9YQ=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "c8ed24cc104ebbc218d992e208131e9f024b69f0",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_2": {
"inputs": {
"nixpkgs": [
"mod_ros_stormd",
@@ -1473,7 +1450,7 @@
"type": "github"
}
},
- "rust-overlay_3": {
+ "rust-overlay_2": {
"inputs": {
"nixpkgs": [
"mod_secrets",
@@ -1495,7 +1472,7 @@
"type": "github"
}
},
- "rust-overlay_4": {
+ "rust-overlay_3": {
"inputs": {
"nixpkgs": [
"ros_neovim",
diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock
index 4188cb7..f2defaa 100644
--- a/hosts/oren/flake.lock
+++ b/hosts/oren/flake.lock
@@ -3,9 +3,9 @@
"agenix": {
"inputs": {
"darwin": "darwin",
- "home-manager": "home-manager",
+ "home-manager": "home-manager_2",
"nixpkgs": [
- "mod_common",
+ "mod_secrets",
"ragenix",
"nixpkgs"
],
@@ -35,15 +35,14 @@
"nixpkgs-stable": [
"mod_de_cosmic",
"nixpkgs-stable"
- ],
- "rust-overlay": "rust-overlay_2"
+ ]
},
"locked": {
- "lastModified": 1735781836,
- "narHash": "sha256-3QBrsbyM1DyyXruthYJVAiK7kijJP4Mx996q1NC5FWE=",
+ "lastModified": 1736513564,
+ "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
- "rev": "553e7a4b77c4ddf8ed700776f9d71982a14e23c4",
+ "rev": "0855bf33427209e4f5e3d2d0968a14784525e929",
"type": "github"
},
"original": {
@@ -70,7 +69,7 @@
"darwin": {
"inputs": {
"nixpkgs": [
- "mod_common",
+ "mod_secrets",
"ragenix",
"agenix",
"nixpkgs"
@@ -128,7 +127,29 @@
"home-manager": {
"inputs": {
"nixpkgs": [
- "mod_common",
+ "mod_home-manager",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1736373539,
+ "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+ "owner": "rycee",
+ "repo": "home-manager",
+ "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+ "type": "github"
+ },
+ "original": {
+ "owner": "rycee",
+ "ref": "release-24.11",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
+ "home-manager_2": {
+ "inputs": {
+ "nixpkgs": [
+ "mod_secrets",
"ragenix",
"agenix",
"nixpkgs"
@@ -148,28 +169,6 @@
"type": "github"
}
},
- "home-manager_2": {
- "inputs": {
- "nixpkgs": [
- "mod_home-manager",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1735344290,
- "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
- "owner": "rycee",
- "repo": "home-manager",
- "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
- "type": "github"
- },
- "original": {
- "owner": "rycee",
- "ref": "release-24.11",
- "repo": "home-manager",
- "type": "github"
- }
- },
"mod_boot_systemd": {
"locked": {
"lastModified": 1735793935,
@@ -190,15 +189,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
- ],
- "ragenix": "ragenix"
+ ]
},
"locked": {
- "lastModified": 1735795919,
- "narHash": "sha256-vreq5NKH6dCj9nAsR59KTHfT+i9SLDbtGbsEcv0Heuw=",
+ "lastModified": 1736544147,
+ "narHash": "sha256-WijrrGDuY8O0VUgsIbZK6PrvCMdgUGPex23hv1FmmHs=",
"ref": "mod_common",
- "rev": "b693858091a4a1e1135393b941ad16cbf21fa5fe",
- "revCount": 1,
+ "rev": "780bcb7c44a274e4128af656dafce6d26463d6b8",
+ "revCount": 6,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -219,11 +217,11 @@
]
},
"locked": {
- "lastModified": 1735839171,
- "narHash": "sha256-yXTT8Lwbsm2ujIeK8NiVb0YUdjPT//3NK8vhXd9x8KE=",
+ "lastModified": 1736544162,
+ "narHash": "sha256-C1pkQDar5XSdZtir3EfMWtW9gX3z8vaucGg800YzMvw=",
"ref": "mod_de_cosmic",
- "rev": "ce85513ec5b69279aed6859bc37c78c22e5e944f",
- "revCount": 2,
+ "rev": "6d8795b3c6ce2a640abe36801959e3af37d85a2e",
+ "revCount": 3,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -235,17 +233,17 @@
},
"mod_home-manager": {
"inputs": {
- "home-manager": "home-manager_2",
+ "home-manager": "home-manager",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1735796212,
- "narHash": "sha256-8aN/3ioMsr8IhBvo/Ym98bkFbHQ/4ODrww15W9b0i2g=",
+ "lastModified": 1736544172,
+ "narHash": "sha256-5Zp1Fg5A827aIjKrhtW84vvJmwRQqBHWzKButnaD14E=",
"ref": "mod_home_manager",
- "rev": "c3bcacb4ff5697c2f186c8d645c135356f68bc11",
- "revCount": 1,
+ "rev": "df0c4e95ac6b056202c4ec6fabfcfa5bd205a0b4",
+ "revCount": 2,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -271,35 +269,16 @@
"url": "https://git.joshuabell.xyz/dotfiles"
}
},
- "mod_ros_neovim": {
- "inputs": {
- "ringofstorms-nvim": "ringofstorms-nvim"
- },
- "locked": {
- "lastModified": 1735796481,
- "narHash": "sha256-DvenriWxmFoh/hJ0nxpTKEr4lzgD+exLPboN4CK8Zyk=",
- "ref": "mod_neovim",
- "rev": "311a994ebb87242d55b9f00eed0232aa5b4c51d8",
- "revCount": 1,
- "type": "git",
- "url": "https://git.joshuabell.xyz/dotfiles"
- },
- "original": {
- "ref": "mod_neovim",
- "type": "git",
- "url": "https://git.joshuabell.xyz/dotfiles"
- }
- },
"mod_ros_stormd": {
"inputs": {
"ringofstorms-stormd": "ringofstorms-stormd"
},
"locked": {
- "lastModified": 1735796563,
- "narHash": "sha256-YjXJu/5Hcl7YpcpiHLd5wqCFUlJp39MM9CfQKhdpkk8=",
+ "lastModified": 1736544199,
+ "narHash": "sha256-OWboCDCBHFy+PuWsFVShEqEaLEgVdZR98k9zrNIb+3s=",
"ref": "mod_stormd",
- "rev": "a184895fd3f32051499dfad8eb2cb18faaec4188",
- "revCount": 1,
+ "rev": "765c7f4436db03936960373ff77dc2d41f0c4cd5",
+ "revCount": 2,
"type": "git",
"url": "https://git.joshuabell.xyz/dotfiles"
},
@@ -309,6 +288,25 @@
"url": "https://git.joshuabell.xyz/dotfiles"
}
},
+ "mod_secrets": {
+ "inputs": {
+ "ragenix": "ragenix"
+ },
+ "locked": {
+ "lastModified": 1736544189,
+ "narHash": "sha256-itFFi1SGZRdmREBhcDpuSD93bInq2Juoj3JQ7Q/oF+8=",
+ "ref": "mod_secrets",
+ "rev": "17777b25238d4cb84b903252c49c75bd7030a3f6",
+ "revCount": 8,
+ "type": "git",
+ "url": "https://git.joshuabell.xyz/dotfiles"
+ },
+ "original": {
+ "ref": "mod_secrets",
+ "type": "git",
+ "url": "https://git.joshuabell.xyz/dotfiles"
+ }
+ },
"nix-filter": {
"locked": {
"lastModified": 1710156097,
@@ -325,38 +323,6 @@
}
},
"nixpkgs": {
- "locked": {
- "lastModified": 1735697839,
- "narHash": "sha256-0Acw0UaLi+VNThsmeX8zOKi000DFrYXNnrgpOpk2+MM=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "5eaa5fdf06d2b15d373b82c0f3a1ec1c6cab02ae",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "master",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1735531152,
- "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-24.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
"locked": {
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
@@ -372,13 +338,29 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_2": {
"locked": {
- "lastModified": 1735669367,
- "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
+ "lastModified": 1725634671,
+ "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+ "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1736200483,
+ "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github"
},
"original": {
@@ -388,6 +370,21 @@
"type": "github"
}
},
+ "nixpkgs_4": {
+ "locked": {
+ "lastModified": 1735854365,
+ "narHash": "sha256-pNb03vdsQmn0jS5dKAdx2DFZ2QH4RRvrIzZxqpfMcS8=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "cd9f495ef7584a714938915d3fe9327c2735d7e4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nvim_plugin-Almo7aya/openingh.nvim": {
"flake": false,
"locked": {
@@ -1305,11 +1302,8 @@
"agenix": "agenix",
"crane": "crane",
"flake-utils": "flake-utils",
- "nixpkgs": [
- "mod_common",
- "nixpkgs"
- ],
- "rust-overlay": "rust-overlay"
+ "nixpkgs": "nixpkgs_2",
+ "rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1726755133,
@@ -1325,10 +1319,42 @@
"type": "github"
}
},
- "ringofstorms-nvim": {
+ "ringofstorms-stormd": {
"inputs": {
+ "nix-filter": "nix-filter",
"nixpkgs": "nixpkgs",
- "nixpkgs-stable": "nixpkgs-stable",
+ "rust-overlay": "rust-overlay"
+ },
+ "locked": {
+ "lastModified": 1735420577,
+ "narHash": "sha256-2HWEALz0PVJCiP/2iZuDMj4qyukXR5IxNKFxT1NAMlQ=",
+ "ref": "refs/heads/master",
+ "rev": "7edf6888a460708889fabea2c762d4dfed4fa64f",
+ "revCount": 51,
+ "type": "git",
+ "url": "ssh://git.joshuabell.xyz:3032/stormd"
+ },
+ "original": {
+ "type": "git",
+ "url": "ssh://git.joshuabell.xyz:3032/stormd"
+ }
+ },
+ "root": {
+ "inputs": {
+ "mod_boot_systemd": "mod_boot_systemd",
+ "mod_common": "mod_common",
+ "mod_de_cosmic": "mod_de_cosmic",
+ "mod_home-manager": "mod_home-manager",
+ "mod_nebula": "mod_nebula",
+ "mod_ros_stormd": "mod_ros_stormd",
+ "mod_secrets": "mod_secrets",
+ "nixpkgs": "nixpkgs_3",
+ "ros_neovim": "ros_neovim"
+ }
+ },
+ "ros_neovim": {
+ "inputs": {
+ "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",
@@ -1389,11 +1415,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
- "lastModified": 1735698506,
- "narHash": "sha256-S1lVjc2wayhC50B4Wo3p958bTjd1kqiMSiWnc4hdWZg=",
+ "lastModified": 1735857201,
+ "narHash": "sha256-zyljmBv1FegF4kF2ZWdSdBCIktSHxJljPipwLOOyjrk=",
"ref": "refs/heads/master",
- "rev": "3d9d5258b72ea19863a53d6ac69e6dffc4ad2ba6",
- "revCount": 250,
+ "rev": "31220281739c7b6432f3533313a0fa0164f232c0",
+ "revCount": 254,
"type": "git",
"url": "https://git.joshuabell.xyz/nvim"
},
@@ -1402,42 +1428,32 @@
"url": "https://git.joshuabell.xyz/nvim"
}
},
- "ringofstorms-stormd": {
- "inputs": {
- "nix-filter": "nix-filter",
- "nixpkgs": "nixpkgs_2",
- "rust-overlay": "rust-overlay_4"
- },
- "locked": {
- "lastModified": 1735420577,
- "narHash": "sha256-2HWEALz0PVJCiP/2iZuDMj4qyukXR5IxNKFxT1NAMlQ=",
- "ref": "refs/heads/master",
- "rev": "7edf6888a460708889fabea2c762d4dfed4fa64f",
- "revCount": 51,
- "type": "git",
- "url": "ssh://git.joshuabell.xyz:3032/stormd"
- },
- "original": {
- "type": "git",
- "url": "ssh://git.joshuabell.xyz:3032/stormd"
- }
- },
- "root": {
- "inputs": {
- "mod_boot_systemd": "mod_boot_systemd",
- "mod_common": "mod_common",
- "mod_de_cosmic": "mod_de_cosmic",
- "mod_home-manager": "mod_home-manager",
- "mod_nebula": "mod_nebula",
- "mod_ros_neovim": "mod_ros_neovim",
- "mod_ros_stormd": "mod_ros_stormd",
- "nixpkgs": "nixpkgs_3"
- }
- },
"rust-overlay": {
"inputs": {
"nixpkgs": [
- "mod_common",
+ "mod_ros_stormd",
+ "ringofstorms-stormd",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1729218602,
+ "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
+ "rust-overlay_2": {
+ "inputs": {
+ "nixpkgs": [
+ "mod_secrets",
"ragenix",
"nixpkgs"
]
@@ -1456,33 +1472,10 @@
"type": "github"
}
},
- "rust-overlay_2": {
- "inputs": {
- "nixpkgs": [
- "mod_de_cosmic",
- "cosmic",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1735698720,
- "narHash": "sha256-+skLL6mq/T7s6J5YmSp89ivQOHBPQ40GEU2n8yqp6bs=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "a00807363a8a6cae6c3fa84ff494bf9d96333674",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
"rust-overlay_3": {
"inputs": {
"nixpkgs": [
- "mod_ros_neovim",
- "ringofstorms-nvim",
+ "ros_neovim",
"nixpkgs"
]
},
@@ -1500,28 +1493,6 @@
"type": "github"
}
},
- "rust-overlay_4": {
- "inputs": {
- "nixpkgs": [
- "mod_ros_stormd",
- "ringofstorms-stormd",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1729218602,
- "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
"systems": {
"locked": {
"lastModified": 1681028828,
diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix
index ef32243..768a09f 100644
--- a/hosts/oren/flake.nix
+++ b/hosts/oren/flake.nix
@@ -5,6 +5,7 @@
ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
mod_common.inputs.nixpkgs.follows = "nixpkgs";
+ mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets";
mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd";
mod_de_cosmic.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_cosmic";
mod_de_cosmic.inputs.nixpkgs-stable.follows = "nixpkgs";
@@ -77,12 +78,7 @@
google-chrome
discordo
discord
- # nautilus qimgv # file browsing (not needed in cosmic)
firefox-esr
- # freecad
- # ladybird
- # ollama
- # vlc
];
};
};
@@ -96,7 +92,6 @@
../../components/hm/atuin.nix
../../components/hm/direnv.nix
../../components/hm/git.nix
- # ../../components/hm/launcher_rofi.nix # not needed in cosmic
../../components/hm/nix_deprecations.nix
../../components/hm/postgres.nix
../../components/hm/ssh.nix
@@ -105,15 +100,6 @@
../../components/hm/zsh.nix
];
};
- # root = {
- # imports = [
- # ../../components/hm/nix_deprecations.nix
- # ../../components/hm/postgres.nix
- # ../../components/hm/starship.nix
- # ../../components/hm/zoxide.nix
- # ../../components/hm/zsh.nix
- # ];
- # };
};
};
};