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

nixos-remote cannot be declarative

Browse Source
This commit is contained in:
Nathan
2024-11-20 00:19:16 -06:00
parent 774b1f919b
commit b735069d4d
4 changed files with 52 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
flake.lock generated
View File

@@ -6,12 +6,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-La2gzBd7kakz/yi+6kKKI0KZ4ZyAo6xUxu1hh4RDc4E=", "narHash": "sha256-16SMbNTMTa+acgZVO0MihmuQonvLo4Oy24fSzNvBKLw=",
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/ags", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/ags",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/ags", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/ags",
"type": "path" "type": "path"
} }
}, },
@@ -234,12 +234,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-DZWjDSVV3HjKCT5htsKZvG9mP/R+hZjgXIbGOuILWmQ=", "narHash": "sha256-sdsD7OzeWyBdSRpf90GeDM/xCoNIdAVh1OsPnqLdlkU=",
"path": "/nix/store/xbg9cs794sn4xi7ly5k9g9sxwldpka7n-source/external", "path": "/nix/store/fzn4is98a0rrszcmm6vgz4f4j31sby2v-source/external",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/xbg9cs794sn4xi7ly5k9g9sxwldpka7n-source/external", "path": "/nix/store/fzn4is98a0rrszcmm6vgz4f4j31sby2v-source/external",
"type": "path" "type": "path"
} }
}, },
@@ -297,22 +297,6 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"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-compat_4": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -326,7 +310,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_5": { "flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@@ -816,12 +800,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-ScOcxr4PPYVMMQpTiNlmAOXBbfEtbU856EJBFLZU85o=", "narHash": "sha256-Np+6rlFj1UaiFZKO03Y3p8HaS9lXalRI8nhvwH6DqR8=",
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/hyprland", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/hyprland",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/hyprland", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/hyprland",
"type": "path" "type": "path"
} }
}, },
@@ -939,7 +923,7 @@
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"hyprutils": "hyprutils_2", "hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner_2", "hyprwayland-scanner": "hyprwayland-scanner_2",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_11",
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"systems": "systems_4", "systems": "systems_4",
"xdph": "xdph_2" "xdph": "xdph_2"
@@ -1218,12 +1202,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-0zgpI56FE6fRJczV2ZenMD1+MD/E3tC0TTeOWuH1F3M=", "narHash": "sha256-x2DMOqlM3gOvdADQhK+V7hzu0c3mTbD51RlaEV8Bt6U=",
"path": "/nix/store/2drwhlk76mg73wdd4p0dkwhkrs05518k-source/home-manager", "path": "/nix/store/gdns6vaa9267rnh9jk0068m5ihky86jk-source/home-manager",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/2drwhlk76mg73wdd4p0dkwhkrs05518k-source/home-manager", "path": "/nix/store/gdns6vaa9267rnh9jk0068m5ihky86jk-source/home-manager",
"type": "path" "type": "path"
} }
}, },
@@ -1378,22 +1362,6 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1727802920,
"narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1727634051, "lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
@@ -1409,7 +1377,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
@@ -1515,7 +1483,7 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@@ -1532,23 +1500,23 @@
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1731797254, "lastModified": 1727802920,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -1602,7 +1570,7 @@
"nixvim_3": { "nixvim_3": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_9",
"nixvim": "nixvim_4" "nixvim": "nixvim_4"
}, },
"locked": { "locked": {
@@ -1621,12 +1589,12 @@
"nixvim_4": { "nixvim_4": {
"inputs": { "inputs": {
"devshell": "devshell_2", "devshell": "devshell_2",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
"git-hooks": "git-hooks_2", "git-hooks": "git-hooks_2",
"home-manager": "home-manager_4", "home-manager": "home-manager_4",
"nix-darwin": "nix-darwin_2", "nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_10",
"nuschtosSearch": "nuschtosSearch_2", "nuschtosSearch": "nuschtosSearch_2",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
@@ -1700,12 +1668,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-Ep1A7GWxunbxUChvLZbqRR+Qa5Mtm4Stzvwm3gC7Yyo=", "narHash": "sha256-bdsn3cBMySV5RHcYNRe3gp7PWEv6Y8dg9EgLUQU+1os=",
"path": "/nix/store/qhd87dd6gpm23nl7igs0cz6s4dkqh48i-source/packages", "path": "/nix/store/d1fa3rq4v353qlfrg100sfgf15vzw532-source/packages",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/qhd87dd6gpm23nl7igs0cz6s4dkqh48i-source/packages", "path": "/nix/store/d1fa3rq4v353qlfrg100sfgf15vzw532-source/packages",
"type": "path" "type": "path"
} }
}, },
@@ -1738,7 +1706,7 @@
}, },
"pre-commit-hooks_2": { "pre-commit-hooks_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"gitignore": "gitignore_4", "gitignore": "gitignore_4",
"nixpkgs": [ "nixpkgs": [
"system", "system",
@@ -1773,12 +1741,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-GYHqnNSY4ZhThmb5fKFiRbkUbq8T39jyA2/XaZnd3MM=", "narHash": "sha256-iGN7t8xsMXG94DW9FGCzSADcOvyRf7sIVSKTVo4D5Js=",
"path": "/nix/store/qhd87dd6gpm23nl7igs0cz6s4dkqh48i-source/programs", "path": "/nix/store/d1fa3rq4v353qlfrg100sfgf15vzw532-source/programs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/qhd87dd6gpm23nl7igs0cz6s4dkqh48i-source/programs", "path": "/nix/store/d1fa3rq4v353qlfrg100sfgf15vzw532-source/programs",
"type": "path" "type": "path"
} }
}, },
@@ -1789,29 +1757,27 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=", "narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=",
"path": "/nix/store/bxijp9w1r8xww01rh8yqd183dwg276jc-source/programs", "path": "/nix/store/jbym5hn0m5331j90jf7qfg1p6x2hhcrc-source/programs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/bxijp9w1r8xww01rh8yqd183dwg276jc-source/programs", "path": "/nix/store/jbym5hn0m5331j90jf7qfg1p6x2hhcrc-source/programs",
"type": "path" "type": "path"
} }
}, },
"pywal": { "pywal": {
"inputs": { "inputs": {
"nixpkgs-us": "nixpkgs-us_2", "nixpkgs-us": "nixpkgs-us_2",
"spicetify-ext": "spicetify-ext",
"spicetify-nix": "spicetify-nix",
"themecord": "themecord" "themecord": "themecord"
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-IaE53iupxjNxOLruh+S5vGawCVdo7CaZscw0OpIh1wM=", "narHash": "sha256-BKq9hm1hSSkzD7574MRGl0bKi47iU44tvxhxjCIOEVw=",
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/pywal", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/pywal",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/pywal", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/pywal",
"type": "path" "type": "path"
} }
}, },
@@ -1835,11 +1801,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-TsMqdRC5Rsop/6ASLtAFJc0Spt9NI8iQBk6dXxJ8mYA=", "narHash": "sha256-TsMqdRC5Rsop/6ASLtAFJc0Spt9NI8iQBk6dXxJ8mYA=",
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/rofi", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/rofi",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/lwb5sbwmv6bg92mzrqm8mdm1hlkwhd7r-source/rofi", "path": "/nix/store/ncizvd4s9v31xbgba85pxswhxn2fisji-source/rofi",
"type": "path" "type": "path"
} }
}, },
@@ -1850,7 +1816,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"nathan": "nathan", "nathan": "nathan",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"nixvim": "nixvim_3", "nixvim": "nixvim_3",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"system": "system" "system": "system"
@@ -1863,11 +1829,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=", "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=",
"path": "/nix/store/bxijp9w1r8xww01rh8yqd183dwg276jc-source/services/sddm", "path": "/nix/store/jbym5hn0m5331j90jf7qfg1p6x2hhcrc-source/services/sddm",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/bxijp9w1r8xww01rh8yqd183dwg276jc-source/services/sddm", "path": "/nix/store/jbym5hn0m5331j90jf7qfg1p6x2hhcrc-source/services/sddm",
"type": "path" "type": "path"
} }
}, },
@@ -1891,41 +1857,6 @@
"type": "github" "type": "github"
} }
}, },
"spicetify-ext": {
"flake": false,
"locked": {
"lastModified": 1732049311,
"narHash": "sha256-Iod7aHgJwEfclCXmIvyzfS8Nu1fWHyKqHD7qzHjDH/4=",
"owner": "rxri",
"repo": "spicetify-extensions",
"rev": "c03b61c0f8adcf338f0f071046a8f2a20b2093ad",
"type": "github"
},
"original": {
"owner": "rxri",
"repo": "spicetify-extensions",
"type": "github"
}
},
"spicetify-nix": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1731989835,
"narHash": "sha256-Y1S+x2jWLQB9hn4aG04/213ZlTp+30itKe9KcSsrFgw=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "aac6c81489f61034916efa4ed62840dc1d72c413",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "spicetify-nix",
"type": "github"
}
},
"system": { "system": {
"inputs": { "inputs": {
"prgms": "prgms_2", "prgms": "prgms_2",
@@ -1933,12 +1864,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-SrF8Bj1QEmV3kLYg0V/L4ttQE4HLxpIAFQHO2Xbay1E=", "narHash": "sha256-C121ADg8KvQOdF2zGV70BCibR5sa7QXha/tUjmLG6P4=",
"path": "/nix/store/2drwhlk76mg73wdd4p0dkwhkrs05518k-source/system-config", "path": "/nix/store/gdns6vaa9267rnh9jk0068m5ihky86jk-source/system-config",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/2drwhlk76mg73wdd4p0dkwhkrs05518k-source/system-config", "path": "/nix/store/gdns6vaa9267rnh9jk0068m5ihky86jk-source/system-config",
"type": "path" "type": "path"
} }
}, },
@@ -2019,7 +1950,7 @@
}, },
"themecord": { "themecord": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1730423227, "lastModified": 1730423227,

12
home-manager/programs/pywal/flake.nix
View File

@@ -8,15 +8,15 @@
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
}; };
spicetify-nix = { /*spicetify-nix = {
url = "github:Gerg-L/spicetify-nix"; url = "github:Gerg-L/spicetify-nix";
#inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
}; };
spicetify-ext = { spicetify-ext = {
url = "github:rxri/spicetify-extensions"; url = "github:rxri/spicetify-extensions";
flake = false; flake = false;
}; };*/
nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -34,7 +34,7 @@
hmModule = { config, lib, pkgs, ... }:{ hmModule = { config, lib, pkgs, ... }:{
imports = [ imports = [
inputs.spicetify-nix.homeManagerModules.default #inputs.spicetify-nix.homeManagerModules.default
]; ];
options.homeconfig.wal.enable = lib.options.mkOption { options.homeconfig.wal.enable = lib.options.mkOption {
@@ -48,7 +48,7 @@
''; '';
in lib.mkIf config.homeconfig.wal.enable { in lib.mkIf config.homeconfig.wal.enable {
programs.spicetify = let /*programs.spicetify = let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
in { in {
enable = true; enable = true;
@@ -66,7 +66,7 @@
enabledCustomApps = with spicePkgs.apps; [ enabledCustomApps = with spicePkgs.apps; [
ncsVisualizer ncsVisualizer
]; ];
}; };*/
home.packages = with pkgs; [ home.packages = with pkgs; [

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

@@ -258,6 +258,7 @@
nextcloud.enable = true; nextcloud.enable = true;
gitlab.enable = true; gitlab.enable = true;
}; };
}; };
}; };

32
system-config/services/containers/nixos-remote/default.nix
View File

@@ -1,32 +0,0 @@
{ config, lib, pkgs, ... }: {
options.sysconfig.opts.virtualization.nixos-remote.enable = lib.options.mkOption {
type = lib.types.bool;
default = false;
};
config = lib.mkIf config.sysconfig.opts.virtualization.nixos-remote.enable {
containers.nixos-remote = {
ephemeral = true;
autoStart = false;
privateNetwork = true;
hostAddress = "192.168.100.10";
localAddress = "192.168.100.17";
extraFlags = [
"-U"
];
config = { config, lib, pkgs, ... }: {
users.users.nixos = {
isNormalUser = true;
extraGroups = [ "wheel" ];
initialPassword = "7567";
};
};
};
};
}