Compare commits

...
3 Commits
5 changed files with 120 additions and 58 deletions
Generated
+65 -10
View File
@@ -101,6 +101,27 @@
"type": "github"
}
},
"claude-desktop": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1786936050,
"narHash": "sha256-YybpTwsaUCh6+MpC/CcXHfpZ6Qhsi3YF/2RF/8hUnUs=",
"owner": "aaddrick",
"repo": "claude-desktop-debian",
"rev": "a4d7ab8fe0b8fe8500ce415c4cb2f6dceee7bd70",
"type": "github"
},
"original": {
"owner": "aaddrick",
"repo": "claude-desktop-debian",
"type": "github"
}
},
"crane": {
"locked": {
"lastModified": 1754269165,
@@ -291,6 +312,24 @@
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1785627969,
"narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"lanzaboote",
@@ -311,9 +350,9 @@
"type": "github"
}
},
"flake-parts_2": {
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1782949081,
@@ -329,7 +368,7 @@
"type": "github"
}
},
"flake-parts_3": {
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
@@ -350,7 +389,7 @@
"type": "github"
}
},
"flake-parts_4": {
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"nur",
@@ -371,7 +410,7 @@
"type": "github"
}
},
"flake-parts_5": {
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": [
"stylix",
@@ -957,7 +996,7 @@
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts",
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
],
@@ -1137,7 +1176,7 @@
"nix-gaming": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_2",
"flake-parts": "flake-parts_3",
"git-hooks": "git-hooks",
"nixpkgs": [
"nixpkgs"
@@ -1195,6 +1234,21 @@
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1785031560,
"narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1782614948,
"narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
@@ -1400,7 +1454,7 @@
},
"nixvim": {
"inputs": {
"flake-parts": "flake-parts_3",
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_9",
"systems": "systems_4"
},
@@ -1443,7 +1497,7 @@
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_4",
"flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgs"
]
@@ -1537,6 +1591,7 @@
},
"root": {
"inputs": {
"claude-desktop": "claude-desktop",
"devshell": "devshell",
"disko": "disko",
"elephant": "elephant",
@@ -1629,7 +1684,7 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_5",
"flake-parts": "flake-parts_6",
"gnome-shell": "gnome-shell",
"nixpkgs": [
"nixpkgs"
+4
View File
@@ -97,6 +97,9 @@
# musnix.url = "github:musnix/musnix";
# musnix.inputs.nixpkgs.follows = "nixpkgs";
claude-desktop.url = "github:aaddrick/claude-desktop-debian";
claude-desktop.inputs.nixpkgs.follows = "nixpkgs";
stylix.url = "github:nix-community/stylix";
stylix.inputs.nixpkgs.follows = "nixpkgs";
@@ -156,6 +159,7 @@
inputs.nur.overlays.default
inputs.niri.overlays.niri
# inputs.emacs-overlay.overlay
inputs.claude-desktop.overlays.default
# All my own overlays (derivations + modifications)
(import ./overlays {inherit inputs nixpkgs pkgs-stable;})
+2
View File
@@ -99,6 +99,7 @@ in {
lldb
inotify-tools
xdotool
gnome-keyring
# Hardware/Software info
pciutils # lspci
@@ -165,6 +166,7 @@ in {
tableplus # database explorer
# opencode-desktop
lmstudio # TODO: Ollama
claude-desktop
# Office
kdePackages.wacomtablet # For xournalpp/krita
+47 -47
View File
@@ -93,53 +93,53 @@
};
};
games = {
type = "disk";
device = "/dev/disk/by-id/nvme-WD_BLACK_SN850X_2000GB_231623802252";
content = {
type = "gpt";
partitions = {
luks = {
label = "LUKS_GAMES";
size = "100%";
content = {
type = "luks";
name = "crypted_games";
extraOpenArgs = [
"--perf-no_read_workqueue"
"--perf-no_write_workqueue"
];
settings = {
allowDiscards = true;
crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10" "tries=5"];
# Disable for interactive password entry
# This is contained on the main disk, so by unlocking the main disk with the password,
# the second disk can unlock automatically
keyFile = "/persist/home/christoph/.secrets/luks.keyfile";
fallbackToPassword = false;
};
content = {
type = "btrfs";
extraArgs = ["-L" "GAMES" "-f"];
subvolumes = {
"data" = {
mountpoint = "/home/christoph/Games";
mountOptions = [
"compress=zstd"
"noatime"
];
};
};
};
};
};
};
};
};
# games = {
# type = "disk";
# device = "/dev/disk/by-id/nvme-WD_BLACK_SN850X_2000GB_231623802252";
# content = {
# type = "gpt";
# partitions = {
# luks = {
# label = "LUKS_GAMES";
# size = "100%";
# content = {
# type = "luks";
# name = "crypted_games";
#
# extraOpenArgs = [
# "--perf-no_read_workqueue"
# "--perf-no_write_workqueue"
# ];
#
# settings = {
# allowDiscards = true;
# crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10" "tries=5"];
#
# # Disable for interactive password entry
# # This is contained on the main disk, so by unlocking the main disk with the password,
# # the second disk can unlock automatically
# keyFile = "/persist/home/christoph/.secrets/luks.keyfile";
# fallbackToPassword = false;
# };
#
# content = {
# type = "btrfs";
# extraArgs = ["-L" "GAMES" "-f"];
# subvolumes = {
# "data" = {
# mountpoint = "/home/christoph/Games";
# mountOptions = [
# "compress=zstd"
# "noatime"
# ];
# };
# };
# };
# };
# };
# };
# };
# };
# ssd = {
# type = "disk";
@@ -159,7 +159,8 @@ in {
# (mkUDir ".config/beekeeper-studio" m755)
(mkUDir ".config/beets" m755)
(mkUDir ".config/blender" m755)
(mkUDir ".config/chromium" m755) # TODO: Remove this someday
(mkUDir ".config/chromium" m755)
(mkUDir ".config/Claude" m755) # Claude desktop
(mkUDir ".config/Code" m755)
(mkUDir ".config/Ferdium" m755)
(mkUDir ".config/feishin" m755)