diff --git a/flake.nix b/flake.nix index 0554500..756899a 100755 --- a/flake.nix +++ b/flake.nix @@ -22,13 +22,13 @@ nixos = lib.nixosSystem { inherit system; modules = [ - ./configuration.nix + ./nixos/configuration.nix hyprland.nixosModules.default {programs.hyprland.enable = true;} home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.notoh = import ./modules/home/home.nix; + home-manager.users.notoh = import ./home/home.nix; } ]; }; diff --git a/modules/home/gtk/default.nix b/modules/home/gtk/default.nix new file mode 100644 index 0000000..c89407f --- /dev/null +++ b/modules/home/gtk/default.nix @@ -0,0 +1,16 @@ +{ + pkgs, + config, + ... +}: { + config.gtk = { + enable = true; + theme = { + name = "Catppuccin-Mocha-Standard-Pink-Dark"; + package = pkgs.catppuccin-gtk.override { + accents = ["pink"]; + variant = "mocha"; + }; + }; + }; +} \ No newline at end of file diff --git a/modules/home/home.nix b/modules/home/home.nix index a52cc6a..8fe2d02 100755 --- a/modules/home/home.nix +++ b/modules/home/home.nix @@ -1,15 +1,23 @@ -{ inputs, outputs, lib, config, pkgs, ... }: { - # You can import other home-manager modules here - imports = [ +{config, pkgs, ...}: - ]; +{ - programs.home-manager.enable = true; +imports = [ + ./gtk/default.nix +]; + programs.home-manager.enable = true; - systemd.user.startServices = "sd-switch"; - - - home.stateVersion = "23.05"; -} + home = { + username = "notoh"; + homeDirectory = "/home/notoh"; + stateVersion = "23.05"; + packages = [ + pkgs.alsa-lib + pkgs.boost + pkgs.qt5.full + pkgs.openssl + ]; + }; +} \ No newline at end of file diff --git a/configuration.nix b/nixos/configuration.nix similarity index 98% rename from configuration.nix rename to nixos/configuration.nix index 44b9764..ba630a0 100755 --- a/configuration.nix +++ b/nixos/configuration.nix @@ -4,7 +4,7 @@ imports = [ ./hardware-configuration.nix - ./modules/hyprland/default.nix + ../modules/hyprland/default.nix ]; # bootloader @@ -56,9 +56,6 @@ fstrim = { enable = true; }; - printing = { - enable = false; - }; xserver = { enable = true; videoDrivers = [ "nvidia" ]; @@ -189,7 +186,6 @@ wireplumber dunst qt6.full - qt5.full gcc cmake libvirt diff --git a/hardware-configuration.nix b/nixos/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to nixos/hardware-configuration.nix