cleanup and format

This commit is contained in:
Thilo Billerbeck 2024-02-27 02:54:02 +01:00
parent 1121201acd
commit 07a1841fda
37 changed files with 336 additions and 427 deletions

View file

@ -1,26 +1,29 @@
{ config, lib, pkgs, modulesPath, ... }:
{ config, lib, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/2e1227f6-8725-43a3-aeb6-961df4ed9b25";
fsType = "ext4";
boot = {
initrd = {
availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
kernelModules = [ ];
};
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
};
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
fileSystems."/" = {
device = "/dev/disk/by-uuid/2e1227f6-8725-43a3-aeb6-961df4ed9b25";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/877C-C918";
fsType = "vfat";
};
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
"/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/877C-C918";
fsType = "vfat";
};
swapDevices = [ ];
@ -33,5 +36,6 @@
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -1,44 +1,43 @@
{ inputs, pkgs, ... }:
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.thilo = {
imports = [
./../../home-manager/modules/machine.nix
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit inputs; };
users.thilo = {
imports = [ ./../../home-manager/modules/machine.nix ];
machine = {
username = "thilo";
isGeneric = false;
isGnome = false;
noiseSuppression.enable = true;
isGraphical = true;
};
machine = {
username = "thilo";
isGeneric = false;
isGnome = false;
noiseSuppression.enable = true;
isGraphical = true;
};
xsession.pointerCursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 128;
};
xsession.pointerCursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 128;
};
programs.obs-studio = {
enable = true;
/* plugins = with pkgs.obs-studio-plugins; [
obs-vaapi
obs-teleport
droidcam-obs
obs-gstreamer
obs-shaderfilter
obs-command-source
obs-move-transition
advanced-scene-switcher
]; */
};
programs.obs-studio = {
enable = true;
/* plugins = with pkgs.obs-studio-plugins; [
obs-vaapi
obs-teleport
droidcam-obs
obs-gstreamer
obs-shaderfilter
obs-command-source
obs-move-transition
advanced-scene-switcher
];
*/
};
home.sessionVariables = {
LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
};
};
}

View file

@ -1,35 +1,26 @@
{
config,
pkgs,
lib,
...
}:
{ pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
./../../nixos/common.nix
];
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
./../../nixos/common.nix
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
# Setup keyfile
boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
networking.hostName = "thilo-laptop"; # Define your hostname.
# Configure console keymap
console.keyMap = "de";
environment.gnome.excludePackages = with pkgs; [
tracker
tracker-miners
];
environment.gnome.excludePackages = with pkgs; [ tracker tracker-miners ];
hardware.bluetooth.enable = true;
@ -50,10 +41,7 @@
fwupd.enable = true;
};
environment.systemPackages = with pkgs; [
brlaser
brgenml1lpr
];
environment.systemPackages = with pkgs; [ brlaser brgenml1lpr ];
system.stateVersion = "23.05";
}

View file

@ -1,34 +1,38 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ config, lib, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot = {
initrd = {
availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
kernelModules = [ ];
};
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
fsType = "btrfs";
options = [ "subvol=@" ];
};
fileSystems."/data" =
{
"/data" = {
device = "/dev/disk/by-uuid/91f64815-1d3c-4032-960f-0a53eb3b01ab";
fsType = "btrfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0EB3-BFB0";
"/boot" = {
device = "/dev/disk/by-uuid/0EB3-BFB0";
fsType = "vfat";
};
};
swapDevices = [ ];
@ -40,5 +44,6 @@
# networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -1,37 +1,33 @@
{ inputs, pkgs, ... }:
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.thilo = {
imports = [
./../../home-manager/modules/machine.nix
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit inputs; };
users.thilo = {
imports = [ ./../../home-manager/modules/machine.nix ];
machine = {
username = "thilo";
isGeneric = false;
isGnome = false;
noiseSuppression.enable = true;
isGraphical = true;
machine = {
username = "thilo";
isGeneric = false;
isGnome = false;
noiseSuppression.enable = true;
isGraphical = true;
};
xsession.pointerCursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 128;
};
services.kdeconnect.enable = true;
services.kdeconnect.indicator = true;
home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
home.packages = with pkgs; [ libsForQt5.discover ];
};
xsession.pointerCursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 128;
};
services.kdeconnect.enable = true;
services.kdeconnect.indicator = true;
home.sessionVariables = {
LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
};
home.packages = with pkgs; [
libsForQt5.discover
];
};
}

View file

