Compare commits

...

10 commits

Author SHA1 Message Date
adb399df89 fix vscode 2025-04-01 20:54:54 +02:00
67d7bc7813 Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles 2025-04-01 20:48:26 +02:00
5db76aec8d add nextcloud client 2025-04-01 20:47:24 +02:00
b4e9a29654 several improvements to desktop 2025-04-01 20:01:20 +02:00
bf38821477 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5e5402ecbcb27af32284d4a62553c019a3a49ea6?narHash=sha256-gWd4urRoLRe8GLVC/3rYRae1h%2BxfQzt09xOfb0PaHSk%3D' (2025-03-27)
  → 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30)
2025-03-31 14:18:15 +02:00
87f8c661a9 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52?narHash=sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt%2Bg%3D' (2025-03-27)
  → 'github:nix-community/home-manager/1efd2503172016a6742c87b47b43ca2c8145607d?narHash=sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54%3D' (2025-03-28)
• Updated input 'jovian-nixos':
    'github:Jovian-Experiments/Jovian-NixOS/a95606cae5c9e1f5b84debe7865ef171d4deb287?narHash=sha256-gpjtkoeq5Ye9J8GoR%2BrWg3NL4bbEtcLvvF4nN6MtxdU%3D' (2025-03-20)
  → 'github:Jovian-Experiments/Jovian-NixOS/1c17514c8558886af0afc34b6c348c1f2ee9fd24?narHash=sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms%3D' (2025-03-28)
2025-03-28 15:47:54 +01:00
3f41727276 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/693840c01b9bef9e54100239cef937e53d4661bf?narHash=sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA%3D' (2025-03-26)
  → 'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52?narHash=sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt%2Bg%3D' (2025-03-27)
2025-03-27 22:10:13 +01:00
fad3eed964 flake.lock: Update
Flake lock file updates:

• Updated input 'dagger':
    'github:dagger/nix/588d2e8a81dc965705d56e83f0392f76f93985e4?narHash=sha256-TNSSDjVF4%2BI%2BLlcA3tWc5kgoDtGCLusrNdhdkciSUig%3D' (2025-02-27)
  → 'github:dagger/nix/a16cf50595de02fd3cfa644794e0983d8761d177?narHash=sha256-NyezPcnXjuZSsIkZZr4rRuThs7u1sYhPU%2BPwgJjmFgU%3D' (2025-03-12)
• Updated input 'home-manager':
    'github:nix-community/home-manager/fcac3d6d88302a5e64f6cb8014ac785e08874c8d?narHash=sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw%3D' (2025-03-01)
  → 'github:nix-community/home-manager/4e12151c9e014e2449e0beca2c0e9534b96a26b4?narHash=sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY%3D' (2025-03-14)
• Updated input 'nix-alien':
    'github:thiagokokada/nix-alien/ab175cdbbad2a93afc86125eb0835694b005b2fb?narHash=sha256-vGxTGexcKN8BVunczdqps1dbu0khOFp0%2B%2BGvip9QZJ8%3D' (2025-02-20)
  → 'github:thiagokokada/nix-alien/876d83ac35fc52145674282f87898824182edc48?narHash=sha256-mzZdujmFWC%2BwHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY%3D' (2025-03-15)
• Updated input 'nix-alien/nix-index-database':
    'github:nix-community/nix-index-database/895d81b6228bbd50a6ef22f5a58a504ca99763ea?narHash=sha256-/Ak%2BQuinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I%3D' (2025-02-09)
  → 'github:nix-community/nix-index-database/66537fb185462ba9b07f4e6f2d54894a1b2d04ab?narHash=sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE%3D' (2025-03-10)
• Updated input 'nix-alien/nixpkgs':
    'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0?narHash=sha256-%2B/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc%3D' (2025-02-13)
  → 'github:NixOS/nixpkgs/6607cf789e541e7873d40d3a8f7815ea92204f32?narHash=sha256-cPfs8qMccim2RBgtKGF%2Bx9IBCduRvd/N5F4nYpU0TVE%3D' (2025-03-13)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6313551cd05425cd5b3e63fe47dbc324eabb15e4?narHash=sha256-D%2BR%2BkFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs%3D' (2025-02-27)
  → 'github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5?narHash=sha256-C7jVfohcGzdZRF6DO%2BybyG/sqpo1h6bZi9T56sxLy%2Bk%3D' (2025-03-15)
2025-03-16 17:47:20 +01:00
0103d05ddd flake.lock: Update
Flake lock file updates:

• Updated input 'dagger':
    'github:dagger/nix/578e8c28bba72e4269cfe15de4a7097c1b3ebcff?narHash=sha256-wRW107bfN9jOrFHZdT7JUNw/RDn2BNxInqLLDKsgodk%3D' (2025-02-20)
  → 'github:dagger/nix/588d2e8a81dc965705d56e83f0392f76f93985e4?narHash=sha256-TNSSDjVF4%2BI%2BLlcA3tWc5kgoDtGCLusrNdhdkciSUig%3D' (2025-02-27)
• Updated input 'home-manager':
    'github:nix-community/home-manager/12e26a74e5eb1a31e13daaa08858689e25ebd449?narHash=sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob%2B6M963bwVq74%3D' (2025-02-23)
  → 'github:nix-community/home-manager/fcac3d6d88302a5e64f6cb8014ac785e08874c8d?narHash=sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw%3D' (2025-03-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05?narHash=sha256-WGaHVAjcrv%2BCun7zPlI41SerRtfknGQap281%2BAakSAw%3D' (2025-02-24)
  → 'github:NixOS/nixpkgs/6313551cd05425cd5b3e63fe47dbc324eabb15e4?narHash=sha256-D%2BR%2BkFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs%3D' (2025-02-27)
2025-03-01 21:30:30 +01:00
b5a30f0ae9 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/ed030a787938cae01d693ebaad52bbb672a4a69d?narHash=sha256-R61wtNknWWejnl%2BK0l4sxu/wnLNFbNe44tNM2zbj5yE%3D' (2025-02-23)
  → 'github:nix-community/home-manager/12e26a74e5eb1a31e13daaa08858689e25ebd449?narHash=sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob%2B6M963bwVq74%3D' (2025-02-23)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680?narHash=sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64%3D' (2025-02-18)
  → 'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05?narHash=sha256-WGaHVAjcrv%2BCun7zPlI41SerRtfknGQap281%2BAakSAw%3D' (2025-02-24)
2025-02-24 20:15:09 +01:00
11 changed files with 48 additions and 53 deletions

View file

@ -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";

View file

@ -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;

View file

@ -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
View file

@ -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",

View file

@ -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

View file

@ -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

View file

@ -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
[ ]

View file

@ -1,7 +1,7 @@
{ config, ... }:
{
programs.firefox = {
programs.floorp = {
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
};
}

View 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;
};
}

View file

@ -25,6 +25,7 @@ in
"nix"
"uv"
];
nix_arguments = "--builders \"\"";
};
git.repos = [ configPath ];
firmware = {

View file

@ -0,0 +1,8 @@
{ config, ... }:
{
programs.vscode = {
enable = !config.machine.isGeneric && config.machine.isGraphical;
};
}