Compare commits

..

2 commits

5 changed files with 46 additions and 8 deletions

View file

@ -433,6 +433,22 @@
"type": "github" "type": "github"
} }
}, },
"hyprland-stable": {
"locked": {
"lastModified": 1723474844,
"narHash": "sha256-9dyLWfx/PruwHjCZhIvY3jBdNfhID1AbsSU6Wkn284k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6404fe89d602c9511c08f4978bcb214032cd3cfc",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6404fe89d602c9511c08f4978bcb214032cd3cfc",
"type": "github"
}
},
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
@ -721,6 +737,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"homebrew-cask": "homebrew-cask", "homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core", "homebrew-core": "homebrew-core",
"hyprland-stable": "hyprland-stable",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"lix-module": "lix-module", "lix-module": "lix-module",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",

View file

@ -53,6 +53,8 @@
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland-stable.url = "github:nixos/nixpkgs/6404fe89d602c9511c08f4978bcb214032cd3cfc";
}; };
outputs = { outputs = {
@ -77,8 +79,11 @@
nixosConfigurations = { nixosConfigurations = {
demeter = nixpkgs.lib.nixosSystem { demeter = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {
inherit inputs;
system = "x86_64-linux";
};
modules = [ modules = [
./hosts/demeter ./hosts/demeter
]; ];

View file

@ -1,4 +1,8 @@
{inputs, ...}: { {
inputs,
system,
...
}: {
imports = with inputs; [ imports = with inputs; [
./configuration.nix ./configuration.nix
../../modules/nixos/gaming ../../modules/nixos/gaming
@ -17,6 +21,10 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.extraSpecialArgs = {
inherit inputs;
inherit system;
};
home-manager.users.youwen = { home-manager.users.youwen = {
imports = [ imports = [
../../users/youwen/linux/desktop ../../users/youwen/linux/desktop
@ -25,8 +33,8 @@
../../users/youwen/common/neofetch ../../users/youwen/common/neofetch
../../users/youwen/common/neovim ../../users/youwen/common/neovim
../../users/youwen/common ../../users/youwen/common
inputs.catppuccin.homeManagerModules.catppuccin catppuccin.homeManagerModules.catppuccin
inputs.nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
]; ];
}; };
} }

View file

@ -1,6 +1,12 @@
{pkgs, ...}: { {
pkgs,
inputs,
system,
...
}: {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = inputs.hyprland-stable.legacyPackages.${system}.hyprland;
settings = { settings = {
exec-once = ["waypaper --restore"]; exec-once = ["waypaper --restore"];
"$mod" = "SUPER"; "$mod" = "SUPER";

View file

@ -12,11 +12,13 @@
background_opacity = "0.8"; background_opacity = "0.8";
allow_remote_control = "socket-only"; allow_remote_control = "socket-only";
listen_on = "unix:/tmp/kitty"; listen_on = "unix:/tmp/kitty";
action_alias = "kitty_scrollback_nvim kitten /home/youwen/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py"; # action_alias = "kitty_scrollback_nvim kitten /home/youwen/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py";
scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "'';
}; };
keybindings = { keybindings = {
"kitty_mod+h" = "kitty_scrollback_nvim"; # "kitty_mod+h" = "kitty_scrollback_nvim";
"kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output"; # "kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
"kitty_mod+h" = "show_scrollback";
}; };
}; };