Compare commits
No commits in common. "50901f6810e6ed4419c026207154b8850a9f2922" and "8341ffcfcd37135095062cd9211e6ed3b6c2ff7a" have entirely different histories.
50901f6810
...
8341ffcfcd
102
flake.lock
102
flake.lock
|
|
@ -18,24 +18,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -43,11 +25,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779969295,
|
"lastModified": 1776454077,
|
||||||
"narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
|
"narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
|
"rev": "565e5349208fe7d0831ef959103c9bafbeac0681",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -56,26 +38,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"insomnia": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1780015149,
|
|
||||||
"narHash": "sha256-sEpglWrsVDNHys56LNLY8mvak2A3OkRE865ZYTc9i/w=",
|
|
||||||
"ref": "develop",
|
|
||||||
"rev": "b0c3b79e114502acd375afe78cac34ef2aeef05c",
|
|
||||||
"revCount": 610,
|
|
||||||
"type": "git",
|
|
||||||
"url": "ssh://git@gitea.hareworks.net/Hare/insomnia.git"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"ref": "develop",
|
|
||||||
"type": "git",
|
|
||||||
"url": "ssh://git@gitea.hareworks.net/Hare/insomnia.git"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-index-database": {
|
"nix-index-database": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -83,11 +45,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779604987,
|
"lastModified": 1775970782,
|
||||||
"narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
|
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
|
"rev": "bedba5989b04614fc598af9633033b95a937933f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -98,11 +60,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779826373,
|
"lastModified": 1775490113,
|
||||||
"narHash": "sha256-3sRzgLX86qV5NlhWUAufLmHwkyP03tmL3VdZIM13dEo=",
|
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "ef4efb84766a166c906bd55759574676bf91267c",
|
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -113,37 +75,21 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775036866,
|
"lastModified": 1776169885,
|
||||||
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1779560665,
|
|
||||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727348695,
|
"lastModified": 1727348695,
|
||||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
||||||
|
|
@ -163,10 +109,9 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"insomnia": "insomnia",
|
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs",
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -185,24 +130,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"zen-browser": {
|
"zen-browser": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761859251,
|
"lastModified": 1761859251,
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
zen-browser.url = "github:xaragon/zen-browser-flake";
|
zen-browser.url = "github:xaragon/zen-browser-flake";
|
||||||
insomnia.url = "git+ssh://git@gitea.hareworks.net/Hare/insomnia.git?ref=develop";
|
|
||||||
|
|
||||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configPath = ".mozilla/firefox";
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,46 +5,8 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib) mkOption recursiveUpdate types optionals;
|
||||||
mkOption
|
|
||||||
recursiveUpdate
|
|
||||||
types
|
|
||||||
optionals
|
|
||||||
;
|
|
||||||
rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { };
|
rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { };
|
||||||
mkLua = lib.generators.mkLuaInline;
|
|
||||||
|
|
||||||
mkEnv = name: value: {
|
|
||||||
_args = [
|
|
||||||
name
|
|
||||||
value
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
mkBind = keys: dispatcher: {
|
|
||||||
_args = [
|
|
||||||
keys
|
|
||||||
(mkLua dispatcher)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
mkMouseBind = keys: dispatcher: {
|
|
||||||
_args = [
|
|
||||||
keys
|
|
||||||
(mkLua dispatcher)
|
|
||||||
{ mouse = true; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
mkStartHook = commands: {
|
|
||||||
_args = [
|
|
||||||
"hyprland.start"
|
|
||||||
(mkLua ''
|
|
||||||
function()
|
|
||||||
${lib.concatMapStrings (command: " hl.exec_cmd(${builtins.toJSON command})\n") commands}end
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
defaultInput = {
|
defaultInput = {
|
||||||
kb_layout = "us";
|
kb_layout = "us";
|
||||||
|
|
@ -65,31 +27,35 @@ let
|
||||||
|
|
||||||
wallpaperCommand = config.hare.hyprland.wallpaperCommand;
|
wallpaperCommand = config.hare.hyprland.wallpaperCommand;
|
||||||
|
|
||||||
startupCommands = [
|
baseSettings = {
|
||||||
# "/usr/lib/polkit-kde-authentication-agent-1"
|
exec-once = [
|
||||||
# "dunst"
|
# "/usr/lib/polkit-kde-authentication-agent-1"
|
||||||
"awww-daemon"
|
# "dunst"
|
||||||
# "copyq --start-server"
|
"awww-daemon"
|
||||||
# "wl-paste --type text --watch cliphist store"
|
# "copyq --start-server"
|
||||||
# "wl-paste --type image --watch cliphist store"
|
# "wl-paste --type text --watch cliphist store"
|
||||||
"eww daemon"
|
# "wl-paste --type image --watch cliphist store"
|
||||||
"eww open bar"
|
"eww daemon"
|
||||||
"eww open roundedEdge"
|
"eww open bar"
|
||||||
];
|
"eww open roundedEdge"
|
||||||
|
];
|
||||||
reloadCommands =
|
exec =
|
||||||
optionals (wallpaperCommand != null) [
|
optionals (wallpaperCommand != null) [
|
||||||
wallpaperCommand
|
wallpaperCommand
|
||||||
]
|
]
|
||||||
++ [
|
++ [
|
||||||
"dconf write /org/gnome/desktop/interface/gtk-theme 'Adwaita Dark'"
|
"dconf write /org/gnome/desktop/interface/gtk-theme 'Adwaita Dark'"
|
||||||
"dconf write /org/gnome/desktop/interface/icon-theme 'Adwaita Dark'"
|
"dconf write /org/gnome/desktop/interface/icon-theme 'Adwaita Dark'"
|
||||||
"dconf write /org/gnome/desktop/interface/document-font-name 'Noto Sans Medium 11'"
|
"dconf write /org/gnome/desktop/interface/document-font-name 'Noto Sans Medium 11'"
|
||||||
"dconf write /org/gnome/desktop/interface/font-name 'Noto Sans Medium 11'"
|
"dconf write /org/gnome/desktop/interface/font-name 'Noto Sans Medium 11'"
|
||||||
"dconf write /org/gnome/desktop/interface/monospace-font-name 'Noto Sans Mono Medium 11'"
|
"dconf write /org/gnome/desktop/interface/monospace-font-name 'Noto Sans Mono Medium 11'"
|
||||||
];
|
];
|
||||||
|
env = [
|
||||||
|
"XDG_CURRENT_DESKTOP,Hyprland"
|
||||||
|
"XDG_SESSION_TYPE,wayland"
|
||||||
|
"XDG_SESSION_DESKTOP,Hyprland"
|
||||||
|
];
|
||||||
|
|
||||||
baseConfig = {
|
|
||||||
ecosystem.no_update_news = true;
|
ecosystem.no_update_news = true;
|
||||||
|
|
||||||
input = defaultInput;
|
input = defaultInput;
|
||||||
|
|
@ -100,6 +66,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
dwindle = {
|
dwindle = {
|
||||||
|
pseudotile = true;
|
||||||
preserve_split = true;
|
preserve_split = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -108,124 +75,76 @@ let
|
||||||
disable_hyprland_logo = true;
|
disable_hyprland_logo = true;
|
||||||
disable_splash_rendering = true;
|
disable_splash_rendering = true;
|
||||||
};
|
};
|
||||||
xwayland = {
|
|
||||||
force_zero_scaling = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
baseSettings = {
|
windowrule = [
|
||||||
menu = {
|
"animation windowsIn 0, match:title ^(.*wofi.*)$"
|
||||||
_var = "uwsm app -- $(tofi-drun)";
|
"float on, match:title ^(.*feh.*)$"
|
||||||
};
|
"center on, match:title ^(.*feh.*)$"
|
||||||
terminal = {
|
"float on, match:title ^(Picture.*)$"
|
||||||
_var = "wezterm";
|
"pin on, match:title ^(Picture.*)$"
|
||||||
};
|
"immediate on, match:class ^(Terraria)$"
|
||||||
lock = {
|
|
||||||
_var = "hyprlock";
|
|
||||||
};
|
|
||||||
|
|
||||||
env = [
|
|
||||||
(mkEnv "XDG_CURRENT_DESKTOP" "Hyprland")
|
|
||||||
(mkEnv "XDG_SESSION_TYPE" "wayland")
|
|
||||||
(mkEnv "XDG_SESSION_DESKTOP" "Hyprland")
|
|
||||||
# "GDK_SCALE,2"
|
|
||||||
# "XCURSOR_SIZE,32"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
exec_cmd = reloadCommands;
|
workspace = [
|
||||||
|
"1, monitor:DP-2, default:true"
|
||||||
on = mkStartHook startupCommands;
|
"r[2-9], monitor:DP-2"
|
||||||
|
"name:sub, monitor:DP-1, default:true"
|
||||||
window_rule = [
|
|
||||||
{
|
|
||||||
match.title = "^(.*wofi.*)$";
|
|
||||||
animation = "windowsIn 0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
match.title = "^(.*feh.*)$";
|
|
||||||
float = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
match.title = "^(.*feh.*)$";
|
|
||||||
center = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
match.title = "^(Picture.*)$";
|
|
||||||
float = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
match.title = "^(Picture.*)$";
|
|
||||||
pin = true;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
workspace_rule = [
|
"$menu" = "uwsm app -- $(tofi-drun)";
|
||||||
{
|
"$terminal" = "wezterm";
|
||||||
workspace = "r[1-9]";
|
"$lock" = "hyprlock";
|
||||||
monitor = "DP-1";
|
bindm = [
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "101";
|
|
||||||
monitor = "DP-2";
|
|
||||||
default = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "102";
|
|
||||||
monitor = "DP-3";
|
|
||||||
default = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
bind = [
|
|
||||||
# Window Movement & Resizing
|
# Window Movement & Resizing
|
||||||
(mkMouseBind "SUPER + mouse:272" "hl.dsp.window.drag()")
|
"SUPER, mouse:272, movewindow"
|
||||||
(mkMouseBind "SUPER + mouse:273" "hl.dsp.window.resize()")
|
"SUPER, mouse:273, resizewindow"
|
||||||
|
];
|
||||||
|
bind = [
|
||||||
# basic
|
# basic
|
||||||
(mkBind "SUPER + RETURN" "hl.dsp.exec_cmd(menu)")
|
"SUPER, return, exec, $menu"
|
||||||
(mkBind "SUPER + E" "hl.dsp.exec_cmd(terminal)")
|
"SUPER, E, exec, $terminal"
|
||||||
(mkBind "SUPER + Q" "hl.dsp.window.close()")
|
"SUPER, Q, killactive,"
|
||||||
(mkBind "SUPER + L" "hl.dsp.exec_cmd(lock)")
|
"SUPER, L, exec, $lock"
|
||||||
(mkBind "SUPER + SHIFT + L" ''hl.dsp.dpms({ action = "off" })'')
|
"SUPER_SHIFT, L, exec, hyprctl dispatch dpms off"
|
||||||
(mkBind "SUPER + SHIFT + M" ''hl.dsp.exec_cmd("loginctl terminate-user $USER")'')
|
"SUPER_SHIFT, M, exec, loginctl terminate-user $USER"
|
||||||
|
|
||||||
# prsc
|
# prsc
|
||||||
(mkBind "Print" ''hl.dsp.exec_cmd("hyprshot -m window -m active --clipboard-only")'')
|
", Print, exec, hyprshot -m window -m active --clipboard-only"
|
||||||
|
|
||||||
# Clipboard
|
# Clipboard
|
||||||
(mkBind "SUPER + C" ''hl.dsp.exec_cmd("copyq show")'')
|
"SUPER, C, exec, copyq show"
|
||||||
(mkBind "SUPER + V" ''hl.dsp.exec_cmd("clipman pick -t dmenu")'')
|
"SUPER, V, exec, clipman pick -t dmenu"
|
||||||
|
|
||||||
# Window navigation
|
# Window navigation
|
||||||
(mkBind "SUPER + F" "hl.dsp.window.fullscreen()")
|
"SUPER, F, fullscreen,"
|
||||||
(mkBind "SUPER + Y" "hl.dsp.window.pin()")
|
"SUPER, Y, pin"
|
||||||
(mkBind "SUPER + I" ''hl.dsp.window.float({ action = "toggle" })'')
|
"SUPER, I, togglefloating,"
|
||||||
(mkBind "SUPER + O" ''hl.dsp.layout("togglesplit")'') # dwindle
|
"SUPER, O, togglesplit," # dwindle
|
||||||
(mkBind "SUPER + P" "hl.dsp.window.pseudo()") # dwindle
|
"SUPER, P, pseudo," # dwindle
|
||||||
|
|
||||||
# Window focus
|
# Window focus
|
||||||
(mkBind "SUPER + mouse_down" "hl.dsp.window.cycle_next()")
|
"SUPER, mouse_down, cyclenext, next"
|
||||||
(mkBind "SUPER + mouse_up" "hl.dsp.window.cycle_next({ next = false })")
|
"SUPER, mouse_up, cyclenext, prev"
|
||||||
|
|
||||||
(mkBind "SUPER + left" ''hl.dsp.focus({ direction = "left" })'')
|
"SUPER, left, movefocus, l"
|
||||||
(mkBind "SUPER + right" ''hl.dsp.focus({ direction = "right" })'')
|
"SUPER, right, movefocus, r"
|
||||||
(mkBind "SUPER + up" ''hl.dsp.focus({ direction = "up" })'')
|
"SUPER, up, movefocus, u"
|
||||||
(mkBind "SUPER + down" ''hl.dsp.focus({ direction = "down" })'')
|
"SUPER, down, movefocus, d"
|
||||||
|
|
||||||
(mkBind "SUPER + SHIFT + left" ''hl.dsp.window.move({ direction = "left" })'')
|
"SUPER_SHIFT, left, movewindow, l"
|
||||||
(mkBind "SUPER + SHIFT + right" ''hl.dsp.window.move({ direction = "right" })'')
|
"SUPER_SHIFT, right, movewindow, r"
|
||||||
(mkBind "SUPER + SHIFT + up" ''hl.dsp.window.move({ direction = "up" })'')
|
"SUPER_SHIFT, up, movewindow, u"
|
||||||
(mkBind "SUPER + SHIFT + down" ''hl.dsp.window.move({ direction = "down" })'')
|
"SUPER_SHIFT, down, movewindow, d"
|
||||||
|
|
||||||
# workspaces
|
# workspaces
|
||||||
(mkBind "SUPER + 1" "hl.dsp.focus({ workspace = 1 })")
|
"SUPER, 1, workspace, 1"
|
||||||
(mkBind "SUPER + 2" "hl.dsp.focus({ workspace = 2 })")
|
"SUPER, 2, workspace, 2"
|
||||||
(mkBind "SUPER + 3" "hl.dsp.focus({ workspace = 3 })")
|
"SUPER, 3, workspace, 3"
|
||||||
|
|
||||||
(mkBind "SUPER + CTRL + left" ''hl.dsp.focus({ workspace = "m-1" })'')
|
"SUPER_CTRL, left, workspace, m-1"
|
||||||
(mkBind "SUPER + CTRL + right" ''hl.dsp.focus({ workspace = "m+1" })'')
|
"SUPER_CTRL, right, workspace, m+1"
|
||||||
(mkBind "SUPER + CTRL + SHIFT + left" ''hl.dsp.focus({ workspace = "r-1" })'')
|
"SUPER_CTRL_SHIFT, left, workspace, r-1"
|
||||||
(mkBind "SUPER + CTRL + SHIFT + right" ''hl.dsp.focus({ workspace = "r+1" })'')
|
"SUPER_CTRL_SHIFT, right, workspace, r+1"
|
||||||
]
|
]
|
||||||
++ (
|
++ (
|
||||||
# workspaces
|
# workspaces
|
||||||
|
|
@ -237,8 +156,8 @@ let
|
||||||
ws = i + 1;
|
ws = i + 1;
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
(mkBind "SUPER + code:1${toString i}" "hl.dsp.focus({ workspace = ${toString ws} })")
|
"SUPER, code:1${toString i}, workspace, ${toString ws}"
|
||||||
(mkBind "SUPER + SHIFT + code:1${toString i}" "hl.dsp.window.move({ workspace = ${toString ws} })")
|
"SUPER SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
|
||||||
]
|
]
|
||||||
) 9
|
) 9
|
||||||
)
|
)
|
||||||
|
|
@ -250,16 +169,8 @@ let
|
||||||
gaps_in = 4;
|
gaps_in = 4;
|
||||||
gaps_out = 7;
|
gaps_out = 7;
|
||||||
border_size = 3;
|
border_size = 3;
|
||||||
col = {
|
"col.active_border" = "rgba(6e848cee) rgba(eeeeffee) 90deg";
|
||||||
active_border = {
|
"col.inactive_border" = "rgba(595959aa)";
|
||||||
colors = [
|
|
||||||
"rgba(6e848cee)"
|
|
||||||
"rgba(eeeeffee)"
|
|
||||||
];
|
|
||||||
angle = 90;
|
|
||||||
};
|
|
||||||
inactive_border = "rgba(595959aa)";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
decoration = {
|
decoration = {
|
||||||
rounding = 10;
|
rounding = 10;
|
||||||
|
|
@ -284,59 +195,18 @@ let
|
||||||
animations = {
|
animations = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
animation = [
|
animation = [
|
||||||
{
|
"windowsIn, 1, 1, default, popin 90%"
|
||||||
leaf = "windowsIn";
|
"windowsOut, 1, 100, default, popin 80%"
|
||||||
enabled = true;
|
"windowsMove, 1, 3, default"
|
||||||
speed = 1;
|
"border, 1, 10, default"
|
||||||
bezier = "default";
|
"borderangle, 1, 8, default"
|
||||||
style = "popin 90%";
|
"fade, 1, 7, default"
|
||||||
}
|
"workspaces, 1, 5, default, slidefade 10%"
|
||||||
{
|
|
||||||
leaf = "windowsOut";
|
|
||||||
enabled = true;
|
|
||||||
speed = 100;
|
|
||||||
bezier = "default";
|
|
||||||
style = "popin 80%";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "windowsMove";
|
|
||||||
enabled = true;
|
|
||||||
speed = 3;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "border";
|
|
||||||
enabled = true;
|
|
||||||
speed = 10;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "borderangle";
|
|
||||||
enabled = true;
|
|
||||||
speed = 8;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "fade";
|
|
||||||
enabled = true;
|
|
||||||
speed = 7;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "workspaces";
|
|
||||||
enabled = true;
|
|
||||||
speed = 5;
|
|
||||||
bezier = "default";
|
|
||||||
style = "slidefade 10%";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
styleSettings = recursiveUpdate defaultStyle config.hare.hyprland.style;
|
styleSettings = recursiveUpdate defaultStyle config.hare.hyprland.style;
|
||||||
styleConfig = recursiveUpdate (builtins.removeAttrs styleSettings [ "animations" ]) {
|
|
||||||
animations = builtins.removeAttrs styleSettings.animations [ "animation" ];
|
|
||||||
};
|
|
||||||
inputSettings = recursiveUpdate defaultInput config.hare.hyprland.input;
|
inputSettings = recursiveUpdate defaultInput config.hare.hyprland.input;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
@ -360,13 +230,9 @@ in
|
||||||
config = {
|
config = {
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configType = "lua";
|
|
||||||
systemd.enable = false;
|
systemd.enable = false;
|
||||||
settings = recursiveUpdate baseSettings {
|
settings = recursiveUpdate (recursiveUpdate baseSettings styleSettings) {
|
||||||
config = recursiveUpdate (recursiveUpdate baseConfig styleConfig) {
|
input = inputSettings;
|
||||||
input = inputSettings;
|
|
||||||
};
|
|
||||||
animation = styleSettings.animations.animation;
|
|
||||||
};
|
};
|
||||||
plugins = [
|
plugins = [
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -4,16 +4,8 @@
|
||||||
gaps_in = 0;
|
gaps_in = 0;
|
||||||
gaps_out = 0;
|
gaps_out = 0;
|
||||||
border_size = 2;
|
border_size = 2;
|
||||||
col = {
|
"col.active_border" = "rgba(6e848cee) rgba(eeeeffee) 90deg";
|
||||||
active_border = {
|
"col.inactive_border" = "rgba(595959aa)";
|
||||||
colors = [
|
|
||||||
"rgba(6e848cee)"
|
|
||||||
"rgba(eeeeffee)"
|
|
||||||
];
|
|
||||||
angle = 90;
|
|
||||||
};
|
|
||||||
inactive_border = "rgba(595959aa)";
|
|
||||||
};
|
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
allow_tearing = true;
|
allow_tearing = true;
|
||||||
};
|
};
|
||||||
|
|
@ -39,51 +31,13 @@
|
||||||
animations = lib.mkForce {
|
animations = lib.mkForce {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
animation = [
|
animation = [
|
||||||
{
|
"windowsIn, 1, 1, default, popin 90%"
|
||||||
leaf = "windowsIn";
|
"windowsOut, 1, 100, default, popin 80%"
|
||||||
enabled = true;
|
"windowsMove, 1, 3, default"
|
||||||
speed = 1;
|
"border, 1, 10, default"
|
||||||
bezier = "default";
|
"borderangle, 1, 8, default"
|
||||||
style = "popin 90%";
|
"fade, 1, 7, default"
|
||||||
}
|
"workspaces, 1, 5, default, slidefade 10%"
|
||||||
{
|
|
||||||
leaf = "windowsOut";
|
|
||||||
enabled = true;
|
|
||||||
speed = 100;
|
|
||||||
bezier = "default";
|
|
||||||
style = "popin 80%";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "windowsMove";
|
|
||||||
enabled = true;
|
|
||||||
speed = 3;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "border";
|
|
||||||
enabled = true;
|
|
||||||
speed = 10;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "borderangle";
|
|
||||||
enabled = true;
|
|
||||||
speed = 8;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "fade";
|
|
||||||
enabled = true;
|
|
||||||
speed = 7;
|
|
||||||
bezier = "default";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
leaf = "workspaces";
|
|
||||||
enabled = true;
|
|
||||||
speed = 5;
|
|
||||||
bezier = "default";
|
|
||||||
style = "slidefade 10%";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
home.stateVersion = "26.05";
|
home.stateVersion = "25.05";
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nix-index-database.homeModules.nix-index
|
inputs.nix-index-database.homeModules.nix-index
|
||||||
../../../home-manager/tofi.nix
|
../../../home-manager/tofi.nix
|
||||||
|
|
@ -19,30 +19,13 @@
|
||||||
../../../home-manager/obs-studio.nix
|
../../../home-manager/obs-studio.nix
|
||||||
../../../home-manager/zeditor.nix
|
../../../home-manager/zeditor.nix
|
||||||
../../../home-manager/blender.nix
|
../../../home-manager/blender.nix
|
||||||
# ../../../home-manager/voicevox.nix
|
../../../home-manager/voicevox.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings.monitor = [
|
wayland.windowManager.hyprland.settings.monitor = [
|
||||||
{
|
"DP-1, 5120x2880@60, 0x0, 2"
|
||||||
output = "DP-1";
|
"DP-2, 2560x1440@144, 2560x0, 1, transform, 0"
|
||||||
mode = "5120x2880@60";
|
"DP-3, 1920x1080@144, -1080x-240, 1, transform, 1"
|
||||||
position = "0x0";
|
|
||||||
scale = 2;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
output = "DP-2";
|
|
||||||
mode = "2560x1440@144";
|
|
||||||
position = "2560x0";
|
|
||||||
scale = 1;
|
|
||||||
transform = 0;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
output = "DP-3";
|
|
||||||
mode = "1920x1080@144";
|
|
||||||
position = "-1080x-240";
|
|
||||||
scale = 1;
|
|
||||||
transform = 1;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
hare.hyprland = {
|
hare.hyprland = {
|
||||||
input.sensitivity = -1.0;
|
input.sensitivity = -1.0;
|
||||||
|
|
@ -58,7 +41,6 @@
|
||||||
plemoljp
|
plemoljp
|
||||||
plemoljp-nf
|
plemoljp-nf
|
||||||
prismlauncher
|
prismlauncher
|
||||||
nodejs
|
|
||||||
scrcpy
|
scrcpy
|
||||||
tetrio-desktop
|
tetrio-desktop
|
||||||
kicad
|
kicad
|
||||||
|
|
@ -66,9 +48,11 @@
|
||||||
inkscape
|
inkscape
|
||||||
obsidian
|
obsidian
|
||||||
kdePackages.filelight
|
kdePackages.filelight
|
||||||
|
inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
|
||||||
(deno.overrideAttrs (oldAttrs: {
|
(deno.overrideAttrs (oldAttrs: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
}))
|
}))
|
||||||
|
nodejs_24
|
||||||
godot
|
godot
|
||||||
unityhub
|
unityhub
|
||||||
nixd
|
nixd
|
||||||
|
|
@ -77,8 +61,7 @@
|
||||||
bambu-studio
|
bambu-studio
|
||||||
orca-slicer
|
orca-slicer
|
||||||
davinci-resolve
|
davinci-resolve
|
||||||
inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
|
antigravity
|
||||||
inputs.insomnia.packages.${stdenv.hostPlatform.system}.default
|
|
||||||
];
|
];
|
||||||
services.easyeffects = {
|
services.easyeffects = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -88,11 +71,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.user.name = "Hare";
|
settings.user.name = "Hare";
|
||||||
settings.user.email = "kei.hiracchi.0928@gmail.com";
|
settings.user.email = "kei.hiracchi.0928@gmail.com";
|
||||||
signing = {
|
|
||||||
format = "ssh";
|
|
||||||
key = "~/.ssh/git-sign.pub";
|
|
||||||
signByDefault = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts = {
|
fonts = {
|
||||||
|
|
@ -114,7 +92,6 @@
|
||||||
"x-scheme-handler/https" = "vivaldi-stable.desktop";
|
"x-scheme-handler/https" = "vivaldi-stable.desktop";
|
||||||
"x-scheme-handler/about" = "vivaldi-stable.desktop";
|
"x-scheme-handler/about" = "vivaldi-stable.desktop";
|
||||||
"x-scheme-handler/unknown" = "vivaldi-stable.desktop";
|
"x-scheme-handler/unknown" = "vivaldi-stable.desktop";
|
||||||
"x-scheme-handler/vivaldi" = "vivaldi-stable.desktop";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,20 +6,9 @@ in
|
||||||
system.stateVersion = "25.11";
|
system.stateVersion = "25.11";
|
||||||
|
|
||||||
cornflake.greeter.monitors = [
|
cornflake.greeter.monitors = [
|
||||||
{
|
"DP-1, 5120x2880@60, 0x0, 2"
|
||||||
output = "DP-1";
|
"DP-2, disable"
|
||||||
mode = "5120x2880@60";
|
"DP-3, disable"
|
||||||
position = "0x0";
|
|
||||||
scale = 2;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
output = "DP-2";
|
|
||||||
disabled = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
output = "DP-3";
|
|
||||||
disabled = true;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -65,7 +54,6 @@ in
|
||||||
obexftp
|
obexftp
|
||||||
fzf
|
fzf
|
||||||
ghq
|
ghq
|
||||||
gh
|
|
||||||
];
|
];
|
||||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
|
||||||
|
|
@ -81,7 +69,8 @@ in
|
||||||
5173
|
5173
|
||||||
8000
|
8000
|
||||||
9001
|
9001
|
||||||
25565
|
2222 # crtb server
|
||||||
|
11434
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [ ];
|
networking.firewall.allowedUDPPorts = [ ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.stateVersion = "26.05";
|
home.stateVersion = "25.05";
|
||||||
imports = [
|
imports = [
|
||||||
../../../home-manager/direnv.nix
|
../../../home-manager/direnv.nix
|
||||||
../../../home-manager/wezterm
|
../../../home-manager/wezterm
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
home.stateVersion = "26.05";
|
home.stateVersion = "25.05";
|
||||||
imports = [
|
imports = [
|
||||||
../../../home-manager/hyprland
|
../../../home-manager/hyprland
|
||||||
../../../home-manager/tofi.nix
|
../../../home-manager/tofi.nix
|
||||||
|
|
@ -18,7 +18,11 @@
|
||||||
hare.hyprland = {
|
hare.hyprland = {
|
||||||
style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; };
|
style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; };
|
||||||
input.sensitivity = -0.6;
|
input.sensitivity = -0.6;
|
||||||
|
<<<<<<< Updated upstream
|
||||||
wallpaperCommand = "awww img /usr/share/wallpaper/";
|
wallpaperCommand = "awww img /usr/share/wallpaper/";
|
||||||
|
=======
|
||||||
|
wallpaperCommand = "swww img /usr/share/wallpaper/001.png";
|
||||||
|
>>>>>>> Stashed changes
|
||||||
};
|
};
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
vivaldi
|
vivaldi
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,4 @@
|
||||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||||
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.gamescope = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,51 +1,39 @@
|
||||||
{
|
{ config, lib, pkgs, ... }:
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
rosePineHyprcursor = pkgs.callPackage ../../home-manager/hyprland/rose-pine-hyprcursor.nix { };
|
rosePineHyprcursor = pkgs.callPackage ../../home-manager/hyprland/rose-pine-hyprcursor.nix { };
|
||||||
toLua = lib.generators.toLua { };
|
monitorConf = lib.concatMapStrings (m: "monitor = ${m}\n") config.cornflake.greeter.monitors;
|
||||||
monitorConf = lib.concatMapStrings (
|
hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" ''
|
||||||
m: "hl.monitor(${toLua m})\n"
|
|
||||||
) config.cornflake.greeter.monitors;
|
|
||||||
hyprGreetConf = pkgs.writeText "hyprland-greetd.lua" ''
|
|
||||||
${monitorConf}
|
${monitorConf}
|
||||||
hl.env("HYPRCURSOR_THEME", "rose-pine-hyprcursor")
|
env = HYPRCURSOR_THEME,rose-pine-hyprcursor
|
||||||
hl.env("HYPRCURSOR_SIZE", "24")
|
env = HYPRCURSOR_SIZE,24
|
||||||
hl.env("XCURSOR_SIZE", "24")
|
env = XCURSOR_SIZE,24
|
||||||
|
|
||||||
hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
|
env = XDG_CURRENT_DESKTOP,Hyprland
|
||||||
hl.env("XDG_SESSION_TYPE", "wayland")
|
env = XDG_SESSION_TYPE,wayland
|
||||||
hl.env("XDG_SESSION_DESKTOP", "Hyprland")
|
env = XDG_SESSION_DESKTOP,Hyprland
|
||||||
|
|
||||||
hl.config({
|
general {
|
||||||
general = {
|
border_size = 0
|
||||||
border_size = 0,
|
}
|
||||||
},
|
|
||||||
animations = {
|
|
||||||
enabled = false,
|
|
||||||
},
|
|
||||||
misc = {
|
|
||||||
force_default_wallpaper = false,
|
|
||||||
disable_hyprland_logo = true,
|
|
||||||
disable_splash_rendering = true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
hl.on("hyprland.start", function()
|
animations {
|
||||||
hl.exec_cmd("${
|
enabled = false
|
||||||
config.programs.regreet.package or pkgs.regreet
|
}
|
||||||
}/bin/regreet; hyprctl dispatch exit")
|
|
||||||
end)
|
misc {
|
||||||
|
force_default_wallpaper = false
|
||||||
|
disable_hyprland_logo = true
|
||||||
|
disable_splash_rendering = true
|
||||||
|
}
|
||||||
|
|
||||||
|
exec-once = ${config.programs.regreet.package or pkgs.regreet}/bin/regreet; hyprctl dispatch exit
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.cornflake.greeter.monitors = lib.mkOption {
|
options.cornflake.greeter.monitors = lib.mkOption {
|
||||||
type = lib.types.listOf lib.types.attrs;
|
type = lib.types.listOf lib.types.str;
|
||||||
default = [ ];
|
default = [ ];
|
||||||
description = "greetd セッション用 Hyprland の Lua monitor 設定";
|
description = "greetd セッション用 Hyprland の monitor 設定";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user