what did the one commit say to the other.. git good
This commit is contained in:
@@ -41,6 +41,13 @@ in
|
|||||||
nixpkgs.config.permittedInsecurePackages = [ "freeimage-unstable-2021-11-01" ];
|
nixpkgs.config.permittedInsecurePackages = [ "freeimage-unstable-2021-11-01" ];
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
profiles = {
|
||||||
|
default = {
|
||||||
|
extensions = [
|
||||||
|
pkgs.vscode-extensions.platformio.platformio-vscode-ide
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
programs.anyrun = {
|
programs.anyrun = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -245,5 +252,8 @@ in
|
|||||||
kdePackages.baloo-widgets # new
|
kdePackages.baloo-widgets # new
|
||||||
kdePackages.kde-cli-tools
|
kdePackages.kde-cli-tools
|
||||||
resvg # new
|
resvg # new
|
||||||
|
#
|
||||||
|
#platformio
|
||||||
|
platformio
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,34 +5,52 @@
|
|||||||
systemName,
|
systemName,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Open ports in the firewall.
|
networking = {
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
# Define hostname based on system type
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
hostName = lib.mkMerge [
|
||||||
# Or disable the firewall altogether.
|
(lib.mkIf (systemName == "laptop") "mrfluffyLaptop")
|
||||||
#networking.hostName = "mrfluffyLaptop"; # Define your hostname.
|
(lib.mkIf (systemName == "pc") "mrfluffyPC")
|
||||||
networking.hostName = lib.mkMerge [
|
];
|
||||||
(lib.mkIf (systemName == "laptop") "mrfluffyLaptop")
|
|
||||||
(lib.mkIf (systemName == "pc") "mrfluffyPC")
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.firewall.enable = false;
|
# Firewall configuration
|
||||||
networking.firewall.checkReversePath = false;
|
firewall = {
|
||||||
# Pick only one of the below networking options.
|
# Open ports in the firewall.
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# allowedTCPPorts = [ ... ];
|
||||||
networking.networkmanager = {
|
# allowedUDPPorts = [ ... ];
|
||||||
enable = true; # Easiest to use and most distros use this by default.
|
# Or disable the firewall altogether.
|
||||||
|
enable = false;
|
||||||
|
checkReversePath = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Networking options
|
||||||
|
# Pick only one of the below networking options.
|
||||||
|
# wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
networkmanager = {
|
||||||
|
enable = true; # Easiest to use and most distros use this by default.
|
||||||
|
dns = "none";
|
||||||
|
};
|
||||||
|
|
||||||
|
# DHCP settings
|
||||||
|
useDHCP = false;
|
||||||
|
dhcpcd.enable = false;
|
||||||
|
|
||||||
|
# IPv6 configuration
|
||||||
|
# enableIPv6 = false;
|
||||||
|
|
||||||
|
# Configure network proxy if necessary
|
||||||
|
# proxy.default = "http://user:password@proxy:port/";
|
||||||
|
# proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||||
|
|
||||||
|
# Hosts and DNS configuration
|
||||||
|
extraHosts = ''
|
||||||
|
127.0.0.0 localhost
|
||||||
|
'';
|
||||||
|
nameservers = [ "192.168.1.1" ];
|
||||||
|
search = [ "localdomain" ];
|
||||||
|
|
||||||
|
# # environment.etc = {
|
||||||
|
# # "resolv.conf".text = "nameserver 192.168.1.180\noptions edns0 trust-ad\nsearch home\n";
|
||||||
|
# # };
|
||||||
};
|
};
|
||||||
#networking.enableIPv6 = false;
|
|
||||||
# Configure network proxy if necessary
|
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
networking.extraHosts = ''
|
|
||||||
127.0.0.0 localhost
|
|
||||||
'';
|
|
||||||
networking.nameservers = [ "192.168.1.180" ];
|
|
||||||
# # environment.etc = {
|
|
||||||
# # "resolv.conf".text = "nameserver 192.168.1.180\noptions edns0 trust-ad\nsearch home\n";
|
|
||||||
# # };
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -199,5 +199,6 @@ in
|
|||||||
libtool
|
libtool
|
||||||
ladspaPlugins
|
ladspaPlugins
|
||||||
inputs.nix-alien.packages.${pkgs.system}.nix-alien
|
inputs.nix-alien.packages.${pkgs.system}.nix-alien
|
||||||
|
python311
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -190,6 +190,12 @@
|
|||||||
SuspendState=mem
|
SuspendState=mem
|
||||||
'';
|
'';
|
||||||
#udev rules
|
#udev rules
|
||||||
|
services.udev.packages = [
|
||||||
|
pkgs.platformio-core
|
||||||
|
pkgs.platformio
|
||||||
|
pkgs.openocd
|
||||||
|
pkgs.brave
|
||||||
|
];
|
||||||
#services.udev.extraRules = ''
|
#services.udev.extraRules = ''
|
||||||
# KERNEL=="hidraw*", KERNELS=="*054C:0CE6*", MODE="0660", TAG+="uaccess"
|
# KERNEL=="hidraw*", KERNELS=="*054C:0CE6*", MODE="0660", TAG+="uaccess"
|
||||||
#'';
|
#'';
|
||||||
|
|||||||
Reference in New Issue
Block a user