diff --git a/modules/home/default.nix b/modules/home/default.nix index 365e6b4..21ace1b 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -35,11 +35,15 @@ in username = name; homeDirectory = "/home/${name}"; packages = with pkgs; - [ jq nixpkgs-fmt ipfetch nixd ] - ++ (if enableDevelopmentKit then [ - rye + [ + jq + nixpkgs-fmt + ipfetch + nixd + htop + ] + ++ (if enableDevelopmentKit then [ devenv - uv devbox terraform kubectl diff --git a/modules/home/services.nix b/modules/home/services.nix index 6a03bed..8a90247 100644 --- a/modules/home/services.nix +++ b/modules/home/services.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { gpg-agent = { enable = true; diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix new file mode 100644 index 0000000..863ce65 --- /dev/null +++ b/modules/nixos/common/core.nix @@ -0,0 +1,87 @@ +# { config, lib, pkgs, ... }: +# with lib; + +# let +# in +# { +# options = { +# skyg.desktop.kde = { +# enabled = mkEnableOption +# "KDE"; +# }; +# }; +# config = mkIf cfg.enabled { +# services.desktopManager.plasma6.enable = true; +# services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; +# services.desktopManager.plasma6.enableQt5Integration = true; +# environment.plasma6.excludePackages = with pkgs.kdePackages; [ +# konsole # terminal +# elisa # media player +# kate # text editor +# gwenview # image viewer +# ]; +# environment.systemPackages = with pkgs; [ +# kdePackages.plasma-browser-integration +# konsave # save configs +# ]; +# }; +# } + +{ pkgs, config, lib, ... }: +let + cfg = config.skyg.nixos; + defaultConfig = { + # System Packages + services.hydra.useSubstitutes = true; + programs.dconf.enable = true; + programs.nix-ld.enable = true; + environment.systemPackages = with pkgs; [ + # nix utils + appimage-run + + # shell tools + git + usbutils + + # system utils + nfs-utils + + # misc + glib-networking + glib + glibc + + # printer + system-config-printer + ]; + services.xserver.excludePackages = with pkgs; [ + xterm + ]; + # Set your time zone. + time.timeZone = "America/Toronto"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_CA.UTF-8"; + + # Storage Clean up + services.cron = { + enable = true; + systemCronJobs = [ + "* 23 * * * root nix-collect-garbage --delete-older-than 1d" + "* 23 * * * ${config.skyg.user.name} nix-collect-garbage --delete-older-than 1d" + ]; + }; + }; +in +{ + options = { + skyg.nixos.enableServe = lib.mkEnableOption "Enable nix serve"; + }; + + config = defaultConfig // (if cfg.enableServe then { + services.nix-serve = { + enable = true; + port = 5000; + }; + } else { }); +} diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 1b7d70b..a0d088b 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -2,5 +2,6 @@ { imports = [ ./hardware + ./core.nix ]; } diff --git a/modules/os/core.nix b/modules/os/core.nix deleted file mode 100644 index 9a4e066..0000000 --- a/modules/os/core.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ user }: -{ pkgs, ... }: -{ - # System Packages - services.hydra.useSubstitutes = true; - services.nix-serve = { - enable = true; - port = 5000; - }; - programs.dconf.enable = true; - programs.nix-ld.enable = true; - environment.systemPackages = with pkgs; [ - # nix utils - appimage-run - - # shell tools - git - usbutils - htop - - # system utils - nfs-utils - - # misc - glib-networking - glib - glibc - - # printer - system-config-printer - ]; - services.xserver.excludePackages = with pkgs; [ - xterm - ]; - # Set your time zone. - time.timeZone = "America/Toronto"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_CA.UTF-8"; - - # Storage Clean up - services.cron = { - enable = true; - systemCronJobs = [ - "* 23 * * * root nix-collect-garbage --delete-older-than 1d" - "* 23 * * * ${user.name} nix-collect-garbage --delete-older-than 1d" - ]; - }; -} diff --git a/modules/os/default.nix b/modules/os/default.nix index 1607245..db21d0e 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -11,7 +11,6 @@ }: { pkgs, ... }: { imports = [ - (import ./core.nix { user = user; }) (import ./user.nix { user = user; }) (import ./containers/default.nix ({ user = user;