@ -1,11 +1,7 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config
, pkgs
, lib
, ...
}:
{ pkgs, ... }:
{
imports = [
@ -15,12 +11,18 @@
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.extraInstallCommands = ''
${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
'';
boot.kernelPackages = pkgs.linuxPackages_latest;
boot = {
loader = {
systemd-boot = {
enable = true;
extraInstallCommands = ''
${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
'';
};
efi.canTouchEfiVariables = true;
};
kernelPackages = pkgs.linuxPackages_latest;
};
networking.hostName = "thilo-pc";
@ -37,10 +39,7 @@
};
hardware.opengl = {
extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
};
system.stateVersion = "23.05";

View file

@ -1,15 +1,13 @@
{ inputs, ... }:
{ ... }:
{
imports = [
./../../home-manager/modules/machine.nix
];
{
imports = [ ./../../home-manager/modules/machine.nix ];
machine = {
username = "thilo";
isGeneric = true;
isGnome = false;
noiseSuppression.enable = false;
isGraphical = false;
};
}
machine = {
username = "thilo";
isGeneric = true;
isGnome = false;
noiseSuppression.enable = false;
isGraphical = false;
};
}

View file

@ -2,12 +2,8 @@
description = "Nixos config";
inputs = {
nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable";
};
nixpkgs-update = {
url = "github:ryantm/nixpkgs-update";
};
nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable"; };
nixpkgs-update = { url = "github:ryantm/nixpkgs-update"; };
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@ -20,19 +16,16 @@
muse-sounds-manager.url = "github:thilobillerbeck/muse-sounds-manager-nix";
};
outputs = { self, nixpkgs, home-manager, nixgl, ... }@inputs:
outputs = { nixpkgs, home-manager, nixgl, ... }@inputs:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
system = "${system}";
overlays = [ nixgl.overlay ];
};
in
{
in {
nixConfig = {
extra-substituters = [
"https://nix-community.cachix.org"
];
extra-substituters = [ "https://nix-community.cachix.org" ];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
@ -55,10 +48,11 @@
];
specialArgs = { inherit inputs; };
};
homeConfigurations."thilo@thilo-pc-win" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ ./configs/wsl/home.nix ];
extraSpecialArgs = { inherit inputs; };
};
homeConfigurations."thilo@thilo-pc-win" =
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ ./configs/wsl/home.nix ];
extraSpecialArgs = { inherit inputs; };
};
};
}

View file

