Compare commits
17
Commits
35623910b0
...
aqua
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f0f04f1a7 | ||
|
|
a27b4930dd | ||
|
|
17c68732d7 | ||
|
|
0ac081a8f1 | ||
|
|
034f58347b | ||
|
|
004f91406a | ||
|
|
0d82893f5d | ||
|
|
252769034d | ||
|
|
6caed14054 | ||
|
|
8f3d89d542 | ||
|
|
1ee7f319a9 | ||
|
|
36c0a5a114 | ||
|
|
9f22a82d4a | ||
|
|
b65beb218d | ||
|
|
d9039467b2 | ||
|
|
61fb43ab75 | ||
|
|
18cba8e35f |
@@ -3,5 +3,5 @@
|
||||
```
|
||||
sudo nixos-rebuild switch --flake .#<host>
|
||||
|
||||
nix run .#home-manager -- switch --flake .#<host>
|
||||
nix run .#home-manager -- switch --flake .#<username>@<host>
|
||||
```
|
||||
|
||||
Generated
+12
-12
@@ -25,11 +25,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770318660,
|
||||
"narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=",
|
||||
"lastModified": 1772218752,
|
||||
"narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "471e6a065f9efed51488d7c51a9abbd387df91b8",
|
||||
"rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -45,11 +45,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771130777,
|
||||
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
|
||||
"lastModified": 1771734689,
|
||||
"narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
|
||||
"rev": "8f590b832326ab9699444f3a48240595954a4b10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -60,11 +60,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1769302137,
|
||||
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
|
||||
"lastModified": 1771969195,
|
||||
"narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
|
||||
"rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -75,11 +75,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770197578,
|
||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
||||
"lastModified": 1771848320,
|
||||
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
||||
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -34,6 +34,9 @@
|
||||
apps.home-manager = {
|
||||
type = "app";
|
||||
program = "${hm}/bin/home-manager";
|
||||
meta = {
|
||||
description = "Home Manager for Nix";
|
||||
};
|
||||
};
|
||||
}
|
||||
));
|
||||
|
||||
@@ -5,7 +5,12 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkOption recursiveUpdate types optionals;
|
||||
inherit (lib)
|
||||
mkOption
|
||||
recursiveUpdate
|
||||
types
|
||||
optionals
|
||||
;
|
||||
rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { };
|
||||
|
||||
defaultInput = {
|
||||
@@ -18,10 +23,10 @@ let
|
||||
follow_mouse = true;
|
||||
|
||||
touchpad = {
|
||||
natural_scroll = true;
|
||||
natural_scroll = false;
|
||||
};
|
||||
|
||||
natural_scroll = true;
|
||||
natural_scroll = false;
|
||||
sensitivity = 0.0;
|
||||
};
|
||||
|
||||
@@ -144,6 +149,9 @@ 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
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -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 ];
|
||||
}
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -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"
|
||||
];
|
||||
}
|
||||
@@ -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"
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
extraGroups = [
|
||||
"docker"
|
||||
"i2c"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
# openssh.authroizedKeys.keys = [
|
||||
# ];
|
||||
}
|
||||
@@ -8,7 +8,8 @@ mkHost {
|
||||
users = [
|
||||
{
|
||||
username = "hare";
|
||||
homeModule = [ ./hare ];
|
||||
home = ./hare/home-manager.nix;
|
||||
nixos = ./hare/nixos.nix;
|
||||
}
|
||||
];
|
||||
systemModules = [ ./nixos.nix ];
|
||||
|
||||
@@ -53,15 +53,9 @@
|
||||
unityhub
|
||||
nixd
|
||||
rust-analyzer
|
||||
beeper
|
||||
# aseprite
|
||||
aseprite
|
||||
bambu-studio
|
||||
orca-slicer
|
||||
|
||||
vinegar
|
||||
|
||||
antigravity
|
||||
|
||||
davinci-resolve
|
||||
];
|
||||
services.easyeffects = {
|
||||
@@ -0,0 +1,14 @@
|
||||
{ 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"
|
||||
];
|
||||
}
|
||||
+8
-20
@@ -1,14 +1,16 @@
|
||||
{
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
config.boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
in
|
||||
{
|
||||
system.stateVersion = "25.11";
|
||||
|
||||
cornflake.greeter.monitors = [
|
||||
"DP-1, 5120x2880@60, 0x0, 2"
|
||||
"DP-2, disable"
|
||||
"DP-3, disable"
|
||||
];
|
||||
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
@@ -43,7 +45,7 @@ in
|
||||
"$@"
|
||||
'')
|
||||
|
||||
wineWowPackages.waylandFull
|
||||
wineWow64Packages.waylandFull
|
||||
winetricks
|
||||
|
||||
bluez
|
||||
@@ -55,19 +57,6 @@ in
|
||||
];
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
users.users.${username} = {
|
||||
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"
|
||||
];
|
||||
};
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
services.openssh.enable = true;
|
||||
@@ -122,5 +111,4 @@ in
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
|
||||
}
|
||||
|
||||
+5
-3
@@ -1,10 +1,12 @@
|
||||
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)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -8,7 +8,8 @@ mkHost {
|
||||
users = [
|
||||
{
|
||||
username = "hare";
|
||||
homeModule = [ ./hare ];
|
||||
home = ./hare/home-manager.nix;
|
||||
nixos = ./hare/nixos.nix;
|
||||
}
|
||||
];
|
||||
systemModules = [ ./nixos.nix ];
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
{ 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
-16
@@ -1,9 +1,4 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
system.stateVersion = "25.05";
|
||||
|
||||
@@ -24,16 +19,6 @@
|
||||
boot.loader.grub.useOSProber = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
users.users.${username} = {
|
||||
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"
|
||||
];
|
||||
};
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
||||
+23
-7
@@ -13,9 +13,21 @@ let
|
||||
in
|
||||
{
|
||||
nixos = inputs.nixpkgs.lib.nixosSystem {
|
||||
modules = systemModules ++ [
|
||||
modules =
|
||||
systemModules
|
||||
++ (map (
|
||||
u:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
users.users = builtins.listToAttrs (map (u: {
|
||||
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: {
|
||||
name = u.username;
|
||||
value = {
|
||||
isNormalUser = true;
|
||||
@@ -25,16 +37,18 @@ in
|
||||
"wheel"
|
||||
];
|
||||
};
|
||||
}) users);
|
||||
}) users
|
||||
);
|
||||
}
|
||||
];
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit inputs hostname;
|
||||
username = (builtins.head users).username;
|
||||
users = map (u: u.username) users;
|
||||
};
|
||||
};
|
||||
home-manager = builtins.listToAttrs (map (u: {
|
||||
home-manager = builtins.listToAttrs (
|
||||
map (u: {
|
||||
name = "${u.username}@${hostname}";
|
||||
value = inputs.home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
@@ -51,7 +65,9 @@ in
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
(import ../system/home-manager)
|
||||
] ++ u.homeModule;
|
||||
]
|
||||
++ (if u ? homeModule then u.homeModule else [ u.home ]);
|
||||
};
|
||||
}) users);
|
||||
}) users
|
||||
);
|
||||
}
|
||||
|
||||
@@ -8,7 +8,8 @@ mkHost {
|
||||
users = [
|
||||
{
|
||||
username = "hare";
|
||||
homeModule = [ ./hare ];
|
||||
home = ./hare/home-manager.nix;
|
||||
nixos = ./hare/nixos.nix;
|
||||
}
|
||||
];
|
||||
systemModules = [ ./nixos.nix ];
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
extraGroups = [
|
||||
"docker"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfql/a6ZtxOPgBhFzOfgTO6HGcy0Se9mgMLmOa40vMF"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
|
||||
];
|
||||
}
|
||||
@@ -1,8 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
config.boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
in
|
||||
@@ -36,16 +32,6 @@ in
|
||||
];
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
users.users.${username} = {
|
||||
extraGroups = [
|
||||
"docker"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfql/a6ZtxOPgBhFzOfgTO6HGcy0Se9mgMLmOa40vMF"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
|
||||
];
|
||||
};
|
||||
programs.nix-ld.enable = true;
|
||||
programs.light.enable = true;
|
||||
|
||||
|
||||
+12
-7
@@ -1,19 +1,16 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
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" ''
|
||||
monitor = DP-1, 5120x2880@60, 0x0, 2
|
||||
|
||||
monitor = DP-2, disable
|
||||
monitor = DP-3, disable
|
||||
|
||||
${monitorConf}
|
||||
env = HYPRCURSOR_THEME,rose-pine-hyprcursor
|
||||
env = HYPRCURSOR_SIZE,24
|
||||
env = XCURSOR_SIZE,24
|
||||
|
||||
env = XDG_CURRENT_DESKTOP,Hyprland
|
||||
env = XDG_SESSION_TYPE,wayland
|
||||
env = XDG_SESSION_DESKTOP,Hyprland"
|
||||
env = XDG_SESSION_DESKTOP,Hyprland
|
||||
|
||||
general {
|
||||
border_size = 0
|
||||
@@ -33,6 +30,13 @@ let
|
||||
'';
|
||||
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.settings.default_session = {
|
||||
command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
|
||||
@@ -69,4 +73,5 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user