diff --git a/flake.lock b/flake.lock index 905eae7..762ae18 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1716276506, - "narHash": "sha256-OjdP5uPgdRA79vy45V0O2HdK4ztbSZ6aHcvikjjPFKU=", + "lastModified": 1716337435, + "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=", "owner": "catppuccin", "repo": "nix", - "rev": "57e8376fdb3514fb4c4eae432e6dfa4137f1a260", + "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82", "type": "github" }, "original": { @@ -532,11 +532,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1715699575, - "narHash": "sha256-MLTUVPcRbH9i+AchIK+3SaeF3K27NGLApQCRoQEsc3s=", + "lastModified": 1716309977, + "narHash": "sha256-4jDQIcMDSFOOMBxVTEiC6Ck1vdc0kAFvv+StxnnE59Q=", "owner": "hyprwm", "repo": "hypridle", - "rev": "afa6e21b8881a4a7d01b960ee4a2421c495777aa", + "rev": "cb169c4e06cec9b4349e3668427e729d22328a54", "type": "github" }, "original": { @@ -555,11 +555,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716295833, - "narHash": "sha256-zrVYmWVmJOq4kZQf1s8m4ZY2cZSShb6oE50DR2vzDZc=", + "lastModified": 1716365376, + "narHash": "sha256-941FKboG8Wc/hb1wvrEEKnC4DwDlSLgrjRL+whgWwUU=", "ref": "refs/heads/main", - "rev": "baef55da1ddccf8ca1b831214bb96e523b600a28", - "revCount": 4720, + "rev": "93fea890433ec11d7a915f5e0466b2e8b513e895", + "revCount": 4724, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -656,11 +656,11 @@ ] }, "locked": { - "lastModified": 1715879663, - "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", + "lastModified": 1716058375, + "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", + "rev": "3afed4364790aebe0426077631af1e164a9650cc", "type": "github" }, "original": { @@ -882,11 +882,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -930,11 +930,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716256771, - "narHash": "sha256-GcDa678TQ0J7ZF3GBYVafZmO7l1rrBxk1oi/k5uIV5M=", + "lastModified": 1716395399, + "narHash": "sha256-X+99WjSwbxQ7X+CTyqZQZqeqGe8nbfAFz+tgK2r3O/g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3cda6aed36d05f90da59d1489c0eba58a06e764", + "rev": "bc5dc89513caa16788f6379962e50383cf3f70b0", "type": "github" }, "original": { @@ -1411,11 +1411,11 @@ ] }, "locked": { - "lastModified": 1716025334, - "narHash": "sha256-ND9F+BJeyKaGZFu94SWIj6HtyZTzWf5qVyp3cI3a7Is=", + "lastModified": 1716362227, + "narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=", "owner": "Alexays", "repo": "Waybar", - "rev": "8ad7c75d79f76c27a9c6b87460b79d1787c8855b", + "rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a", "type": "github" }, "original": { @@ -1441,11 +1441,11 @@ ] }, "locked": { - "lastModified": 1715788457, - "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 86f8924..d09c51b 100644 --- a/flake.nix +++ b/flake.nix @@ -113,6 +113,7 @@ ./hosts/earth/configuration.nix inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.default + inputs.catppuccin.nixosModules.catppuccin inputs.agenix.nixosModules.default ]; }; diff --git a/hosts/earth/configuration.nix b/hosts/earth/configuration.nix index 2e850b0..9e1f184 100644 --- a/hosts/earth/configuration.nix +++ b/hosts/earth/configuration.nix @@ -45,7 +45,7 @@ services.mullvad-vpn.enable = true; services.openvpn.servers = { work = { - config = ''config /home/zack/Downloads/zachary_myers.ovpn ''; + config = ''config /home/zack/Downloads/zachary_myers.ovpn''; updateResolvConf = true; }; }; @@ -189,6 +189,8 @@ ]; }; + catppuccin.enable = true; + home-manager = { extraSpecialArgs = {inherit inputs;}; users = { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 7dc7eb8..5224431 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -45,7 +45,7 @@ in { options = "--delete-older-than 30d"; }; - catppuccin.flavour = "mocha"; + catppuccin.flavor = "mocha"; programs.spicetify = { enable = true; theme = spicePkgs.themes.catppuccin; diff --git a/modules/home-manager/vim/config/lua/plugins/editor/tmux-nav.lua b/modules/home-manager/vim/config/lua/plugins/editor/tmux-nav.lua new file mode 100644 index 0000000..767eafb --- /dev/null +++ b/modules/home-manager/vim/config/lua/plugins/editor/tmux-nav.lua @@ -0,0 +1,4 @@ +return { + "christoomey/vim-tmux-navigator", + lazy = false, +} diff --git a/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua b/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua index ef838e9..b894ccf 100644 --- a/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua +++ b/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua @@ -20,8 +20,4 @@ return { version = "^4", -- Recommended ft = { "rust" }, }, - { - "christoomey/vim-tmux-navigator", - lazy = false, - }, }