From c6cc49c0107ec848b7530bd8e240bb97a6ffc9f7 Mon Sep 17 00:00:00 2001 From: joy Date: Sun, 15 Sep 2024 10:00:51 +0200 Subject: [PATCH] uuh --- flake.nix | 3 +- hosts/desktop/default.nix | 6 +- hosts/desktop/unfree.nix | 20 ----- hosts/laptop/default.nix | 5 +- hosts/laptop/led.nix | 12 --- modules/apps/default.nix | 1 + modules/apps/firefox/default.nix | 2 +- modules/apps/games/default.nix | 26 ++++++ modules/apps/newsboat/default.nix | 76 +++++++++--------- modules/hardware/default.nix | 1 + modules/hardware/led/default.nix | 21 +++++ modules/hypr/default.nix | 4 +- modules/hypr/{hypridle => idle}/default.nix | 2 +- modules/hypr/{hyprland => land}/default.nix | 2 +- .../hypr/{hyprland => land}/scripts/ags.sh | 0 .../hypr/{hyprland => land}/scripts/cmus.sh | 0 .../{hyprland => land}/scripts/gamemode.sh | 0 .../hypr/{hyprland => land}/scripts/lol.webm | Bin .../hypr/{hyprland => land}/scripts/mpv.sh | 0 .../hypr/{hyprland => land}/scripts/rick.sh | 0 .../hypr/{hyprland => land}/scripts/screen.sh | 0 modules/hypr/{hyprland => land}/scripts/vm.sh | 0 .../hypr/{hyprland => land}/scripts/volume.sh | 0 23 files changed, 99 insertions(+), 82 deletions(-) delete mode 100644 hosts/desktop/unfree.nix delete mode 100644 hosts/laptop/led.nix create mode 100644 modules/apps/games/default.nix create mode 100644 modules/hardware/led/default.nix rename modules/hypr/{hypridle => idle}/default.nix (90%) rename modules/hypr/{hyprland => land}/default.nix (98%) rename modules/hypr/{hyprland => land}/scripts/ags.sh (100%) rename modules/hypr/{hyprland => land}/scripts/cmus.sh (100%) rename modules/hypr/{hyprland => land}/scripts/gamemode.sh (100%) rename modules/hypr/{hyprland => land}/scripts/lol.webm (100%) rename modules/hypr/{hyprland => land}/scripts/mpv.sh (100%) rename modules/hypr/{hyprland => land}/scripts/rick.sh (100%) rename modules/hypr/{hyprland => land}/scripts/screen.sh (100%) rename modules/hypr/{hyprland => land}/scripts/vm.sh (100%) rename modules/hypr/{hyprland => land}/scripts/volume.sh (100%) diff --git a/flake.nix b/flake.nix index 1697e8a..fdcb2ad 100644 --- a/flake.nix +++ b/flake.nix @@ -17,12 +17,13 @@ outputs = { nixpkgs, stylix, + home-manager, ... } @ inputs: let systemConfig = {modules}: nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs;}; - modules = modules ++ [stylix.nixosModules.stylix]; + modules = modules ++ [stylix.nixosModules.stylix home-manager.nixosModules.default]; }; in { nixosConfigurations = { diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 9661866..d2ab9ce 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -1,13 +1,13 @@ -{inputs, ...}: { +{...}: { networking.hostName = "desktop"; networking.networkmanager.enable = true; boot.loader.systemd-boot.enable = true; services.hardware.openrgb.enable = true; + games.enable = true; + imports = [ ../../modules ./hardware.nix - ./unfree.nix - inputs.home-manager.nixosModules.default ]; } diff --git a/hosts/desktop/unfree.nix b/hosts/desktop/unfree.nix deleted file mode 100644 index 2137493..0000000 --- a/hosts/desktop/unfree.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "steam-original" - "steam" - "steam-run" - ]; - programs.steam.enable = true; - environment.systemPackages = with pkgs; [ - prismlauncher - dolphin-emu - zulu17 - mangohud - lutris - ]; -} diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 789cc82..1be6ab5 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -1,15 +1,14 @@ -{inputs, ...}: { +{...}: { networking.hostName = "laptop"; networking.networkmanager.enable = true; boot.loader.systemd-boot.enable = true; services.xserver.desktopManager.gnome.enable = true; hypridle.enable = true; + led.enable = true; imports = [ ../../modules ./hardware.nix - ./led.nix - inputs.home-manager.nixosModules.default ]; } diff --git a/hosts/laptop/led.nix b/hosts/laptop/led.nix deleted file mode 100644 index b34b658..0000000 --- a/hosts/laptop/led.nix +++ /dev/null @@ -1,12 +0,0 @@ -{...}: { - systemd.services.micmute = { - description = "Set microphone mute and normal mute LEDs to off"; - wantedBy = ["multi-user.target"]; - serviceConfig = { - ExecStart = "/bin/sh -c 'echo 0 | tee /sys/class/leds/platform::micmute/brightness > /dev/null; echo 0 | tee /sys/class/leds/platform::mute/brightness > /dev/null'"; - Type = "oneshot"; - User = "root"; - Group = "root"; - }; - }; -} diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 12a7d5f..10d7e0f 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -12,5 +12,6 @@ ./tools ./code ./nemo + ./games ]; } diff --git a/modules/apps/firefox/default.nix b/modules/apps/firefox/default.nix index 4325c8e..774b44a 100644 --- a/modules/apps/firefox/default.nix +++ b/modules/apps/firefox/default.nix @@ -88,7 +88,7 @@ } { name = "invidious"; - url = "https://blueberry.invidious.reallyaweso.me/"; + url = "https://invidious.nerdvpn.de/"; } ]; } diff --git a/modules/apps/games/default.nix b/modules/apps/games/default.nix new file mode 100644 index 0000000..5e68e72 --- /dev/null +++ b/modules/apps/games/default.nix @@ -0,0 +1,26 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + games.enable = lib.mkEnableOption ""; + }; + config = lib.mkIf config.games.enable { + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam-original" + "steam" + "steam-run" + ]; + programs.steam.enable = true; + environment.systemPackages = with pkgs; [ + prismlauncher + dolphin-emu + zulu17 + mangohud + lutris + ]; + }; +} diff --git a/modules/apps/newsboat/default.nix b/modules/apps/newsboat/default.nix index 6410196..b1cb0f3 100644 --- a/modules/apps/newsboat/default.nix +++ b/modules/apps/newsboat/default.nix @@ -4,118 +4,118 @@ browser = "firefox"; urls = [ { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCOSqzSTg4QZXdi7jvV-9rUg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCOSqzSTg4QZXdi7jvV-9rUg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCg6gPGh8HU2U01vaFCAsvmQ"; + url = "https://invidious.nerdvpn.de/feed/channel/UCg6gPGh8HU2U01vaFCAsvmQ"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCYAg4bYdyqENxEyHUX7t1FA"; + url = "https://invidious.nerdvpn.de/feed/channel/UCYAg4bYdyqENxEyHUX7t1FA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCVls1GmFKf6WlTraIb_IaJg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCVls1GmFKf6WlTraIb_IaJg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC5KDiSAFxrDWhmysBcNqtMA"; + url = "https://invidious.nerdvpn.de/feed/channel/UC5KDiSAFxrDWhmysBcNqtMA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCcBhwZNKqmPaw3Zk7mh6eBg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCcBhwZNKqmPaw3Zk7mh6eBg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCwnqDLYzLGPbghL9uIOwMnQ"; + url = "https://invidious.nerdvpn.de/feed/channel/UCwnqDLYzLGPbghL9uIOwMnQ"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCRSxdcWjoye7ohD_ibxzYhg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCRSxdcWjoye7ohD_ibxzYhg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UChIs72whgZI9w6d6FhwGGHA"; + url = "https://invidious.nerdvpn.de/feed/channel/UChIs72whgZI9w6d6FhwGGHA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCxdZ7XCQVMRMipj3gGemQfw"; + url = "https://invidious.nerdvpn.de/feed/channel/UCxdZ7XCQVMRMipj3gGemQfw"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCE_K_gW6ReBi4H3Gp0gi-hg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCE_K_gW6ReBi4H3Gp0gi-hg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCWRHrWUsjdF86dt7NKK2Ixw"; + url = "https://invidious.nerdvpn.de/feed/channel/UCWRHrWUsjdF86dt7NKK2Ixw"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCfeNmPbGRF6dkPt04HIl25A"; + url = "https://invidious.nerdvpn.de/feed/channel/UCfeNmPbGRF6dkPt04HIl25A"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCFzUEe9XUlkDLp6AmtNzmOA"; + url = "https://invidious.nerdvpn.de/feed/channel/UCFzUEe9XUlkDLp6AmtNzmOA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCxBfQGaMuiMyw1dgW-tpZbg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCxBfQGaMuiMyw1dgW-tpZbg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCpes6DXY4XCSA8s9Q1G9ocg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCpes6DXY4XCSA8s9Q1G9ocg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCR42P1Uub9py2H5RkdcTnWA"; + url = "https://invidious.nerdvpn.de/feed/channel/UCR42P1Uub9py2H5RkdcTnWA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCtwjD3551TskyUxnfaUw7Rg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCtwjD3551TskyUxnfaUw7Rg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCZpKTYOk5WAdCyMal3J1KHg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCZpKTYOk5WAdCyMal3J1KHg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCl2mFZoRqjw_ELax4Yisf6w"; + url = "https://invidious.nerdvpn.de/feed/channel/UCl2mFZoRqjw_ELax4Yisf6w"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC2eYFnH61tmytImy1mTYvhA"; + url = "https://invidious.nerdvpn.de/feed/channel/UC2eYFnH61tmytImy1mTYvhA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC7YOGHUfC1Tb6E4pudI9STA"; + url = "https://invidious.nerdvpn.de/feed/channel/UC7YOGHUfC1Tb6E4pudI9STA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC0sUzmZ0CHvVCVrpRfGKZfw"; + url = "https://invidious.nerdvpn.de/feed/channel/UC0sUzmZ0CHvVCVrpRfGKZfw"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCFFfGA991VRR4U8FNNs72Qg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCFFfGA991VRR4U8FNNs72Qg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCIS-e4W5wK2xG6NbI5Tdm_g"; + url = "https://invidious.nerdvpn.de/feed/channel/UCIS-e4W5wK2xG6NbI5Tdm_g"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCKmEAsezQ0kUQ6EC-BtBNbg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCKmEAsezQ0kUQ6EC-BtBNbg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCgj6MvuVmp0JVanAZkFQM5A"; + url = "https://invidious.nerdvpn.de/feed/channel/UCgj6MvuVmp0JVanAZkFQM5A"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCXQZRyhGN-1F8zwD0a8QuWA"; + url = "https://invidious.nerdvpn.de/feed/channel/UCXQZRyhGN-1F8zwD0a8QuWA"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCohllq0Pk5lQuuNANabHKcg"; + url = "https://invidious.nerdvpn.de/feed/channel/UCohllq0Pk5lQuuNANabHKcg"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCUKU3fl8z2rcK7GBdocd7Ww"; + url = "https://invidious.nerdvpn.de/feed/channel/UCUKU3fl8z2rcK7GBdocd7Ww"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCO57urWt8_T63SPFCA_QmNw"; + url = "https://invidious.nerdvpn.de/feed/channel/UCO57urWt8_T63SPFCA_QmNw"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCtMVHI3AJD4Qk4hcbZnI9ZQ"; + url = "https://invidious.nerdvpn.de/feed/channel/UCtMVHI3AJD4Qk4hcbZnI9ZQ"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC8ENHE5xdFSwx71u3fDH5Xw"; + url = "https://invidious.nerdvpn.de/feed/channel/UC8ENHE5xdFSwx71u3fDH5Xw"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCMXLdjrQi4JzY0NNvCdUEUQ"; + url = "https://invidious.nerdvpn.de/feed/channel/UCMXLdjrQi4JzY0NNvCdUEUQ"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCEKtvLc3EIS0T7shmgPbVrw"; + url = "https://invidious.nerdvpn.de/feed/channel/UCEKtvLc3EIS0T7shmgPbVrw"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC_zBdZ0_H_jn41FDRG7q4Tw"; + url = "https://invidious.nerdvpn.de/feed/channel/UC_zBdZ0_H_jn41FDRG7q4Tw"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UChuDUAo3Hfr_0dn54GpwdUQ"; + url = "https://invidious.nerdvpn.de/feed/channel/UChuDUAo3Hfr_0dn54GpwdUQ"; } { - url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UClonyx8pReBvkjropmrS6jQ"; + url = "https://invidious.nerdvpn.de/feed/channel/UClonyx8pReBvkjropmrS6jQ"; } ]; extraConfig = '' diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index e91856a..5a9f7c7 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -2,5 +2,6 @@ imports = [ ./bluetooth ./sound + ./led ]; } diff --git a/modules/hardware/led/default.nix b/modules/hardware/led/default.nix new file mode 100644 index 0000000..3f55542 --- /dev/null +++ b/modules/hardware/led/default.nix @@ -0,0 +1,21 @@ +{ + lib, + config, + ... +}: { + options = { + led.enable = lib.mkEnableOption ""; + }; + config = lib.mkIf config.led.enable { + systemd.services.micmute = { + description = "Set microphone mute and normal mute LEDs to off"; + wantedBy = ["multi-user.target"]; + serviceConfig = { + ExecStart = "/bin/sh -c 'echo 0 | tee /sys/class/leds/platform::micmute/brightness > /dev/null; echo 0 | tee /sys/class/leds/platform::mute/brightness > /dev/null'"; + Type = "oneshot"; + User = "root"; + Group = "root"; + }; + }; + }; +} diff --git a/modules/hypr/default.nix b/modules/hypr/default.nix index 3fee3b6..58c9984 100644 --- a/modules/hypr/default.nix +++ b/modules/hypr/default.nix @@ -1,8 +1,8 @@ { imports = [ ./ags - ./hypridle - ./hyprland + ./idle + ./land ./style ]; } diff --git a/modules/hypr/hypridle/default.nix b/modules/hypr/idle/default.nix similarity index 90% rename from modules/hypr/hypridle/default.nix rename to modules/hypr/idle/default.nix index 6bf20e9..cdb8751 100644 --- a/modules/hypr/hypridle/default.nix +++ b/modules/hypr/idle/default.nix @@ -4,7 +4,7 @@ ... }: { options = { - hypridle.enable = lib.mkEnableOption "Enables kitty"; + hypridle.enable = lib.mkEnableOption ""; }; config = lib.mkIf config.hypridle.enable { diff --git a/modules/hypr/hyprland/default.nix b/modules/hypr/land/default.nix similarity index 98% rename from modules/hypr/hyprland/default.nix rename to modules/hypr/land/default.nix index 6d83958..efe1995 100644 --- a/modules/hypr/hyprland/default.nix +++ b/modules/hypr/land/default.nix @@ -22,7 +22,7 @@ enable = true; settings = { "$mod" = "SUPER"; - "$sciPath" = "~/nix/modules/hypr/hyprland/scripts"; + "$sciPath" = "~/nix/modules/hypr/land/scripts"; cursor = { inactive_timeout = "3"; }; diff --git a/modules/hypr/hyprland/scripts/ags.sh b/modules/hypr/land/scripts/ags.sh similarity index 100% rename from modules/hypr/hyprland/scripts/ags.sh rename to modules/hypr/land/scripts/ags.sh diff --git a/modules/hypr/hyprland/scripts/cmus.sh b/modules/hypr/land/scripts/cmus.sh similarity index 100% rename from modules/hypr/hyprland/scripts/cmus.sh rename to modules/hypr/land/scripts/cmus.sh diff --git a/modules/hypr/hyprland/scripts/gamemode.sh b/modules/hypr/land/scripts/gamemode.sh similarity index 100% rename from modules/hypr/hyprland/scripts/gamemode.sh rename to modules/hypr/land/scripts/gamemode.sh diff --git a/modules/hypr/hyprland/scripts/lol.webm b/modules/hypr/land/scripts/lol.webm similarity index 100% rename from modules/hypr/hyprland/scripts/lol.webm rename to modules/hypr/land/scripts/lol.webm diff --git a/modules/hypr/hyprland/scripts/mpv.sh b/modules/hypr/land/scripts/mpv.sh similarity index 100% rename from modules/hypr/hyprland/scripts/mpv.sh rename to modules/hypr/land/scripts/mpv.sh diff --git a/modules/hypr/hyprland/scripts/rick.sh b/modules/hypr/land/scripts/rick.sh similarity index 100% rename from modules/hypr/hyprland/scripts/rick.sh rename to modules/hypr/land/scripts/rick.sh diff --git a/modules/hypr/hyprland/scripts/screen.sh b/modules/hypr/land/scripts/screen.sh similarity index 100% rename from modules/hypr/hyprland/scripts/screen.sh rename to modules/hypr/land/scripts/screen.sh diff --git a/modules/hypr/hyprland/scripts/vm.sh b/modules/hypr/land/scripts/vm.sh similarity index 100% rename from modules/hypr/hyprland/scripts/vm.sh rename to modules/hypr/land/scripts/vm.sh diff --git a/modules/hypr/hyprland/scripts/volume.sh b/modules/hypr/land/scripts/volume.sh similarity index 100% rename from modules/hypr/hyprland/scripts/volume.sh rename to modules/hypr/land/scripts/volume.sh