diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix index 79e121d..c5a16a5 100644 --- a/homes/x86_64-linux/jo@puzzlevision/default.nix +++ b/homes/x86_64-linux/jo@puzzlevision/default.nix @@ -53,6 +53,7 @@ nil zed-editor bruno + deno ### Work teams-for-linux diff --git a/lib/module/default.nix b/lib/module/default.nix new file mode 100644 index 0000000..6f99f78 --- /dev/null +++ b/lib/module/default.nix @@ -0,0 +1,16 @@ +{ + lib, + ... +}: with lib; +rec { + ## Create a NixOS module option. (Stolen from Jake Hamilton) + ## + ## ```nix + ## lib.mkOpt nixpkgs.lib.types.str "My default" "Description of my option." + ## ``` + ## + #@ Type -> Any -> String + mkOpt = + type: default: description: + mkOption { inherit type default description; }; +} diff --git a/modules/home/desktop/gnome/background.png b/modules/home/desktop/gnome/background.png new file mode 100644 index 0000000..1161625 Binary files /dev/null and b/modules/home/desktop/gnome/background.png differ diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix index c6d29d5..6551b9f 100644 --- a/modules/home/desktop/gnome/default.nix +++ b/modules/home/desktop/gnome/default.nix @@ -39,6 +39,7 @@ in }; }; }; + wallpaper = mkOpt str (builtins.toString ./background.png) "Specify the path of your prefered Gnome wallpaper."; }; config = mkIf osConfig.${namespace}.desktop.gnome.enable { @@ -66,6 +67,10 @@ in autofocus-windows = true; notifications-position = "right"; }; + "org/gnome/desktop/background" = { + picture-uri = cfg.wallpaper; + picture-uri-dark = cfg.wallpaper; + }; }; }; } diff --git a/modules/home/themes/catppuccin/gnome/default.nix b/modules/home/themes/catppuccin/gnome/default.nix index cdf7a93..265f883 100644 --- a/modules/home/themes/catppuccin/gnome/default.nix +++ b/modules/home/themes/catppuccin/gnome/default.nix @@ -157,11 +157,6 @@ in name = "Colloid-Dark-Catppuccin"; }; - "org/gnome/desktop/background" = { - picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/mocha-vibrant-colours.png"; - picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/mocha-vibrant-colours.png"; - }; - "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; cursor-theme = "catppuccin-macchiato-blue-cursors"; diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix new file mode 100644 index 0000000..e375051 --- /dev/null +++ b/modules/home/user/default.nix @@ -0,0 +1,16 @@ +{ + lib, + namespace, + ... +}: +let + inherit (lib.${namespace}) mkOpt; +in +{ + options.${namespace}.user = with lib.types; { + name = mkOpt str "Jo" "The user's short name."; + fullName = mkOpt str "Johannes Reckers" "The user's full name."; + email = mkOpt str "reckers.johannes@proton.me" "The user's primary E-Mail address."; + icon = mkOpt str "./icon.jpg" "The path to the users prefered icon."; + }; +} diff --git a/modules/home/user/icon.jpg b/modules/home/user/icon.jpg new file mode 100644 index 0000000..50997ba Binary files /dev/null and b/modules/home/user/icon.jpg differ diff --git a/modules/nixos/common/networking/default.nix b/modules/nixos/common/networking/default.nix index 8ee7cc5..03f3c34 100644 --- a/modules/nixos/common/networking/default.nix +++ b/modules/nixos/common/networking/default.nix @@ -1,16 +1,21 @@ { lib, namespace, - config, ... -}: with lib; with lib.${namespace}; +}: let + inherit (lib) mkIf mkEnableOption; cfg = config.${namespace}.common.networking; in { - options.${namespace}.common.networking = { enable = mkEnableOption "networking"; }; + options.${namespace}.common.networking = { + enable = mkEnableOption "Whether to enable networking through NetworkManager."; + }; config = mkIf cfg.enable { - networking.networkmanager.enable = true; + networking.networkmanager = { + enable = true; + wifi.powersave = false; + }; }; }