More changes

This commit is contained in:
Chris Josten 2020-05-14 23:37:19 +02:00
parent 44b011a6b4
commit 3db9423dc4
7 changed files with 128 additions and 45 deletions

View file

@ -3,6 +3,7 @@
{ {
imports = [ imports = [
./console.nix ./console.nix
./virt.nix
./users.nix ./users.nix
]; ];
} }

View file

@ -6,9 +6,14 @@
# General # General
git git
# C/C++ # C/C++
bison
gcc gcc
cmake cmake
gnumake
ninja
pkgconfig
qtcreator qtcreator
qt5.full
# Java # Java
gradle gradle

View file

@ -20,6 +20,7 @@
services.syncthing.enable = true; services.syncthing.enable = true;
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.gtkUsePortal = true;
# Input config # Input config
services.xserver = { services.xserver = {

View file

@ -1,4 +1,4 @@
{ pkgs, ...}: { pkgs, config, ...}:
{ {
environment = { environment = {
@ -17,19 +17,46 @@
plasma-nm plasma-nm
# KDE plasma and applications # KDE plasma and applications
kate #cuttlefish
discover
# Dependencies for discover
glib-networking
libsoup
# End
kdeApplications.akonadi
kdeApplications.ark
kdeApplications.filelight
kdeApplications.gwenview
kdeApplications.kate
kdeApplications.kdialog
kdeApplications.kmail
kdeApplications.kmail-account-wizard
kdeApplications.kmailtransport
kdeApplications.knotes
kdeApplications.kolourpaint
latte-dock # My PC has enough RAM by now latte-dock # My PC has enough RAM by now
kleopatra kdeApplications.kleopatra
networkmanager kdeApplications.korganizer
okular okular
packagekit
packagekit-qt
plasma-desktop plasma-desktop
plasma-integration plasma-integration
plasma5.xdg-desktop-portal-kde
sddm sddm
kdeApplications.spectacle
# To show of your distro # To show of your distro
neofetch neofetch
# Communication # Communication
tdesktop tdesktop
# Misc
networkmanager
qemu_kvm
virt-manager
]; ];
}; };
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
} }

View file

@ -3,7 +3,13 @@
{ {
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
docker-compose
file
imagemagick
lsb-release
neovim neovim
podman
podman-compose
tmux tmux
vim vim
]; ];

View file

@ -1,41 +0,0 @@
{ pkgs, ...}:
{
environment = {
systemPackages = with pkgs; [
# Internet
firefox
keepassxc
riot-desktop
syncthing
qsyncthingtray
# Wire(less) internet support
dnsmasq
hostapd
iw
plasma-nm
# KDE plasma and applications
kate
latte-dock # My PC has enough RAM by now
kleopatra
networkmanager
okular
plasma-desktop
plasma-integration
sddm
# To show of your distro
neofetch
# Communication
tdesktop
];
};
#packageOverrides = pkgs: rec {
#latte-dock = pkgs.latte-dock.override (attrs: {
# src = fetc
#};
#}
}

84
common/virt.nix Normal file
View file

@ -0,0 +1,84 @@
{ pkgs, ...}:
{
boot.kernelModules = ["kvm-intel"];
# virtualisation.libvirtd.enable = true;
# To map subuid and subguid for your user and allow rootless containers
users.users.chris.extraGroups = [ "docker" ];
virtualisation = {
docker = {
enable = true;
# Create a `docker` alias for podman, to use it as a drop-in replacement
#dockerCompat = true;
};
};
virtualisation.virtualbox.host.enable = true;
virtualisation.virtualbox.host.enableExtensionPack = true;
users.extraGroups.vboxusers.members = [ "chris" ];
# environment.systemPackages = with pkgs; [ podman runc conmon slirp4netns fuse-overlayfs ];
# users.users.chris.subUidRanges = [{ startUid = 100000; count = 65536; }];
# users.users.chris.subGidRanges = [{ startGid = 100000; count = 65536; }];
# environment.etc."containers/policy.json" = {
# mode="0644";
# text=''
# {
# "default": [
# {
# "type": "insecureAcceptAnything"
# }
# ],
# "transports":
# {
# "docker-daemon":
# {
# "": [{"type":"insecureAcceptAnything"}]
# }
# }
# }
# '';
# };
# environment.etc."containers/registries.conf" = {
# mode="0644";
# text=''
# [registries.search]
# registries = ['docker.io', 'quay.io']
# '';
# };
# environment.etc."cni/net.d/00-loopback.conf".text = ''
# {
# "cniVersion": "0.3.0",
# "type": "loopback"
# }
# '';
# environment.etc."cni/net.d/87-podman-bridge.conflist".text = ''
# {
# "cniVersion": "0.3.0",
# "name": "podman",
# "plugins": [
# {
# "type": "bridge",
# "bridge": "cni0",
# "isGateway": true,
# "ipMasq": true,
# "ipam": {
# "type": "host-local",
# "subnet": "10.88.0.0/16",
# "routes": [
# { "dst": "0.0.0.0/0" }
# ]
# }
# },
# {
# "type": "portmap",
# "capabilities": {
# "portMappings": true
# }
# }
# ]
# }
# '';
}