From c61055689845eb1bd5fdf5883fc977ad2782a56d Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 27 Oct 2024 19:22:29 +0000 Subject: [PATCH] Add media --- flake.lock | 63 +++++++++++++++++---------------- hosts/muho/configuration.nix | 4 +++ modules/home/desktop/media.nix | 7 ++++ modules/home/desktop/social.nix | 6 ++-- modules/nixos/unfree/steam.nix | 6 +--- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index dd49b44..814a549 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1725392458, - "narHash": "sha256-sp1Ps5XBrIwDE0e2QOm2dJRRJ12aEWtJBhzohFwn+K4=", + "lastModified": 1728580104, + "narHash": "sha256-M+t/DmOj4cjF7/M9qBW5OK/Lam69z4LX+hXraqegz0w=", "ref": "refs/heads/main", - "rev": "4cc6a8289f809ec4470eb01429aa6ed548349a56", - "revCount": 14, + "rev": "befcf0b6e2b9540f01b5caaafcbe62fcf36a063a", + "revCount": 16, "type": "git", "url": "https://git.xeno.science/xenofem/actual-nix.git" }, @@ -136,11 +136,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1729716953, + "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1726398642, - "narHash": "sha256-tBM92BUtvY3vawqzl50VLY/EFhxw9LjuB/QN6QUC4ls=", + "lastModified": 1728984726, + "narHash": "sha256-v5GnrRqFRAmtfDbWxYKkaQsinz7EyAmFlUVDwH9MPTo=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "399c8e50f10d9bace3a024496e5f4dee28bdfdcd", + "rev": "3d6cd128d04a4df25584a3b23b9298a07661dbf6", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1726370017, - "narHash": "sha256-CJOV4JiLhd++w9K+h2z00DiB4R1CCuElWzhldrXSq5w=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0a2fba621b6bbf06be0b4edd974236e3d2fcc1a9", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726062873, - "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -408,11 +408,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1727635018, - "narHash": "sha256-WSc/MF4dUeB2UPMznXYv4LeKK/ulD4xsufdN/L5PoL4=", + "lastModified": 1729380793, + "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", "owner": "danth", "repo": "stylix", - "rev": "0eea8bcb0f9c3c7638e7ee64f98ed9b4ec716830", + "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", "type": "github" }, "original": { @@ -593,16 +593,17 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, diff --git a/hosts/muho/configuration.nix b/hosts/muho/configuration.nix index d741c2d..9a88e62 100644 --- a/hosts/muho/configuration.nix +++ b/hosts/muho/configuration.nix @@ -70,6 +70,10 @@ in { }; }; + environment.extraInit = '' + xset s off -dpms + ''; + ## GPU (AMD Radeon 7950) ## https://wiki.nixos.org/wiki/AMD_GPU boot.kernelParams = [ "radeon.si_support=0" "amdgpu.si_support=1" ]; diff --git a/modules/home/desktop/media.nix b/modules/home/desktop/media.nix index 8814c39..d68a251 100644 --- a/modules/home/desktop/media.nix +++ b/modules/home/desktop/media.nix @@ -8,6 +8,13 @@ pulseaudio pavucontrol + # Video + stremio + + # Interactive + bottles + mindustry + # Podcasts gpodder ]; diff --git a/modules/home/desktop/social.nix b/modules/home/desktop/social.nix index 3b81f9c..02b8ef2 100644 --- a/modules/home/desktop/social.nix +++ b/modules/home/desktop/social.nix @@ -1,5 +1,5 @@ -{ pkgs, lib, config, ... }: -let +{ pkgs, lib, config, ... }: +let vesktop-nogain = (pkgs.vesktop.overrideAttrs (previousAttrs: { patches = previousAttrs.patches ++ [ (builtins.fetchurl { @@ -15,7 +15,7 @@ in { config = lib.mkIf config.mods.social.enable { home.packages = with pkgs; [ # Communication - kotatogram-desktop + # kotatogram-desktop signal-desktop vesktop-nogain diff --git a/modules/nixos/unfree/steam.nix b/modules/nixos/unfree/steam.nix index 7a1fa3f..bcebad9 100644 --- a/modules/nixos/unfree/steam.nix +++ b/modules/nixos/unfree/steam.nix @@ -5,11 +5,7 @@ description = "enables proprietary steam software"; }; packages = lib.mkOption { - default = [ - "steam" - "steam-original" - "steam-run" - ]; + default = [ "steam" "steam-original" "steam-run" "steam-unwrapped" ]; description = "unfree packages"; }; };