Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "switch back to external sources due to homebox git instability"

Browse Source 
This reverts commit 27ab9e27fa.
This commit is contained in:
Nathan
2025-01-15 15:38:20 -06:00
parent 9c9f323424
commit be0a270574
3 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
flake.lock generated
View File

@@ -342,16 +342,16 @@
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1736373539,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community", "ref": "release-24.11",
"repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github" "revCount": 3879,
"type": "git",
"url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager"
}, },
"original": { "original": {
"owner": "nix-community",
"ref": "release-24.11", "ref": "release-24.11",
"repo": "home-manager", "type": "git",
"type": "github" "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager"
} }
}, },
"home-manager_2": { "home-manager_2": {
@@ -457,12 +457,12 @@
"revCount": 5672, "revCount": 5672,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland"
}, },
"original": { "original": {
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland"
} }
}, },
"hyprland-protocols": { "hyprland-protocols": {
@@ -717,16 +717,16 @@
"locked": { "locked": {
"lastModified": 1736798957, "lastModified": 1736798957,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "nixos", "ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github" "revCount": 737779,
"type": "git",
"url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs"
}, },
"original": { "original": {
"owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "type": "git",
"type": "github" "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
@@ -765,16 +765,16 @@
"locked": { "locked": {
"lastModified": 1736867362, "lastModified": 1736867362,
"narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
"owner": "nixos", "ref": "nixos-24.11",
"repo": "nixpkgs",
"rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
"type": "github" "revCount": 713159,
"type": "git",
"url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs"
}, },
"original": { "original": {
"owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-24.11",
"repo": "nixpkgs", "type": "git",
"type": "github" "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
@@ -822,11 +822,11 @@
"rev": "7521112f1a19d7c2d90b810f469d7a5920e2f642", "rev": "7521112f1a19d7c2d90b810f469d7a5920e2f642",
"revCount": 8, "revCount": 8,
"type": "git", "type": "git",
"url": "ssh://gitea@192.168.100.20/Blunkall-Technologies/Moirai" "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "ssh://gitea@192.168.100.20/Blunkall-Technologies/Moirai" "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
} }
}, },
"nixvim_2": { "nixvim_2": {

18
flake.nix
View File

@@ -2,11 +2,11 @@
description = "Nixos config flake"; description = "Nixos config flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; #nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
#nixpkgs.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.11"; nixpkgs.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.11";
nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable"; #nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
#nixpkgs-us.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-unstable"; nixpkgs-us.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-unstable";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
@@ -21,8 +21,8 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; #url = "github:nix-community/home-manager/release-24.11";
#url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11"; url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -35,8 +35,8 @@
#simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; #hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
#hyprland.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland?submodules=1"; hyprland.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland?submodules=1";
tokyo-night-sddm = { tokyo-night-sddm = {
url = "github:siddrs/tokyo-night-sddm"; url = "github:siddrs/tokyo-night-sddm";
@@ -48,7 +48,7 @@
flake = false; flake = false;
}; };
nixvim.url = "git+ssh://gitea@192.168.100.20/Blunkall-Technologies/Moirai"; nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai";
ags.url = "github:Aylur/ags/v1"; ags.url = "github:Aylur/ags/v1";

1
system-config/configuration/homebox/default.nix
View File

@@ -94,7 +94,6 @@
firewall.interfaces."ve-traefik".allowedTCPPorts = [ 9000 8080 6080 8123 ]; firewall.interfaces."ve-traefik".allowedTCPPorts = [ 9000 8080 6080 8123 ];
hosts = { hosts = {
"192.168.100.11" = [ "blunkall.us" "*.blunkall.us" "*.local.blunkall.us" ]; "192.168.100.11" = [ "blunkall.us" "*.blunkall.us" "*.local.blunkall.us" ];
"192.168.100.20" = [ "gitea.blunkall.us" ];
}; };
nftables = {}; nftables = {};
nat = { nat = {