Update Hyprland settings
This commit is contained in:
parent
0762ccc9bc
commit
e3de591a27
39
flake.lock
39
flake.lock
|
|
@ -25,11 +25,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767606757,
|
||||
"narHash": "sha256-lCl9QyHHHG/lKkpZu9nhJ5ri30FUD66VWNMJp167wPY=",
|
||||
"lastModified": 1770318660,
|
||||
"narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c4eabb884b01366f25c3f80823b12dd595ed603a",
|
||||
"rev": "471e6a065f9efed51488d7c51a9abbd387df91b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -38,13 +38,33 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771130777,
|
||||
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1767185284,
|
||||
"narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
|
||||
"lastModified": 1769302137,
|
||||
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
|
||||
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -55,11 +75,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1767379071,
|
||||
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
|
||||
"lastModified": 1770197578,
|
||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fb7944c166a3b630f177938e478f0378e64ce108",
|
||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -89,6 +109,7 @@
|
|||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"zen-browser": "zen-browser"
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
flake-utils.url = "github:numtide/flake-utils";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
zen-browser.url = "github:xaragon/zen-browser-flake";
|
||||
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
(pkgs.blender-hip.overrideAttrs (oldAttrs: {
|
||||
# Workaround for this: https://github.com/NixOS/nixpkgs/pull/385913
|
||||
cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DWITH_ASSERT_ABORT=OFF" ];
|
||||
}))
|
||||
blender
|
||||
];
|
||||
}
|
||||
|
|
@ -76,14 +76,13 @@ let
|
|||
disable_splash_rendering = true;
|
||||
};
|
||||
|
||||
windowrulev2 = [
|
||||
"animation windowsIn 0,title:^(.*wofi.*)$"
|
||||
"float,title:^(.*feh.*)$"
|
||||
"center,title:^(.*feh.*)$"
|
||||
"float,title:^(Picture.*)$"
|
||||
"pin,title:^(Picture.*)$"
|
||||
"immediate, class:^(Terraria)$"
|
||||
"idleinhibit fullscreen, class:^(steam_app.*)$"
|
||||
windowrule = [
|
||||
"animation windowsIn 0, match:title ^(.*wofi.*)$"
|
||||
"float on, match:title ^(.*feh.*)$"
|
||||
"center on, match:title ^(.*feh.*)$"
|
||||
"float on, match:title ^(Picture.*)$"
|
||||
"pin on, match:title ^(Picture.*)$"
|
||||
"immediate on, match:class ^(Terraria)$"
|
||||
];
|
||||
|
||||
workspace = [
|
||||
|
|
@ -243,6 +242,7 @@ in
|
|||
++ (with pkgs; [
|
||||
swww
|
||||
eww
|
||||
hyprshot
|
||||
]);
|
||||
home.sessionVariables = {
|
||||
HYPRCURSOR_THEME = "rose-pine-hyprcursor";
|
||||
|
|
|
|||
8
home-manager/voicevox.nix
Normal file
8
home-manager/voicevox.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
voicevox-core
|
||||
voicevox-engine
|
||||
voicevox
|
||||
];
|
||||
}
|
||||
22
home-manager/zeditor.nix
Normal file
22
home-manager/zeditor.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.zed-editor = {
|
||||
enable = true;
|
||||
extensions = [ "nix" "toml" "rust" ];
|
||||
|
||||
userSettings = {
|
||||
theme = {
|
||||
mode = "system";
|
||||
dark = "Kanagawa Dragon";
|
||||
light = "Kanagawa Lotus";
|
||||
};
|
||||
hour_format = "hour24";
|
||||
vim_mode = true;
|
||||
buffer_font_size = 12.0;
|
||||
buffer_font_family = "PlemolJP Console NF";
|
||||
};
|
||||
};
|
||||
fonts.fontconfig.enable = true;
|
||||
home.file.".local/share/fonts/plemoljp".source = "${pkgs.plemoljp-nf}/share/fonts/truetype/plemoljp-nf-console";
|
||||
}
|
||||
|
|
@ -7,25 +7,28 @@
|
|||
{
|
||||
home.stateVersion = "25.05";
|
||||
imports = [
|
||||
../../home-manager/hyprland
|
||||
../../home-manager/tofi.nix
|
||||
../../home-manager/fnott.nix
|
||||
|
||||
inputs.nix-index-database.homeModules.nix-index
|
||||
./display.nix
|
||||
|
||||
../../home-manager/tofi.nix
|
||||
../../home-manager/hyprland
|
||||
../../home-manager/fnott.nix
|
||||
../../home-manager/wezterm
|
||||
../../home-manager/fish
|
||||
|
||||
../../home-manager/vscode.nix
|
||||
../../home-manager/direnv.nix
|
||||
../../home-manager/firefox.nix
|
||||
../../home-manager/obs-studio.nix
|
||||
../../home-manager/zeditor.nix
|
||||
../../home-manager/blender.nix
|
||||
../../home-manager/voicevox.nix
|
||||
];
|
||||
hare.hyprland = {
|
||||
input.sensitivity = -1.0;
|
||||
wallpaperCommand = "swww img /usr/share/wallpaper/arknights-02.jpg";
|
||||
};
|
||||
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
vivaldi
|
||||
google-chrome
|
||||
|
|
@ -40,10 +43,9 @@
|
|||
gimp
|
||||
inkscape
|
||||
obsidian
|
||||
zed-editor
|
||||
# davinci-resolve
|
||||
kdePackages.filelight
|
||||
inputs.zen-browser.packages."${system}".default
|
||||
inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
|
||||
(deno.overrideAttrs (oldAttrs: {
|
||||
doCheck = false;
|
||||
}))
|
||||
|
|
@ -57,10 +59,6 @@
|
|||
bambu-studio
|
||||
orca-slicer
|
||||
|
||||
# voicevox-core
|
||||
# voicevox-engine
|
||||
# voicevox
|
||||
|
||||
vinegar
|
||||
|
||||
antigravity
|
||||
|
|
|
|||
|
|
@ -28,11 +28,13 @@ in
|
|||
rustfmt
|
||||
openssl
|
||||
vulkan-tools
|
||||
android-tools
|
||||
android-file-transfer
|
||||
|
||||
rocmPackages.rocm-runtime
|
||||
rocmPackages.rocminfo
|
||||
rocmPackages.clr
|
||||
rocmPackages.rocm-smi
|
||||
|
||||
qemu
|
||||
(pkgs.writeShellScriptBin "qemu-system-x86_64-uefi" ''
|
||||
|
|
@ -64,9 +66,8 @@ in
|
|||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICi8Cciepfs1ikPdfyHjc9qJX5z2QLFF9jBszsyEvCMA nix-on-droid@localhost"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID8Eo/QDJtXqluvjNx5ZpeIt0c/yf/Mgr7dKhNWAICZX hare@x1carbon"
|
||||
];
|
||||
];
|
||||
};
|
||||
programs.adb.enable = true;
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
|
|
|||
|
|
@ -51,17 +51,23 @@ let
|
|||
in
|
||||
rec {
|
||||
hosts = {
|
||||
arcadia = mkHost {
|
||||
system = "x86_64-linux";
|
||||
hostname = "Arcadia";
|
||||
username = "hare";
|
||||
systemModules = [
|
||||
./arcadia/nixos.nix
|
||||
];
|
||||
homeModule = [
|
||||
./arcadia/home-manager.nix
|
||||
];
|
||||
};
|
||||
arcadia =
|
||||
let
|
||||
inputs.nixpkgs = import inputs.nixpkgs {
|
||||
config.rocmSupport = true;
|
||||
};
|
||||
in
|
||||
mkHost {
|
||||
system = "x86_64-linux";
|
||||
hostname = "Arcadia";
|
||||
username = "hare";
|
||||
systemModules = [
|
||||
./arcadia/nixos.nix
|
||||
];
|
||||
homeModule = [
|
||||
./arcadia/home-manager.nix
|
||||
];
|
||||
};
|
||||
x1carbon = mkHost {
|
||||
system = "x86_64-linux";
|
||||
hostname = "x1carbon";
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ in
|
|||
{
|
||||
services.greetd.enable = true;
|
||||
services.greetd.settings.default_session = {
|
||||
command = "${pkgs.hyprland}/bin/Hyprland --config ${hyprGreetConf}";
|
||||
command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
|
||||
user = "greeter";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
hyprland = {
|
||||
prettyName = "Hyprland";
|
||||
comment = "Hyprland compositor managed by UWSM";
|
||||
binPath = lib.mkDefault "${pkgs.hyprland}/bin/Hyprland";
|
||||
binPath = "${pkgs.hyprland}/bin/start-hyprland";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user