framework-2023-08-22-11-49-02
This commit is contained in:
@ -39,6 +39,7 @@ in
|
|||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
updateDbusEnvironment = true;
|
updateDbusEnvironment = true;
|
||||||
};
|
};
|
||||||
|
udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with unstable.pkgs; [
|
environment.systemPackages = with unstable.pkgs; [
|
||||||
|
13
configs/browser.nix
Normal file
13
configs/browser.nix
Normal 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
|
||||||
|
];
|
||||||
|
}
|
@ -1,11 +1,7 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
unstable = import <nixos-unstable> {
|
unstable = import <nixos-unstable> {
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
config.permittedInsecurePackages = [
|
|
||||||
"electron-12.2.3"
|
|
||||||
];
|
|
||||||
config.packageOverrides = pkgs: {
|
config.packageOverrides = pkgs: {
|
||||||
steam = pkgs.steam.override {
|
steam = pkgs.steam.override {
|
||||||
extraPkgs = pkgs: with unstable.pkgs; [
|
extraPkgs = pkgs: with unstable.pkgs; [
|
||||||
@ -31,30 +27,9 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with unstable.pkgs; [
|
environment.systemPackages = with unstable.pkgs; [
|
||||||
brave
|
|
||||||
catfish
|
|
||||||
chromium
|
|
||||||
czkawka # fslint before
|
|
||||||
discord
|
|
||||||
espeak-ng
|
|
||||||
firefox
|
|
||||||
handbrake
|
|
||||||
insomnia
|
|
||||||
libreoffice
|
|
||||||
librewolf
|
|
||||||
lutris
|
lutris
|
||||||
meld
|
|
||||||
nextcloud-client
|
|
||||||
pinta
|
|
||||||
signal-desktop
|
|
||||||
solaar
|
|
||||||
remmina
|
|
||||||
spotify
|
|
||||||
tor-browser-bundle-bin
|
|
||||||
virtmanager
|
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
wine
|
wine
|
||||||
winetricks
|
winetricks
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
@ -31,6 +31,7 @@
|
|||||||
whitesur-gtk-theme
|
whitesur-gtk-theme
|
||||||
whitesur-icon-theme
|
whitesur-icon-theme
|
||||||
moka-icon-theme
|
moka-icon-theme
|
||||||
|
pantheon.elementary-icon-theme
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.gnome.excludePackages = (with pkgs; [ gnome-tour ])
|
environment.gnome.excludePackages = (with pkgs; [ gnome-tour ])
|
||||||
@ -45,6 +46,7 @@
|
|||||||
hitori # sudoku game
|
hitori # sudoku game
|
||||||
atomix # puzzle game
|
atomix # puzzle game
|
||||||
]);
|
]);
|
||||||
|
services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
|
||||||
|
|
||||||
# services.gpg-agent.pinentryFlavor = lib.mkDefault "gnome3";
|
# services.gpg-agent.pinentryFlavor = lib.mkDefault "gnome3";
|
||||||
|
|
||||||
|
@ -20,7 +20,6 @@ in
|
|||||||
glxinfo
|
glxinfo
|
||||||
gparted
|
gparted
|
||||||
libsecret
|
libsecret
|
||||||
# openconnect
|
|
||||||
gnome.simple-scan
|
gnome.simple-scan
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -76,7 +75,6 @@ in
|
|||||||
services = {
|
services = {
|
||||||
mullvad-vpn.enable = true;
|
mullvad-vpn.enable = true;
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
# udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
|
|
||||||
etesync-dav = {
|
etesync-dav = {
|
||||||
enable = true;
|
enable = true;
|
||||||
apiUrl = "https://etesync.szczepan.ski/";
|
apiUrl = "https://etesync.szczepan.ski/";
|
||||||
|
@ -9,5 +9,5 @@
|
|||||||
spiceUSBRedirection.enable = true;
|
spiceUSBRedirection.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ proot ];
|
environment.systemPackages = with pkgs; [ proot virtiofsd ];
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@
|
|||||||
gnome.gnome-system-monitor
|
gnome.gnome-system-monitor
|
||||||
indicator-application-gtk3
|
indicator-application-gtk3
|
||||||
monitor
|
monitor
|
||||||
ulauncher
|
gnome.eog
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.pantheon.excludePackages = with pkgs.pantheon; [
|
environment.pantheon.excludePackages = with pkgs.pantheon; [
|
||||||
|
@ -7,21 +7,29 @@ in
|
|||||||
{
|
{
|
||||||
imports = [ <home-manager/nixos> ];
|
imports = [ <home-manager/nixos> ];
|
||||||
|
|
||||||
home-manager.users.alex = { pkgs, ... }: {
|
environment.systemPackages = with unstable.pkgs; [
|
||||||
home = {
|
catfish
|
||||||
packages = with unstable.pkgs; [
|
czkawka # fslint before
|
||||||
|
discord
|
||||||
|
espeak-ng
|
||||||
|
handbrake
|
||||||
|
insomnia
|
||||||
|
libreoffice
|
||||||
|
meld
|
||||||
|
nextcloud-client
|
||||||
|
pinta
|
||||||
|
signal-desktop
|
||||||
|
solaar
|
||||||
|
remmina
|
||||||
|
spotify
|
||||||
baobab
|
baobab
|
||||||
# barrier
|
|
||||||
keepassxc
|
keepassxc
|
||||||
ponymix
|
ponymix
|
||||||
# mullvad-vpn
|
|
||||||
# dracula-theme
|
|
||||||
# deadbeef
|
|
||||||
grsync
|
grsync
|
||||||
|
virtmanager
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
home-manager.users.alex = { pkgs, ... }: {
|
||||||
services = { syncthing = { enable = true; }; };
|
services = { syncthing = { enable = true; }; };
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
@ -30,7 +38,6 @@ in
|
|||||||
package = unstable.pkgs.vscode;
|
package = unstable.pkgs.vscode;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
mpv = {
|
mpv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
|
@ -71,13 +71,6 @@ in
|
|||||||
tealdeer
|
tealdeer
|
||||||
unrar
|
unrar
|
||||||
yt-dlp
|
yt-dlp
|
||||||
|
|
||||||
gnumake
|
|
||||||
pkg-config
|
|
||||||
libftdi
|
|
||||||
libusb1
|
|
||||||
gcc
|
|
||||||
coreboot-toolchain.arm
|
|
||||||
];
|
];
|
||||||
sessionPath = [ "$HOME/.npm-packages" "$HOME/.bin" ];
|
sessionPath = [ "$HOME/.npm-packages" "$HOME/.bin" ];
|
||||||
file = {
|
file = {
|
||||||
@ -183,11 +176,6 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
tmux = { enable = true; };
|
tmux = { enable = true; };
|
||||||
|
|
||||||
# exa = {
|
|
||||||
# enable = true;
|
|
||||||
# enableAliases = true;
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# services.vscode-server.enable = true;
|
# services.vscode-server.enable = true;
|
||||||
|
10
configs/wireguard.nix
Normal file
10
configs/wireguard.nix
Normal 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=";
|
||||||
|
}
|
@ -1,20 +1,24 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ 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
|
in
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[
|
|
||||||
<nixos-hardware/framework/12th-gen-intel>
|
<nixos-hardware/framework/12th-gen-intel>
|
||||||
|
<home-manager/nixos>
|
||||||
/etc/nixos/hardware-configuration.nix
|
/etc/nixos/hardware-configuration.nix
|
||||||
../configs/gui.nix
|
../configs/gui.nix
|
||||||
../configs/docker.nix
|
../configs/docker.nix
|
||||||
../configs/libvirt.nix
|
../configs/libvirt.nix
|
||||||
../configs/common.nix
|
../configs/common.nix
|
||||||
|
../configs/games.nix
|
||||||
|
../configs/browser.nix
|
||||||
../configs/user.nix
|
../configs/user.nix
|
||||||
../configs/user-gui.nix
|
../configs/user-gui.nix
|
||||||
../configs/user-gui-applications.nix
|
../configs/gnome.nix
|
||||||
../configs/pantheon.nix
|
/home/alex/Workspace/fw-fanctrl-nix/service.nix
|
||||||
<home-manager/nixos>
|
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
@ -37,6 +41,7 @@ in
|
|||||||
# gcc.tune = "alderlake";
|
# gcc.tune = "alderlake";
|
||||||
# system = "x86_64-linux";
|
# system = "x86_64-linux";
|
||||||
# };
|
# };
|
||||||
|
|
||||||
nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
|
nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ];
|
||||||
# programs.nix-ld.enable = true;
|
# programs.nix-ld.enable = true;
|
||||||
|
|
||||||
@ -48,7 +53,7 @@ in
|
|||||||
privateKey = secrets.wireguard-framework-private;
|
privateKey = secrets.wireguard-framework-private;
|
||||||
|
|
||||||
peers = [{
|
peers = [{
|
||||||
publicKey = secrets.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 = "szczepan.ski:51820";
|
endpoint = "szczepan.ski:51820";
|
||||||
@ -82,6 +87,8 @@ in
|
|||||||
# rtkit is optional but recommended
|
# rtkit is optional but recommended
|
||||||
services = {
|
services = {
|
||||||
power-profiles-daemon.enable = true;
|
power-profiles-daemon.enable = true;
|
||||||
|
fw-fanctrl.enable = true;
|
||||||
|
thermald.enable = true;
|
||||||
pipewire = {
|
pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
@ -99,8 +106,20 @@ in
|
|||||||
DefaultTimeoutStopSec=10s
|
DefaultTimeoutStopSec=10s
|
||||||
'';
|
'';
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
programs.kdeconnect.enable = true;
|
||||||
|
environment.systemPackages =
|
||||||
|
with unstable.pkgs; [
|
||||||
|
cinnamon.warpinator
|
||||||
|
psensor
|
||||||
|
gnumake
|
||||||
|
pkg-config
|
||||||
|
libftdi
|
||||||
|
libusb1
|
||||||
|
gcc
|
||||||
|
# coreboot-toolchain.arm
|
||||||
intel-gpu-tools
|
intel-gpu-tools
|
||||||
|
msr-tools
|
||||||
|
(import ("/home/alex/Workspace/fw-ectool/default.nix"))
|
||||||
];
|
];
|
||||||
|
|
||||||
# Set up deep sleep + hibernation
|
# Set up deep sleep + hibernation
|
||||||
|
Reference in New Issue
Block a user