diff --git a/flake.nix b/flake.nix index 8aef01b..6057c1d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,9 @@ modules = [ (import ./modules/impurity.nix self) ./modules/preserve-system.nix + ./modules/overlay-pkgs ./modules/core.nix + ./modules/system.nix ./modules/user ./systems/lenovo.nix ]; diff --git a/modules/overlay-pkgs/default.nix b/modules/overlay-pkgs/default.nix new file mode 100644 index 0000000..444881b --- /dev/null +++ b/modules/overlay-pkgs/default.nix @@ -0,0 +1,5 @@ +{ + nixpkgs.overlays = [(final: prev: { + kwrite = final.callPackage ./kwrite.nix {}; + })]; +} diff --git a/modules/overlay-pkgs/kwrite.nix b/modules/overlay-pkgs/kwrite.nix new file mode 100644 index 0000000..e208968 --- /dev/null +++ b/modules/overlay-pkgs/kwrite.nix @@ -0,0 +1,3 @@ +{ kate }: kate.overrideAttrs (_: _: { + cmakeFlags = [ "-DBUILD_kate=FALSE" ]; +}) diff --git a/modules/system.nix b/modules/system.nix new file mode 100644 index 0000000..4a34a66 --- /dev/null +++ b/modules/system.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: { + programs.dconf.enable = true; + + services.cpupower-gui.enable = true; + + # power management + services.tlp.enable = true; + + environment.systemPackages = with pkgs; [ + git + vim + ]; +} diff --git a/modules/user/default.nix b/modules/user/default.nix index a9f6573..9e6b791 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -2,7 +2,11 @@ username = "admin"; homeDirectory = "/home/${username}"; in { - imports = [ inputs.home-manager.nixosModules.home-manager ]; + imports = [ + inputs.home-manager.nixosModules.home-manager + + ./general.nix + ]; options.user = lib.mkOption { type = with lib.types; attrsOf anything; @@ -53,8 +57,6 @@ in { XCURSOR_SIZE = "24"; }; - programs.hyprland.enable = true; - home-manager = { extraSpecialArgs = { inherit system inputs; @@ -76,6 +78,9 @@ in { inherit username homeDirectory; stateVersion = config.system.stateVersion; }; + + # enable xdg dir management + xdg.enable = true; }; }; } diff --git a/modules/user/general.nix b/modules/user/general.nix new file mode 100644 index 0000000..74513f4 --- /dev/null +++ b/modules/user/general.nix @@ -0,0 +1,27 @@ +{ pkgs, homeConfig, ... }: { + user = { + home.packages = with pkgs; [ + ark + kwrite + krita + gimp + vlc + mpv + gpicview + filelight + cantata + logseq + + + unrar # used by ark + xdg-utils + ]; + + programs = { + direnv = { + enable = true; + nix-direnv.enable = true; + }; + }; + }; +}