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

framework-2023-08-22-11-49-02

Browse Source
This commit is contained in:
Alexander Szczepanski
2023-08-22 11:49:02 +02:00
parent 9333f73867
commit d3d29d1b9e
11 changed files with 88 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backup/bspwm.nix
View File

@ -39,6 +39,7 @@ in
libinput.enable = true;
updateDbusEnvironment = true;
};
udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
};
environment.systemPackages = with unstable.pkgs; [

13
configs/browser.nix Normal file
View File

@ -0,0 +1,13 @@
{ config, pkgs, lib, ... }:
let
unstable = import <nixos-unstable> { config.allowUnfree = true; };
in
{
environment.systemPackages = with unstable.pkgs; [
brave
chromium
firefox
librewolf
tor-browser-bundle-bin
];
}

25
configs/user-gui-applications.nix → configs/games.nix
View File

@ -1,11 +1,7 @@
{ config, pkgs, lib, ... }:
let
unstable = import <nixos-unstable> {
config.allowUnfree = true;
config.permittedInsecurePackages = [
"electron-12.2.3"
];
config.packageOverrides = pkgs: {
steam = pkgs.steam.override {
extraPkgs = pkgs: with unstable.pkgs; [
@ -31,30 +27,9 @@ in
};
environment.systemPackages = with unstable.pkgs; [
brave
catfish
chromium
czkawka # fslint before
discord
espeak-ng
firefox
handbrake
insomnia
libreoffice
librewolf
lutris
meld
nextcloud-client
pinta
signal-desktop
solaar
remmina
spotify
tor-browser-bundle-bin
virtmanager
vulkan-tools
wine
winetricks
];
}

2
configs/gnome.nix
View File

@ -31,6 +31,7 @@
whitesur-gtk-theme
whitesur-icon-theme
moka-icon-theme
pantheon.elementary-icon-theme
];
environment.gnome.excludePackages = (with pkgs; [ gnome-tour ])
@ -45,6 +46,7 @@
hitori # sudoku game
atomix # puzzle game
]);
services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
# services.gpg-agent.pinentryFlavor = lib.mkDefault "gnome3";

2
configs/gui.nix
View File

@ -20,7 +20,6 @@ in
glxinfo
gparted
libsecret
# openconnect
gnome.simple-scan
];
@ -76,7 +75,6 @@ in
services = {
mullvad-vpn.enable = true;
gvfs.enable = true;
# udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
etesync-dav = {
enable = true;
apiUrl = "https://etesync.szczepan.ski/";

2
configs/libvirt.nix
View File

@ -9,5 +9,5 @@
spiceUSBRedirection.enable = true;
};
environment.systemPackages = with pkgs; [ proot ];
environment.systemPackages = with pkgs; [ proot virtiofsd ];
}

2
configs/pantheon.nix
View File

