Move desktop module into sbc-deploys
This commit is contained in:
parent
3ab62e38f3
commit
569734690b
3 changed files with 69 additions and 4 deletions
|
@ -152,11 +152,11 @@
|
||||||
"rockchip": "rockchip"
|
"rockchip": "rockchip"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686167917,
|
"lastModified": 1686175220,
|
||||||
"narHash": "sha256-yZRKsPjV1pRe4fxMI/OKd9BLkBNzx3I5TSZaPux9X9s=",
|
"narHash": "sha256-+jdhbkTLmvf2ZCwFjlvZXCHg7fR4v4G+eM0KubQ5x2c=",
|
||||||
"ref": "asonix/nabam-sd-image",
|
"ref": "asonix/nabam-sd-image",
|
||||||
"rev": "f606e4ebc4e7f4cc898b37fbc27079546ea6ea1d",
|
"rev": "b0eda5c0d9e84a9cf81e164b83c24104b9096fa7",
|
||||||
"revCount": 39,
|
"revCount": 41,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.asonix.dog/asonix/sd-images"
|
"url": "https://git.asonix.dog/asonix/sd-images"
|
||||||
},
|
},
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
k3sModule = import ./modules/k3s;
|
k3sModule = import ./modules/k3s;
|
||||||
networkModule = import ./modules/network;
|
networkModule = import ./modules/network;
|
||||||
wireguardModule = import ./modules/wireguard;
|
wireguardModule = import ./modules/wireguard;
|
||||||
|
desktopModule = import ./modules/desktop;
|
||||||
|
|
||||||
makeConfig = { hostname, extraModules ? [ ] }:
|
makeConfig = { hostname, extraModules ? [ ] }:
|
||||||
nixpkgs.lib.nixosSystem {
|
nixpkgs.lib.nixosSystem {
|
||||||
|
@ -899,6 +900,7 @@
|
||||||
address = "192.168.5.13/24";
|
address = "192.168.5.13/24";
|
||||||
privateKeyFile = config.sops.secrets.pinetabWireguardKey.path;
|
privateKeyFile = config.sops.secrets.pinetabWireguardKey.path;
|
||||||
})
|
})
|
||||||
|
(desktopModule)
|
||||||
] ++ sd-images.packages.${system}.PineTab2.modules;
|
] ++ sd-images.packages.${system}.PineTab2.modules;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
63
modules/desktop/default.nix
Normal file
63
modules/desktop/default.nix
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
users.users.asonix = {
|
||||||
|
extraGroups = [ "networkmanager" ];
|
||||||
|
shell = pkgs.zsh;
|
||||||
|
};
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
services = {
|
||||||
|
xserver = {
|
||||||
|
layout = "us";
|
||||||
|
xkbVariant = "";
|
||||||
|
enable = true;
|
||||||
|
desktopManager.gnome.enable = true;
|
||||||
|
displayManager.gdm.enable = true;
|
||||||
|
};
|
||||||
|
flatpak.enable = true;
|
||||||
|
printing.enable = true;
|
||||||
|
avahi = {
|
||||||
|
enable = true;
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
|
pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa = {
|
||||||
|
enable = true;
|
||||||
|
support32Bit = true;
|
||||||
|
};
|
||||||
|
pulse.enable = true;
|
||||||
|
jack.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
programs = {
|
||||||
|
dconf.enable = true;
|
||||||
|
zsh.enable = true;
|
||||||
|
};
|
||||||
|
sound.enable = true;
|
||||||
|
hardware.pulseaudio.enable = false;
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
android-tools
|
||||||
|
firefox
|
||||||
|
git
|
||||||
|
vim
|
||||||
|
zsh
|
||||||
|
|
||||||
|
gnomeExtensions.improved-osk
|
||||||
|
gnomeExtensions.fullscreen-on-new-workspace
|
||||||
|
gnomeExtensions.gesture-improvements
|
||||||
|
|
||||||
|
usbutils
|
||||||
|
pciutils
|
||||||
|
wireguard-tools
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.sessionVariables = {
|
||||||
|
MOZ_ENABLE_WAYLAND = "1";
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.hostName = "pinetab2";
|
||||||
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
}
|
Loading…
Reference in a new issue