edison: various changes
This commit is contained in:
parent
4db68b9217
commit
b771e42ac7
8
base.nix
8
base.nix
|
@ -42,13 +42,16 @@
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
bat
|
bat
|
||||||
bottom
|
bottom
|
||||||
|
eza
|
||||||
git
|
git
|
||||||
gnugrep
|
gnugrep
|
||||||
gnutar
|
gnutar
|
||||||
|
neofetch
|
||||||
|
python3
|
||||||
ripgrep
|
ripgrep
|
||||||
rsync
|
rsync
|
||||||
tree
|
screen
|
||||||
eza
|
unzip
|
||||||
wget
|
wget
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -62,7 +65,6 @@
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
AllowTcpForwarding yes
|
AllowTcpForwarding yes
|
||||||
X11Forwarding no
|
|
||||||
AllowAgentForwarding yes
|
AllowAgentForwarding yes
|
||||||
AuthenticationMethods publickey
|
AuthenticationMethods publickey
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -15,8 +15,12 @@
|
||||||
hostName = "edison";
|
hostName = "edison";
|
||||||
defaultGateway = "192.168.10.1";
|
defaultGateway = "192.168.10.1";
|
||||||
|
|
||||||
# Networking / Wi-Fi is configured with NM for now. TODO
|
interfaces.enp4s0.useDHCP = false;
|
||||||
networkmanager.enable = true;
|
interfaces.enp4s0.ipv4.addresses = [
|
||||||
|
{ address = "192.168.10.170"; prefixLength = 24; }
|
||||||
|
];
|
||||||
|
|
||||||
|
hostId = "8e84b281";
|
||||||
};
|
};
|
||||||
|
|
||||||
console.keyMap = "us";
|
console.keyMap = "us";
|
||||||
|
@ -26,6 +30,8 @@
|
||||||
environment.variables = { EDITOR = "vim"; };
|
environment.variables = { EDITOR = "vim"; };
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
gparted
|
||||||
|
unstable.hydrus
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
xkbVariant = "intl";
|
xkbVariant = "intl";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.openssh.settings.X11Forwarding = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
xfce.xfce4-pulseaudio-plugin
|
xfce.xfce4-pulseaudio-plugin
|
||||||
];
|
];
|
||||||
|
@ -46,6 +48,7 @@
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
security.polkit.enable = true;
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
users.users."felixalb".packages = [ pkgs.flatpak ];
|
users.users."felixalb".packages = [ pkgs.flatpak ];
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
|
|
|
@ -23,6 +23,11 @@
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/data" =
|
||||||
|
{ device = "/dev/disk/by-uuid/ebbdf34e-adec-4df3-bbed-20d80455f3f7";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/d56040a0-3009-4899-95fa-1b82e60e32e4"; }
|
[ { device = "/dev/disk/by-uuid/d56040a0-3009-4899-95fa-1b82e60e32e4"; }
|
||||||
];
|
];
|
||||||
|
@ -31,7 +36,7 @@
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault false;
|
||||||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue