mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2025-03-16 12:21:54 +01:00
Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles
This commit is contained in:
commit
814fd8d882
15 changed files with 248 additions and 647 deletions
|
|
@ -27,7 +27,8 @@
|
|||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
|
||||
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";
|
||||
|
|
|
|||
|
|
@ -9,51 +9,55 @@
|
|||
}:
|
||||
|
||||
{
|
||||
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"
|
||||
];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/5A04-0844";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
};
|
||||
|
||||
"/data" = {
|
||||
device = "/dev/disk/by-uuid/91f64815-1d3c-4032-960f-0a53eb3b01ab";
|
||||
device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/0EB3-BFB0";
|
||||
fsType = "vfat";
|
||||
options = [ "nofail" ];
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ inputs
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
|
|
@ -31,22 +33,12 @@
|
|||
};
|
||||
*/
|
||||
|
||||
home.sessionVariables = {
|
||||
LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
|
||||
};
|
||||
|
||||
nix = {
|
||||
package = pkgs.lix;
|
||||
};
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "kde";
|
||||
package = lib.mkDefault pkgs.lix;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
lix
|
||||
papirus-icon-theme
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +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’).
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, options, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
loader = {
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
extraInstallCommands = ''
|
||||
${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
|
||||
'';
|
||||
# extraInstallCommands = ''
|
||||
# ${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
|
||||
# '';
|
||||
};
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
binfmt.registrations.appimage = {
|
||||
wrapInterpreterInShell = false;
|
||||
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
|
||||
|
|
@ -37,36 +37,135 @@
|
|||
|
||||
# Enable the X11 windowing system.
|
||||
services = {
|
||||
xserver = {
|
||||
enable = true;
|
||||
displayManager.sddm.enable = true;
|
||||
displayManager.sddm.wayland.enable = true;
|
||||
xkb = {
|
||||
variant = "";
|
||||
layout = "us";
|
||||
};
|
||||
xserver.enable = true;
|
||||
displayManager.sddm.enable = true;
|
||||
desktopManager.plasma6.enable = true;
|
||||
xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
};
|
||||
ollama = {
|
||||
enable = false;
|
||||
acceleration = "rocm";
|
||||
};
|
||||
desktopManager.plasma6.enable = true;
|
||||
blueman.enable = true;
|
||||
};
|
||||
|
||||
programs.kdeconnect.enable = true;
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries =
|
||||
(pkgs.steam-run.args.multiPkgs pkgs)
|
||||
++ (with pkgs; [
|
||||
nss
|
||||
sane-backends
|
||||
nspr
|
||||
zlib
|
||||
libglvnd
|
||||
qt5.qtbase
|
||||
qt5.qtsvg
|
||||
qt5.qtdeclarative
|
||||
qt5.qtwayland
|
||||
pkcs11helper
|
||||
stdenv.cc.cc
|
||||
freetype
|
||||
|
||||
hardware.opengl = {
|
||||
stdenv.cc.cc
|
||||
openssl
|
||||
xorg.libXcomposite
|
||||
xorg.libXtst
|
||||
xorg.libXrandr
|
||||
xorg.libXext
|
||||
xorg.libX11
|
||||
xorg.libXfixes
|
||||
libGL
|
||||
libva
|
||||
xorg.libxcb
|
||||
xorg.libXdamage
|
||||
xorg.libxshmfence
|
||||
xorg.libXxf86vm
|
||||
libelf
|
||||
glib
|
||||
gtk3
|
||||
bzip2
|
||||
xorg.libXinerama
|
||||
xorg.libXcursor
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXi
|
||||
xorg.libSM
|
||||
xorg.libICE
|
||||
gnome2.GConf
|
||||
nspr
|
||||
nss
|
||||
cups
|
||||
libcap
|
||||
SDL2
|
||||
libusb1
|
||||
dbus-glib
|
||||
ffmpeg
|
||||
libudev0-shim
|
||||
xorg.libXt
|
||||
xorg.libXmu
|
||||
libogg
|
||||
libvorbis
|
||||
SDL
|
||||
SDL2_image
|
||||
glew110
|
||||
libidn
|
||||
tbb
|
||||
flac
|
||||
freeglut
|
||||
libjpeg
|
||||
libpng
|
||||
libpng12
|
||||
libsamplerate
|
||||
libmikmod
|
||||
libtheora
|
||||
libtiff
|
||||
pixman
|
||||
speex
|
||||
SDL_image
|
||||
SDL_ttf
|
||||
SDL_mixer
|
||||
SDL2_ttf
|
||||
SDL2_mixer
|
||||
libappindicator-gtk2
|
||||
libdbusmenu-gtk2
|
||||
libindicator-gtk2
|
||||
libcaca
|
||||
libcanberra
|
||||
libgcrypt
|
||||
libvpx
|
||||
librsvg
|
||||
xorg.libXft
|
||||
libvdpau
|
||||
pango
|
||||
cairo
|
||||
atk
|
||||
gdk-pixbuf
|
||||
fontconfig
|
||||
freetype
|
||||
dbus
|
||||
alsa-lib
|
||||
expat
|
||||
libdrm
|
||||
mesa
|
||||
libxkbcommon
|
||||
]);
|
||||
};
|
||||
|
||||
hardware.graphics = {
|
||||
extraPackages = with pkgs; [
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
};
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
programs.steam.gamescopeSession = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
env = {
|
||||
WLR_RENDERER = "vulkan";
|
||||
DXVK_HDR = "1";
|
||||
|
|
@ -89,7 +188,5 @@
|
|||
];
|
||||
};
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.stateVersion = "24.11";
|
||||
}
|
||||
|
|
|
|||
505
flake.lock
generated
505
flake.lock
generated
|
|
@ -1,505 +0,0 @@
|
|||
{
|
||||
"nodes": {
|
||||
"dagger": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736877484,
|
||||
"narHash": "sha256-D41j29wFhKfTQHRy/lSxiZz2JGlXiRt3JAh22W9bJR0=",
|
||||
"owner": "dagger",
|
||||
"repo": "nix",
|
||||
"rev": "113c1e24069523bb9d595c31398f84c86e11bd54",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "dagger",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737762889,
|
||||
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mmdoc": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-update",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710694589,
|
||||
"narHash": "sha256-5wa+Jzxr+LygoxSZuZg0YU81jgdnx2IY/CqDIJMOgec=",
|
||||
"owner": "ryantm",
|
||||
"repo": "mmdoc",
|
||||
"rev": "b6ddf748b1d1c01ca582bb1b3dafd6bc3a4c83a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ryantm",
|
||||
"repo": "mmdoc",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"muse-sounds-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711493694,
|
||||
"narHash": "sha256-u6hPaeOUsV/d/kBNo1vlG6X0/gHvTkHfCECH9pjFnV8=",
|
||||
"owner": "thilobillerbeck",
|
||||
"repo": "muse-sounds-manager-nix",
|
||||
"rev": "06b0da28c54331d5af73efd2ebf264ce914e5936",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "thilobillerbeck",
|
||||
"repo": "muse-sounds-manager-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-alien": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils",
|
||||
"nix-filter": "nix-filter",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736952083,
|
||||
"narHash": "sha256-zLhLqxc2JKvUtr0mSRRvOeKXN5dl5bn1e99z7EOp3bI=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "7e687663d2054fa1708284bd42731c6be62b1667",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-filter": {
|
||||
"locked": {
|
||||
"lastModified": 1731533336,
|
||||
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-alien",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736652904,
|
||||
"narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737861961,
|
||||
"narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixgl": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713543440,
|
||||
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
|
||||
"owner": "guibou",
|
||||
"repo": "nixGL",
|
||||
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "guibou",
|
||||
"repo": "nixGL",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1736798957,
|
||||
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-update": {
|
||||
"inputs": {
|
||||
"mmdoc": "mmdoc",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"runtimeDeps": "runtimeDeps",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736377062,
|
||||
"narHash": "sha256-btbfArUqew5zanxo01ypigjR32MILaePcVf+xUqrXSc=",
|
||||
"owner": "ryantm",
|
||||
"repo": "nixpkgs-update",
|
||||
"rev": "cdc89d742137e1fd2dd23c82ae6fa9d0c2e3d302",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ryantm",
|
||||
"repo": "nixpkgs-update",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1737746512,
|
||||
"narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "825479c345a7f806485b7f00dbe3abb50641b083",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1672428209,
|
||||
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1726142289,
|
||||
"narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "280db3decab4cbeb22a4599bd472229ab74d25e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"dagger": "dagger",
|
||||
"home-manager": "home-manager",
|
||||
"muse-sounds-manager": "muse-sounds-manager",
|
||||
"nix-alien": "nix-alien",
|
||||
"nix-index-database": "nix-index-database_2",
|
||||
"nixgl": "nixgl",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-update": "nixpkgs-update",
|
||||
"suyu": "suyu",
|
||||
"w17": "w17"
|
||||
}
|
||||
},
|
||||
"runtimeDeps": {
|
||||
"locked": {
|
||||
"lastModified": 1714247354,
|
||||
"narHash": "sha256-6dFKqP/aCKIdpOgqgIQUrRT0NOfVc14ftNcdELa4Pu4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c8d7c8a78fb516c0842cc65346506a565c88014d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"suyu": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726259531,
|
||||
"narHash": "sha256-84sIM3Gd7e6PhjsBT2EiiAInJlKQsb4HpgUPTYr6eg0=",
|
||||
"owner": "Noodlez1232",
|
||||
"repo": "suyu-flake",
|
||||
"rev": "e3ea28163248edaf5fe2a65f92e9ef3593bdc20a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Noodlez1232",
|
||||
"repo": "suyu-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-update",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711963903,
|
||||
"narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"w17": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709679417,
|
||||
"narHash": "sha256-I1f3QEmM/ktBVlVk9CvoBtS7/CBlgV4vSgIR20u82lc=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "92b5e8a6e3710073c68a629a52a964e1ffd6c4a1",
|
||||
"revCount": 2,
|
||||
"type": "git",
|
||||
"url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
16
flake.nix
16
flake.nix
|
|
@ -28,10 +28,6 @@
|
|||
};
|
||||
suyu.url = "github:Noodlez1232/suyu-flake";
|
||||
nix-alien.url = "github:thiagokokada/nix-alien";
|
||||
nix-index-database = {
|
||||
url = "github:nix-community/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
nixConfig = {
|
||||
|
|
@ -50,11 +46,12 @@
|
|||
};
|
||||
|
||||
outputs =
|
||||
{ nixpkgs
|
||||
, home-manager
|
||||
, nixgl
|
||||
, w17
|
||||
, ...
|
||||
{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nixgl,
|
||||
w17,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
|
|
@ -92,7 +89,6 @@
|
|||
homeConfigurations."thilo@thilo-pc" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
./configs/fedora/home.nix
|
||||
];
|
||||
extraSpecialArgs = {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ with lib;
|
|||
./../programs/hstr.nix
|
||||
./../programs/thefuck.nix
|
||||
./../programs/ssh.nix
|
||||
./../programs/zed.nix
|
||||
./../../nix.nix
|
||||
./packages.nix
|
||||
];
|
||||
|
|
@ -85,7 +86,7 @@ with lib;
|
|||
nixGL = {
|
||||
packages = inputs.nixgl.packages;
|
||||
defaultWrapper = "mesa";
|
||||
installScripts = ["mesa"];
|
||||
installScripts = [ "mesa" ];
|
||||
vulkan.enable = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ in
|
|||
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
|
||||
(callPackage ./../pkgs/extract.nix { inherit pkgs; })
|
||||
(pkgs.writeShellScriptBin "kitty-term-fix" ''
|
||||
infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
|
||||
'')
|
||||
infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
|
||||
'')
|
||||
nixpkgs-fmt
|
||||
ddev
|
||||
act
|
||||
|
|
@ -93,6 +93,11 @@ in
|
|||
nextpnr
|
||||
icestorm
|
||||
icebreaker
|
||||
|
||||
php
|
||||
(lib.hiPrio phpPackages.composer)
|
||||
|
||||
nixfmt-rfc-style
|
||||
]
|
||||
++ (
|
||||
if (!config.machine.isGeneric) then
|
||||
|
|
@ -117,22 +122,23 @@ in
|
|||
++ (
|
||||
if (config.machine.isGraphical && !config.machine.isGeneric) then
|
||||
[
|
||||
jetbrains.webstorm
|
||||
jetbrains.phpstorm
|
||||
jetbrains.rust-rover
|
||||
jetbrains.goland
|
||||
jetbrains.pycharm-professional
|
||||
# jetbrains.webstorm
|
||||
# jetbrains.phpstorm
|
||||
# jetbrains.rust-rover
|
||||
# jetbrains.goland
|
||||
element-desktop
|
||||
ludusavi
|
||||
dbeaver
|
||||
dbeaver-bin
|
||||
onlyoffice-bin
|
||||
spotify
|
||||
vesktop
|
||||
discord
|
||||
(lutris.override {
|
||||
extraLibraries = _: [ gnome3.adwaita-icon-theme ];
|
||||
extraLibraries = _: [ adwaita-icon-theme ];
|
||||
extraPkgs = _: [
|
||||
wineWowPackages.full
|
||||
winetricks
|
||||
gnome3.adwaita-icon-theme
|
||||
adwaita-icon-theme
|
||||
];
|
||||
})
|
||||
bottles
|
||||
|
|
@ -143,22 +149,24 @@ in
|
|||
quickgui
|
||||
trilium-desktop
|
||||
anki
|
||||
# inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
|
||||
muse-sounds-manager
|
||||
jetbrains-toolbox
|
||||
mumble
|
||||
prusa-slicer
|
||||
trayscale
|
||||
gnome.gnome-disk-utility
|
||||
gnome-disk-utility
|
||||
inkscape
|
||||
musescore
|
||||
obsidian
|
||||
syncthingtray
|
||||
reaper
|
||||
yabridge
|
||||
inputs.suyu.packages.x86_64-linux.suyu
|
||||
torzu
|
||||
inputs.nix-alien.packages.x86_64-linux.nix-alien
|
||||
kdePackages.kdenlive
|
||||
audacity
|
||||
signal-desktop
|
||||
telegram-desktop
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
|
|
|
|||
|
|
@ -35,12 +35,8 @@ let
|
|||
extensions = map (eid: { id = eid; }) chromium_extension;
|
||||
in
|
||||
{
|
||||
programs.chromium = {
|
||||
inherit dictionaries commandLineArgs extensions;
|
||||
enable = isEnabled;
|
||||
};
|
||||
programs.google-chrome = {
|
||||
inherit commandLineArgs;
|
||||
programs.brave = {
|
||||
# inherit commandLineArgs;
|
||||
enable = isEnabled;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,9 @@ let
|
|||
user = "git";
|
||||
identitiesOnly = true;
|
||||
};
|
||||
"mail" = { hostname = "mail.officerent.de"; };
|
||||
"mail" = {
|
||||
hostname = "mail.officerent.de";
|
||||
};
|
||||
"*.tu-darmstadt.de" = {
|
||||
identityFile = "~/.ssh/id_tu-darmstadt-de";
|
||||
};
|
||||
|
|
@ -61,25 +63,23 @@ let
|
|||
};
|
||||
};
|
||||
catchAlls = builtins.listToAttrs (
|
||||
builtins.map
|
||||
(host: {
|
||||
name = "*.${host}";
|
||||
value = {
|
||||
identityFile = "~/.ssh/id_thilo-billerbeck-com";
|
||||
user = "root";
|
||||
};
|
||||
})
|
||||
ownDomains
|
||||
builtins.map (host: {
|
||||
name = "*.${host}";
|
||||
value = {
|
||||
identityFile = "~/.ssh/id_thilo-billerbeck-com";
|
||||
user = "root";
|
||||
};
|
||||
}) ownDomains
|
||||
);
|
||||
hostnameAliasses = builtins.listToAttrs (
|
||||
builtins.map
|
||||
(host: {
|
||||
name = "${host}";
|
||||
value = {
|
||||
hostname = "${host}.thilo-billerbeck.com";
|
||||
};
|
||||
})
|
||||
thiloBillerbeckHosts
|
||||
builtins.map (host: {
|
||||
name = "${host}";
|
||||
value = lib.hm.dag.entryBefore ["*.thilo-billerbeck.com"] {
|
||||
hostname = "${host}.thilo-billerbeck.com";
|
||||
identityFile = "~/.ssh/id_thilo-billerbeck-com";
|
||||
user = "root";
|
||||
};
|
||||
}) thiloBillerbeckHosts
|
||||
);
|
||||
buildersCCCDA = builtins.listToAttrs (
|
||||
builtins.map
|
||||
|
|
@ -89,7 +89,13 @@ let
|
|||
user = "avocadoom";
|
||||
identityFile = "~/.ssh/id_darmstadt-ccc-de";
|
||||
};
|
||||
}) [ "1" "2" "3" "4" ]
|
||||
})
|
||||
[
|
||||
"1"
|
||||
"2"
|
||||
"3"
|
||||
"4"
|
||||
]
|
||||
);
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,6 +32,10 @@ in
|
|||
pre_commands = {
|
||||
flakeUpgrade = "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair";
|
||||
};
|
||||
post_commands = {
|
||||
nixCollectGarbage = "nix-collect-garbage -d";
|
||||
dockerPrune = "docker system prune -f";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
7
home-manager/programs/zed.nix
Normal file
7
home-manager/programs/zed.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{ pkgs, config, ... }:
|
||||
|
||||
{
|
||||
programs.zed-editor = {
|
||||
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
|
||||
};
|
||||
}
|
||||
|
|
@ -18,21 +18,15 @@
|
|||
update-local = "bash $HOME/.dotfiles/install";
|
||||
sudo = "sudo --preserve-env=PATH env";
|
||||
};
|
||||
initExtra = ''
|
||||
antidote = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
"ohmyzsh/ohmyzsh path:plugins/dotenv"
|
||||
];
|
||||
};
|
||||
initExtraFirst = ''
|
||||
ZSH_DOTENV_PROMPT=false
|
||||
export PATH=~/.npm-global/bin:$PATH
|
||||
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
|
||||
'';
|
||||
plugins = [
|
||||
{
|
||||
name = "zsh-nix-shell";
|
||||
file = "nix-shell.plugin.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "chisui";
|
||||
repo = "zsh-nix-shell";
|
||||
rev = "v0.8.0";
|
||||
sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
{
|
||||
programs.ssh.knownHosts = {
|
||||
"build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
|
||||
"build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
|
||||
"build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
|
||||
"build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
|
||||
"build1.darmstadt.ccc.de".publicKey =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
|
||||
"build2.darmstadt.ccc.de".publicKey =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
|
||||
"build3.darmstadt.ccc.de".publicKey =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
|
||||
"build4.darmstadt.ccc.de".publicKey =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
|
||||
};
|
||||
|
||||
nix = {
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
virtualisation = {
|
||||
docker.enable = true;
|
||||
podman.enable = true;
|
||||
podman.enable = false;
|
||||
};
|
||||
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
steam.enable = true;
|
||||
zsh.enable = true;
|
||||
adb.enable = true;
|
||||
noisetorch.enable = true;
|
||||
noisetorch.enable = false;
|
||||
dconf = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
@ -89,8 +89,6 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
zsh
|
||||
kitty
|
||||
steamtinkerlaunch
|
||||
];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
|
@ -124,15 +122,13 @@
|
|||
};
|
||||
|
||||
hardware = {
|
||||
pulseaudio.enable = false;
|
||||
opengl = {
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
};
|
||||
};
|
||||
|
||||
security.polkit.enable = true;
|
||||
sound.enable = true;
|
||||
security.rtkit.enable = true;
|
||||
|
||||
time.hardwareClockInLocalTime = true;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue