mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2025-05-18 14:37:05 +02:00
several improvements to nixos config
This commit is contained in:
parent
7afb9f7d6a
commit
36c5da7e58
4 changed files with 36 additions and 35 deletions
|
@ -13,6 +13,11 @@
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sharedModules = [
|
||||||
|
inputs.distrobox4nix.homeManagerModule
|
||||||
|
];
|
||||||
|
|
||||||
users.thilo = {
|
users.thilo = {
|
||||||
imports = [ ./../../home-manager/modules/machine.nix ];
|
imports = [ ./../../home-manager/modules/machine.nix ];
|
||||||
|
|
||||||
|
@ -42,6 +47,25 @@
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
lix
|
lix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
programs.distrobox = {
|
||||||
|
enable = true;
|
||||||
|
containers = {
|
||||||
|
arch = {
|
||||||
|
image = "arch-toolbox";
|
||||||
|
additional_packages = "python python-pip nodejs";
|
||||||
|
volume = "/etc/static/profiles/per-user:/etc/profiles/per-user:ro";
|
||||||
|
replace = true;
|
||||||
|
};
|
||||||
|
fedora = {
|
||||||
|
image = "quay.io/fedora/fedora-toolbox:41";
|
||||||
|
additional_packages = "python python-pip code";
|
||||||
|
home = "/home/thilo/.distrobox/fedora";
|
||||||
|
pre_init_hooks = ''rpm --import https://packages.microsoft.com/keys/microsoft.asc && echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\nautorefresh=1\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" | sudo tee /etc/yum.repos.d/vscode.repo > /dev/null'';
|
||||||
|
replace = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
{ pkgs, options, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -9,6 +9,7 @@
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./../../nixos/common.nix
|
./../../nixos/common.nix
|
||||||
./../../nixos/builders.nix
|
./../../nixos/builders.nix
|
||||||
|
inputs.jovian-nixos.nixosModules.jovian
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
|
@ -43,14 +44,7 @@
|
||||||
layout = "us";
|
layout = "us";
|
||||||
variant = "";
|
variant = "";
|
||||||
};
|
};
|
||||||
# AI
|
envfs.enable = true;
|
||||||
# ollama = {
|
|
||||||
# enable = true;
|
|
||||||
# acceleration = "rocm";
|
|
||||||
# };
|
|
||||||
# open-webui = {
|
|
||||||
# enable = true;
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
|
@ -167,32 +161,17 @@
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
hardware.bluetooth.powerOnBoot = true;
|
hardware.bluetooth.powerOnBoot = true;
|
||||||
|
|
||||||
programs.steam.gamescopeSession = {
|
jovian = {
|
||||||
enable = false;
|
steam = {
|
||||||
env = {
|
enable = true;
|
||||||
WLR_RENDERER = "vulkan";
|
user = "thilo";
|
||||||
DXVK_HDR = "1";
|
|
||||||
STEAM_GAMESCOPE_VRR_SUPPORTED = "1";
|
|
||||||
SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS = "0";
|
|
||||||
ENABLE_GAMESCOPE_WSI = "1";
|
|
||||||
WINE_FULLSCREEN_FSR = "1";
|
|
||||||
};
|
};
|
||||||
args = [
|
|
||||||
"-f"
|
|
||||||
"-F fsr"
|
|
||||||
"--rt"
|
|
||||||
"--adaptive-sync"
|
|
||||||
"-w 1920"
|
|
||||||
"-h 1080"
|
|
||||||
"-r 120"
|
|
||||||
"--hdr-enabled"
|
|
||||||
"--hdr-itm-enable"
|
|
||||||
"-O DP-3"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.gamescope.enable = true;
|
programs.gamescope.enable = true;
|
||||||
|
|
||||||
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
system.stateVersion = "24.11";
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
@ -18,12 +18,9 @@
|
||||||
url = "github:guibou/nixGL";
|
url = "github:guibou/nixGL";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
muse-sounds-manager = {
|
|
||||||
url = "github:thilobillerbeck/muse-sounds-manager-nix";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
suyu.url = "github:Noodlez1232/suyu-flake";
|
|
||||||
nix-alien.url = "github:thiagokokada/nix-alien";
|
nix-alien.url = "github:thiagokokada/nix-alien";
|
||||||
|
jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS/development";
|
||||||
|
distrobox4nix.url = "github:aguirre-matteo/distrobox4nix";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
|
|
|
@ -111,6 +111,7 @@ in
|
||||||
};
|
};
|
||||||
tailscale = {
|
tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
useRoutingFeatures = "both";
|
||||||
};
|
};
|
||||||
flatpak.enable = true;
|
flatpak.enable = true;
|
||||||
avahi = {
|
avahi = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue