diff --git a/flake.lock b/flake.lock index 5601523..dd7d503 100644 --- a/flake.lock +++ b/flake.lock @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1719677234, - "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -592,6 +592,57 @@ "url": "https://github.com/hyprwm/Hyprland" } }, + "hyprland-contrib": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718476555, + "narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=", + "owner": "hyprwm", + "repo": "contrib", + "rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "contrib", + "type": "github" + } + }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1719784423, + "narHash": "sha256-D7O5+nh2Wn9tQPJArWHrDSZeEfBCtj5zTGd86701LPE=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "98cb18c6fcfe8196ef4150d09fbae305b7bb2954", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -667,6 +718,36 @@ "type": "github" } }, + "hyprlock": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": "hyprutils_2", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1719593858, + "narHash": "sha256-0dPNNBou9g5Pii9N06OCxJy/fS74Tjckqr9HAkEn730=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "0f66aeac03ae4dda5223768c31ce720b9272e1db", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlock", + "type": "github" + } + }, "hyprpaper": { "inputs": { "hyprlang": "hyprlang_2", @@ -730,49 +811,53 @@ "type": "github" } }, - "hyprwayland-scanner": { + "hyprutils_2": { "inputs": { "nixpkgs": [ - "hyprland", + "hyprlock", "nixpkgs" ], "systems": [ - "hyprland", + "hyprlock", "systems" ] }, "locked": { - "lastModified": 1719067853, - "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "914f083741e694092ee60a39d31f693d0a6dc734", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprwayland-scanner", + "repo": "hyprutils", "type": "github" } }, - "matugen": { + "hyprwayland-scanner": { "inputs": { "nixpkgs": [ + "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1699310205, - "narHash": "sha256-G/w5emPS6OtSwLclW1ji5dwjLec0ey06IU/Xj96W9f0=", - "owner": "InioX", - "repo": "matugen", - "rev": "ceead3ee416bffa337c5243c60d69022572a4cdf", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { - "owner": "InioX", - "ref": "module", - "repo": "matugen", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -977,11 +1062,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1188,11 +1273,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1719769335, - "narHash": "sha256-2UsgGTR8gnbSBMduHoy3pGR/vQ8Jotzt71QK7O5p2Vc=", + "lastModified": 1719833552, + "narHash": "sha256-vjh6GReG6gH81HYbqrQhUdDzmlJcWVu2cWbYQq8LZ6o=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "be802889902ce53e769559fd48759e0b99bed8e7", + "rev": "39287a427035135fbaa35a565c37f6151a0d676b", "type": "github" }, "original": { @@ -1214,9 +1299,11 @@ "home-manager": "home-manager", "hyprcontrib": "hyprcontrib", "hyprland": "hyprland", + "hyprland-contrib": "hyprland-contrib", + "hyprland-plugins": "hyprland-plugins", + "hyprlock": "hyprlock", "hyprpaper": "hyprpaper", "hyprpicker": "hyprpicker", - "matugen": "matugen", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-minecraft": "nix-minecraft", "nixd": "nixd", @@ -1280,11 +1367,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1719714047, - "narHash": "sha256-MeNPopLLv63EZj5L43j4TZkmW4wj1ouoc/h/E20sl/U=", + "lastModified": 1719800573, + "narHash": "sha256-9DLgG4T6l7cc4pJNOCcXGUwHsFfUp8KLsiwed65MdHk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb216719ce89a43dfb3d1b86a9575e89f4b727a4", + "rev": "648b25dd9c3acd255dc50c1eb3ca8b987856f675", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a8fd2a7..c329472 100644 --- a/flake.nix +++ b/flake.nix @@ -67,9 +67,21 @@ catppuccin.url = "github:catppuccin/nix"; - matugen = { - url = "github:InioX/matugen/module"; - inputs.nixpkgs.follows = "nixpkgs"; + hyprland-contrib = { + url = "github:hyprwm/contrib"; + inputs.nixpkgs.follows = "hyprland/nixpkgs"; + }; + + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs.hyprlang.follows = "hyprland/hyprlang"; + inputs.nixpkgs.follows = "hyprland/nixpkgs"; + inputs.systems.follows = "hyprland/systems"; }; dotzsh.url = "github:number5/dotzsh"; @@ -80,6 +92,12 @@ parts.lib.mkFlake {inherit inputs;} { systems = ["x86_64-linux" "aarch64-darwin"]; + perSystem = { config, self', inputs', pkgs, system, ... }: { + # Per-system attributes can be defined here. The self' and inputs' + # module parameters provide easy access to attributes of the same + # system. + }; + imports = [ ./parts/auxiliary.nix ./parts/home_configs.nix diff --git a/home/configurations/bruce_at_chestnut.nix b/home/configurations/bruce_at_chestnut.nix index f8a8575..4080916 100644 --- a/home/configurations/bruce_at_chestnut.nix +++ b/home/configurations/bruce_at_chestnut.nix @@ -11,6 +11,7 @@ imports = [ ./chestnut_config.nix + ./catppuccin.nix ]; config = { diff --git a/home/configurations/catppuccin.nix b/home/configurations/catppuccin.nix new file mode 100644 index 0000000..b4c7e94 --- /dev/null +++ b/home/configurations/catppuccin.nix @@ -0,0 +1,8 @@ +{...} : { + catppuccin.flavor = "mocha"; + gtk.catppuccin.enable = true; + programs.bat.catppuccin.enable = true; + programs.starship.catppuccin.enable = true; + services.polybar.catppuccin.enable = true; + wayland.windowManager.hyprland.catppuccin.enable = true; +} diff --git a/home/modules/home.nix b/home/modules/home.nix index abd43e0..0d16421 100644 --- a/home/modules/home.nix +++ b/home/modules/home.nix @@ -1,21 +1,20 @@ { - unstable, self, + hyprland-contrib, ... }: { config, pkgs, lib, ... -}: let - self' = self.packages.${pkgs.system}; -in { +}: { _file = ./default.nix; imports = [ ./starship.nix ]; + home = let cursor = { package = pkgs.catppuccin-cursors.macchiatoTeal; @@ -23,12 +22,10 @@ in { size = 24; }; in { - packages = let - p = pkgs; - s = self'; - in [ - p.exercism - p.lefthook + packages = [ + pkgs.exercism + pkgs.lefthook + hyprland-contrib.packages.${pkgs.system}.grimblast ]; diff --git a/home/modules/wayland/hyprland/default.nix b/home/modules/wayland/hyprland/default.nix index bddb5e5..ee6afb7 100644 --- a/home/modules/wayland/hyprland/default.nix +++ b/home/modules/wayland/hyprland/default.nix @@ -9,10 +9,6 @@ _: { ./settings.nix ]; - home.packages = [ - inputs.hyprland-contrib.packages.${pkgs.system}.grimblast - ]; - # enable hyprland wayland.windowManager.hyprland = { enable = true; diff --git a/home/modules/wayland/hyprland/settings.nix b/home/modules/wayland/hyprland/settings.nix index 6309bc4..174c3e0 100644 --- a/home/modules/wayland/hyprland/settings.nix +++ b/home/modules/wayland/hyprland/settings.nix @@ -1,6 +1,4 @@ {config, ...}: let - variant = "dark"; - c = config.programs.matugen.theme.colors.colors.${variant}; pointer = config.home.pointerCursor; in { wayland.windowManager.hyprland.settings = { @@ -63,19 +61,8 @@ in { ]; }; - group = { - groupbar = { - font_size = 10; - gradients = false; - text_color = "rgb(${c.primary})"; - }; - - "col.border_active" = "rgba(${c.primary_container}88);"; - "col.border_inactive" = "rgba(${c.on_primary_container}88)"; - }; - input = { - kb_layout = "ro"; + kb_layout = "us"; # focus change on cursor move follow_mouse = 1; @@ -84,7 +71,7 @@ in { }; dwindle = { - # keep floating dimentions while tiling + # keep floating dimensions while tiling pseudotile = true; preserve_split = true; }; diff --git a/parts/home_configs.nix b/parts/home_configs.nix index 6ddf912..597f970 100644 --- a/parts/home_configs.nix +++ b/parts/home_configs.nix @@ -99,7 +99,6 @@ in { {systemd.user.startServices = "legacy";} inputs.sops-nix.homeManagerModules.sops inputs.catppuccin.homeManagerModules.catppuccin - inputs.matugen.nixosModules.default inputs.hyprland.homeManagerModules.default inputs.anyrun.homeManagerModules.default ] @@ -114,7 +113,7 @@ in { finalHome = inputs.home-manager.lib.homeManagerConfiguration { pkgs = config.nixpkgs.legacyPackages.${config.system}; - # extraSpecialArgs.npins = npins; + # extraSpecialArgs.inputs = {inherit inputs;}; modules = config.finalModules; }; };