From 42ade27956e6151da20f3cfb0de8da782c138074 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Fri, 7 Jul 2023 22:46:47 +0300 Subject: [PATCH] please work --- default.nix | 26 ++++++++++++++++++++++++++ hosts/sakotop/configuration.nix | 1 + modules/desktop/bspwm.nix | 5 ++++- modules/desktop/chat/discord.nix | 5 ++++- modules/desktop/game/lutris.nix | 5 ++++- modules/desktop/game/steam.nix | 5 ++++- modules/desktop/game/wine.nix | 7 +++++-- modules/desktop/keepassxc.nix | 5 ++++- modules/desktop/kitty.nix | 5 ++++- modules/desktop/web/qutebrowser.nix | 5 ++++- modules/dev/cpp.nix | 5 ++++- modules/dev/editors/nvim.nix | 5 ++++- modules/dev/javascript.nix | 5 ++++- modules/dev/python.nix | 5 ++++- modules/dev/rust.nix | 5 ++++- modules/devices/bluetooth.nix | 5 ++++- modules/devices/nvidia/default.nix | 5 ++++- modules/devices/pipewire.nix | 5 ++++- modules/media/mpd/default.nix | 5 ++++- modules/media/ncmpcpp/default.nix | 5 ++++- modules/shell/newsboat.nix | 5 ++++- modules/shell/zsh.nix | 5 ++++- 22 files changed, 108 insertions(+), 21 deletions(-) diff --git a/default.nix b/default.nix index 03446b6b..decd630f 100644 --- a/default.nix +++ b/default.nix @@ -6,6 +6,32 @@ # modules #i dont think this is right #./modules + outputs.nixosModules.desktop + outputs.nixosModules.desktop.bspwm + outputs.nixosModules.desktop.kitty + outputs.nixosModules.desktop.keepassxc + outputs.nixosModules.desktop.web.qutebrowser + outputs.nixosModules.desktop.game.steam + outputs.nixosModules.desktop.game.wine + outputs.nixosModules.desktop.game.lutris + outputs.nixosModules.desktop.chat.discord + outputs.nixosModules.dev + outputs.nixosModules.dev.editors + outputs.nixosModules.dev.editors.nvim + outputs.nixosModules.dev.cpp + outputs.nixosModules.dev.javascript + outputs.nixosModules.dev.python + outputs.nixosModules.dev.rust + outputs.nixosModules.devices + outputs.nixosModules.devices.nvidia + outputs.nixosModules.devices.pipewire + outputs.nixosModules.devices.bluetooth + outputs.nixosModules.media + outputs.nixosModules.media.mpd + outputs.nixosModules.media.ncmpcpp + outputs.nixosModules.shell + outputs.nixosModules.shell.newsboat + outputs.nixosModules.shell.zsh ]; nix.settings.experimental-features = [ "nix-command" "flakes"]; diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix index aaaac686..e049671f 100644 --- a/hosts/sakotop/configuration.nix +++ b/hosts/sakotop/configuration.nix @@ -7,6 +7,7 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ../../default.nix + ]; modules = { diff --git a/modules/desktop/bspwm.nix b/modules/desktop/bspwm.nix index 4fb5bcd7..3bd50595 100644 --- a/modules/desktop/bspwm.nix +++ b/modules/desktop/bspwm.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.desktop.bspwm; in { options.modules.desktop.bspwm = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/desktop/chat/discord.nix b/modules/desktop/chat/discord.nix index 4fa20ea7..75b26d45 100644 --- a/modules/desktop/chat/discord.nix +++ b/modules/desktop/chat/discord.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.desktop.chat.discord; in { options.modules.desktop.chat.discord = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/desktop/game/lutris.nix b/modules/desktop/game/lutris.nix index 8aa1e21b..00e835c8 100644 --- a/modules/desktop/game/lutris.nix +++ b/modules/desktop/game/lutris.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.desktop.game.lutris; in { options.modules.desktop.game.lutris = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/desktop/game/steam.nix b/modules/desktop/game/steam.nix index 8aa350fe..92fb1868 100644 --- a/modules/desktop/game/steam.nix +++ b/modules/desktop/game/steam.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.desktop.game.steam; in { options.modules.desktop.game.steam = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/desktop/game/wine.nix b/modules/desktop/game/wine.nix index 94cd555a..33ea7477 100644 --- a/modules/desktop/game/wine.nix +++ b/modules/desktop/game/wine.nix @@ -2,8 +2,11 @@ with lib; let cfg = config.modules.desktop.game.wine; in { - options.modules.desktop.game.wine= { - enable = mkBoolOpt false; + options.modules.desktop.game.wine = { + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/desktop/keepassxc.nix b/modules/desktop/keepassxc.nix index 3ec2ddec..4ede9f85 100644 --- a/modules/desktop/keepassxc.nix +++ b/modules/desktop/keepassxc.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.desktop.keepassxc; in { options.modules.desktop.keepassxc = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { users.users.sako.packages = with pkgs; [ diff --git a/modules/desktop/kitty.nix b/modules/desktop/kitty.nix index e161a91f..e8bc9ac7 100644 --- a/modules/desktop/kitty.nix +++ b/modules/desktop/kitty.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.desktop.kitty; in { options.modules.desktop.kitty = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/desktop/web/qutebrowser.nix b/modules/desktop/web/qutebrowser.nix index 443b1d63..671adf50 100644 --- a/modules/desktop/web/qutebrowser.nix +++ b/modules/desktop/web/qutebrowser.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.web.qutebrowser; in { options.modules.web.qutebrowser = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/dev/cpp.nix b/modules/dev/cpp.nix index 336d2db7..6a0077c6 100644 --- a/modules/dev/cpp.nix +++ b/modules/dev/cpp.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.dev.cpp; in { options.modules.dev.cpp = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/dev/editors/nvim.nix b/modules/dev/editors/nvim.nix index c92f3d8d..8b5440b5 100644 --- a/modules/dev/editors/nvim.nix +++ b/modules/dev/editors/nvim.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.dev.editors.nvim; in { options.modules.dev.editors.nvim = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/dev/javascript.nix b/modules/dev/javascript.nix index 376eaf39..1b09113b 100644 --- a/modules/dev/javascript.nix +++ b/modules/dev/javascript.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.dev.javascript; in { options.modules.dev.javascript = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/dev/python.nix b/modules/dev/python.nix index 9c4a8152..23a2eb8e 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.dev.python; in { options.modules.dev.python= { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/dev/rust.nix b/modules/dev/rust.nix index 4392eafc..69d85e90 100644 --- a/modules/dev/rust.nix +++ b/modules/dev/rust.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.dev.rust; in { options.modules.dev.rust = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/devices/bluetooth.nix b/modules/devices/bluetooth.nix index 10b72022..970c18cf 100644 --- a/modules/devices/bluetooth.nix +++ b/modules/devices/bluetooth.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.devices.bluetooth; in { options.modules.devices.bluetooth = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/devices/nvidia/default.nix b/modules/devices/nvidia/default.nix index 83b90d8c..91945d09 100644 --- a/modules/devices/nvidia/default.nix +++ b/modules/devices/nvidia/default.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.devices.nvidia; in { options.modules.devices.nvidia = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/devices/pipewire.nix b/modules/devices/pipewire.nix index a9abbd06..b1689e39 100644 --- a/modules/devices/pipewire.nix +++ b/modules/devices/pipewire.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.devices.pipewire; in { options.modules.devices.pipewire= { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/media/mpd/default.nix b/modules/media/mpd/default.nix index 5caa7259..d68bcb48 100644 --- a/modules/media/mpd/default.nix +++ b/modules/media/mpd/default.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.media.mpd; in { options.modules.media.mpd = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { services.mpd = { diff --git a/modules/media/ncmpcpp/default.nix b/modules/media/ncmpcpp/default.nix index eacd5560..a499a60f 100644 --- a/modules/media/ncmpcpp/default.nix +++ b/modules/media/ncmpcpp/default.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.media.ncmpcpp; in { options.modules.media.ncmpcpp = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/shell/newsboat.nix b/modules/shell/newsboat.nix index 327027e8..0d076686 100644 --- a/modules/shell/newsboat.nix +++ b/modules/shell/newsboat.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.shell.newsboat; in { options.modules.shell.newsboat= { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 0dfaec9e..46a6d2b0 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -3,7 +3,10 @@ with lib; let cfg = config.modules.shell.zsh; in { options.modules.shell.zsh = { - enable = mkBoolOpt false; + enable = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable {