Compare commits
No commits in common. "master" and "034f58347b19a71e4b23cf097ead3416a75a824c" have entirely different histories.
master
...
034f58347b
|
|
@ -3,5 +3,5 @@
|
|||
```
|
||||
sudo nixos-rebuild switch --flake .#<host>
|
||||
|
||||
nix run .#home-manager -- switch --flake .#<username>@<host>
|
||||
nix run .#home-manager -- switch --flake .#<host>
|
||||
```
|
||||
|
|
|
|||
128
flake.lock
128
flake.lock
|
|
@ -18,24 +18,6 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -43,11 +25,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780408569,
|
||||
"narHash": "sha256-s7Tv6FUQThRAvW8En8XVC6HMb0uiikzVccCcCo9u/Bg=",
|
||||
"lastModified": 1772218752,
|
||||
"narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f384af1bec6423a0d4ba1855917ab948f64e5808",
|
||||
"rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -63,11 +45,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780210899,
|
||||
"narHash": "sha256-4axz3OBPTKa6LIkXV8n0lc63MQU+et2CB5DGobEAi6k=",
|
||||
"lastModified": 1771734689,
|
||||
"narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "97df9dc0b7c924344b793a15c1e8e4522ebb854e",
|
||||
"rev": "8f590b832326ab9699444f3a48240595954a4b10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -77,15 +59,12 @@
|
|||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780310866,
|
||||
"narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
|
||||
"lastModified": 1771969195,
|
||||
"narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "4ed851c979641e28597a05086332d75cdc9e395f",
|
||||
"rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -96,50 +75,21 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1767892417,
|
||||
"narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
|
||||
"rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
|
||||
"lastModified": 1771848320,
|
||||
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1780243769,
|
||||
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"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_4": {
|
||||
"locked": {
|
||||
"lastModified": 1727348695,
|
||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
||||
|
|
@ -161,8 +111,7 @@
|
|||
"home-manager": "home-manager",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"yoi": "yoi",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
},
|
||||
|
|
@ -181,44 +130,9 @@
|
|||
"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"
|
||||
}
|
||||
},
|
||||
"yoi": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780446170,
|
||||
"narHash": "sha256-Jfmsj1boCZ1xIZw+7rUN/cib61KKX37lZ0I4T+Ds6SA=",
|
||||
"ref": "develop",
|
||||
"rev": "cc98c0eb28376adef8722ec96b8e2ffba05e4f8f",
|
||||
"revCount": 950,
|
||||
"type": "git",
|
||||
"url": "ssh://git@gitea.hareworks.net/Hare/yoi.git"
|
||||
},
|
||||
"original": {
|
||||
"ref": "develop",
|
||||
"type": "git",
|
||||
"url": "ssh://git@gitea.hareworks.net/Hare/yoi.git"
|
||||
}
|
||||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761859251,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
flake-utils.url = "github:numtide/flake-utils";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
zen-browser.url = "github:xaragon/zen-browser-flake";
|
||||
yoi.url = "git+ssh://git@gitea.hareworks.net/Hare/yoi.git?ref=develop";
|
||||
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -35,9 +34,6 @@
|
|||
apps.home-manager = {
|
||||
type = "app";
|
||||
program = "${hm}/bin/home-manager";
|
||||
meta = {
|
||||
description = "Home Manager for Nix";
|
||||
};
|
||||
};
|
||||
}
|
||||
));
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
configPath = ".mozilla/firefox";
|
||||
};
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,39 +12,6 @@ let
|
|||
optionals
|
||||
;
|
||||
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 = {
|
||||
kb_layout = "us";
|
||||
|
|
@ -56,40 +23,44 @@ let
|
|||
follow_mouse = true;
|
||||
|
||||
touchpad = {
|
||||
natural_scroll = true;
|
||||
natural_scroll = false;
|
||||
};
|
||||
|
||||
natural_scroll = true;
|
||||
natural_scroll = false;
|
||||
sensitivity = 0.0;
|
||||
};
|
||||
|
||||
wallpaperCommand = config.hare.hyprland.wallpaperCommand;
|
||||
|
||||
startupCommands = [
|
||||
# "/usr/lib/polkit-kde-authentication-agent-1"
|
||||
# "dunst"
|
||||
"awww-daemon"
|
||||
# "copyq --start-server"
|
||||
# "wl-paste --type text --watch cliphist store"
|
||||
# "wl-paste --type image --watch cliphist store"
|
||||
"eww daemon"
|
||||
"eww open bar"
|
||||
"eww open roundedEdge"
|
||||
];
|
||||
|
||||
reloadCommands =
|
||||
optionals (wallpaperCommand != null) [
|
||||
wallpaperCommand
|
||||
]
|
||||
++ [
|
||||
"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/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/monospace-font-name 'Noto Sans Mono Medium 11'"
|
||||
baseSettings = {
|
||||
exec-once = [
|
||||
# "/usr/lib/polkit-kde-authentication-agent-1"
|
||||
# "dunst"
|
||||
"swww-daemon"
|
||||
# "copyq --start-server"
|
||||
# "wl-paste --type text --watch cliphist store"
|
||||
# "wl-paste --type image --watch cliphist store"
|
||||
"eww daemon"
|
||||
"eww open bar"
|
||||
"eww open roundedEdge"
|
||||
];
|
||||
exec =
|
||||
optionals (wallpaperCommand != null) [
|
||||
wallpaperCommand
|
||||
]
|
||||
++ [
|
||||
"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/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/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;
|
||||
|
||||
input = defaultInput;
|
||||
|
|
@ -100,6 +71,7 @@ let
|
|||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
preserve_split = true;
|
||||
};
|
||||
|
||||
|
|
@ -108,124 +80,78 @@ let
|
|||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
};
|
||||
xwayland = {
|
||||
force_zero_scaling = true;
|
||||
};
|
||||
};
|
||||
|
||||
baseSettings = {
|
||||
menu = {
|
||||
_var = "uwsm app -- $(tofi-drun)";
|
||||
};
|
||||
terminal = {
|
||||
_var = "wezterm";
|
||||
};
|
||||
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"
|
||||
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)$"
|
||||
];
|
||||
|
||||
exec_cmd = reloadCommands;
|
||||
|
||||
on = mkStartHook startupCommands;
|
||||
|
||||
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 = [
|
||||
"1, monitor:DP-2, default:true"
|
||||
"r[2-9], monitor:DP-2"
|
||||
"name:sub, monitor:DP-1, default:true"
|
||||
];
|
||||
|
||||
workspace_rule = [
|
||||
{
|
||||
workspace = "r[1-9]";
|
||||
monitor = "DP-1";
|
||||
}
|
||||
{
|
||||
workspace = "101";
|
||||
monitor = "DP-2";
|
||||
default = true;
|
||||
}
|
||||
{
|
||||
workspace = "102";
|
||||
monitor = "DP-3";
|
||||
default = true;
|
||||
}
|
||||
];
|
||||
|
||||
bind = [
|
||||
"$menu" = "uwsm app -- $(tofi-drun)";
|
||||
"$terminal" = "wezterm";
|
||||
"$lock" = "hyprlock";
|
||||
bindm = [
|
||||
# Window Movement & Resizing
|
||||
(mkMouseBind "SUPER + mouse:272" "hl.dsp.window.drag()")
|
||||
(mkMouseBind "SUPER + mouse:273" "hl.dsp.window.resize()")
|
||||
|
||||
"SUPER, mouse:272, movewindow"
|
||||
"SUPER, mouse:273, resizewindow"
|
||||
];
|
||||
bind = [
|
||||
# basic
|
||||
(mkBind "SUPER + RETURN" "hl.dsp.exec_cmd(menu)")
|
||||
(mkBind "SUPER + E" "hl.dsp.exec_cmd(terminal)")
|
||||
(mkBind "SUPER + Q" "hl.dsp.window.close()")
|
||||
(mkBind "SUPER + L" "hl.dsp.exec_cmd(lock)")
|
||||
(mkBind "SUPER + SHIFT + L" ''hl.dsp.dpms({ action = "off" })'')
|
||||
(mkBind "SUPER + SHIFT + M" ''hl.dsp.exec_cmd("loginctl terminate-user $USER")'')
|
||||
"SUPER, return, exec, $menu"
|
||||
"SUPER, E, exec, $terminal"
|
||||
"SUPER, Q, killactive,"
|
||||
"SUPER, L, exec, $lock"
|
||||
"SUPER_SHIFT, M, exec, loginctl terminate-user $USER"
|
||||
|
||||
# prsc
|
||||
(mkBind "Print" ''hl.dsp.exec_cmd("hyprshot -m window -m active --clipboard-only")'')
|
||||
", Print, exec, hyprshot -m window -m active --clipboard-only"
|
||||
|
||||
# Clipboard
|
||||
(mkBind "SUPER + C" ''hl.dsp.exec_cmd("copyq show")'')
|
||||
(mkBind "SUPER + V" ''hl.dsp.exec_cmd("clipman pick -t dmenu")'')
|
||||
"SUPER, C, exec, copyq show"
|
||||
"SUPER, V, exec, clipman pick -t dmenu"
|
||||
|
||||
# Window navigation
|
||||
(mkBind "SUPER + F" "hl.dsp.window.fullscreen()")
|
||||
(mkBind "SUPER + Y" "hl.dsp.window.pin()")
|
||||
(mkBind "SUPER + I" ''hl.dsp.window.float({ action = "toggle" })'')
|
||||
(mkBind "SUPER + O" ''hl.dsp.layout("togglesplit")'') # dwindle
|
||||
(mkBind "SUPER + P" "hl.dsp.window.pseudo()") # dwindle
|
||||
"SUPER, F, fullscreen,"
|
||||
"SUPER, Y, pin"
|
||||
"SUPER, I, togglefloating,"
|
||||
"SUPER, O, togglesplit," # dwindle
|
||||
"SUPER, P, pseudo," # dwindle
|
||||
|
||||
# Window focus
|
||||
(mkBind "SUPER + mouse_down" "hl.dsp.window.cycle_next()")
|
||||
(mkBind "SUPER + mouse_up" "hl.dsp.window.cycle_next({ next = false })")
|
||||
"SUPER, mouse_down, cyclenext, next"
|
||||
"SUPER, mouse_up, cyclenext, prev"
|
||||
|
||||
(mkBind "SUPER + left" ''hl.dsp.focus({ direction = "left" })'')
|
||||
(mkBind "SUPER + right" ''hl.dsp.focus({ direction = "right" })'')
|
||||
(mkBind "SUPER + up" ''hl.dsp.focus({ direction = "up" })'')
|
||||
(mkBind "SUPER + down" ''hl.dsp.focus({ direction = "down" })'')
|
||||
"SUPER, left, movefocus, l"
|
||||
"SUPER, right, movefocus, r"
|
||||
"SUPER, up, movefocus, u"
|
||||
"SUPER, down, movefocus, d"
|
||||
|
||||
(mkBind "SUPER + SHIFT + left" ''hl.dsp.window.move({ direction = "left" })'')
|
||||
(mkBind "SUPER + SHIFT + right" ''hl.dsp.window.move({ direction = "right" })'')
|
||||
(mkBind "SUPER + SHIFT + up" ''hl.dsp.window.move({ direction = "up" })'')
|
||||
(mkBind "SUPER + SHIFT + down" ''hl.dsp.window.move({ direction = "down" })'')
|
||||
"SUPER_SHIFT, left, movewindow, l"
|
||||
"SUPER_SHIFT, right, movewindow, r"
|
||||
"SUPER_SHIFT, up, movewindow, u"
|
||||
"SUPER_SHIFT, down, movewindow, d"
|
||||
|
||||
# workspaces
|
||||
(mkBind "SUPER + 1" "hl.dsp.focus({ workspace = 1 })")
|
||||
(mkBind "SUPER + 2" "hl.dsp.focus({ workspace = 2 })")
|
||||
(mkBind "SUPER + 3" "hl.dsp.focus({ workspace = 3 })")
|
||||
"SUPER, 1, workspace, 1"
|
||||
"SUPER, 2, workspace, 2"
|
||||
"SUPER, 3, workspace, 3"
|
||||
|
||||
(mkBind "SUPER + CTRL + left" ''hl.dsp.focus({ workspace = "m-1" })'')
|
||||
(mkBind "SUPER + CTRL + right" ''hl.dsp.focus({ workspace = "m+1" })'')
|
||||
(mkBind "SUPER + CTRL + SHIFT + left" ''hl.dsp.focus({ workspace = "r-1" })'')
|
||||
(mkBind "SUPER + CTRL + SHIFT + right" ''hl.dsp.focus({ workspace = "r+1" })'')
|
||||
"SUPER_CTRL, left, workspace, m-1"
|
||||
"SUPER_CTRL, right, workspace, m+1"
|
||||
"SUPER_CTRL_SHIFT, left, workspace, r-1"
|
||||
"SUPER_CTRL_SHIFT, right, workspace, r+1"
|
||||
|
||||
# screenshot
|
||||
"SUPER_SHIFT, S, exec, hyprshot -m region --clipboard-only"
|
||||
]
|
||||
++ (
|
||||
# workspaces
|
||||
|
|
@ -237,8 +163,8 @@ let
|
|||
ws = i + 1;
|
||||
in
|
||||
[
|
||||
(mkBind "SUPER + code:1${toString i}" "hl.dsp.focus({ workspace = ${toString ws} })")
|
||||
(mkBind "SUPER + SHIFT + code:1${toString i}" "hl.dsp.window.move({ workspace = ${toString ws} })")
|
||||
"SUPER, code:1${toString i}, workspace, ${toString ws}"
|
||||
"SUPER SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
|
||||
]
|
||||
) 9
|
||||
)
|
||||
|
|
@ -250,16 +176,8 @@ let
|
|||
gaps_in = 4;
|
||||
gaps_out = 7;
|
||||
border_size = 3;
|
||||
col = {
|
||||
active_border = {
|
||||
colors = [
|
||||
"rgba(6e848cee)"
|
||||
"rgba(eeeeffee)"
|
||||
];
|
||||
angle = 90;
|
||||
};
|
||||
inactive_border = "rgba(595959aa)";
|
||||
};
|
||||
"col.active_border" = "rgba(6e848cee) rgba(eeeeffee) 90deg";
|
||||
"col.inactive_border" = "rgba(595959aa)";
|
||||
};
|
||||
decoration = {
|
||||
rounding = 10;
|
||||
|
|
@ -284,59 +202,18 @@ let
|
|||
animations = {
|
||||
enabled = true;
|
||||
animation = [
|
||||
{
|
||||
leaf = "windowsIn";
|
||||
enabled = true;
|
||||
speed = 1;
|
||||
bezier = "default";
|
||||
style = "popin 90%";
|
||||
}
|
||||
{
|
||||
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%";
|
||||
}
|
||||
"windowsIn, 1, 1, default, popin 90%"
|
||||
"windowsOut, 1, 100, default, popin 80%"
|
||||
"windowsMove, 1, 3, default"
|
||||
"border, 1, 10, default"
|
||||
"borderangle, 1, 8, default"
|
||||
"fade, 1, 7, default"
|
||||
"workspaces, 1, 5, default, slidefade 10%"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
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;
|
||||
in
|
||||
{
|
||||
|
|
@ -354,19 +231,15 @@ in
|
|||
options.hare.hyprland.wallpaperCommand = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = "Command to set the wallpaper (e.g., \"awww img <path>\"); appended to Hyprland's exec list when provided.";
|
||||
description = "Command to set the wallpaper (e.g., \"swww img <path>\"); appended to Hyprland's exec list when provided.";
|
||||
};
|
||||
|
||||
config = {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
configType = "lua";
|
||||
systemd.enable = false;
|
||||
settings = recursiveUpdate baseSettings {
|
||||
config = recursiveUpdate (recursiveUpdate baseConfig styleConfig) {
|
||||
input = inputSettings;
|
||||
};
|
||||
animation = styleSettings.animations.animation;
|
||||
settings = recursiveUpdate (recursiveUpdate baseSettings styleSettings) {
|
||||
input = inputSettings;
|
||||
};
|
||||
plugins = [
|
||||
];
|
||||
|
|
@ -375,7 +248,7 @@ in
|
|||
rosePineHyprcursor
|
||||
]
|
||||
++ (with pkgs; [
|
||||
awww
|
||||
swww
|
||||
eww
|
||||
hyprshot
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -4,16 +4,8 @@
|
|||
gaps_in = 0;
|
||||
gaps_out = 0;
|
||||
border_size = 2;
|
||||
col = {
|
||||
active_border = {
|
||||
colors = [
|
||||
"rgba(6e848cee)"
|
||||
"rgba(eeeeffee)"
|
||||
];
|
||||
angle = 90;
|
||||
};
|
||||
inactive_border = "rgba(595959aa)";
|
||||
};
|
||||
"col.active_border" = "rgba(6e848cee) rgba(eeeeffee) 90deg";
|
||||
"col.inactive_border" = "rgba(595959aa)";
|
||||
layout = "dwindle";
|
||||
allow_tearing = true;
|
||||
};
|
||||
|
|
@ -39,51 +31,13 @@
|
|||
animations = lib.mkForce {
|
||||
enabled = true;
|
||||
animation = [
|
||||
{
|
||||
leaf = "windowsIn";
|
||||
enabled = true;
|
||||
speed = 1;
|
||||
bezier = "default";
|
||||
style = "popin 90%";
|
||||
}
|
||||
{
|
||||
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%";
|
||||
}
|
||||
"windowsIn, 1, 1, default, popin 90%"
|
||||
"windowsOut, 1, 100, default, popin 80%"
|
||||
"windowsMove, 1, 3, default"
|
||||
"border, 1, 10, default"
|
||||
"borderangle, 1, 8, default"
|
||||
"fade, 1, 7, default"
|
||||
"workspaces, 1, 5, default, slidefade 10%"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,11 @@
|
|||
{
|
||||
programs.zed-editor = {
|
||||
enable = true;
|
||||
extensions = [ "nix" "toml" "rust" ];
|
||||
extensions = [
|
||||
"nix"
|
||||
"toml"
|
||||
"rust"
|
||||
];
|
||||
|
||||
userSettings = {
|
||||
theme = {
|
||||
|
|
@ -12,11 +16,12 @@
|
|||
light = "Kanagawa Lotus";
|
||||
};
|
||||
hour_format = "hour24";
|
||||
vim_mode = true;
|
||||
vim_mode = false;
|
||||
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";
|
||||
home.file.".local/share/fonts/plemoljp".source =
|
||||
"${pkgs.plemoljp-nf}/share/fonts/truetype/plemoljp-nf-console";
|
||||
}
|
||||
|
|
|
|||
BIN
hosts/.default.nix.swp
Normal file
BIN
hosts/.default.nix.swp
Normal file
Binary file not shown.
|
|
@ -4,12 +4,12 @@ let
|
|||
in
|
||||
mkHost {
|
||||
system = "x86_64-linux";
|
||||
hostname = "Arcadia";
|
||||
hostname = "AQUA";
|
||||
users = [
|
||||
{
|
||||
username = "hare";
|
||||
home = ./hare/home-manager.nix;
|
||||
nixos = ./hare/nixos.nix;
|
||||
username = "umi";
|
||||
homeModule = [ ./umi/home-manager.nix ];
|
||||
userNixos = ./umi/nixos.nix;
|
||||
}
|
||||
];
|
||||
systemModules = [ ./nixos.nix ];
|
||||
|
|
@ -1,3 +1,6 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
|
|
@ -5,15 +8,16 @@
|
|||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
|
|
@ -23,12 +27,12 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/f3934858-078f-463a-9dd3-d6ba220ced6d";
|
||||
device = "/dev/disk/by-uuid/e8956bf9-0123-4caf-8a5d-abe77a33e83a";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/FFAC-0945";
|
||||
device = "/dev/disk/by-uuid/6949-1506";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
|
|
@ -38,21 +42,13 @@
|
|||
|
||||
swapDevices = [ ];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
mesa
|
||||
libva
|
||||
libvdpau-va-gl
|
||||
vulkan-loader
|
||||
vulkan-validation-layers
|
||||
mesa.opencl # Enables Rusticl (OpenCL) support
|
||||
rocmPackages.clr.icd
|
||||
];
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
open = true;
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,8 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
let
|
||||
config.boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
in
|
||||
|
|
@ -19,16 +23,20 @@ in
|
|||
../../programs/steam.nix
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
cargo
|
||||
rustc
|
||||
rustfmt
|
||||
openssl
|
||||
|
||||
vulkan-tools
|
||||
android-tools
|
||||
android-file-transfer
|
||||
ddcutil
|
||||
bluez
|
||||
bluez-tools
|
||||
bluetuith
|
||||
|
||||
brightnessctl
|
||||
|
||||
obexftp
|
||||
fzf
|
||||
ghq
|
||||
|
||||
android-tools
|
||||
];
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
|
|
@ -38,22 +46,27 @@ in
|
|||
|
||||
services.udisks2.enable = true;
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
22
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ ];
|
||||
services.keyd.enable = true;
|
||||
|
||||
services.openvpn.servers = {
|
||||
homeVPN = {
|
||||
config = ''config /root/nixos/openvpn/homeVPN.conf '';
|
||||
hardware.i2c.enable = true;
|
||||
|
||||
services.keyd.keyboards.default = {
|
||||
ids = [ "*" ];
|
||||
settings = {
|
||||
main = {
|
||||
capslock = "C-space";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.udev.extraRules = ''
|
||||
ATTRS{idVendor}=="3151", ATTRS{idProduct}=="502d", MODE="0777"
|
||||
ATTRS{idVendor}=="414", ATTRS{idProduct}=="211a", MODE="0777"
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="input"
|
||||
'';
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
22
|
||||
19132
|
||||
25565
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ ];
|
||||
|
||||
services.udev.extraRules = "";
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
|
|
@ -82,6 +95,24 @@ in
|
|||
"v4l2loopback"
|
||||
];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = false;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.efi.efiSysMountPoint = "/boot";
|
||||
|
||||
boot.loader.grub = {
|
||||
enable = true;
|
||||
efiSupport = true;
|
||||
devices = [ "nodev" ];
|
||||
useOSProber = true;
|
||||
|
||||
copyKernels = true;
|
||||
configurationLimit = 10;
|
||||
};
|
||||
|
||||
cornflake.greeter.monitors = [
|
||||
"DP-1, disable"
|
||||
"DP-2, disable"
|
||||
"DP-3, 1920x1080@240, 0x0"
|
||||
];
|
||||
}
|
||||
93
hosts/aqua/umi/home-manager.nix
Normal file
93
hosts/aqua/umi/home-manager.nix
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.stateVersion = "25.05";
|
||||
imports = [
|
||||
inputs.nix-index-database.homeModules.nix-index
|
||||
../../../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/voicevox.nix
|
||||
];
|
||||
hare.hyprland = {
|
||||
input.sensitivity = -0.85;
|
||||
wallpaperCommand = "swww img /usr/share/wallpaper/arknights-02.jpg";
|
||||
};
|
||||
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
google-chrome
|
||||
discord
|
||||
discord-canary
|
||||
discord-ptb
|
||||
helvum
|
||||
plemoljp
|
||||
plemoljp-nf
|
||||
prismlauncher
|
||||
scrcpy
|
||||
tetrio-desktop
|
||||
gimp
|
||||
inkscape
|
||||
obsidian
|
||||
kdePackages.filelight
|
||||
(deno.overrideAttrs (oldAttrs: {
|
||||
doCheck = false;
|
||||
}))
|
||||
bun
|
||||
nodejs_24
|
||||
nixd
|
||||
rar
|
||||
rust-analyzer
|
||||
ytmdesktop
|
||||
opencode
|
||||
];
|
||||
services.easyeffects = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user.name = "Kariya";
|
||||
settings.user.email = "kariya2298@gmail.com";
|
||||
};
|
||||
|
||||
fonts = {
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "Noto Serif" ];
|
||||
sansSerif = [ "Noto Sans" ];
|
||||
monospace = [ "PlemolJP NF Console" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
|
||||
defaultApplications = {
|
||||
"text/html" = "google-chrome.desktop";
|
||||
"x-scheme-handler/http" = "google-chrome.desktop";
|
||||
"x-scheme-handler/https" = "google-chrome.desktop";
|
||||
"x-scheme-handler/about" = "google-chrome.desktop";
|
||||
"x-scheme-handler/unknown" = "google-chrome.desktop";
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings.monitor = [
|
||||
"DP-1, 1920x1080@60, -1920x0, 1"
|
||||
"DP-2, 1600x900@60, -3520x90, 1"
|
||||
"DP-3, 1920x1080@240, 0x0, 1"
|
||||
];
|
||||
}
|
||||
10
hosts/aqua/umi/nixos.nix
Normal file
10
hosts/aqua/umi/nixos.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
extraGroups = [
|
||||
"docker"
|
||||
"i2c"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
# openssh.authroizedKeys.keys = [
|
||||
# ];
|
||||
}
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
imports = [
|
||||
inputs.nix-index-database.homeModules.nix-index
|
||||
../../../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
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland.settings.monitor = [
|
||||
{
|
||||
output = "DP-1";
|
||||
mode = "5120x2880@60";
|
||||
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 = {
|
||||
input.sensitivity = -1.0;
|
||||
wallpaperCommand = "awww img /usr/share/wallpaper/arknights-02.jpg";
|
||||
};
|
||||
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
vivaldi
|
||||
google-chrome
|
||||
discord
|
||||
plemoljp
|
||||
plemoljp-nf
|
||||
prismlauncher
|
||||
nodejs
|
||||
scrcpy
|
||||
tetrio-desktop
|
||||
kicad
|
||||
gimp
|
||||
inkscape
|
||||
obsidian
|
||||
kdePackages.filelight
|
||||
(deno.overrideAttrs (oldAttrs: {
|
||||
doCheck = false;
|
||||
}))
|
||||
godot
|
||||
unityhub
|
||||
nixd
|
||||
rust-analyzer
|
||||
aseprite
|
||||
bambu-studio
|
||||
orca-slicer
|
||||
davinci-resolve
|
||||
inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
|
||||
inputs.yoi.packages.${stdenv.hostPlatform.system}.default
|
||||
];
|
||||
services.easyeffects = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user.name = "Hare";
|
||||
settings.user.email = "kei.hiracchi.0928@gmail.com";
|
||||
signing = {
|
||||
format = "ssh";
|
||||
key = "~/.ssh/git-sign.pub";
|
||||
signByDefault = true;
|
||||
};
|
||||
};
|
||||
|
||||
fonts = {
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "Noto Serif" ];
|
||||
sansSerif = [ "Noto Sans" ];
|
||||
monospace = [ "PlemolJP NF Console" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
|
||||
defaultApplications = {
|
||||
"text/html" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/http" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/https" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/about" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/unknown" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/vivaldi" = "vivaldi-stable.desktop";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
extraGroups = [
|
||||
"adbusers"
|
||||
"docker"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfql/a6ZtxOPgBhFzOfgTO6HGcy0Se9mgMLmOa40vMF"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICi8Cciepfs1ikPdfyHjc9qJX5z2QLFF9jBszsyEvCMA nix-on-droid@localhost"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID8Eo/QDJtXqluvjNx5ZpeIt0c/yf/Mgr7dKhNWAICZX hare@x1carbon"
|
||||
];
|
||||
}
|
||||
|
|
@ -1,125 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
config.boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
in
|
||||
{
|
||||
system.stateVersion = "25.11";
|
||||
|
||||
cornflake.greeter.monitors = [
|
||||
{
|
||||
output = "DP-1";
|
||||
mode = "5120x2880@60";
|
||||
position = "0x0";
|
||||
scale = 2;
|
||||
}
|
||||
{
|
||||
output = "DP-2";
|
||||
disabled = true;
|
||||
}
|
||||
{
|
||||
output = "DP-3";
|
||||
disabled = true;
|
||||
}
|
||||
];
|
||||
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
../../system/core
|
||||
../../programs/ssh.nix
|
||||
../../programs/utility.nix
|
||||
../../programs/shell.nix
|
||||
../../programs/docker.nix
|
||||
../../programs/v4l2.nix
|
||||
../../programs/desktop/hyprland.nix
|
||||
../../programs/fcitx.nix
|
||||
../../programs/steam.nix
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
cargo
|
||||
rustc
|
||||
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" ''
|
||||
qemu-system-x86_64 \
|
||||
-bios ${pkgs.OVMF.fd}/FV/OVMF.fd \
|
||||
"$@"
|
||||
'')
|
||||
|
||||
wineWow64Packages.waylandFull
|
||||
winetricks
|
||||
|
||||
bluez
|
||||
bluez-tools
|
||||
bluetuith
|
||||
obexftp
|
||||
fzf
|
||||
ghq
|
||||
gh
|
||||
];
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
||||
services.udisks2.enable = true;
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
8080
|
||||
22
|
||||
5173
|
||||
8000
|
||||
9001
|
||||
25565
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ ];
|
||||
|
||||
services.udev.extraRules = ''
|
||||
ATTRS{idVendor}=="3151", ATTRS{idProduct}=="502d", MODE="0777"
|
||||
ATTRS{idVendor}=="414", ATTRS{idProduct}=="211a", MODE="0777"
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="input"
|
||||
'';
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
package = pkgs.bluez;
|
||||
powerOnBoot = true;
|
||||
settings = {
|
||||
General = {
|
||||
ControllerMode = "dual";
|
||||
Experimental = true;
|
||||
KernelExperimental = true;
|
||||
FastConnectable = true;
|
||||
# セキュリティレベルを調整
|
||||
Class = "0x000100";
|
||||
# ペアリングタイムアウトを延長
|
||||
PairableTimeout = 0;
|
||||
};
|
||||
Policy = {
|
||||
AutoEnable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot.kernelPackages = config.boot.kernelPackages;
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
|
||||
boot.kernelModules = [
|
||||
"v4l2loopback"
|
||||
];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
}
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
inputs:
|
||||
rec {
|
||||
hosts = {
|
||||
arcadia = import ./arcadia inputs;
|
||||
x1carbon = import ./x1carbon inputs;
|
||||
fungus = import ./fungus inputs;
|
||||
aqua = import ./aqua inputs;
|
||||
};
|
||||
nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
|
||||
home-manager = builtins.foldl' (a: b: a // b) { } (map (h: h.home-manager) (builtins.attrValues hosts));
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
inputs:
|
||||
let
|
||||
mkHost = import ../mkHost.nix inputs;
|
||||
in
|
||||
mkHost {
|
||||
system = "x86_64-linux";
|
||||
hostname = "Fungus";
|
||||
users = [
|
||||
{
|
||||
username = "hare";
|
||||
home = ./hare/home-manager.nix;
|
||||
nixos = ./hare/nixos.nix;
|
||||
}
|
||||
];
|
||||
systemModules = [ ./nixos.nix ];
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/e4eb343c-d88f-4d63-99aa-c2c41d8580db";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
imports = [
|
||||
../../../home-manager/direnv.nix
|
||||
../../../home-manager/wezterm
|
||||
../../../home-manager/fish
|
||||
];
|
||||
home.packages = with pkgs; [ ];
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user.name = "Hare";
|
||||
settings.user.email = "kei.hiracchi.0928@gmail.com";
|
||||
};
|
||||
|
||||
fonts = {
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "Noto Serif" ];
|
||||
sansSerif = [ "Noto Sans" ];
|
||||
monospace = [ "PlemolJP NF Console" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
extraGroups = [
|
||||
"docker"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBd45JtvgM44KUqhp3Xl2Wtt6rmxU13c/84YLyGKigkG hare@nixos"
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZTkjrLwH+jsSHF/LI23+WPQ9rff9vWBH1VaxSjNADIIKDY7vGkWWRUCImt8QTzied3mNFv+EyZ8igiJdm5tEO1KkrWUqTZk5Ut79LTQftB23SDNC8XzuHKxwaKHdwZIP065biRFUqNYHu8h0EHKbQ3Djj6cZYBcEL1JOc0wtm4jmuW6Fp3rCn/ZCo0g3Kg7SfY4cpf4fJTB97bIjPJzG7JSSOuTkJcDQzFrySUPOpgrt5+iSqKJ/tQtfxLHcNq8AMrh1fH6sUzaJLmMs/7V9LTbsbILTY4YQj5FF07dBqEJBwvZ9sRTPPzl/HSdVmp9OlCZnryPbjTKJmK1Nxx+tOZfh4IY3mWWnEegvDNCYwKJu+d+zeqDaSUMx0kpAnK9PLSI0By8FtboRVvSFSce6FouiUhEzJyKXAr3E1JCgQXdLcTTb66rbBcauuqhuieKDGPpz45EbFi83uHNeDodi5b75h5r1Nn+oJmzagwUAoyw4gCCbiYwTAe3GA79LK7kE= hare@hr-r620"
|
||||
];
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
system.stateVersion = "25.05";
|
||||
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
../../system/core
|
||||
../../programs/ssh.nix
|
||||
../../programs/utility.nix
|
||||
../../programs/shell.nix
|
||||
../../programs/docker.nix
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
];
|
||||
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
boot.loader.grub.useOSProber = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
22
|
||||
25565
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ ];
|
||||
}
|
||||
|
|
@ -16,8 +16,8 @@ in
|
|||
modules =
|
||||
systemModules
|
||||
++ (map (u: { pkgs, ... }: {
|
||||
users.users.${u.username} = import u.nixos { inherit pkgs; };
|
||||
}) (builtins.filter (u: u ? nixos) users))
|
||||
users.users.${u.username} = import u.userNixos { inherit pkgs; };
|
||||
}) (builtins.filter (u: u ? userNixos) users))
|
||||
++ [
|
||||
{
|
||||
users.users = builtins.listToAttrs (map (u: {
|
||||
|
|
@ -56,8 +56,7 @@ in
|
|||
programs.home-manager.enable = true;
|
||||
}
|
||||
(import ../system/home-manager)
|
||||
u.home
|
||||
];
|
||||
] ++ u.homeModule;
|
||||
};
|
||||
}) users);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
inputs:
|
||||
let
|
||||
mkHost = import ../mkHost.nix inputs;
|
||||
in
|
||||
mkHost {
|
||||
system = "x86_64-linux";
|
||||
hostname = "x1carbon";
|
||||
users = [
|
||||
{
|
||||
username = "hare";
|
||||
home = ./hare/home-manager.nix;
|
||||
nixos = ./hare/nixos.nix;
|
||||
}
|
||||
];
|
||||
systemModules = [ ./nixos.nix ];
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/92c8bab5-07b9-4394-888d-6cb481972018";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/1711-8E2B";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
imports = [
|
||||
../../../home-manager/hyprland
|
||||
../../../home-manager/tofi.nix
|
||||
../../../home-manager/fnott.nix
|
||||
../../../home-manager/direnv.nix
|
||||
../../../home-manager/obs-studio.nix
|
||||
../../../home-manager/wezterm
|
||||
../../../home-manager/fish
|
||||
];
|
||||
hare.hyprland = {
|
||||
style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; };
|
||||
input.sensitivity = -0.6;
|
||||
wallpaperCommand = "awww img /usr/share/wallpaper/";
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
vivaldi
|
||||
discord
|
||||
plemoljp
|
||||
plemoljp-nf
|
||||
prismlauncher
|
||||
scrcpy
|
||||
gimp
|
||||
zed-editor
|
||||
deno
|
||||
nodejs_latest
|
||||
# aseprite
|
||||
];
|
||||
services.easyeffects = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user.name = "Hare";
|
||||
settings.user.email = "kei.hiracchi.0928@gmail.com";
|
||||
};
|
||||
|
||||
fonts = {
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "Noto Serif" ];
|
||||
sansSerif = [ "Noto Sans" ];
|
||||
monospace = [ "PlemolJP NF Console" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
|
||||
defaultApplications = {
|
||||
"text/html" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/http" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/https" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/about" = "vivaldi-stable.desktop";
|
||||
"x-scheme-handler/unknown" = "vivaldi-stable.desktop";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
extraGroups = [
|
||||
"docker"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfql/a6ZtxOPgBhFzOfgTO6HGcy0Se9mgMLmOa40vMF"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
|
||||
];
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
services.hypridle.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
awww
|
||||
swww
|
||||
eww
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,4 @@
|
|||
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
|
||||
};
|
||||
|
||||
programs.gamescope = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
bat
|
||||
wezterm
|
||||
libsixel
|
||||
nixfmt
|
||||
nil
|
||||
nixfmt-rfc-style
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,51 +1,39 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
rosePineHyprcursor = pkgs.callPackage ../../home-manager/hyprland/rose-pine-hyprcursor.nix { };
|
||||
toLua = lib.generators.toLua { };
|
||||
monitorConf = lib.concatMapStrings (
|
||||
m: "hl.monitor(${toLua m})\n"
|
||||
) config.cornflake.greeter.monitors;
|
||||
hyprGreetConf = pkgs.writeText "hyprland-greetd.lua" ''
|
||||
monitorConf = lib.concatMapStrings (m: "monitor = ${m}\n") config.cornflake.greeter.monitors;
|
||||
hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" ''
|
||||
${monitorConf}
|
||||
hl.env("HYPRCURSOR_THEME", "rose-pine-hyprcursor")
|
||||
hl.env("HYPRCURSOR_SIZE", "24")
|
||||
hl.env("XCURSOR_SIZE", "24")
|
||||
env = HYPRCURSOR_THEME,rose-pine-hyprcursor
|
||||
env = HYPRCURSOR_SIZE,24
|
||||
env = XCURSOR_SIZE,24
|
||||
|
||||
hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
|
||||
hl.env("XDG_SESSION_TYPE", "wayland")
|
||||
hl.env("XDG_SESSION_DESKTOP", "Hyprland")
|
||||
env = XDG_CURRENT_DESKTOP,Hyprland
|
||||
env = XDG_SESSION_TYPE,wayland
|
||||
env = XDG_SESSION_DESKTOP,Hyprland
|
||||
|
||||
hl.config({
|
||||
general = {
|
||||
border_size = 0,
|
||||
},
|
||||
animations = {
|
||||
enabled = false,
|
||||
},
|
||||
misc = {
|
||||
force_default_wallpaper = false,
|
||||
disable_hyprland_logo = true,
|
||||
disable_splash_rendering = true,
|
||||
},
|
||||
})
|
||||
general {
|
||||
border_size = 0
|
||||
}
|
||||
|
||||
hl.on("hyprland.start", function()
|
||||
hl.exec_cmd("${
|
||||
config.programs.regreet.package or pkgs.regreet
|
||||
}/bin/regreet; hyprctl dispatch exit")
|
||||
end)
|
||||
animations {
|
||||
enabled = false
|
||||
}
|
||||
|
||||
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
|
||||
{
|
||||
options.cornflake.greeter.monitors = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.attrs;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
description = "greetd セッション用 Hyprland の Lua monitor 設定";
|
||||
description = "greetd セッション用 Hyprland の monitor 設定";
|
||||
};
|
||||
|
||||
config = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user