From 7c2e4b61003f8b1db6dbe924d824d3bdf9298495 Mon Sep 17 00:00:00 2001 From: zackartz Date: Wed, 17 Apr 2024 15:45:55 -0400 Subject: [PATCH] 372 current 2024-04-17 15:45:47 24.05.20240417.203fac8 6.8.6-zen1 * --- flake.lock | 64 +++++++++++++++---------- flake.nix | 3 ++ modules/home-manager/default.nix | 17 ++++++- modules/home-manager/vim/lazy-lock.json | 3 +- modules/rice/kitty.nix | 57 +++++++++++----------- 5 files changed, 90 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 8fa4f26..245124b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "catppuccin": { + "locked": { + "lastModified": 1713323853, + "narHash": "sha256-EfUm65RRsoch0tpfHZtEyqo+iWIYhuSX39U/fi0/4WU=", + "owner": "catppuccin", + "repo": "nix", + "rev": "372decb578f3187d7aad837885ed98e73e8abd60", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -175,11 +190,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1713294767, + "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", "type": "github" }, "original": { @@ -250,11 +265,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1713278471, - "narHash": "sha256-+X/Cxi6eTCGmqPolNdrrB9SMmjSqrW8trP8hXaeHAPI=", + "lastModified": 1713376910, + "narHash": "sha256-6cvw+CxacXe+l8/mZ1+ih21vLHvhIC+Erc7LQF0dyrQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9a66514e26319e41c8661f57097a73b1c8579ccf", + "rev": "82222342f10a7eff0ec9be972153e740d0f95213", "type": "github" }, "original": { @@ -275,11 +290,11 @@ ] }, "locked": { - "lastModified": 1712836056, - "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=", + "lastModified": 1713283897, + "narHash": "sha256-/0OPK/bDr8/Lf7r8kzDD/yP1kySbJ8gPmV3CdUbVTFM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197", + "rev": "00d147d7f6ad2ecfbf75efe4a8402723c72edd98", "type": "github" }, "original": { @@ -376,11 +391,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1713224895, - "narHash": "sha256-zu0iktDPgweB4KRRYc4Qmqi86u6UggJsctx2b+LObYo=", + "lastModified": 1713307949, + "narHash": "sha256-hfiUG/nGWaPnYdiDXVHagVLoezxflWHdKiAtghkIHYc=", "owner": "neovim", "repo": "neovim", - "rev": "8c970d34034c874ab12b924a5e057997797868f4", + "rev": "2f371ad7d0294072d407bb05816425b5694d1935", "type": "github" }, "original": { @@ -399,11 +414,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713225809, - "narHash": "sha256-sTQmsPydtcomXMgVf0ipvfgjt3XEBDjg8oDBjonc6tY=", + "lastModified": 1713312222, + "narHash": "sha256-81xZFNHBLV8+oD3Q3SkesXFLh2U1UFeGQBLw75moOh4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "20f618e5c0cf105e476fb813538ce054d914e5ee", + "rev": "542a3c18b471dbaaf8ffda27a65d3aa8e829a5e2", "type": "github" }, "original": { @@ -448,11 +463,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713128889, - "narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=", + "lastModified": 1713254108, + "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa", + "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", "type": "github" }, "original": { @@ -464,11 +479,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713244569, - "narHash": "sha256-2C9bevUVcIxdIrs8OMRAXLs/28OPJQciLni6uL1hwGg=", + "lastModified": 1713368829, + "narHash": "sha256-EreStuOxwalGOy5seV5PGc3zDT1Ppqj/4Q3ByAOGMnY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c04952a627c1996ba05c6859b82613c60f42a4f6", + "rev": "203fac824e2fdfed2e3a832b8123d9a64ee58b43", "type": "github" }, "original": { @@ -549,6 +564,7 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "home-manager": "home-manager", "hyprcontrib": "hyprcontrib", "hyprland": "hyprland", @@ -696,11 +712,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1713212297, - "narHash": "sha256-X8bn+q9/lcTmODxqLF9jm/ZuakRWgATrEJLPDsYO3dc=", + "lastModified": 1713335280, + "narHash": "sha256-wjSRLR/iu48spBlQUshYX9jPUb5CS2MYuru9NqoU7Bk=", "owner": "Alexays", "repo": "Waybar", - "rev": "3efebc282294c78f7312b70d2f18e3df3daacd91", + "rev": "dd092a5fc11b373b4c73ff7e4fb902c09d87e955", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 62f22df..4ce216b 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + catppuccin.url = "github:catppuccin/nix"; + hyprland = { url = "github:hyprwm/Hyprland/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -73,6 +75,7 @@ specialArgs = {inherit inputs;}; modules = [ ./hosts/earth/configuration.nix + # inputs.catppuccin.homeManagerModules.catppuccin inputs.home-manager.nixosModules.default ]; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 4a50e57..94dd749 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -72,7 +72,6 @@ pkgs.slack (pkgs.nerdfonts.override {fonts = ["Iosevka"];}) pkgs.git - pkgs.lazygit pkgs.spotify pkgs.neovide pkgs.wofi @@ -80,7 +79,6 @@ pkgs.dconf pkgs.wl-clipboard pkgs.swaybg - pkgs.btop pkgs.zoom-us pkgs.pavucontrol pkgs.wlogout @@ -149,6 +147,21 @@ options = ["--cmd cd"]; }; + # programs.btop = { + # enable = true; + # catppuccin.enable = true; + # }; + # + # programs.lazygit = { + # enable = true; + # catppuccin.enable = true; + # }; + # + # programs.fzf = { + # enable = true; + # catppuccin.enable = true; + # }; + systemd.user.services.kb-gui = { Unit = { Description = "KB Time/Date thing"; diff --git a/modules/home-manager/vim/lazy-lock.json b/modules/home-manager/vim/lazy-lock.json index bee5cd6..74679b6 100644 --- a/modules/home-manager/vim/lazy-lock.json +++ b/modules/home-manager/vim/lazy-lock.json @@ -2,6 +2,7 @@ "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "blame.nvim": { "branch": "main", "commit": "21fe989f323ad0418ecf2e8f8e4d2000613b269b" }, "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "ccc.nvim": { "branch": "main", "commit": "1283eef5494c092a047baa34ed3e667f3cb2715e" }, "clear-action.nvim": { "branch": "master", "commit": "29ca65333238607ff503950fdd5d122d73a3902f" }, @@ -39,7 +40,7 @@ "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-surround": { "branch": "main", "commit": "a4e30d33add8a9743b4f518b3a788b3c8e5def71" }, - "nvim-treesitter": { "branch": "master", "commit": "7099c9e5310ec3ef70f99e8c935c061ae9990cdd" }, + "nvim-treesitter": { "branch": "master", "commit": "037c6af78fb50ec5ca9401c3fce437b95db8e09d" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, diff --git a/modules/rice/kitty.nix b/modules/rice/kitty.nix index 7b99144..c643c42 100644 --- a/modules/rice/kitty.nix +++ b/modules/rice/kitty.nix @@ -5,37 +5,40 @@ name = "Iosevka Nerd Font Mono"; size = 14; }; + + # catppuccin.enable = true; + settings = { window_padding_width = 8; background_opacity = "0.75"; - foreground = "#a9b1d6"; - background = "#1a1b26"; - cursor = "#a9b1d6"; - - color0 = "#1a1b26"; - color8 = "#4e5173"; - - color1 = "#F7768E"; - color9 = "#F7768E"; - - color2 = "#9ECE6A"; - color10 = "#9ECE6A"; - - color3 = "#E0AF68"; - color11 = "#E0AF68"; - - color4 = "#7AA2F7"; - color12 = "#7AA2F7"; - - color5 = "#9a7ecc"; - color13 = "#9a7ecc"; - - color6 = "#4abaaf"; - color14 = "#4abaaf"; - - color7 = "#acb0d0"; - color15 = "#acb0d0"; + # foreground = "#a9b1d6"; + # background = "#1a1b26"; + # cursor = "#a9b1d6"; + # + # color0 = "#1a1b26"; + # color8 = "#4e5173"; + # + # color1 = "#F7768E"; + # color9 = "#F7768E"; + # + # color2 = "#9ECE6A"; + # color10 = "#9ECE6A"; + # + # color3 = "#E0AF68"; + # color11 = "#E0AF68"; + # + # color4 = "#7AA2F7"; + # color12 = "#7AA2F7"; + # + # color5 = "#9a7ecc"; + # color13 = "#9a7ecc"; + # + # color6 = "#4abaaf"; + # color14 = "#4abaaf"; + # + # color7 = "#acb0d0"; + # color15 = "#acb0d0"; }; }; # theme = "rosepine";