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

2023-06-28-12-47-21

Browse Source
This commit is contained in:
Alexander Szczepanski
2023-06-28 12:47:21 +02:00
parent ee7aff8404
commit 8ea95b95d6
9 changed files with 150 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/common.nix
View File

@ -6,6 +6,7 @@ in {
services = {
vnstat.enable = true;
tuptime.enable = true;
locate.enable = true;
openssh = {
enable = true;
settings = {
@ -64,7 +65,6 @@ in {
lsd
lsof
man-pages
mlocate
nethogs
nil
nix-du

11
configs/gui.nix
View File

@ -17,14 +17,10 @@ in
};
environment.systemPackages = with unstable.pkgs; [
# brave
# fswebcam
glxinfo
gparted
libsecret
# networkmanager-openconnect
# openconnect
# pulseaudio-ctl
gnome.simple-scan
];
@ -51,6 +47,7 @@ in
corefonts
google-fonts
liberation_ttf
gyre-fonts
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
@ -77,13 +74,9 @@ in
hardware.sane.enable = true;
services = {
# mullvad-vpn.enable = true;
mullvad-vpn.enable = true;
gvfs.enable = true;
# udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
printing = {
enable = true;
drivers = [ pkgs.brlaser ];
};
etesync-dav = {
enable = true;
apiUrl = "https://etesync.szczepan.ski/";

39
configs/pantheon.nix
View File

@ -17,7 +17,10 @@
desktopManager.pantheon = {
enable = true;
extraWingpanelIndicators = with pkgs; [ wingpanel-indicator-ayatana ];
extraWingpanelIndicators = with pkgs; [
monitor
wingpanel-indicator-ayatana
];
};
layout = "us";
@ -28,8 +31,40 @@
};
};
systemd.user.services = {
monitor = {
description = "indicator-monitor";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${pkgs.monitor}/bin/com.github.stsdc.monitor";
};
};
indicatorapp = {
description = "indicator-application-gtk3";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${pkgs.indicator-application-gtk3}/libexec/indicator-application/indicator-application-service";
};
};
};
# App indicator
environment.pathsToLink = [ "/libexec" ];
environment.systemPackages = with pkgs; [ indicator-application-gtk3 ];
environment.systemPackages = with pkgs; [
blackbox-terminal
cinnamon.nemo-with-extensions
gnome-online-accounts
gnome.gnome-control-center
gnome.gnome-system-monitor
indicator-application-gtk3
monitor
ulauncher
];
environment.pantheon.excludePackages = with pkgs.pantheon; [
elementary-code
];
}

9
configs/plasma.nix Normal file
View File

@ -0,0 +1,9 @@
{ config, pkgs, lib, ... }:
{
programs.dconf.enable = true;
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
}

9
configs/printing.nix Normal file
View File

@ -0,0 +1,9 @@
{ config, pkgs, lib, ... }:
{
services = {
printing = {
enable = true;
drivers = [ pkgs.brlaser ];
};
};
}

75
configs/user-gui-applications.nix
View File

@ -11,47 +11,50 @@ let
extraPkgs = pkgs: with unstable.pkgs; [
gamescope
mangohud
ncurses6
];
};
lutris = pkgs.lutris.override {
extraPkgs = pkgs: with unstable.pkgs; [
gamescope
mangohud
];
};
};
};
in
{
imports = [ <home-manager/nixos> ];
home-manager.users.alex = { pkgs, ... }: {
home = {
packages = with unstable.pkgs; [
brave
chromium
# bitwarden
# cura
czkawka
discord
# etcher
firefox
# font-manager
# freecad
# homebank
insomnia
# kdenlive
libreoffice
lutris
meld
# obs-studio
pinta
# prusa-slicer
# rpi-imager
signal-desktop
steam
solaar
spotify
# teams
virtmanager
vulkan-tools
wine
winetricks
];
};
programs.steam = {
enable = true;
package = unstable.pkgs.steam;
};
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
];
}

13
configs/user-gui.nix
View File

@ -28,19 +28,6 @@ in
vscode = {
enable = true;
package = unstable.pkgs.vscode;
# extensions = with unstable.pkgs.vscode-extensions; [
# bbenoist.nix
# eamodio.gitlens
# editorconfig.editorconfig
# ms-azuretools.vscode-docker
# # ms-vsliveshare.vsliveshare
# # ms-vscode.cpptools
# mskelton.one-dark-theme
# ms-kubernetes-tools.vscode-kubernetes-tools
# ryu1kn.partial-diff
# jnoortheen.nix-ide
# brettm12345.nixfmt-vscode
# ];
};

