From 2e63f3969704f8068e39f32cc8cc066e90f26b2e Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Fri, 7 Mar 2025 11:27:13 -0500 Subject: [PATCH] update --- flake.lock | 31 +++++++++++ flake.nix | 4 ++ hosts/desktop/configuration.nix | 1 - hosts/desktop/home.nix | 55 ++++--------------- hosts/macbook/home.nix | 15 +++-- modules/home-manager/direnv.nix | 13 +++++ .../{email/default.nix => email.nix} | 0 .../home-manager/{git/default.nix => git.nix} | 0 modules/home-manager/hyprland.nix | 1 + modules/home-manager/jq.nix | 11 ++++ .../{kitty/default.nix => kitty.nix} | 0 modules/home-manager/lazygit.nix | 11 ++++ modules/home-manager/man.nix | 11 ++++ .../{nixvim/default.nix => nixvim.nix} | 0 .../default.nix => taskwarrior.nix} | 0 .../{tmux/default.nix => tmux.nix} | 0 .../home-manager/{zsh/default.nix => zsh.nix} | 0 modules/nixos/hyprland.nix | 1 + modules/nixos/nvidia.nix | 2 +- 19 files changed, 102 insertions(+), 54 deletions(-) create mode 100644 modules/home-manager/direnv.nix rename modules/home-manager/{email/default.nix => email.nix} (100%) rename modules/home-manager/{git/default.nix => git.nix} (100%) create mode 100644 modules/home-manager/jq.nix rename modules/home-manager/{kitty/default.nix => kitty.nix} (100%) create mode 100644 modules/home-manager/lazygit.nix create mode 100644 modules/home-manager/man.nix rename modules/home-manager/{nixvim/default.nix => nixvim.nix} (100%) rename modules/home-manager/{taskwarrior/default.nix => taskwarrior.nix} (100%) rename modules/home-manager/{tmux/default.nix => tmux.nix} (100%) rename modules/home-manager/{zsh/default.nix => zsh.nix} (100%) diff --git a/flake.lock b/flake.lock index 52a66d8..6a3716b 100644 --- a/flake.lock +++ b/flake.lock @@ -415,6 +415,36 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738966025, + "narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -981,6 +1011,7 @@ "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nix-on-droid": "nix-on-droid", diff --git a/flake.nix b/flake.nix index 56786e6..394376f 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland.url = "github:hyprwm/Hyprland"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; ghostty = { url = "github:ghostty-org/ghostty"; }; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index e0f6e7c..efabdd6 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -17,7 +17,6 @@ ../../modules/nixos/sound.nix ../../modules/nixos/steam.nix ../../modules/nixos/env.nix - ../../modules/nixos/1password.nix ../../modules/nixos/docker.nix ]; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index d3498d6..c123a44 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -5,60 +5,27 @@ }: { imports = [ ../../modules/home-manager/hyprland.nix - ../../modules/home-manager/git - ../../modules/home-manager/nixvim - ../../modules/home-manager/kitty - ../../modules/home-manager/zsh - ../../modules/home-manager/tmux - ../../modules/home-manager/taskwarrior - ../../modules/home-manager/email + ../../modules/home-manager/git.nix + ../../modules/home-manager/nixvim.nix + ../../modules/home-manager/kitty.nix + ../../modules/home-manager/zsh.nix + ../../modules/home-manager/tmux.nix + ../../modules/home-manager/taskwarrior.nix + ../../modules/home-manager/email.nix ../../modules/home-manager/syncthing.nix ../../modules/home-manager/bitwarden.nix ../../modules/home-manager/kubernetes.nix ../../modules/home-manager/nix-index.nix ../../modules/home-manager/bitwarden.nix - ../../modules/home-manager/network-manager-applet.nix - ../../modules/home-manager/pasystray.nix + ../../modules/home-manager/direnv.nix + ../../modules/home-manager/jq.nix + ../../modules/home-manager/lazygit.nix + ../../modules/home-manager/man.nix ]; home.username = "mthomson"; home.homeDirectory = "/home/mthomson"; home.stateVersion = "23.11"; - home.sessionVariables = { - ZK_NOTEBOOK_DIR = "\${HOME}/zk"; - }; - - programs = { - direnv = { - enable = true; - enableZshIntegration = true; # see note on other shells below - nix-direnv.enable = true; - }; - jq = { - enable = true; - }; - lazygit = { - enable = true; - }; - man = { - enable = true; - }; - tealdeer = { - enable = true; - settings.updates.auto_update = true; - }; - helix = { - enable = true; - }; - neovide = { - enable = true; - settings = {}; - }; - }; - - services.blueman-applet.enable = true; - services.dunst.enable = true; - home.packages = with pkgs; [ firefox gcc diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 95b2cdf..3e29317 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -4,16 +4,15 @@ ... }: { imports = [ - ../../modules/home-manager/git - ../../modules/home-manager/nixvim + ../../modules/home-manager/git.nix + ../../modules/home-manager/nixvim.nix ../../modules/home-manager/emacs - ../../modules/home-manager/kitty - ../../modules/home-manager/zsh - ../../modules/home-manager/tmux - ../../modules/home-manager/email + ../../modules/home-manager/kitty.nix + ../../modules/home-manager/zsh.nix + ../../modules/home-manager/tmux.nix + ../../modules/home-manager/email.nix ../../modules/home-manager/password-store - ../../modules/home-manager/taskwarrior - #../../modules/home-manager/sketchybar + ../../modules/home-manager/taskwarrior.nix ../../modules/home-manager/kubernetes.nix ../../modules/home-manager/nix-index.nix ../../modules/home-manager/bitwarden.nix diff --git a/modules/home-manager/direnv.nix b/modules/home-manager/direnv.nix new file mode 100644 index 0000000..0b9e616 --- /dev/null +++ b/modules/home-manager/direnv.nix @@ -0,0 +1,13 @@ +{ + pkgs, + config, + ... +}: { + programs = { + direnv = { + enable = true; + enableZshIntegration = true; # see note on other shells below + nix-direnv.enable = true; + }; + }; +} diff --git a/modules/home-manager/email/default.nix b/modules/home-manager/email.nix similarity index 100% rename from modules/home-manager/email/default.nix rename to modules/home-manager/email.nix diff --git a/modules/home-manager/git/default.nix b/modules/home-manager/git.nix similarity index 100% rename from modules/home-manager/git/default.nix rename to modules/home-manager/git.nix diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index 970f009..98916d4 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -7,6 +7,7 @@ inputs, wayland.windowManager.hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; settings = { monitor = [ "DP-1,1920x1080,0x0,1" diff --git a/modules/home-manager/jq.nix b/modules/home-manager/jq.nix new file mode 100644 index 0000000..f756702 --- /dev/null +++ b/modules/home-manager/jq.nix @@ -0,0 +1,11 @@ +{ + pkgs, + config, + ... +}: { + programs = { + jq = { + enable = true; + }; + }; +} diff --git a/modules/home-manager/kitty/default.nix b/modules/home-manager/kitty.nix similarity index 100% rename from modules/home-manager/kitty/default.nix rename to modules/home-manager/kitty.nix diff --git a/modules/home-manager/lazygit.nix b/modules/home-manager/lazygit.nix new file mode 100644 index 0000000..92454d8 --- /dev/null +++ b/modules/home-manager/lazygit.nix @@ -0,0 +1,11 @@ +{ + pkgs, + config, + ... +}: { + programs = { + lazygit = { + enable = true; + }; + }; +} diff --git a/modules/home-manager/man.nix b/modules/home-manager/man.nix new file mode 100644 index 0000000..1dbc626 --- /dev/null +++ b/modules/home-manager/man.nix @@ -0,0 +1,11 @@ +{ + pkgs, + config, + ... +}: { + programs = { + man = { + enable = true; + }; + }; +} diff --git a/modules/home-manager/nixvim/default.nix b/modules/home-manager/nixvim.nix similarity index 100% rename from modules/home-manager/nixvim/default.nix rename to modules/home-manager/nixvim.nix diff --git a/modules/home-manager/taskwarrior/default.nix b/modules/home-manager/taskwarrior.nix similarity index 100% rename from modules/home-manager/taskwarrior/default.nix rename to modules/home-manager/taskwarrior.nix diff --git a/modules/home-manager/tmux/default.nix b/modules/home-manager/tmux.nix similarity index 100% rename from modules/home-manager/tmux/default.nix rename to modules/home-manager/tmux.nix diff --git a/modules/home-manager/zsh/default.nix b/modules/home-manager/zsh.nix similarity index 100% rename from modules/home-manager/zsh/default.nix rename to modules/home-manager/zsh.nix diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 0acbdfa..9227db2 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -6,4 +6,5 @@ package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; } diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 0ee1634..393771d 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -3,7 +3,7 @@ config, ... }: { - hardware.opengl = { + hardware.graphics = { enable = true; };