This commit is contained in:
2025-11-24 17:47:49 +09:00
parent 12f649840a
commit b69ae143c2
5 changed files with 39 additions and 29 deletions

View File

@@ -2,24 +2,13 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, inputs, pkgs, dankMaterialShell, niri, ... }: { config, inputs, pkgs, dankMaterialShell, ... }:
{ {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
# niri.nixosModules.niri
dankMaterialShell.nixosModules.greeter dankMaterialShell.nixosModules.greeter
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
]; ];
services.xserver = {
enable = true;
modules = [ pkgs.xorg.xf86videofbdev ];
videoDrivers = [
"hyperv_fb"
"qemu"
];
};
#services.displayManager.sddm.enable = true;
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@@ -54,9 +43,17 @@
}; };
# Configure keymap in X11 # Configure keymap in X11
services.xserver.xkb = { services.xserver = {
layout = "us"; enable = true;
variant = ""; modules = [ pkgs.xorg.xf86videofbdev ];
videoDrivers = [
"hyperv_fb"
"qemu"
];
xkb = {
layout = "us";
variant = "";
};
}; };
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
@@ -72,6 +69,7 @@
services.getty.autologinUser = "bangae1"; services.getty.autologinUser = "bangae1";
services.spice-vdagentd.enable = true; services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
# Allow unfree packages # Allow unfree packages
@@ -89,7 +87,6 @@
xwayland-satellite xwayland-satellite
xdg-desktop-portal-gnome xdg-desktop-portal-gnome
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
#niri.packages.${pkgs.system}.sessionPackage
nerd-fonts.jetbrains-mono nerd-fonts.jetbrains-mono
jetbrains-mono jetbrains-mono
kime kime
@@ -118,9 +115,16 @@
# enable = true; # enable = true;
# enableSSHSupport = true; # enableSSHSupport = true;
# }; # };
#programs.niri.enable = true;
programs.fish.enable = true; programs.fish.enable = true;
programs.firefox.enable = true; programs.firefox.enable = true;
programs.uwsm = {
enable = true;
waylandCompositors.niri = {
prettyName = "Niri";
comment = "Niri Scrolling Managed";
binPath = "/etc/profiles/per-user/bangae1/bin/niri-session";
};
};
programs.nano.nanorc = '' programs.nano.nanorc = ''
set tabsize 2 set tabsize 2

View File

@@ -32,7 +32,6 @@
nixos = nixpkgs.lib.nixosSystem { nixos = nixpkgs.lib.nixosSystem {
specialArgs = { inherit system niri dankMaterialShell; }; specialArgs = { inherit system niri dankMaterialShell; };
modules = [ modules = [
# #./sys/desktop.nix
./configuration.nix ./configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager.extraSpecialArgs = { inherit niri dankMaterialShell; }; home-manager.extraSpecialArgs = { inherit niri dankMaterialShell; };

17
hm/conf/alacritty.nix Normal file
View File

@@ -0,0 +1,17 @@
{...}:
{
home.file."alacritty.alacritty.toml" = {
text = ''
[general]
import = ["dank-theme.toml"]
[window]
padding = { x = 10, y = 10 }
[font]
normal = { family = 'JetBrainsMono Nerd Font', style = 'Regular' }
size = 11
offset = { x = 1, y = 2}
'';
}
}

View File

@@ -5,6 +5,7 @@
niri.homeModules.niri niri.homeModules.niri
dankMaterialShell.homeModules.dankMaterialShell.default dankMaterialShell.homeModules.dankMaterialShell.default
dankMaterialShell.homeModules.dankMaterialShell.niri dankMaterialShell.homeModules.dankMaterialShell.niri
./conf/alacritty.nix
]; ];
programs.niri = { programs.niri = {

View File

@@ -1,11 +0,0 @@
{ pkgs, niri, ...}:
{
environment.pathsToLink = [ "/wayland-sessions" ];
environment.etc."wayland-sessions/niri.desktop".text = ''
[Desktop Entry]
Name=niri
Exec=${pkgs.niri}/bin/niri-session
Type=Application
Keywords=wayland;niri;
'';
}