@ -1,6 +1,5 @@
{ lib, pkgs, config, ... }:
with lib;
{
with lib; {
imports = [
./../programs/alacritty.nix
./../programs/bat.nix
@ -70,8 +69,9 @@ with lib;
include "/usr/share/nano/*.nanorc"
'';
".ssh/config_source" = {
source = ./../dotfiles/ssh-config;
onChange = ''cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config'';
source = ./../dotfiles/ssh-config;
onChange =
"cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config";
};
".gitignore".source = ./../dotfiles/.gitignore;
".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = ''

View file

@ -2,128 +2,126 @@
with lib;
let
electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
electronFlags =
"--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
in {
config = {
nixpkgs.overlays = [
(final: prev: {
(_: prev: {
quickemu = prev.quickemu.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [
./../patches/quickemu.patch
];
patches = (old.patches or [ ]) ++ [ ./../patches/quickemu.patch ];
});
})
];
home.packages = with pkgs; [
up
htop
rustc
cargo
nixfmt
nodejs
bun
deno
devbox
tldr
flutter
nurl
hcloud
tea
dgraph
nix-init
nodePackages.nodemon
pocketbase
thefuck
hub
httpie
manix
(pkgs.writeShellScriptBin "ssh-fix-permissions"
(builtins.readFile ./../scripts/ssh-fix-permissions.sh))
(pkgs.writeShellScriptBin "yt-dlp-audio"
(builtins.readFile ./../scripts/yt-dlp-audio.sh))
(pkgs.writeShellScriptBin "nix-shell-init"
(builtins.readFile ./../scripts/nix-shell-init.sh))
(pkgs.writeShellScriptBin "http-server" ''
${pkgs.caddy}/bin/caddy file-server --listen :2345
'')
(pkgs.writeShellScriptBin "nix-build-default" ''
nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
'')
(callPackage ./../pkgs/toggl-time-grouper/package.nix {
inherit lib;
})
nixpkgs-fmt
toolbox
distrobox
ddev
act
mkcert
pulumi
kubectl
pulumiPackages.pulumi-language-nodejs
ncdu
inputs.devenv.packages.x86_64-linux.devenv
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
inputs.dagger.packages.x86_64-linux.dagger
unzip
gh
nil
nixd
unrar
] ++ (if config.machine.isGraphical then [
(pkgs.nerdfonts.override {
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
})
corefonts
vistafonts
jetbrains.webstorm
jetbrains.phpstorm
jetbrains.rust-rover
jetbrains.goland
element-desktop
ludusavi
dbeaver
insomnia
onlyoffice-bin
spotify
vesktop
(lutris.override {
extraLibraries = pkgs: [
gnome3.adwaita-icon-theme
];
extraPkgs = pkgs: [
wineWowPackages.full
winetricks
gnome3.adwaita-icon-theme
];
})
bottles
protontricks
heroic
(vscode.override { commandLineArgs = electronFlags; })
quickemu
quickgui
trilium-desktop
anki
inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
jetbrains-toolbox
mumble
prusa-slicer
trayscale
gnome.gnome-disk-utility
inkscape
musescore
obsidian
syncthingtray
reaper
yabridge
] else [ ]) ++ (if config.machine.isGnome then [
gnomeExtensions.blur-my-shell
gnomeExtensions.dash-to-panel
gnomeExtensions.user-themes
gnomeExtensions.vitals
gnomeExtensions.custom-accent-colors
] else [ ]);
home.packages = with pkgs;
[
up
htop
rustc
cargo
nixfmt
nodejs
bun
deno
devbox
tldr
flutter
nurl
hcloud
tea
dgraph
nix-init
nodePackages.nodemon
pocketbase
thefuck
hub
httpie
manix
(pkgs.writeShellScriptBin "ssh-fix-permissions"
(builtins.readFile ./../scripts/ssh-fix-permissions.sh))
(pkgs.writeShellScriptBin "yt-dlp-audio"
(builtins.readFile ./../scripts/yt-dlp-audio.sh))
(pkgs.writeShellScriptBin "nix-shell-init"
(builtins.readFile ./../scripts/nix-shell-init.sh))
(pkgs.writeShellScriptBin "http-server" ''
${pkgs.caddy}/bin/caddy file-server --listen :2345
'')
(pkgs.writeShellScriptBin "nix-build-default" ''
nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
'')
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit lib; })
nixpkgs-fmt
toolbox
distrobox
ddev
act
mkcert
pulumi
kubectl
pulumiPackages.pulumi-language-nodejs
ncdu
inputs.devenv.packages.x86_64-linux.devenv
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
inputs.dagger.packages.x86_64-linux.dagger
unzip
gh
nil
nixd
unrar
] ++ (if config.machine.isGraphical then [
(pkgs.nerdfonts.override {
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
})
corefonts
vistafonts
jetbrains.webstorm
jetbrains.phpstorm
jetbrains.rust-rover
jetbrains.goland
element-desktop
ludusavi
dbeaver
insomnia
onlyoffice-bin
spotify
vesktop
(lutris.override {
extraLibraries = _: [ gnome3.adwaita-icon-theme ];
extraPkgs = _: [
wineWowPackages.full
winetricks
gnome3.adwaita-icon-theme
];
})
bottles
protontricks
heroic
(vscode.override { commandLineArgs = electronFlags; })
quickemu
quickgui
trilium-desktop
anki
inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
jetbrains-toolbox
mumble
prusa-slicer
trayscale
gnome.gnome-disk-utility
inkscape
musescore
obsidian
syncthingtray
reaper
yabridge
] else
[ ]) ++ (if config.machine.isGnome then [
gnomeExtensions.blur-my-shell
gnomeExtensions.dash-to-panel
gnomeExtensions.user-themes
gnomeExtensions.vitals
gnomeExtensions.custom-accent-colors
] else
[ ]);
};
}

View file

@ -1,7 +1,4 @@
{ lib
, stdenv
, fetchFromGitHub
}:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "docker-craft-cms-dev-env";
@ -20,7 +17,8 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Docker image for local development of sites based on Craft CMS";
description =
"Docker image for local development of sites based on Craft CMS";
homepage = "https://github.com/codemonauts/docker-craft-cms-dev-env";
license = licenses.mit;
maintainers = with maintainers; [ ];

View file

@ -1,8 +1,4 @@
{ lib
, stdenv
, buildNpmPackage
, fetchFromGitHub
}:
{ lib, buildNpmPackage, fetchFromGitHub }:
buildNpmPackage rec {
pname = "spx-gc";
@ -25,7 +21,8 @@ buildNpmPackage rec {
'';
meta = with lib; {
description = "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software";
description =
"SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software";
homepage = "https://github.com/TuomoKu/SPX-GC#npminstall";
license = licenses.mit;
maintainers = with maintainers; [ ];

View file

@ -1,7 +1,7 @@
{ lib, python3Packages }:
{ python3Packages }:
with python3Packages;
buildPythonApplication {
name = "toggl-time-grouper";
src = ./.;
propagatedBuildInputs = [ pandas ];
}
}

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ config, ... }:
{
programs.alacritty = {

View file

@ -1,5 +1 @@
{ config, pkgs, lib, ... }:
{
programs.bat = { enable = true; };
}
{ programs.bat = { enable = true; }; }

View file

@ -1,5 +1,3 @@
{ config, pkgs, lib, ... }:
{
programs.beets = {
enable = false;

View file

@ -22,30 +22,23 @@ let
isEnabled = if config.machine.isGraphical then true else false;
dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
commandLineArgs = [
"--ignore-gpu-blocklist"
"--enable-gpu-rasterization"
"--enable-zero-copy"
"--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,WebRTCPipeWireCapturer"
"--disable-features=UseChromeOSDirectVideoDecoder"
"--use-vulkan"
"--ozone-platform-hint=auto"
"--enable-hardware-overlays"
"--ignore-gpu-blocklist"
"--enable-gpu-rasterization"
"--enable-zero-copy"
"--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,WebRTCPipeWireCapturer"
"--disable-features=UseChromeOSDirectVideoDecoder"
"--use-vulkan"
"--ozone-platform-hint=auto"
"--enable-hardware-overlays"
];
extensions = map
(eid: {
id = eid;
})
chromium_extension;
in
{
extensions = map (eid: { id = eid; }) chromium_extension;
in {
programs.chromium = {
inherit dictionaries commandLineArgs extensions;
enable = isEnabled;
dictionaries = dictionaries;
commandLineArgs = commandLineArgs;
extensions = extensions;
};
programs.google-chrome = {
inherit commandLineArgs;
enable = isEnabled;
commandLineArgs = commandLineArgs;
};
}

View file

@ -1,5 +1 @@
{ config, pkgs, lib, ... }:
{
programs.command-not-found = { enable = true; };
}
{ programs.command-not-found = { enable = true; }; }

View file

@ -1,5 +1,3 @@
{ config, pkgs, lib, ... }:
{
programs.dircolors = {
enable = true;

View file

@ -1,5 +1,3 @@
{ config, pkgs, lib, ... }:
{
programs.direnv = {
enable = true;

View file

@ -4,4 +4,4 @@
programs.firefox = {
enable = if config.machine.isGraphical then true else false;
};
}
}

View file

@ -1,5 +1,3 @@
{ config, pkgs, lib, ... }:
{
programs.fzf = {
enable = true;

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ pkgs, ... }:
{
programs.git = {
@ -27,7 +27,5 @@
branch = { autosetuprebase = "always"; };
};
};
programs.git-credential-oauth = {
enable = true;
};
programs.git-credential-oauth = { enable = true; };
}

View file

@ -1,7 +1 @@
{ config, pkgs, lib, ... }:
{
programs.go = {
enable = true;
};
}
{ programs.go = { enable = true; }; }

View file

@ -1,5 +1 @@
{ config, pkgs, lib, ... }:
{
programs.hstr = { enable = true; };
}
{ programs.hstr = { enable = true; }; }

View file

@ -1,5 +1,3 @@
{ config, pkgs, lib, ... }:
{
programs.htop = {
enable = true;

View file

@ -5,4 +5,4 @@
enable = if config.machine.isGraphical then true else false;
scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
};
}
}

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ pkgs, ... }:
{
programs.neovim = {

View file

@ -1,5 +1,3 @@
{ config, pkgs, lib, ... }:
{
programs.starship = {
enable = true;

View file

@ -1,7 +1 @@
{ config, pkgs, lib, ... }:
{
services.syncthing = {
enable = true;
};
}
{ services.syncthing = { enable = true; }; }

View file

@ -1,7 +1,10 @@
{ config, pkgs, lib, ... }:
{ config, ... }:
let
configPath = if config.machine.isGeneric then "${config.home.homeDirectory}/.config/home-manager" else "${config.home.homeDirectory}/.nixos-config";
configPath = if config.machine.isGeneric then
"${config.home.homeDirectory}/.config/home-manager"
else
"${config.home.homeDirectory}/.nixos-config";
in {
programs.topgrade = {
enable = true;
@ -13,18 +16,13 @@ in {
pre_sudo = false;
cleanup = true;
skip_notify = true;
disable = [
"bun"
"tldr"
"flutter"
];
disable = [ "bun" "tldr" "flutter" ];
};
git.repos = [
configPath
];
git.repos = [ configPath ];
firmware = { upgrade = true; };
pre_commands = {
flakeUpgrade = "cd ${configPath} && nix flake update --commit-lock-file --verbose --repair";
flakeUpgrade =
"cd ${configPath} && nix flake update --commit-lock-file --verbose --repair";
};
};
};

View file

@ -1,6 +1,2 @@
{ config, pkgs, lib, ... }:
{
programs.yt-dlp = { enable = true; };
}
{ programs.yt-dlp = { enable = true; }; }

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ pkgs, ... }:
let
omz-plugins = [
"git"

View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
{ pkgs, lib, ... }:
let
chromeArgs = lib.strings.concatStringsSep " " [
@ -16,15 +15,15 @@ let
"--ozone-platform-hint=auto"
"--enable-features=WaylandWindowDecorations"
];
code-wrapper = (pkgs.writeShellScriptBin "code" ''
code-wrapper = pkgs.writeShellScriptBin "code" ''
exec /usr/bin/code ${codeArgs} "$@"
'');
chrome-wrapper = (pkgs.writeShellScriptBin "google-chrome" ''
'';
chrome-wrapper = pkgs.writeShellScriptBin "google-chrome" ''
exec /usr/bin/google-chrome ${chromeArgs} "$@"
'');
chrome-stable-wrapper = (pkgs.writeShellScriptBin "google-chrome-stable" ''
'';
chrome-stable-wrapper = pkgs.writeShellScriptBin "google-chrome-stable" ''
exec /usr/bin/google-chrome-stable ${chromeArgs} "$@"
'');
'';
in {
home.packages = with pkgs; [
code-wrapper
@ -202,7 +201,7 @@ in {
Name[vi]=Ca s Mi
Name[zh_CN]=
Name[zh_TW]=
Exec=/usr/bin/google-chrome-stable ${chromeArgs}
Exec=/usr/bin/google-chrome-stable ${chromeArgs}
[Desktop Action new-private-window]
Name=New Incognito Window

View file

@ -8,18 +8,15 @@
sandbox = relaxed
'';
settings = {
trusted-users = [
"root"
"thilo"
];
trusted-users = [ "root" "thilo" ];
trusted-substituters = [
"https://cache.nixos.org"
"https://cache.nixos.org"
"https://nix-community.cachix.org"
"https://nixpkgs-update.cachix.org"
"https://devenv.cachix.org"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="

View file

@ -1,31 +1,22 @@
{ config
, pkgs
, lib
, inputs
, ...
}:
{ config, pkgs, lib, inputs, ... }:
{
imports = [
./../nix.nix
];
imports = [ ./../nix.nix ];
nix = {
# This will add each flake input as a registry
# To make nix3 commands consistent with your flake
registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}")
config.nix.registry;
};
nixpkgs = {
config = {
permittedInsecurePackages = [
"electron-24.8.6"
"electron-25.9.0"
];
permittedInsecurePackages = [ "electron-24.8.6" "electron-25.9.0" ];
allowUnfree = true;
};
};
@ -44,7 +35,7 @@
LC_TIME = "de_DE.UTF-8";
};
users.users.thilo = {
users.users.thilo = {
uid = 1000;
description = "Thilo Billerbeck";
shell = pkgs.zsh;
@ -85,12 +76,7 @@
noisetorch.enable = true;
};
environment.systemPackages = with pkgs; [
git
zsh
kitty
steamtinkerlaunch
];
environment.systemPackages = with pkgs; [ git zsh kitty steamtinkerlaunch ];
networking.networkmanager.enable = true;
@ -103,9 +89,7 @@
pulse.enable = true;
jack.enable = true;
};
tailscale = {
enable = true;
};
tailscale = { enable = true; };
flatpak.enable = true;
avahi = {
enable = true;
@ -117,13 +101,17 @@
};
};
hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = true;
hardware = {
pulseaudio.enable = false;
opengl = {
driSupport = true;
driSupport32Bit = true;
};
};
security.polkit.enable = true;
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
time.hardwareClockInLocalTime = true;
}
}