14
configs/user.nix
View File

@ -94,19 +94,9 @@ in
forwardAgent = true;
matchBlocks."szczepan.ski" = { hostname = "207.180.220.97"; };
matchBlocks."nixos-vm" = {
hostname = "192.168.122.222";
remoteForwards = [{
bind.address = "/run/user/1000/gnupg/S.gpg-agent";
host.address = "/run/user/1000/gnupg/S.gpg-agent";
}];
};
matchBlocks."mini" = { hostname = "192.168.0.101"; };
matchBlocks."mini" = { hostname = "10.100.0.3"; };
matchBlocks."thinkpad" = { hostname = "10.100.0.8"; };
matchBlocks."pi" = { hostname = "192.168.1.143"; };
matchBlocks."router" = {
hostname = "192.168.1.1";
user = "root";

93
machine/framework.nix
View File

@ -1,5 +1,5 @@
{ config, pkgs, lib, ... }:
let
let secrets = import ../configs/secrets.nix;
in
{
imports =
@ -32,8 +32,32 @@ in
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
};
# nixpkgs.localSystem = {
# gcc.arch = "alderlake";
# gcc.tune = "alderlake";
# system = "x86_64-linux";
# };
nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
# programs.nix-ld.enable = true;
networking = {
hostName = "framework";
wireguard.interfaces = {
wg0 = {
ips = [ "10.100.0.7/24" ];
privateKey = secrets.wireguard-framework-private;
peers = [{
publicKey = secrets.wireguard-vps-public;
presharedKey = secrets.wireguard-preshared;
allowedIPs = [ "10.100.0.0/24" ];
endpoint = "szczepan.ski:51820";
persistentKeepalive = 25;
}];
};
};
};
networking.hostName = "framework"; # Define your hostname.
time.timeZone = "Europe/Berlin";
hardware = {
@ -60,16 +84,8 @@ in
services = {
power-profiles-daemon.enable = true;
auto-cpufreq.enable = true;
# # Enable fractional scaling
# xserver.desktopManager.gnome = {
# extraGSettingsOverrides = ''
# [org.gnome.mutter]
# experimental-features=['scale-monitor-framebuffer']
# '';
# extraGSettingsOverridePackages = [ pkgs.gnome.mutter ];
# };
auto-cpufreq.enable = false;
thermald.enable = false;
};
powerManagement = {
@ -81,39 +97,32 @@ in
DefaultTimeoutStopSec=10s
'';
# # Set display settings with 150% fractional scaling
# systemd.tmpfiles.rules = [
# "L+ /run/gdm/.config/monitors.xml - - - - ${pkgs.writeText "gdm-monitors.xml" ''
# <monitors version="2">
# <configuration>
# <logicalmonitor>
# <x>0</x>
# <y>0</y>
# <scale>1.5009980201721191</scale>
# <primary>yes</primary>
# <monitor>
# <monitorspec>
# <connector>eDP-1</connector>
# <vendor>BOE</vendor>
# <product>0x095f</product>
# <serial>0x00000000</serial>
# </monitorspec>
# <mode>
# <width>2256</width>
# <height>1504</height>
# <rate>59.999</rate>
# </mode>
# </monitor>
# </logicalmonitor>
# </configuration>
# </monitors>
# ''}"
# ];
environment.systemPackages = with pkgs; [
intel-gpu-tools
powertop
];
# Set up deep sleep + hibernation
swapDevices = [
{ device = "/swapfile"; }
];
# Partition swapfile is on (after LUKS decryption)
boot.resumeDevice = "/dev/disk/by-uuid/ab1126e8-ae5a-4313-a520-4dc267fea528";
# Resume Offset is offset of swapfile
# https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file
boot.kernelParams = [ "mem_sleep_default=deep" "resume_offset=128563200" ];
# Suspend-then-hibernate everywhere
services.logind = {
lidSwitch = "suspend-then-hibernate";
extraConfig = ''
HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate
IdleActionSec=2m
'';
};
systemd.sleep.extraConfig = "HibernateDelaySec=60m";
system.stateVersion = "23.05";
}