framework-2024-08-25-11-10-37
This commit is contained in:
@ -32,5 +32,6 @@ in
|
|||||||
vulkan-tools
|
vulkan-tools
|
||||||
wine
|
wine
|
||||||
winetricks
|
winetricks
|
||||||
|
pcsx2
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -4,12 +4,29 @@
|
|||||||
kdeconnect.enable = true;
|
kdeconnect.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.plasma6.excludePackages = with pkgs.kdePackages; [
|
environment = {
|
||||||
plasma-browser-integration
|
sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
konsole
|
plasma6.excludePackages = with pkgs.kdePackages; [
|
||||||
oxygen
|
plasma-browser-integration
|
||||||
kate
|
konsole
|
||||||
];
|
oxygen
|
||||||
|
kate
|
||||||
|
];
|
||||||
|
|
||||||
|
systemPackages = with pkgs; [
|
||||||
|
kdePackages.ksshaskpass
|
||||||
|
kdePackages.kde-gtk-config
|
||||||
|
kdePackages.breeze-gtk
|
||||||
|
kdePackages.partitionmanager
|
||||||
|
kdePackages.filelight
|
||||||
|
kdePackages.plasma-disks
|
||||||
|
kdePackages.kalk
|
||||||
|
krusader
|
||||||
|
ktimetracker
|
||||||
|
kdiff3
|
||||||
|
kdiskmark
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
desktopManager.plasma6.enable = true;
|
desktopManager.plasma6.enable = true;
|
||||||
@ -22,4 +39,11 @@
|
|||||||
|
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
ssh = {
|
||||||
|
startAgent = true;
|
||||||
|
askPassword = pkgs.lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -4,12 +4,27 @@
|
|||||||
kdeconnect.enable = true;
|
kdeconnect.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.plasma6.excludePackages = with pkgs.kdePackages; [
|
environment = {
|
||||||
plasma-browser-integration
|
plasma6.excludePackages = with pkgs.kdePackages; [
|
||||||
konsole
|
plasma-browser-integration
|
||||||
oxygen
|
konsole
|
||||||
kate
|
oxygen
|
||||||
];
|
kate
|
||||||
|
];
|
||||||
|
|
||||||
|
systemPackages = with pkgs; [
|
||||||
|
kdePackages.ksshaskpass
|
||||||
|
kdePackages.kde-gtk-config
|
||||||
|
kdePackages.breeze-gtk
|
||||||
|
kdePackages.partitionmanager
|
||||||
|
kdePackages.filelight
|
||||||
|
kdePackages.plasma-disks
|
||||||
|
kdePackages.kalk
|
||||||
|
krusader
|
||||||
|
ktimetracker
|
||||||
|
kdiff3
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
desktopManager.plasma6.enable = true;
|
desktopManager.plasma6.enable = true;
|
||||||
@ -34,4 +49,11 @@
|
|||||||
|
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
ssh = {
|
||||||
|
startAgent = true;
|
||||||
|
askPassword = pkgs.lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -69,11 +69,11 @@ in {
|
|||||||
|
|
||||||
environment.systemPackages = with unstable.pkgs; [
|
environment.systemPackages = with unstable.pkgs; [
|
||||||
alacritty
|
alacritty
|
||||||
baobab
|
# baobab
|
||||||
|
# gparted
|
||||||
czkawka # fslint before
|
czkawka # fslint before
|
||||||
# discord
|
# discord
|
||||||
# espeak-ng
|
# espeak-ng
|
||||||
gparted
|
|
||||||
grsync
|
grsync
|
||||||
handbrake
|
handbrake
|
||||||
insomnia
|
insomnia
|
||||||
|
@ -95,31 +95,31 @@ in {
|
|||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
|
|
||||||
matchBlocks."szczepan.ski" = { hostname = "szczepan.ski"; };
|
matchBlocks."szczepan.ski" = { hostname = "szczepan.ski"; };
|
||||||
matchBlocks."mini" = { hostname = "10.100.0.3"; };
|
matchBlocks."mini" = { hostname = "mini"; };
|
||||||
matchBlocks."thinkpad" = { hostname = "10.100.0.8"; };
|
matchBlocks."thinkpad" = { hostname = "thinkpad"; };
|
||||||
matchBlocks."pi" = { hostname = "10.100.0.6"; };
|
# matchBlocks."pi" = { hostname = "10.100.0.6"; };
|
||||||
matchBlocks."vps2" = { hostname = "10.100.0.50"; };
|
# matchBlocks."vps2" = { hostname = "10.100.0.50"; };
|
||||||
matchBlocks."vps3" = { hostname = "10.100.0.100"; };
|
# matchBlocks."vps3" = { hostname = "10.100.0.100"; };
|
||||||
matchBlocks."router" = {
|
# matchBlocks."router" = {
|
||||||
hostname = "192.168.1.1";
|
# hostname = "192.168.1.1";
|
||||||
user = "root";
|
# user = "root";
|
||||||
localForwards = [{
|
# localForwards = [{
|
||||||
bind.address = "127.0.0.1";
|
# bind.address = "127.0.0.1";
|
||||||
bind.port = 1337;
|
# bind.port = 1337;
|
||||||
host.address = "127.0.0.1";
|
# host.address = "127.0.0.1";
|
||||||
host.port = 80;
|
# host.port = 80;
|
||||||
}];
|
# }];
|
||||||
};
|
# };
|
||||||
|
|
||||||
matchBlocks."homeserver" = {
|
# matchBlocks."homeserver" = {
|
||||||
hostname = "192.168.0.100";
|
# hostname = "192.168.0.100";
|
||||||
localForwards = [{
|
# localForwards = [{
|
||||||
bind.address = "127.0.0.1";
|
# bind.address = "127.0.0.1";
|
||||||
bind.port = 8385;
|
# bind.port = 8385;
|
||||||
host.address = "127.0.0.1";
|
# host.address = "127.0.0.1";
|
||||||
host.port = 8384;
|
# host.port = 8384;
|
||||||
}];
|
# }];
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
git = {
|
git = {
|
||||||
|
@ -27,7 +27,6 @@ in
|
|||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
efi = { canTouchEfiVariables = true; };
|
efi = { canTouchEfiVariables = true; };
|
||||||
};
|
};
|
||||||
plymouth.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
@ -48,20 +47,20 @@ in
|
|||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "framework";
|
hostName = "framework";
|
||||||
wireguard.interfaces = {
|
# wireguard.interfaces = {
|
||||||
wg0 = {
|
# wg0 = {
|
||||||
ips = [ "10.100.0.7/24" ];
|
# ips = [ "10.100.0.7/24" ];
|
||||||
privateKey = secrets.wireguard-framework-private;
|
# privateKey = secrets.wireguard-framework-private;
|
||||||
|
|
||||||
peers = [{
|
# peers = [{
|
||||||
publicKey = wireguard.wireguard-vps-public;
|
# publicKey = wireguard.wireguard-vps-public;
|
||||||
presharedKey = secrets.wireguard-preshared;
|
# presharedKey = secrets.wireguard-preshared;
|
||||||
allowedIPs = [ "10.100.0.0/24" ];
|
# allowedIPs = [ "10.100.0.0/24" ];
|
||||||
endpoint = "old.szczepan.ski:51820";
|
# endpoint = "old.szczepan.ski:51820";
|
||||||
persistentKeepalive = 25;
|
# persistentKeepalive = 25;
|
||||||
}];
|
# }];
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
@ -87,6 +86,7 @@ in
|
|||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
# rtkit is optional but recommended
|
# rtkit is optional but recommended
|
||||||
services = {
|
services = {
|
||||||
|
# foldingathome.enable = true;
|
||||||
power-profiles-daemon.enable = true;
|
power-profiles-daemon.enable = true;
|
||||||
colord.enable = true;
|
colord.enable = true;
|
||||||
|
|
||||||
@ -170,8 +170,6 @@ in
|
|||||||
# systemd.services.nix-daemon.serviceConfig.LimitNOFILE = 40960;
|
# systemd.services.nix-daemon.serviceConfig.LimitNOFILE = 40960;
|
||||||
|
|
||||||
environment.systemPackages = with unstable.pkgs; [
|
environment.systemPackages = with unstable.pkgs; [
|
||||||
# rustdesk
|
|
||||||
# cinnamon.warpinator
|
|
||||||
psensor
|
psensor
|
||||||
veracrypt
|
veracrypt
|
||||||
gnumake
|
gnumake
|
||||||
@ -179,11 +177,15 @@ in
|
|||||||
libftdi
|
libftdi
|
||||||
libusb1
|
libusb1
|
||||||
gcc
|
gcc
|
||||||
# coreboot-toolchain.arm
|
|
||||||
intel-gpu-tools
|
intel-gpu-tools
|
||||||
msr-tools
|
msr-tools
|
||||||
quota
|
quota
|
||||||
|
mergerfs
|
||||||
|
snapraid
|
||||||
|
gparted
|
||||||
homebank
|
homebank
|
||||||
|
# fahviewer
|
||||||
|
# fahcontrol
|
||||||
(import ("/home/alex/Workspace/fw-ectool/default.nix"))
|
(import ("/home/alex/Workspace/fw-ectool/default.nix"))
|
||||||
];
|
];
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user