albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Test
Some checks failed
ssh-test / ssh-test (push) Failing after 23s
Details

Browse source
This commit is contained in:
iFargle 2023-12-11 19:52:52 +09:00
parent de1bad145b
commit 0057e4f804
5 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.nix
View file

@ -39,24 +39,18 @@
libx = import ./lib { inherit self inputs outputs stateVersion hmStateVersion; }; libx = import ./lib { inherit self inputs outputs stateVersion hmStateVersion; };
in { in {
nixosConfigurations = { nixosConfigurations = {
# Virtual osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small"; };
osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small"; }; nixos-vm-01 = libx.mkHost { hostname = "nixos-vm-01"; };
nixos-vm-01 = libx.mkHost { hostname = "nixos-vm-01"; };
# Physical
framework-server = libx.mkHost { hostname = "framework-server"; }; framework-server = libx.mkHost { hostname = "framework-server"; };
# nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; desktop = "gnome"; gpu = "nvidia"; };
nixos-framework = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd"; theme = "green"; }; nixos-framework = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd"; theme = "green"; };
nixos-rpi4-01 = libx.mkHost { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; }; nixos-rpi4-01 = libx.mkHost { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; };
nixos-rpi4-02 = libx.mkHost { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; }; nixos-rpi4-02 = libx.mkHost { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; };
nixos-rpi4-03 = libx.mkHost { hostname = "nixos-rpi4-03"; platform = "aarch64-linux"; }; nixos-rpi4-03 = libx.mkHost { hostname = "nixos-rpi4-03"; platform = "aarch64-linux"; };
}; };
homeConfigurations = { homeConfigurations = {
# Virtual "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; };
"albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; }; "albert@nixos-vm-01" = libx.mkHome { hostname = "nixos-vm-01"; };
"albert@nixos-vm-01" = libx.mkHome { hostname = "nixos-vm-01"; };
# Physical
"albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
# "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; };
"albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; }; "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; };
"albert@nixos-rpi4-01" = libx.mkHome { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; }; "albert@nixos-rpi4-01" = libx.mkHome { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; };
"albert@nixos-rpi4-02" = libx.mkHome { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; }; "albert@nixos-rpi4-02" = libx.mkHome { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; };
@ -69,12 +63,9 @@
nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; }; nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; };
}; };
deploy.nodes = { deploy.nodes = {
# Virtual
osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; }; osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; };
nixos-vm-01 = libx.deploy { hostname = "nixos-vm-01"; }; nixos-vm-01 = libx.deploy { hostname = "nixos-vm-01"; };
# Physical
framework-server = libx.deploy { hostname = "framework-server"; }; framework-server = libx.deploy { hostname = "framework-server"; };
# nixos-desktop = libx.deploy { hostname = "nixos-desktop"; };
nixos-framework = libx.deploy { hostname = "nixos-framework"; }; nixos-framework = libx.deploy { hostname = "nixos-framework"; };
nixos-rpi4-01 = libx.deploy { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; }; nixos-rpi4-01 = libx.deploy { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; };
nixos-rpi4-02 = libx.deploy { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; }; nixos-rpi4-02 = libx.deploy { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; };

5
lib/deploy-rs.nix
View file

@ -1,5 +0,0 @@
let deploy-rs-lock = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes.deploy-rs.locked;
in import (fetchTarball {
url = "https://github.com/serokell/deploy-rs/archive/${deploy-rs-lock.rev}.tar.gz";
sha256 = deploy-rs-lock.narHash;
})

5
lib/nixpkgs.nix
View file

@ -1,5 +0,0 @@
let nixpkgs-lock = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes.nixpkgs.locked;
in import (fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${nixpkgs-lock.rev}.tar.gz";
sha256 = nixpkgs-lock.narHash;
})

5
lib/sops-nix.nix
View file

@ -1,5 +0,0 @@
let sops-nix-lock = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes.sops-nix.locked;
in import (fetchTarball {
url = "https://github.com/Mic92/sops-nix/archive/${sops-nix-lock.rev}.tar.gz";
sha256 = sops-nix-lock.narHash;
})

7
nixos/hosts/framework-server/default.nix
View file

@ -1,8 +1,7 @@
{ inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: { { inputs, config, lib, pkgs, modulesPath, desktop, username, platform, ... }: {
imports = [ imports = [
# inputs.nixos-hardware.nixosModules.framework-13-inch-13th-gen-intel # inputs.nixos-hardware.nixosModules.framework-13-inch-13th-gen-intel
inputs.nixos-hardware.nixosModules.framework-13th-gen-intel inputs.nixos-hardware.nixosModules.framework-13th-gen-intel
inputs.deploy-rs.deploy-rs
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
./disks.nix ./disks.nix
../../common/modules/secureboot.nix ../../common/modules/secureboot.nix
@ -15,6 +14,10 @@
./cron.nix ./cron.nix
] ++ lib.optional (builtins.isString desktop) ./rdesktop.nix; ] ++ lib.optional (builtins.isString desktop) ./rdesktop.nix;
environment.systemPackages = [
inputs.deploy-rs.packages.${platform}.deploy-rs
];
# steam , etc # steam , etc
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;