Compare commits
5 Commits
kodi-hdr
...
4204bf7a7f
| Author | SHA1 | Date | |
|---|---|---|---|
| 4204bf7a7f | |||
| 09562f0af9 | |||
| ae543d9628 | |||
| c7716d2bca | |||
| 54cf339d52 |
30
flake.lock
generated
30
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729459288,
|
"lastModified": 1730633670,
|
||||||
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
|
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
|
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -22,11 +22,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729256560,
|
"lastModified": 1730531603,
|
||||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -38,11 +38,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729357638,
|
"lastModified": 1730602179,
|
||||||
"narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
|
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
|
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -62,11 +62,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729372184,
|
"lastModified": 1730635861,
|
||||||
"narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
|
"narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
|
"rev": "293668587937daae1df085ee36d2b2d0792b7a0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -91,11 +91,11 @@
|
|||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729394972,
|
"lastModified": 1730605784,
|
||||||
"narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
|
"narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
|
"rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -7,21 +7,13 @@
|
|||||||
# Plasma-manager options documentation
|
# Plasma-manager options documentation
|
||||||
# https://nix-community.github.io/plasma-manager/options.xhtml
|
# https://nix-community.github.io/plasma-manager/options.xhtml
|
||||||
#
|
#
|
||||||
# Polonium usage
|
|
||||||
# https://github.com/zeroxoneafour/polonium/blob/master/docs/usage.md
|
|
||||||
#
|
|
||||||
# TODO: Extract this configuration into something that's a bit easier to manage
|
# TODO: Extract this configuration into something that's a bit easier to manage
|
||||||
# TODO: Update shortcuts for better window/tiling/desktop management akin to i3wm
|
|
||||||
# TODO(ambitious): Add Kmail support to plasma-manager
|
# TODO(ambitious): Add Kmail support to plasma-manager
|
||||||
{
|
{
|
||||||
programs.plasma = {
|
programs.plasma = {
|
||||||
enable = true;
|
enable = true;
|
||||||
overrideConfig = true;
|
overrideConfig = true;
|
||||||
|
|
||||||
kwin = {
|
|
||||||
scripts.polonium.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
hotkeys.commands."launch-konsole" = {
|
hotkeys.commands."launch-konsole" = {
|
||||||
name = "Launch Konsole";
|
name = "Launch Konsole";
|
||||||
key = "Meta+Return";
|
key = "Meta+Return";
|
||||||
@@ -67,46 +59,7 @@
|
|||||||
|
|
||||||
"Activate Window Demanding Attention" = "Meta+Ctrl+A";
|
"Activate Window Demanding Attention" = "Meta+Ctrl+A";
|
||||||
|
|
||||||
"PoloniumCycleEngine" = "Meta+|,none,Polonium: Cycle Engine";
|
|
||||||
"PoloniumFocusAbove" = "Meta+K,none,Polonium: Focus Above";
|
|
||||||
"PoloniumFocusBelow" = "Meta+J,none,Polonium: Focus Below";
|
|
||||||
"PoloniumFocusLeft" = "Meta+H,none,Polonium: Focus Left";
|
|
||||||
"PoloniumFocusRight" = "Meta+L,none,Polonium: Focus Right";
|
|
||||||
"PoloniumInsertAbove" = "Meta+Shift+K,none,Polonium: Insert Above";
|
|
||||||
"PoloniumInsertBelow" = "Meta+Shift+J,none,Polonium: Insert Below";
|
|
||||||
"PoloniumInsertLeft" = "Meta+Shift+H,none,Polonium: Insert Left";
|
|
||||||
"PoloniumInsertRight" = "Meta+Shift+L,none,Polonium: Insert Right";
|
|
||||||
"PoloniumOpenSettings" = "Meta+\\\\,none,Polonium: Open Settings Dialog";
|
|
||||||
"PoloniumResizeAbove" = "Meta+Ctrl+K,none,Polonium: Resize Above";
|
|
||||||
"PoloniumResizeBelow" = "Meta+Ctrl+J,none,Polonium: Resize Below";
|
|
||||||
"PoloniumResizeLeft" = "Meta+Ctrl+H,none,Polonium: Resize Left";
|
|
||||||
"PoloniumResizeRight" = "Meta+Ctrl+L,none,Polonium: Resize Right";
|
|
||||||
"PoloniumRetileWindow" = "Meta+Shift+Space,none,Polonium: Retile Window";
|
|
||||||
"PoloniumSwitchBTree" = [ ];
|
|
||||||
"PoloniumSwitchHalf" = [ ];
|
|
||||||
"PoloniumSwitchKwin" = [ ];
|
|
||||||
"PoloniumSwitchMonocle" = [ ];
|
|
||||||
"PoloniumSwitchThreeColumn" = [ ];
|
|
||||||
|
|
||||||
"Show Desktop" = "Meta+D";
|
"Show Desktop" = "Meta+D";
|
||||||
"Switch to Desktop 1" = "Meta+1,,Switch to Desktop 1";
|
|
||||||
"Switch to Desktop 2" = "Meta+2,,Switch to Desktop 2";
|
|
||||||
"Switch to Desktop 3" = "Meta+3,,Switch to Desktop 3";
|
|
||||||
"Switch to Desktop 4" = "Meta+4,,Switch to Desktop 4";
|
|
||||||
"Switch to Desktop 5" = "Meta+5,,Switch to Desktop 5";
|
|
||||||
"Switch to Desktop 6" = "none,,Switch to Desktop 6";
|
|
||||||
"Switch to Desktop 7" = "none,,Switch to Desktop 7";
|
|
||||||
"Switch to Desktop 8" = "none,,Switch to Desktop 8";
|
|
||||||
"Switch to Desktop 9" = "none,,Switch to Desktop 9";
|
|
||||||
"Window to Desktop 1" = "Meta+!,,Window to Desktop 1";
|
|
||||||
"Window to Desktop 2" = "Meta+@,,Window to Desktop 2";
|
|
||||||
"Window to Desktop 3" = "Meta+#,,Window to Desktop 3";
|
|
||||||
"Window to Desktop 4" = "Meta+$,,Window to Desktop 4";
|
|
||||||
"Window to Desktop 5" = "Meta+%,,Window to Desktop 5";
|
|
||||||
"Window to Desktop 6" = "none,,Window to Desktop 6";
|
|
||||||
"Window to Desktop 7" = "none,,Window to Desktop 7";
|
|
||||||
"Window to Desktop 8" = "none,,Window to Desktop 8";
|
|
||||||
"Window to Desktop 9" = "none,,Window to Desktop 9";
|
|
||||||
|
|
||||||
"Walk Through Windows" = "Alt+Tab";
|
"Walk Through Windows" = "Alt+Tab";
|
||||||
"Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
|
"Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
|
||||||
@@ -155,7 +108,7 @@
|
|||||||
|
|
||||||
configFile = {
|
configFile = {
|
||||||
kwinrc.Desktops.Number = {
|
kwinrc.Desktops.Number = {
|
||||||
value = 9;
|
value = 10;
|
||||||
immutable = true;
|
immutable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,10 +19,6 @@ with lib;
|
|||||||
autologin = true;
|
autologin = true;
|
||||||
wayland = true;
|
wayland = true;
|
||||||
};
|
};
|
||||||
spotifyd = {
|
|
||||||
enable = true;
|
|
||||||
deviceType = "t_v";
|
|
||||||
};
|
|
||||||
users.enable = true;
|
users.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -13,15 +13,16 @@ in
|
|||||||
config = mkIf cfg.enable
|
config = mkIf cfg.enable
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
alsa-utils
|
|
||||||
paprefs
|
paprefs
|
||||||
pavucontrol
|
pavucontrol
|
||||||
pulsemixer
|
pulsemixer
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.pulseaudio.enable = true;
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
};
|
||||||
hardware.pulseaudio.package = pkgs.pulseaudioFull;
|
hardware.pulseaudio.package = pkgs.pulseaudioFull;
|
||||||
hardware.pulseaudio.support32Bit = true;
|
|
||||||
hardware.pulseaudio.extraConfig = "
|
hardware.pulseaudio.extraConfig = "
|
||||||
load-module module-combine-sink
|
load-module module-combine-sink
|
||||||
load-module module-switch-on-connect
|
load-module module-switch-on-connect
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ with lib;
|
|||||||
];
|
];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixFlakes;
|
package = pkgs.nix;
|
||||||
distributedBuilds = true;
|
distributedBuilds = true;
|
||||||
buildMachines = [{
|
buildMachines = [{
|
||||||
hostName = "z790prors.oglehome";
|
hostName = "z790prors.oglehome";
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ let
|
|||||||
basePackages = with pkgs; [
|
basePackages = with pkgs; [
|
||||||
brightnessctl
|
brightnessctl
|
||||||
mangohud # Should probably get refactored with steam/gamescope out to a gaming role
|
mangohud # Should probably get refactored with steam/gamescope out to a gaming role
|
||||||
polonium # auto tiling kwin addon
|
|
||||||
];
|
];
|
||||||
|
|
||||||
x11BasePackages = with pkgs; [
|
x11BasePackages = with pkgs; [
|
||||||
|
|||||||
@@ -8,38 +8,29 @@ in
|
|||||||
{
|
{
|
||||||
options.roles.spotifyd = {
|
options.roles.spotifyd = {
|
||||||
enable = mkEnableOption "Enable the spotifyd role";
|
enable = mkEnableOption "Enable the spotifyd role";
|
||||||
deviceType = mkOption {
|
|
||||||
default = "computer";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable
|
config = mkIf cfg.enable
|
||||||
{
|
{
|
||||||
roles.audio.enable = true;
|
roles.audio.enable = true;
|
||||||
hardware.pulseaudio.enable = true;
|
|
||||||
hardware.pulseaudio.extraConfig = ''
|
|
||||||
unload-module module-native-protocol-unix
|
|
||||||
load-module module-native-protocol-unix auth-anonymous=1
|
|
||||||
'';
|
|
||||||
hardware.pulseaudio.systemWide = true;
|
|
||||||
|
|
||||||
services.spotifyd = {
|
services.spotifyd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
use_mpris = false;
|
use_mpris = false;
|
||||||
backend = "pulseaudio";
|
backend = "alsa";
|
||||||
|
device = "sysdefault";
|
||||||
bitrate = 320;
|
bitrate = 320;
|
||||||
cache_path = "";
|
cache_path = "";
|
||||||
zeroconf_port = 5354;
|
zeroconf_port = 1234;
|
||||||
autoplay = false;
|
autoplay = false;
|
||||||
device_type = cfg.deviceType;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
5354
|
1234
|
||||||
57621
|
57621
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [
|
networking.firewall.allowedUDPPorts = [
|
||||||
|
|||||||
Reference in New Issue
Block a user