Compare commits

..

No commits in common. "9992039edbc4c25d2af9aa555f6465acdd750cfd" and "f52e880b4cc06565716873541fb51e6cf82dd32e" have entirely different histories.

6 changed files with 5 additions and 138 deletions

View File

@ -1,4 +1,4 @@
{ inputs, pkgs, ... }:
{ inputs, ... }:
{
# State version
@ -24,14 +24,6 @@
};
};
# TODO: Remove once laptop is properly integrated into domain
programs.ssh = {
package = pkgs.openssh_gssapi;
extraConfig = ''
GSSAPIAuthentication yes
'';
};
# Enable virtualisation for VMs
virtualisation.libvirtd.enable = true;
@ -42,17 +34,12 @@
usbmon.enable = true;
};
# Enable Nix-LD
programs.nix-ld = {
enable = true;
};
# Set up wstunnel client
services.wstunnel = {
enable = true;
clients.wg-tunnel = {
connectTo = "wss://tunnel.bulthuis.dev:443";
settings.local-to-remote = [
localToRemote = [
"udp://51820:10.10.40.100:51820"
];
};

View File

@ -15,7 +15,7 @@ in
};
config = mkIf cfg.enable {
# TODO: Enable extensions (declaratively) with dconf
# TODO: Enable extensions with dconf
home.pointerCursor = {
name = "capitaine-cursors";
@ -50,30 +50,18 @@ in
file-roller
mission-center
dconf-editor
gnome-calendar
# For theming gtk3
adw-gtk3
# More icons
morewaita-icon-theme
]
++ (with pkgs.gnomeExtensions; [
gsconnect
disable-workspace-animation
wallpaper-slideshow
media-progress
# luminus-desktop
]);
# Set up gnome terminal as changing the default terminal is a pain
programs.gnome-terminal = {
enable = true;
profile."12d2da79-b36c-43d5-8e1f-cf70907b84b3" = {
visibleName = "Default";
default = true;
};
};
# Enable and set the gtk themes
gtk = {
enable = true;

View File

@ -1,42 +0,0 @@
{
lib,
config,
pkgs,
...
}:
with lib;
let
cfg = config.modules.go;
in
{
options.modules.go = {
enable = mkEnableOption "go";
};
config = mkIf cfg.enable {
# Development packages
home.packages = with pkgs; [
];
# VSCode configuration
programs.vscode = {
profiles.default = {
extensions = with pkgs.vscode-extensions; [
golang.go
];
userSettings = {
};
};
};
# Neovim configuration
# programs.nixvim = {
# plugins.rustaceanvim = {
# enable = true;
# };
# };
};
}

View File

@ -28,6 +28,7 @@ in
gnome-backgrounds
gnome-bluetooth
gnome-color-manager
gnome-control-center
gnome-shell-extensions
gnome-tour
gnome-user-docs

View File

@ -1,65 +0,0 @@
{
disko.devices = {
disk = {
main = {
type = "disk";
device = "/dev/sda"; # How do I handle this for laptops
imageSize = "64G"; # For test VMs
content = {
type = "gpt";
partitions = {
boot = {
size = "512M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
zfs = {
end = "-16G";
content = {
type = "zfs";
pool = "tank";
};
};
swap = {
size = "100%";
content = {
type = "swap";
discardPolicy = "both";
};
};
};
};
};
};
zpool = {
tank = {
type = "zpool";
rootFsOptions = {
compression = "zstd";
};
mountpoint = null;
postCreateHook = "zfs snapshot -r tank@blank && zfs hold -r blank tank@blank";
datasets = {
root = {
type = "zfs_fs";
mountpoint = "/";
};
nix = {
type = "zfs_fs";
mountpoint = "/nix";
};
persist = {
type = "zfs_fs";
mountpoint = "/persist";
};
};
};
};
};
}

View File

@ -41,7 +41,6 @@ in
obsidian
devenv
kicad
vlc
];
modules = {
@ -86,7 +85,6 @@ in
cpp.enable = true;
tex.enable = true;
jupyter.enable = false;
go.enable = true;
};
};
}