Skip to content

Commit f265bdc

Browse files
committed
WIP : rpi deployment
1 parent bfa8543 commit f265bdc

17 files changed

+725
-24
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ home-manager/hspecter/*-vpn
22
home-manager/hspecter/result
33
hspecter/wg*
44
hspecter/smb-secrets
5-
result
5+
result
6+
llitt/peers

home-manager/desktop-packages.nix

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{ pkgs, unstable, ... }:
2+
let
3+
unstable = import ../unstable.nix { config.allowUnfree = true; };
4+
in
25
{
3-
packages = with pkgs; [
6+
home.packages = with pkgs; [
47
# Dependencies
58
feh
69
unstable.flameshot

home-manager/home.nix

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ in
3636
maxCacheTtl = 7200;
3737
};
3838

39+
40+
3941
};
4042

4143

home-manager/hspecter/default.nix

+6-11
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,10 @@ in
1010
imports = [
1111
../home.nix
1212
../battery.nix
13+
./packages.nix
14+
../desktop-packages.nix
1315
];
1416

15-
home = {
16-
packages = lib.mkMerge [ (import ../desktop-packages.nix { inherit pkgs unstable; }).packages (import ./packages.nix { inherit pkgs unstable; }).packages ];
17-
18-
# sessionVariables = {
19-
# LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib:\${LD_LIBRARY_PATH}";
20-
# };
21-
};
2217

2318

2419
xsession.windowManager.i3 = import ../i3.nix { inherit pkgs lib; };
@@ -40,14 +35,14 @@ in
4035

4136

4237
fish = {
43-
shellAbbrs = lib.mkMerge [
38+
shellAbbrs =
4439
{
4540
deletec = "sudo openfortivpn -c /home/tchekda/nixos-configuration/home-manager/hspecter/deletec-vpn";
4641
ambition = "sudo openfortivpn -c /home/tchekda/nixos-configuration/home-manager/hspecter/ambition-vpn";
4742
nrs = "sudo nixos-rebuild -I \"nixos-config=/home/tchekda/nixos-configuration/hspecter/configuration.nix\" switch";
48-
hms = "home-manager -f /home/tchekda/nixos-configuration/home-manager/home.nix switch";
49-
}
50-
];
43+
hms = "home-manager -f /home/tchekda/nixos-configuration/home-manager/hspecter/default.nix switch";
44+
};
45+
5146
};
5247

5348

home-manager/hspecter/packages.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, unstable, ... }:
1+
{ pkgs, unstable, config, ... }:
22
let
33
curstomPHP8 = pkgs.php80.buildEnv {
44
extraConfig =
@@ -7,10 +7,11 @@ let
77
extensions = { enabled, all }: enabled ++ [ all.xdebug ];
88
};
99
m68k = pkgs.qt5.callPackage ./m68k.nix { };
10+
unstable = import ../../unstable.nix { config.allowUnfree = true; };
1011

1112
in
1213
{
13-
packages = with pkgs; [
14+
home.packages = with pkgs; [
1415
# Dev
1516
openfortivpn
1617
python39Packages.autopep8
@@ -39,7 +40,7 @@ in
3940
zoom-us
4041
evince
4142
filezilla
42-
nixops
43+
nixopsUnstable
4344

4445
# Virtualisation
4546
virt-manager

home-manager/llitt/default.nix

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{ ... }:
2+
3+
{
4+
imports = [ ../home.nix ];
5+
6+
}

hspecter/configuration.nix

+10-7
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ in
4545
kernelModules = [ "amdgpu" ];
4646
availableKernelModules = [ "thinkpad_acpi" ];
4747
};
48+
49+
binfmt.emulatedSystems = [ "aarch64-linux" ];
4850
};
4951

5052
fileSystems."/mnt/fbx" = {
@@ -226,13 +228,14 @@ in
226228
}
227229
];
228230
levels = [
229-
[ 0 0 55 ]
230-
[ 1 50 60 ]
231-
[ 2 55 65 ]
232-
[ 3 60 70 ]
233-
[ 6 65 75 ]
234-
[ 7 70 80 ]
235-
[ "level full-speed" 75 32767 ]
231+
[ "level auto" 0 32767 ]
232+
# [ 0 0 55 ]
233+
# [ 1 50 60 ]
234+
# [ 2 55 65 ]
235+
# [ 3 60 70 ]
236+
# [ 6 65 75 ]
237+
# [ 7 70 80 ]
238+
# [ "level full-speed" 75 32767 ]
236239
];
237240
};
238241

iso.nix

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=iso.nix
2+
3+
{ config, pkgs, ... }:
4+
{
5+
imports = [
6+
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
7+
8+
# Provide an initial copy of the NixOS channel so that the user
9+
# doesn't need to run "nix-channel --update" first.
10+
<nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
11+
./tchekda_user.nix
12+
];
13+
14+
boot.kernelPackages = pkgs.linuxPackages_latest;
15+
16+
time.timeZone = "Europe/Paris";
17+
18+
networking = {
19+
hostName = "iso";
20+
21+
dhcpcd.enable = true;
22+
23+
firewall.enable = false;
24+
};
25+
26+
environment.systemPackages = with pkgs; [
27+
wget
28+
nano
29+
git
30+
htop
31+
lnav
32+
];
33+
34+
systemd.services.sshd.wantedBy = pkgs.lib.mkForce [ "multi-user.target" ];
35+
users.users.root.openssh.authorizedKeys.keys = [
36+
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAavYBAIwKDDixRTBJbSHMpkCeN6OMfAMoypSVdYAgpY3OILAUj/HoIJp1uIiKlxJ+v4gLDPjaPWmPPiOW2O4EEiCTEV22DlhcFQZs7DY1Pf7WQnUW1g4PI35LUEWlBOghnB+D11ltU5odTBPVgu1HxNX6pbE1r2MLvox8xt+PHkqXvaPDX7QGPBuAAusK8trEUROObc6+umHPH1VeTK7H810kSGDy1JVPQgK28byh/yJcoHL53XGZ+nCYiuZVFfPmLofPP+LGzulGT2TwNcUiAA8Wv7skSNUdjzXJ4KRZlqIsYiey1vx0hq3+whfC3vLwMBvz90v0HTW+xtEnX4vqR4SeFfRaLpUXpY8rceICgo3XnBQyn/2NNpmbRIJWowK0ENA58psbxo4Z+2qa0is3XLvVc2yqcdd2dLRr+gk3qwEIRcY1m+oGw2u4kv4RkTvboVPTdQozUcTB5EfLKRPB3DnVwULIYbt3QJ5CnW+v+PqinHc2vmAeUaKOEwfufdE= tchekda@hspecter"
37+
];
38+
}

0 commit comments

Comments
 (0)