Compare commits

...
15 Commits
Author SHA1 Message Date
kariya 4f0f04f1a7 feat: ntfs3gの追加 2026-03-01 23:51:35 +09:00
kariya a27b4930dd Merge hare/master into master 2026-03-01 23:34:16 +09:00
kariya 17c68732d7 fea: notionの追加 2026-03-01 23:30:39 +09:00
kariya 0ac081a8f1 feat: pnpmの追加 2026-03-01 23:24:19 +09:00
kariya 034f58347b feat: 一部スクショ実装 2026-03-01 17:55:06 +09:00
kariya 004f91406a feat: opencode追加 2026-03-01 17:40:52 +09:00
kariya 0d82893f5d feat: モニターの色調整 2026-03-01 15:48:07 +09:00
kariya 252769034d feat: アプリ追加 2026-03-01 13:19:45 +09:00
kariya 6caed14054 feat: 感度の変更 2026-03-01 04:22:49 +09:00
kariya 8f3d89d542 feat: Grubの導入 2026-03-01 04:10:45 +09:00
kariya 1ee7f319a9 feat: capsLockによるIME切り替え 2026-03-01 02:23:59 +09:00
kariya 36c0a5a114 init: firstCommit 2026-03-01 01:39:57 +09:00
Hare 9f22a82d4a update monitor settings 2026-03-01 00:07:03 +09:00
Hare b65beb218d Update greeter.nix 2026-02-28 23:52:23 +09:00
Hare d9039467b2 Update flake.lock 2026-02-28 23:19:42 +09:00
14 changed files with 430 additions and 98 deletions
Generated
+12 -12
View File
@@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770318660, "lastModified": 1772218752,
"narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771130777, "lastModified": 1771734689,
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "rev": "8f590b832326ab9699444f3a48240595954a4b10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -60,11 +60,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1769302137, "lastModified": 1771969195,
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -75,11 +75,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770197578, "lastModified": 1771848320,
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github" "type": "github"
}, },
"original": { "original": {
+3
View File
@@ -34,6 +34,9 @@
apps.home-manager = { apps.home-manager = {
type = "app"; type = "app";
program = "${hm}/bin/home-manager"; program = "${hm}/bin/home-manager";
meta = {
description = "Home Manager for Nix";
};
}; };
} }
)); ));
+11 -3
View File
@@ -5,7 +5,12 @@
... ...
}: }:
let let
inherit (lib) mkOption recursiveUpdate types optionals; inherit (lib)
mkOption
recursiveUpdate
types
optionals
;
rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { }; rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { };
defaultInput = { defaultInput = {
@@ -18,10 +23,10 @@ let
follow_mouse = true; follow_mouse = true;
touchpad = { touchpad = {
natural_scroll = true; natural_scroll = false;
}; };
natural_scroll = true; natural_scroll = false;
sensitivity = 0.0; sensitivity = 0.0;
}; };
@@ -144,6 +149,9 @@ let
"SUPER_CTRL, right, workspace, m+1" "SUPER_CTRL, right, workspace, m+1"
"SUPER_CTRL_SHIFT, left, workspace, r-1" "SUPER_CTRL_SHIFT, left, workspace, r-1"
"SUPER_CTRL_SHIFT, right, workspace, r+1" "SUPER_CTRL_SHIFT, right, workspace, r+1"
# screenshot
"SUPER_SHIFT, S, exec, hyprshot -m region --clipboard-only"
] ]
++ ( ++ (
# workspaces # workspaces
+8 -3
View File
@@ -3,7 +3,11 @@
{ {
programs.zed-editor = { programs.zed-editor = {
enable = true; enable = true;
extensions = [ "nix" "toml" "rust" ]; extensions = [
"nix"
"toml"
"rust"
];
userSettings = { userSettings = {
theme = { theme = {
@@ -12,11 +16,12 @@
light = "Kanagawa Lotus"; light = "Kanagawa Lotus";
}; };
hour_format = "hour24"; hour_format = "hour24";
vim_mode = true; vim_mode = false;
buffer_font_size = 12.0; buffer_font_size = 12.0;
buffer_font_family = "PlemolJP Console NF"; buffer_font_family = "PlemolJP Console NF";
}; };
}; };
fonts.fontconfig.enable = true; 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";
} }
Binary file not shown.
+16
View File
@@ -0,0 +1,16 @@
inputs:
let
mkHost = import ../mkHost.nix inputs;
in
mkHost {
system = "x86_64-linux";
hostname = "AQUA";
users = [
{
username = "umi";
homeModule = [ ./umi/home-manager.nix ];
userNixos = ./umi/nixos.nix;
}
];
systemModules = [ ./nixos.nix ];
}
+54
View File
@@ -0,0 +1,54 @@
# 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"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/e8956bf9-0123-4caf-8a5d-abe77a33e83a";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6949-1506";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = {
modesetting.enable = true;
open = true;
nvidiaSettings = true;
};
}
+118
View File
@@ -0,0 +1,118 @@
{
pkgs,
username,
...
}:
let
config.boot.kernelPackages = pkgs.linuxPackages_latest;
in
{
system.stateVersion = "25.11";
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
ddcutil
bluez
bluez-tools
bluetuith
obexftp
fzf
ghq
];
environment.sessionVariables.NIXOS_OZONE_WL = "1";
programs.nix-ld.enable = true;
services.openssh.enable = true;
services.udisks2.enable = true;
services.keyd.enable = true;
hardware.i2c.enable = true;
services.keyd.keyboards.default = {
ids = [ "*" ];
settings = {
main = {
capslock = "C-space";
};
};
};
networking.firewall.allowedTCPPorts = [
22
19132
25565
];
networking.firewall.allowedUDPPorts = [ ];
services.udev.extraRules = "";
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"
];
# 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"
];
}
+95
View File
@@ -0,0 +1,95 @@
{
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
pnpm_9
ntfs3g
];
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
View File
@@ -0,0 +1,10 @@
{ pkgs, ... }:
{
extraGroups = [
"docker"
"i2c"
];
shell = pkgs.fish;
# openssh.authroizedKeys.keys = [
# ];
}
+7 -1
View File
@@ -5,6 +5,12 @@ in
{ {
system.stateVersion = "25.11"; system.stateVersion = "25.11";
cornflake.greeter.monitors = [
"DP-1, 5120x2880@60, 0x0, 2"
"DP-2, disable"
"DP-3, disable"
];
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@@ -39,7 +45,7 @@ in
"$@" "$@"
'') '')
wineWowPackages.waylandFull wineWow64Packages.waylandFull
winetricks winetricks
bluez bluez
+5 -3
View File
@@ -1,10 +1,12 @@
inputs: inputs: rec {
rec {
hosts = { hosts = {
aqua = import ./aqua inputs;
arcadia = import ./arcadia inputs; arcadia = import ./arcadia inputs;
x1carbon = import ./x1carbon inputs; x1carbon = import ./x1carbon inputs;
fungus = import ./fungus inputs; fungus = import ./fungus inputs;
}; };
nixos = builtins.mapAttrs (_: host: host.nixos) hosts; nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
home-manager = builtins.foldl' (a: b: a // b) { } (map (h: h.home-manager) (builtins.attrValues hosts)); home-manager = builtins.foldl' (a: b: a // b) { } (
map (h: h.home-manager) (builtins.attrValues hosts)
);
} }
+19 -9
View File
@@ -15,12 +15,19 @@ in
nixos = inputs.nixpkgs.lib.nixosSystem { nixos = inputs.nixpkgs.lib.nixosSystem {
modules = modules =
systemModules systemModules
++ (map (u: { pkgs, ... }: { ++ (map (
users.users.${u.username} = import u.nixos { inherit pkgs; }; u:
}) (builtins.filter (u: u ? nixos) users)) { pkgs, ... }:
{
users.users.${u.username} = import (if u ? userNixos then u.userNixos else u.nixos) {
inherit pkgs;
};
}
) (builtins.filter (u: u ? userNixos || u ? nixos) users))
++ [ ++ [
{ {
users.users = builtins.listToAttrs (map (u: { users.users = builtins.listToAttrs (
map (u: {
name = u.username; name = u.username;
value = { value = {
isNormalUser = true; isNormalUser = true;
@@ -30,7 +37,8 @@ in
"wheel" "wheel"
]; ];
}; };
}) users); }) users
);
} }
]; ];
inherit system; inherit system;
@@ -39,7 +47,8 @@ in
users = map (u: u.username) users; users = map (u: u.username) users;
}; };
}; };
home-manager = builtins.listToAttrs (map (u: { home-manager = builtins.listToAttrs (
map (u: {
name = "${u.username}@${hostname}"; name = "${u.username}@${hostname}";
value = inputs.home-manager.lib.homeManagerConfiguration { value = inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
@@ -56,8 +65,9 @@ in
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }
(import ../system/home-manager) (import ../system/home-manager)
u.home ]
]; ++ (if u ? homeModule then u.homeModule else [ u.home ]);
}; };
}) users); }) users
);
} }
+12 -7
View File
@@ -1,19 +1,16 @@
{ config, 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 { };
monitorConf = lib.concatMapStrings (m: "monitor = ${m}\n") config.cornflake.greeter.monitors;
hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" '' hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" ''
monitor = DP-1, 5120x2880@60, 0x0, 2 ${monitorConf}
monitor = DP-2, disable
monitor = DP-3, disable
env = HYPRCURSOR_THEME,rose-pine-hyprcursor env = HYPRCURSOR_THEME,rose-pine-hyprcursor
env = HYPRCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24
env = XCURSOR_SIZE,24 env = XCURSOR_SIZE,24
env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_CURRENT_DESKTOP,Hyprland
env = XDG_SESSION_TYPE,wayland env = XDG_SESSION_TYPE,wayland
env = XDG_SESSION_DESKTOP,Hyprland" env = XDG_SESSION_DESKTOP,Hyprland
general { general {
border_size = 0 border_size = 0
@@ -33,6 +30,13 @@ let
''; '';
in in
{ {
options.cornflake.greeter.monitors = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "greetd Hyprland monitor ";
};
config = {
services.greetd.enable = true; services.greetd.enable = true;
services.greetd.settings.default_session = { services.greetd.settings.default_session = {
command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}"; command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
@@ -69,4 +73,5 @@ in
}; };
}; };
}; };
};
} }