Compare commits

..
4 Commits
Author SHA1 Message Date
Hare 8341ffcfcd x1carbon config 2026-04-19 08:27:56 +09:00
Hare 69b8ac60b8 swww -> awww 2026-04-19 08:26:43 +09:00
Hare 583fa01873 flake update 2026-04-19 06:43:30 +09:00
Hare 2285edc35b monitor settings 2026-03-24 18:57:34 +09:00
17 changed files with 80 additions and 401 deletions
Generated
+12 -12
View File
@@ -25,11 +25,11 @@
]
},
"locked": {
"lastModified": 1772218752,
"narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
"lastModified": 1776454077,
"narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
"rev": "565e5349208fe7d0831ef959103c9bafbeac0681",
"type": "github"
},
"original": {
@@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1771734689,
"narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
"lastModified": 1775970782,
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "8f590b832326ab9699444f3a48240595954a4b10",
"rev": "bedba5989b04614fc598af9633033b95a937933f",
"type": "github"
},
"original": {
@@ -60,11 +60,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1771969195,
"narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
"lastModified": 1775490113,
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
"type": "github"
},
"original": {
@@ -75,11 +75,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"lastModified": 1776169885,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
"type": "github"
},
"original": {
+13 -20
View File
@@ -5,12 +5,7 @@
...
}:
let
inherit (lib)
mkOption
recursiveUpdate
types
optionals
;
inherit (lib) mkOption recursiveUpdate types optionals;
rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { };
defaultInput = {
@@ -23,10 +18,10 @@ let
follow_mouse = true;
touchpad = {
natural_scroll = false;
natural_scroll = true;
};
natural_scroll = false;
natural_scroll = true;
sensitivity = 0.0;
};
@@ -36,7 +31,7 @@ let
exec-once = [
# "/usr/lib/polkit-kde-authentication-agent-1"
# "dunst"
"swww-daemon"
"awww-daemon"
# "copyq --start-server"
# "wl-paste --type text --watch cliphist store"
# "wl-paste --type image --watch cliphist store"
@@ -49,12 +44,12 @@ let
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'"
];
"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"
@@ -110,6 +105,7 @@ let
"SUPER, E, exec, $terminal"
"SUPER, Q, killactive,"
"SUPER, L, exec, $lock"
"SUPER_SHIFT, L, exec, hyprctl dispatch dpms off"
"SUPER_SHIFT, M, exec, loginctl terminate-user $USER"
# prsc
@@ -149,9 +145,6 @@ let
"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
@@ -231,7 +224,7 @@ in
options.hare.hyprland.wallpaperCommand = mkOption {
type = types.nullOr types.str;
default = null;
description = "Command to set the wallpaper (e.g., \"swww img <path>\"); appended to Hyprland's exec list when provided.";
description = "Command to set the wallpaper (e.g., \"awww img <path>\"); appended to Hyprland's exec list when provided.";
};
config = {
@@ -248,7 +241,7 @@ in
rosePineHyprcursor
]
++ (with pkgs; [
swww
awww
eww
hyprshot
]);
+3 -8
View File
@@ -3,11 +3,7 @@
{
programs.zed-editor = {
enable = true;
extensions = [
"nix"
"toml"
"rust"
];
extensions = [ "nix" "toml" "rust" ];
userSettings = {
theme = {
@@ -16,12 +12,11 @@
light = "Kanagawa Lotus";
};
hour_format = "hour24";
vim_mode = false;
vim_mode = true;
buffer_font_size = 12.0;
buffer_font_family = "PlemolJP Console NF";
};
};
fonts.fontconfig.enable = true;
home.file.".local/share/fonts/plemoljp".source =
"${pkgs.plemoljp-nf}/share/fonts/truetype/plemoljp-nf-console";
home.file.".local/share/fonts/plemoljp".source = "${pkgs.plemoljp-nf}/share/fonts/truetype/plemoljp-nf-console";
}
Binary file not shown.
-16
View File
@@ -1,16 +0,0 @@
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
@@ -1,54 +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"
"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
@@ -1,118 +0,0 @@
{
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
@@ -1,95 +0,0 @@
{
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
@@ -1,10 +0,0 @@
{ pkgs, ... }:
{
extraGroups = [
"docker"
"i2c"
];
shell = pkgs.fish;
# openssh.authroizedKeys.keys = [
# ];
}
-11
View File
@@ -1,11 +0,0 @@
{
wayland.windowManager.hyprland = {
settings = {
monitor = [
"DP-1, 5120x2880@60, 0x0, 2"
"DP-2, 2560x1440@144, 2560x0, 1, transform, 0"
"DP-3, 1920x1080@144, -1080x-240, 1, transform, 1"
];
};
};
}
+8 -3
View File
@@ -8,7 +8,6 @@
home.stateVersion = "25.05";
imports = [
inputs.nix-index-database.homeModules.nix-index
../display.nix
../../../home-manager/tofi.nix
../../../home-manager/hyprland
../../../home-manager/fnott.nix
@@ -22,9 +21,15 @@
../../../home-manager/blender.nix
../../../home-manager/voicevox.nix
];
wayland.windowManager.hyprland.settings.monitor = [
"DP-1, 5120x2880@60, 0x0, 2"
"DP-2, 2560x1440@144, 2560x0, 1, transform, 0"
"DP-3, 1920x1080@144, -1080x-240, 1, transform, 1"
];
hare.hyprland = {
input.sensitivity = -1.0;
wallpaperCommand = "swww img /usr/share/wallpaper/arknights-02.jpg";
wallpaperCommand = "awww img /usr/share/wallpaper/arknights-02.jpg";
};
programs.nix-index-database.comma.enable = true;
@@ -33,7 +38,6 @@
vivaldi
google-chrome
discord
helvum
plemoljp
plemoljp-nf
prismlauncher
@@ -57,6 +61,7 @@
bambu-studio
orca-slicer
davinci-resolve
antigravity
];
services.easyeffects = {
enable = true;
+3 -5
View File
@@ -1,12 +1,10 @@
inputs: rec {
inputs:
rec {
hosts = {
aqua = import ./aqua inputs;
arcadia = import ./arcadia inputs;
x1carbon = import ./x1carbon inputs;
fungus = import ./fungus inputs;
};
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));
}
+34 -44
View File
@@ -15,30 +15,22 @@ in
nixos = inputs.nixpkgs.lib.nixosSystem {
modules =
systemModules
++ (map (
u:
{ 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))
++ (map (u: { pkgs, ... }: {
users.users.${u.username} = import u.nixos { inherit pkgs; };
}) (builtins.filter (u: u ? nixos) users))
++ [
{
users.users = builtins.listToAttrs (
map (u: {
name = u.username;
value = {
isNormalUser = true;
description = "";
extraGroups = [
"networkmanager"
"wheel"
];
};
}) users
);
users.users = builtins.listToAttrs (map (u: {
name = u.username;
value = {
isNormalUser = true;
description = "";
extraGroups = [
"networkmanager"
"wheel"
];
};
}) users);
}
];
inherit system;
@@ -47,27 +39,25 @@ in
users = map (u: u.username) users;
};
};
home-manager = builtins.listToAttrs (
map (u: {
name = "${u.username}@${hostname}";
value = inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs hostname;
username = u.username;
};
modules = [
{
home = {
username = u.username;
homeDirectory = "/home/${u.username}";
};
programs.home-manager.enable = true;
}
(import ../system/home-manager)
]
++ (if u ? homeModule then u.homeModule else [ u.home ]);
home-manager = builtins.listToAttrs (map (u: {
name = "${u.username}@${hostname}";
value = inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs hostname;
username = u.username;
};
}) users
);
modules = [
{
home = {
username = u.username;
homeDirectory = "/home/${u.username}";
};
programs.home-manager.enable = true;
}
(import ../system/home-manager)
u.home
];
};
}) users);
}
+5 -2
View File
@@ -18,12 +18,15 @@
hare.hyprland = {
style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; };
input.sensitivity = -0.6;
wallpaperCommand = "swww img /usr/share/wallpaper/";
<<<<<<< Updated upstream
wallpaperCommand = "awww img /usr/share/wallpaper/";
=======
wallpaperCommand = "swww img /usr/share/wallpaper/001.png";
>>>>>>> Stashed changes
};
home.packages = with pkgs; [
vivaldi
discord
helvum
plemoljp
plemoljp-nf
prismlauncher
-1
View File
@@ -33,7 +33,6 @@ in
environment.sessionVariables.NIXOS_OZONE_WL = "1";
programs.nix-ld.enable = true;
programs.light.enable = true;
services.openssh.enable = true;
+1 -1
View File
@@ -11,7 +11,7 @@
services.hypridle.enable = true;
environment.systemPackages = with pkgs; [
swww
awww
eww
];
}
+1 -1
View File
@@ -10,6 +10,6 @@
bat
wezterm
libsixel
nixfmt-rfc-style
nixfmt
];
}