mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2025-06-12 15:44:37 +02:00
Compare commits
10 commits
ae57b200d3
...
adb399df89
Author | SHA1 | Date | |
---|---|---|---|
adb399df89 | |||
67d7bc7813 | |||
5db76aec8d | |||
b4e9a29654 | |||
bf38821477 | |||
87f8c661a9 | |||
3f41727276 | |||
fad3eed964 | |||
0103d05ddd | |||
b5a30f0ae9 |
11 changed files with 48 additions and 53 deletions
|
@ -15,21 +15,24 @@
|
|||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/caa83e18-f2f2-46f9-8c27-0842c3051dc1";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
{ device = "/dev/disk/by-uuid/ecc9110a-4510-4a67-9227-021e146b59ca";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/DADB-44A9";
|
||||
{ device = "/dev/disk/by-uuid/230E-6756";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/9ad760a9-34e4-4858-96e6-98c7a8e497a4"; }
|
||||
];
|
||||
|
||||
fileSystems = {
|
||||
"/data" = {
|
||||
device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";
|
||||
|
|
|
@ -46,10 +46,10 @@
|
|||
];
|
||||
|
||||
programs.distrobox = {
|
||||
enable = lib.mkForce true;
|
||||
enable = true;
|
||||
containers = {
|
||||
arch = {
|
||||
image = "arch-toolbox";
|
||||
image = "quay.io/toolbx/arch-toolbox";
|
||||
additional_packages = "python python-pip nodejs";
|
||||
volume = "/etc/static/profiles/per-user:/etc/profiles/per-user:ro";
|
||||
replace = true;
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
grub = {
|
||||
efiSupport = true;
|
||||
device = "nodev";
|
||||
useOSProber = true;
|
||||
};
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
@ -174,6 +175,7 @@
|
|||
autoStart = true;
|
||||
enable = true;
|
||||
user = "thilo";
|
||||
desktopSession = "plasma";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
39
flake.lock
generated
39
flake.lock
generated
|
@ -1,25 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"dagger": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742857412,
|
||||
"narHash": "sha256-Gv7hgW37lyZd2XabuOYQEn8WT7TH9yTqK2+uaAudYyE=",
|
||||
"owner": "dagger",
|
||||
"repo": "nix",
|
||||
"rev": "76507e2d0e6c302cfc652c7acd68c6c700f7125f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "dagger",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1733328505,
|
||||
|
@ -57,11 +37,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742996658,
|
||||
"narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
|
||||
"lastModified": 1743527271,
|
||||
"narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "693840c01b9bef9e54100239cef937e53d4661bf",
|
||||
"rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -76,11 +56,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742465245,
|
||||
"narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
|
||||
"lastModified": 1743144043,
|
||||
"narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
|
||||
"rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -251,11 +231,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1742889210,
|
||||
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
|
||||
"lastModified": 1743315132,
|
||||
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
|
||||
"rev": "52faf482a3889b7619003c0daec593a1912fddc1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -281,7 +261,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"dagger": "dagger",
|
||||
"home-manager": "home-manager",
|
||||
"jovian-nixos": "jovian-nixos",
|
||||
"nix-alien": "nix-alien",
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
dagger.url = "github:dagger/nix";
|
||||
dagger.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixgl = {
|
||||
url = "github:guibou/nixGL";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -57,7 +55,7 @@
|
|||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem {
|
||||
nixosConfigurations."thilo-pc" = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
|
|
|
@ -19,6 +19,7 @@ with lib;
|
|||
./../programs/htop.nix
|
||||
./../programs/kitty.nix
|
||||
./../programs/neovim.nix
|
||||
./../programs/nextcloud-client.nix
|
||||
./../programs/starship.nix
|
||||
./../programs/topgrade.nix
|
||||
./../programs/yt-dlp.nix
|
||||
|
@ -31,6 +32,7 @@ with lib;
|
|||
./../programs/hstr.nix
|
||||
./../programs/thefuck.nix
|
||||
./../programs/ssh.nix
|
||||
./../programs/vscode.nix
|
||||
./../programs/zed.nix
|
||||
./../../nix.nix
|
||||
./packages.nix
|
||||
|
|
|
@ -14,14 +14,6 @@ let
|
|||
in
|
||||
{
|
||||
config = {
|
||||
nixpkgs.overlays = [
|
||||
(_: prev: {
|
||||
quickemu = prev.quickemu.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [ ./../patches/quickemu.patch ];
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
home.packages =
|
||||
with pkgs;
|
||||
[
|
||||
|
@ -70,12 +62,11 @@ in
|
|||
ncdu
|
||||
devenv
|
||||
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
|
||||
inputs.dagger.packages.x86_64-linux.dagger
|
||||
nixpkgs-review
|
||||
unzip
|
||||
nil
|
||||
nixd
|
||||
unrar
|
||||
# inputs.w17.packages.x86_64-linux.default
|
||||
nix-output-monitor
|
||||
nodePackages.pnpm
|
||||
npm-check-updates
|
||||
|
@ -136,10 +127,8 @@ in
|
|||
bottles
|
||||
protontricks
|
||||
heroic
|
||||
(vscode.override { commandLineArgs = electronFlags; })
|
||||
quickemu
|
||||
quickgui
|
||||
trilium-desktop
|
||||
anki
|
||||
muse-sounds-manager
|
||||
jetbrains-toolbox
|
||||
|
@ -160,6 +149,7 @@ in
|
|||
telegram-desktop
|
||||
thunderbird
|
||||
gearlever
|
||||
kdePackages.merkuro
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, ... }:
|
||||
|
||||
{
|
||||
programs.firefox = {
|
||||
programs.floorp = {
|
||||
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
|
||||
};
|
||||
}
|
||||
|
|
12
home-manager/programs/nextcloud-client.nix
Normal file
12
home-manager/programs/nextcloud-client.nix
Normal file
|
@ -0,0 +1,12 @@
|
|||
{ pkgs, config, ... }:
|
||||
|
||||
let
|
||||
nixGL = config.lib.nixGL.wrap;
|
||||
in
|
||||
{
|
||||
services.nextcloud-client = {
|
||||
enable = if (config.machine.isGraphical) then true else false;
|
||||
package = if (config.machine.isGeneric) then (nixGL pkgs.nextcloud-client) else pkgs.nextcloud-client;
|
||||
startInBackground = true;
|
||||
};
|
||||
}
|
|
@ -25,6 +25,7 @@ in
|
|||
"nix"
|
||||
"uv"
|
||||
];
|
||||
nix_arguments = "--builders \"\"";
|
||||
};
|
||||
git.repos = [ configPath ];
|
||||
firmware = {
|
||||
|
|
8
home-manager/programs/vscode.nix
Normal file
8
home-manager/programs/vscode.nix
Normal file
|
@ -0,0 +1,8 @@
|
|||
{ config, ... }:
|
||||
|
||||
|
||||
{
|
||||
programs.vscode = {
|
||||
enable = !config.machine.isGeneric && config.machine.isGraphical;
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue