BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

framework-2024-08-25-11-10-37

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-08-25 11:10:37 +02:00
parent 6c5d958f40
commit 975f1bc642
6 changed files with 104 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configs/games.nix
View File

@ -32,5 +32,6 @@ in
vulkan-tools
wine
winetricks
pcsx2
];
}

36
configs/plasma-wayland.nix
View File

@ -4,12 +4,29 @@
kdeconnect.enable = true;
};
environment.plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration
konsole
oxygen
kate
];
environment = {
sessionVariables.NIXOS_OZONE_WL = "1";
plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration
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 = {
desktopManager.plasma6.enable = true;
@ -22,4 +39,11 @@
libinput.enable = true;
};
programs = {
ssh = {
startAgent = true;
askPassword = pkgs.lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
};
};
}

34
configs/plasma.nix
View File

@ -4,12 +4,27 @@
kdeconnect.enable = true;
};
environment.plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration
konsole
oxygen
kate
];
environment = {
plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration
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
];
};
services = {
desktopManager.plasma6.enable = true;
@ -34,4 +49,11 @@
libinput.enable = true;
};
programs = {
ssh = {
startAgent = true;
askPassword = pkgs.lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
};
};
}

4
configs/user-gui.nix
View File

@ -69,11 +69,11 @@ in {
environment.systemPackages = with unstable.pkgs; [
alacritty
baobab
# baobab
# gparted
czkawka # fslint before
# discord
# espeak-ng
gparted
grsync
handbrake
insomnia

48
configs/user.nix
View File

@ -95,31 +95,31 @@ in {
forwardAgent = true;
matchBlocks."szczepan.ski" = { hostname = "szczepan.ski"; };
matchBlocks."mini" = { hostname = "10.100.0.3"; };
matchBlocks."thinkpad" = { hostname = "10.100.0.8"; };
matchBlocks."pi" = { hostname = "10.100.0.6"; };
matchBlocks."vps2" = { hostname = "10.100.0.50"; };
matchBlocks."vps3" = { hostname = "10.100.0.100"; };
matchBlocks."router" = {
hostname = "192.168.1.1";
user = "root";
localForwards = [{
bind.address = "127.0.0.1";
bind.port = 1337;
host.address = "127.0.0.1";
host.port = 80;
}];
};
matchBlocks."mini" = { hostname = "mini"; };
matchBlocks."thinkpad" = { hostname = "thinkpad"; };
# matchBlocks."pi" = { hostname = "10.100.0.6"; };
# matchBlocks."vps2" = { hostname = "10.100.0.50"; };
# matchBlocks."vps3" = { hostname = "10.100.0.100"; };
# matchBlocks."router" = {
# hostname = "192.168.1.1";
# user = "root";
# localForwards = [{
# bind.address = "127.0.0.1";
# bind.port = 1337;
# host.address = "127.0.0.1";
# host.port = 80;
# }];
# };
matchBlocks."homeserver" = {
hostname = "192.168.0.100";
localForwards = [{
bind.address = "127.0.0.1";
bind.port = 8385;
host.address = "127.0.0.1";
host.port = 8384;
}];
};
# matchBlocks."homeserver" = {
# hostname = "192.168.0.100";
# localForwards = [{
# bind.address = "127.0.0.1";
# bind.port = 8385;
# host.address = "127.0.0.1";
# host.port = 8384;
# }];
# };
};
git = {

36
machine/framework.nix
View File

@ -27,7 +27,6 @@ in
systemd-boot.enable = true;
efi = { canTouchEfiVariables = true; };
};
plymouth.enable = true;
};
nixpkgs.config = {
@ -48,20 +47,20 @@ in
networking = {
hostName = "framework";
wireguard.interfaces = {
wg0 = {
ips = [ "10.100.0.7/24" ];
privateKey = secrets.wireguard-framework-private;
# wireguard.interfaces = {
# wg0 = {
# ips = [ "10.100.0.7/24" ];
# privateKey = secrets.wireguard-framework-private;
peers = [{
publicKey = wireguard.wireguard-vps-public;
presharedKey = secrets.wireguard-preshared;
allowedIPs = [ "10.100.0.0/24" ];
endpoint = "old.szczepan.ski:51820";
persistentKeepalive = 25;
}];
};
};
# peers = [{
# publicKey = wireguard.wireguard-vps-public;
# presharedKey = secrets.wireguard-preshared;
# allowedIPs = [ "10.100.0.0/24" ];
# endpoint = "old.szczepan.ski:51820";
# persistentKeepalive = 25;
# }];
# };
# };
};
time.timeZone = "Europe/Berlin";
@ -87,6 +86,7 @@ in
security.rtkit.enable = true;
# rtkit is optional but recommended
services = {
# foldingathome.enable = true;
power-profiles-daemon.enable = true;
colord.enable = true;
@ -170,8 +170,6 @@ in
# systemd.services.nix-daemon.serviceConfig.LimitNOFILE = 40960;
environment.systemPackages = with unstable.pkgs; [
# rustdesk
# cinnamon.warpinator
psensor
veracrypt
gnumake
@ -179,11 +177,15 @@ in
libftdi
libusb1
gcc
# coreboot-toolchain.arm
intel-gpu-tools
msr-tools
quota
mergerfs
snapraid
gparted
homebank
# fahviewer
# fahcontrol
(import ("/home/alex/Workspace/fw-ectool/default.nix"))
];