@ -61,7 +61,7 @@
gnome.gnome-system-monitor
indicator-application-gtk3
monitor
ulauncher
gnome.eog
];
environment.pantheon.excludePackages = with pkgs.pantheon; [

37
configs/user-gui.nix
View File

@ -7,21 +7,29 @@ in
{
imports = [ <home-manager/nixos> ];
environment.systemPackages = with unstable.pkgs; [
catfish
czkawka # fslint before
discord
espeak-ng
handbrake
insomnia
libreoffice
meld
nextcloud-client
pinta
signal-desktop
solaar
remmina
spotify
baobab
keepassxc
ponymix
grsync
virtmanager
];
home-manager.users.alex = { pkgs, ... }: {
home = {
packages = with unstable.pkgs; [
baobab
# barrier
keepassxc
ponymix
# mullvad-vpn
# dracula-theme
# deadbeef
grsync
];
};
services = { syncthing = { enable = true; }; };
programs = {
@ -30,7 +38,6 @@ in
package = unstable.pkgs.vscode;
};
mpv = {
enable = true;
config = {

12
configs/user.nix
View File

@ -71,13 +71,6 @@ in
tealdeer
unrar
yt-dlp
gnumake
pkg-config
libftdi
libusb1
gcc
coreboot-toolchain.arm
];
sessionPath = [ "$HOME/.npm-packages" "$HOME/.bin" ];
file = {
@ -183,11 +176,6 @@ in
};
tmux = { enable = true; };
# exa = {
# enable = true;
# enableAliases = true;
# };
};
# services.vscode-server.enable = true;

10
configs/wireguard.nix Normal file
View File

@ -0,0 +1,10 @@
{
wireguard-vps-public = "gXG2XaFJZq3/MDva1vbaicRs9z9XfAR2wPLHmg4hRlI=";
wireguard-desktop-public = "yQH91i1Kqxet5iGi3nFMgu7h68Oie6eHOQJHMkhLmWs=";
wireguard-framework-public = "plnKdyh11Z3779LpHQmfU69z7LfCfDATLSxphhcj/3U=";
wireguard-mini-public = "C9dfZUwmKLVpjeXVNkoVyMSXfogdqEK3yMgClpeYzHg=";
wireguard-mbp-public = "GQZ + lfEFQxTl5K5O623tlvWjTzBEeG0gSdvVA61H1z4=";
wireguard-raspberrypi-public = "AB0k5pgI0fsnncNN3GkexWWbA8q/is9JaKY3x8jw4kY=";
wireguard-vps2-public = "fzWLlrK4RqbgBpjQLLwKxGI92aidpZUksjZ6FIrFmEE=";
wireguard-vps3-public = "qfE7vQ+XavOMKgSYxa/me40auoEV3ip/vbiSzjMKgXc=";
}

57
machine/framework.nix
View File

@ -1,21 +1,25 @@
{ config, pkgs, lib, ... }:
let secrets = import ../configs/secrets.nix;
let
unstable = import <nixos-unstable> {};
secrets = import ../configs/secrets.nix;
wireguard = import ../configs/wireguard.nix;
in
{
imports =
[
<nixos-hardware/framework/12th-gen-intel>
/etc/nixos/hardware-configuration.nix
../configs/gui.nix
../configs/docker.nix
../configs/libvirt.nix
../configs/common.nix
../configs/user.nix
../configs/user-gui.nix
../configs/user-gui-applications.nix
../configs/pantheon.nix
<home-manager/nixos>
];
imports = [
<nixos-hardware/framework/12th-gen-intel>
<home-manager/nixos>
/etc/nixos/hardware-configuration.nix
../configs/gui.nix
../configs/docker.nix
../configs/libvirt.nix
../configs/common.nix
../configs/games.nix
../configs/browser.nix
../configs/user.nix
../configs/user-gui.nix
../configs/gnome.nix
/home/alex/Workspace/fw-fanctrl-nix/service.nix
];
boot = {
initrd.systemd.enable = true;
@ -37,6 +41,7 @@ in
# gcc.tune = "alderlake";
# system = "x86_64-linux";
# };
nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
# programs.nix-ld.enable = true;
@ -48,7 +53,7 @@ in
privateKey = secrets.wireguard-framework-private;
peers = [{
publicKey = secrets.wireguard-vps-public;
publicKey = wireguard.wireguard-vps-public;
presharedKey = secrets.wireguard-preshared;
allowedIPs = [ "10.100.0.0/24" ];
endpoint = "szczepan.ski:51820";
@ -82,6 +87,8 @@ in
# rtkit is optional but recommended
services = {
power-profiles-daemon.enable = true;
fw-fanctrl.enable = true;
thermald.enable = true;
pipewire = {
enable = true;
alsa.enable = true;
@ -99,9 +106,21 @@ in
DefaultTimeoutStopSec=10s
'';
environment.systemPackages = with pkgs; [
intel-gpu-tools
];
programs.kdeconnect.enable = true;
environment.systemPackages =
with unstable.pkgs; [
cinnamon.warpinator
psensor
gnumake
pkg-config
libftdi
libusb1
gcc
# coreboot-toolchain.arm
intel-gpu-tools
msr-tools
(import ("/home/alex/Workspace/fw-ectool/default.nix"))
];
# Set up deep sleep + hibernation
swapDevices = [