adds packages per hostname
adds unstable nixpkgs for vscode, docker, go and ollama updates tilingshell layouts
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
# Default applications
|
||||
xdg.mimeApps = {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ ... }:
|
||||
|
||||
let
|
||||
files = builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ];
|
||||
|
@ -137,7 +137,7 @@
|
||||
layouts-json = ''
|
||||
[
|
||||
{
|
||||
"id": "Layout 1",
|
||||
"id": "Landscape Ultrawide",
|
||||
"tiles": [
|
||||
{ "x": 0, "y": 0, "width": 0.22, "height": 0.5, "groups": [1, 2] },
|
||||
{ "x": 0, "y": 0.5, "width": 0.22, "height": 0.5, "groups": [1, 2] },
|
||||
@ -147,46 +147,20 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "Layout 2",
|
||||
"tiles": [
|
||||
{ "x": 0, "y": 0, "width": 0.22, "height": 1, "groups": [1] },
|
||||
{ "x": 0.22, "y": 0, "width": 0.56, "height": 1, "groups": [1, 2] },
|
||||
{ "x": 0.78, "y": 0, "width": 0.22, "height": 1, "groups": [2] }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "Layout 3",
|
||||
"tiles": [
|
||||
{ "x": 0, "y": 0, "width": 0.33, "height": 1, "groups": [1] },
|
||||
{ "x": 0.33, "y": 0, "width": 0.67, "height": 1, "groups": [1] }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "Layout 4",
|
||||
"tiles": [
|
||||
{ "x": 0, "y": 0, "width": 0.67, "height": 1, "groups": [1] },
|
||||
{ "x": 0.67, "y": 0, "width": 0.33, "height": 1, "groups": [1] }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "Portrait Layout",
|
||||
"id": "Portrait Ultrawide",
|
||||
"tiles": [
|
||||
{ "x": 0, "y": 0, "width": 1, "height": 0.25, "groups": [1] },
|
||||
{ "x": 0, "y": 0.25, "width": 1, "height": 0.5, "groups": [1, 2] },
|
||||
{
|
||||
"x": 0,
|
||||
"y": 0.75,
|
||||
"width": 0.50,
|
||||
"height": 0.25,
|
||||
"groups": [2, 3]
|
||||
},
|
||||
{
|
||||
"x": 0.50,
|
||||
"y": 0.75,
|
||||
"width": 0.50,
|
||||
"height": 0.25,
|
||||
"groups": [2, 3]
|
||||
}
|
||||
{ "x": 0, "y": 0.75, "width": 0.5, "height": 0.25, "groups": [2, 3] },
|
||||
{ "x": 0.5, "y": 0.75, "width": 0.5, "height": 0.25, "groups": [2, 3] }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "Landscape Laptop",
|
||||
"tiles": [
|
||||
{ "x": 0, "y": 0, "width": 0.33, "height": 0.5, "groups": [1, 2] },
|
||||
{ "x": 0.33, "y": 0, "width": 0.67, "height": 1, "groups": [1] },
|
||||
{ "x": 0, "y": 0.5, "width": 0.33, "height": 0.5, "groups": [2, 1] }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
37
config/home-manager/workstation/wireguard.nix
Normal file
37
config/home-manager/workstation/wireguard.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
# Enable NetworkManager with Wireguard support
|
||||
networking = {
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
plugins = with pkgs; [
|
||||
networkmanager-vpnc
|
||||
networkmanager-openvpn
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# Add NetworkManager connection profiles
|
||||
environment.etc."NetworkManager/system-connections/work-vpn.nmconnection".source = "${config.home.homeDirectory}/dotfiles/secrets/wireguard/work.wg0.conf";
|
||||
|
||||
# Ensure NetworkManager Wireguard support is installed
|
||||
environment.systemPackages = with pkgs; [
|
||||
networkmanager-wireguard
|
||||
wireguard-tools
|
||||
];
|
||||
|
||||
# Add a systemd service to set proper permissions and reload NetworkManager connections
|
||||
systemd.services.reload-networkmanager-connections = {
|
||||
description = "Set permissions and reload NetworkManager Connections";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "NetworkManager.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = pkgs.writeShellScript "reload-nm-connections" ''
|
||||
chmod 600 /etc/NetworkManager/system-connections/*
|
||||
${pkgs.networkmanager}/bin/nmcli connection reload
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user