Compare commits

...

8 Commits

8 changed files with 65 additions and 31 deletions

54
flake.lock generated
View File

@@ -48,11 +48,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1774690660,
"narHash": "sha256-oMALw/szOKhCXVX00pmITjcHorWPWu2jLRYiV1sWHnI=",
"lastModified": 1775707386,
"narHash": "sha256-1tNzciseW4+JQTSUxCVz1UhW//LuosLb9f3liFOhrL8=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "f4fc55e8011f82a9e0d66c610c1bec5274751b10",
"rev": "c1db0626fa993fe4e773d4c83df4cbb9684e434f",
"type": "gitlab"
},
"original": {
@@ -83,11 +83,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@@ -103,11 +103,11 @@
]
},
"locked": {
"lastModified": 1774559029,
"narHash": "sha256-deix7yg3j6AhjMPnFDCmWB3f83LsajaaULP5HH2j34k=",
"lastModified": 1775425411,
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a0bb0d11514f92b639514220114ac8063c72d0a3",
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
"type": "github"
},
"original": {
@@ -141,11 +141,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1774666183,
"narHash": "sha256-3DNpGXzkyuIu3/gXNtLvB2oSqKY5z1QP5ajy3VZjVV0=",
"lastModified": 1775703388,
"narHash": "sha256-q2OBj67rcfKFSuUB1OApJdseF75T7cOpUjPJkZCYN7M=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "7bcbe84d765e7fce5e267c569c718d8246336f3b",
"rev": "fffe21e97a9cb0a1ebcf1baa17a423d2517bb1f7",
"type": "github"
},
"original": {
@@ -156,11 +156,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1774567711,
"narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=",
"lastModified": 1775490113,
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "3f6f874dfc34d386d10e434c48ad966c4832243e",
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
"type": "github"
},
"original": {
@@ -172,11 +172,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1774388614,
"narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
"lastModified": 1775595990,
"narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
"rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2",
"type": "github"
},
"original": {
@@ -188,11 +188,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"lastModified": 1774748309,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"type": "github"
},
"original": {
@@ -203,11 +203,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"lastModified": 1775423009,
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
"type": "github"
},
"original": {
@@ -239,11 +239,11 @@
]
},
"locked": {
"lastModified": 1774303811,
"narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
"lastModified": 1775682595,
"narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
"rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
"type": "github"
},
"original": {

View File

@@ -6,7 +6,7 @@
flake.homeConfigurations."jonas@comfy-station" = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs {system = "x86_64-linux";};
modules = [
({...}: {nixpkgs.overlays = [self.overlays.unstable inputs.audio.overlays.default];})
({...}: {nixpkgs.overlays = [self.overlays.unstable];})
({...}: {nixpkgs.config.allowUnfree = true;})
./configuration.nix

View File

@@ -42,6 +42,7 @@
image-raw-processing = true;
video-editing-light = true;
};
hive.ntsync.enable = true;
# system packages
environment.systemPackages = with pkgs; [
@@ -111,8 +112,6 @@
trusted-users = [
"@wheel"
];
max-jobs = 2;
cores = 8;
};
gc = {
automatic = true;

View File

@@ -26,6 +26,7 @@
self.nixosModules.openhantek
self.nixosModules.firefox
self.nixosModules.kdeconnect
self.nixosModules.ntsync
];
};
}

View File

@@ -74,6 +74,7 @@
clientIdSopsKey = config.sops.secrets.spotifyShortcutsClientId.name;
clientSecretSopsKey = config.sops.secrets.spotifyShortcutsClientSecret.name;
};
hive.ntsync.enable = true;
# system packages
environment.systemPackages = with pkgs; [
@@ -171,6 +172,7 @@
boot.plymouth.enable = true;
boot.initrd.systemd.enable = true;
boot.supportedFilesystems = ["ntfs"];
boot.kernelPackages = pkgs.linuxPackages_latest;
# Configure console keymap
console.keyMap = "de";

View File

@@ -32,6 +32,7 @@
self.nixosModules.firefox
self.nixosModules.kdeconnect
self.nixosModules.spotify-shortcuts
self.nixosModules.ntsync
];
};
}

View File

@@ -92,7 +92,7 @@
;;collab ; buffers with friends
(debugger +realgud +lsp) ; FIXME stepping through code, to help you add bugs
;;direnv
;;docker
docker
;;editorconfig ; let someone else argue about tabs vs spaces
ein ; tame Jupyter notebooks with emacs
(eval +overlay) ; run code, run (also, repls)

31
modules/system/ntsync.nix Normal file
View File

@@ -0,0 +1,31 @@
{
flake.nixosModules.ntsync = {
config,
lib,
...
}: let
cfg = config.hive.ntsync;
in {
options.hive.ntsync.enable = lib.mkEnableOption "Enable the nt-sync kernel driver.";
options.hive.ntsync.proton = lib.mkOption {
description = "Make proton use ntsync";
default = true;
type = lib.types.bool;
};
config = lib.mkIf cfg.enable {
assertions = [
{
assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.14";
message = "ntsync requires at least linux 6.14";
}
];
boot.kernelModules = ["ntsync"];
environment.variables = lib.optionalAttrs cfg.proton {
PROTON_USE_NTSYNC = 1;
};
};
};
}