Compare commits

..

6 Commits

8 changed files with 64 additions and 38 deletions

View File

@ -24,11 +24,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1665824418, "lastModified": 1668167903,
"narHash": "sha256-OZX8io9UKzxFAwdRvf4uOThDFpGtlbMyi13RbqIpmoY=", "narHash": "sha256-5OENaesVk94meyiaDFgxtr4TTuAg52baVHXOnXL98vI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "08445dd7824253ee8580f06127460a7d14e942cf", "rev": "7b58afb8604c9d53fe11bfb76e2ce903cb658b66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667395993,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667395993,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1665655007, "lastModified": 1667981810,
"narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=", "narHash": "sha256-p27zd5M+OkfND46gzbGkaHlNBZsYe95M48OJuFeuuSY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8cbc6500dfca22d907054f68c564019b3b6cf295", "rev": "6ce3493a3c5c6a8f4cfa6f5f88723272e0cfd335",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,11 +380,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1665839131, "lastModified": 1668157555,
"narHash": "sha256-0KYo13PfwvPw5i/SC+hGy3hsgR++Co7SIzv+0e9YOnM=", "narHash": "sha256-s5rt2FSmV4PWt89rjt4cvBGOhPizStsinkIB0BXnKrk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "674d05f9ae2249d606a0e6fc63e522d2031a27ac", "rev": "062c3cca468a4b404ddd964fb444b665e4da982e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,10 +412,10 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665643254, "lastModified": 1665732960,
"narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=",
"path": "/nix/store/9z3mf509n245ydbsx13ygcp7w4yc3s5g-source", "path": "/nix/store/r2s8wcc8n4c72p9zg5gsacg8nmdhjvka-source",
"rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", "rev": "4428e23312933a196724da2df7ab78eb5e67a88e",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -441,11 +441,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1662996720, "lastModified": 1667629849,
"narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=", "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5f326e2a403e1cebaec378e72ceaf5725983376d", "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,11 +457,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1665732960, "lastModified": 1667991831,
"narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", "narHash": "sha256-DHgEsLZI044B9T4AjA3K6+yB9/DqLr4dyA7OIx0FG7o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4428e23312933a196724da2df7ab78eb5e67a88e", "rev": "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,11 +563,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1665843281, "lastModified": 1668174315,
"narHash": "sha256-OvRNNVJuismkTkpFjh3/B5vKZ6g0FK5mrx3jOsyUqmA=", "narHash": "sha256-oss9lJ30HbgXpVFy5Xv9doB+1mNjQehbFlFYau95odM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "335b2a8147ae0db34321842a0e2705f96091f210", "rev": "5da1d2f59d29cd1bb9c0787db9c1046825ade56a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +618,11 @@
"rnix-lsp": "rnix-lsp_2" "rnix-lsp": "rnix-lsp_2"
}, },
"locked": { "locked": {
"lastModified": 1665757700, "lastModified": 1666188566,
"narHash": "sha256-ewx+XtdjZSwoY148+FMAhnhkReb8wnXdB4jd48e/ew4=", "narHash": "sha256-q/CQWJ5CkKvVZYKYwfng7EkWvNai7T6HFz6rAxzGUNM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "2f221bae4c04e89b371c64995b36c3fab48f82fe", "rev": "a4a2886e495ceadcdc1792e5d0033cdc2d62e197",
"revCount": 109, "revCount": 110,
"type": "git", "type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
}, },
@ -794,11 +794,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667395993,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -87,6 +87,7 @@
}; };
gaming.enable = true; gaming.enable = true;
obs.enable = true; obs.enable = true;
android.enable = true;
}; };
services = { services = {
gamemode.enable = true; gamemode.enable = true;

View File

@ -104,7 +104,7 @@ in {
# We don't tolerate non-free software, except for Steam and Linux firmware # We don't tolerate non-free software, except for Steam and Linux firmware
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel" "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel"
"steam" "steam-original" "steam-runtime" "steam" "steam-original" "steam-runtime" "steam-run"
"discord" "discord-canary" "discord" "discord-canary"
"minecraft" "minecraft"
"spotify" "spotify-unwrapped" "spotify" "spotify-unwrapped"

View File

@ -25,6 +25,7 @@
./programs/bluray ./programs/bluray
./programs/direnv ./programs/direnv
./programs/obs ./programs/obs
./programs/android
# Services # Services
./services/kanshi ./services/kanshi

View File

@ -158,7 +158,7 @@ in {
okular okular
kdeconnect-kde kdeconnect-kde
breeze-gtk breeze-gtk
bismuth #bismuth
gwenview gwenview
yakuake yakuake

View File

@ -0,0 +1,15 @@
{ pkgs, lib, config, ... }:
let
cfg = config.ptw.programs.android;
in {
options.ptw.programs.android = {
enable = lib.mkEnableOption "Enable Android development options";
};
config = lib.mkIf cfg.enable {
environment.variables = {
"ANDROID_HOME" = "/home/alexander/Development/Android/Sdk";
};
};
}

View File

@ -20,7 +20,7 @@ in {
]; ];
}) })
steam-wrapped # Custom package #steam-wrapped # Custom package
gamescope gamescope

View File

@ -12,6 +12,15 @@ in {
enable = true; enable = true;
plugins = with pkgs.obs-studio-plugins; [ plugins = with pkgs.obs-studio-plugins; [
wlrobs obs-vkcapture wlrobs obs-vkcapture
(obs-pipewire-audio-capture.overrideAttrs (old: {
source = pkgs.fetchFromGitHub {
owner = "dimtpap";
repo = "obs-pipewire-audio-capture";
rev = "dd0cfa9581481c862cddd725e23423cd975265d9";
sha256 = "1kwdlvpvvx6fgnbn3scx5yg8vgxqy0blrbdxnwqdizzwm2m412ls";
};
}))
]; ];
}; };
}; };