fix

2026-10-06 00:38:12 +09:00 · 2026-05-30 22:11:33 +09:00
parent 5f1cfc5275
commit 394638638d
26 changed files with 107 additions and 43 deletions
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.btop = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.claude = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.fcitx5 = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.ghostty = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.git = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.gtk = {
@@ -1,4 +1,8 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
  cfg = config.my.applications.gtk.system;
 in
@@ -10,5 +14,7 @@ in
  config = lib.mkIf cfg.enable {
    programs.dconf.enable = true;
    programs.seahorse.enable = true;
+
+    services.gnome.gnome-keyring.enable = true;
  };
 }
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.niri = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.noctalia = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.ssh = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home
+    ./system.nix
  ];

  options.my.applications.vim = {
@@ -1,7 +1,7 @@
 { ... }:
 {
  imports = [
-    ./ui
    ./editor
+    ./ui
  ];
 }
@@ -1,23 +1,23 @@
 { ... }:
 {
  imports = [
-    ./snacks.nix
-    ./treesitter.nix
-    ./blink-cmp.nix
-    ./gitsigns.nix
-    ./comment.nix
    ./autopairs.nix
-    ./lsp-signature.nix
-    ./copilot.nix
-    ./trouble.nix
+    ./blink-cmp.nix
+    ./comment.nix
    ./conform.nix
-    ./surround.nix
-    ./git.nix
-    ./git-conflict.nix
-    ./glance.nix
+    ./copilot.nix
    ./flash.nix
-    ./todo-comments.nix
+    ./git-conflict.nix
+    ./git.nix
+    ./gitsigns.nix
+    ./glance.nix
+    ./lsp-signature.nix
+    ./snacks.nix
    ./spectre.nix
+    ./surround.nix
+    ./todo-comments.nix
+    ./treesitter.nix
+    ./trouble.nix
    ./wakatime.nix
  ];
 }
@@ -1,20 +1,20 @@
 { ... }:
 {
  imports = [
-    ./lualine.nix
-    ./neo-tree.nix
-    ./blankline.nix
-    ./which-key.nix
-    ./web-devicons.nix
-    ./toggleterm.nix
-    ./treesitter.nix
    ./barbar.nix
-    ./lightbulb.nix
+    ./blankline.nix
    ./colorizer.nix
    ./dropbar.nix
-    ./scrollbar.nix
-    ./ufo.nix
-    ./zen-mode.nix
+    ./lightbulb.nix
+    ./lualine.nix
    ./markview.nix
+    ./neo-tree.nix
+    ./scrollbar.nix
+    ./toggleterm.nix
+    ./treesitter.nix
+    ./ufo.nix
+    ./web-devicons.nix
+    ./which-key.nix
+    ./zen-mode.nix
  ];
 }
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.vscode = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.zellij = {
@@ -8,8 +8,8 @@ let
 in
 {
  imports = [
-    ./system.nix
    ./home.nix
+    ./system.nix
  ];

  options.my.applications.zsh = {
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./applications
+    ./drivers
+    ./integrations
+    ./system
+  ];
+}
@@ -0,0 +1,22 @@
+{ lib, config, ... }:
+let
+  cfg = config.my.system.audio;
+in
+{
+  options.my.system.audio = {
+    enable = lib.mkEnableOption "Audio support (PipeWire)";
+  };
+
+  config = lib.mkIf cfg.enable {
+    security.rtkit.enable = true;
+
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+      wireplumber.enable = true;
+    };
+  };
+}
@@ -4,8 +4,14 @@
  ...
 }:
 {
+  imports = [
+    ./nfs.nix
+    ./uefi.nix
+  ];
+
  boot = {
    loader.systemd-boot.configurationLimit = lib.mkDefault 8;
    kernelPackages = pkgs.linuxPackages_latest;
  };
+  programs.nix-ld.enable = true;
 }
@@ -14,5 +14,6 @@ in
  config = lib.mkIf cfg.enable {
    boot.supportedFilesystems = [ "nfs" ];
    fuse.userAllowOther = true;
+    services.rpcbind.enable = true;
  };
 }
@@ -1,14 +1,15 @@
 {
  imports = [
+    ./audio.nix
    ./boot
-    ./nix.nix
    ./camera.nix
    ./fingerprint.nix
    ./fonts.nix
    ./gc.nix
-    ./locale.nix
    ./hardware
+    ./locale.nix
    ./network
+    ./nix.nix
    ./power.nix
    ./secure-boot.nix
    ./user
@@ -1,7 +1,14 @@
 { lib, ... }:
 {
+  imports = [
+    ./bluetooth.nix
+    ./gui.nix
+  ];
+
  hardware = {
    enableRedistributableFirmware = lib.mkDefault true;
    keyboard.qmk.enable = true;
  };
+
+  services.fwupd.enable = true;
 }
@@ -4,6 +4,10 @@
  ...
 }:
 {
+  imports = [
+    ./wifi.nix
+  ];
+
  networking = {
    hostName = host;

@@ -24,5 +24,14 @@ in
    services.power-profiles-daemon.enable = true;
    services.tlp.enable = false;
    services.upower.enable = true;
+
+    services.logind = {
+      settings.Login = {
+        HandleLidSwitch = "suspend";
+        HandleLidSwitchDocked = "ignore";
+        HandleLidSwitchExternalPower = "suspend";
+        LidSwitchIgnoreInhibited = "no";
+      };
+    };
  };
 }
@@ -7,12 +7,12 @@
  options.my.stateVersions = {
    nixos = lib.mkOption {
      type = lib.types.str;
-      default = "25.11";
+      default = "26.05";
    };

    homeManager = lib.mkOption {
      type = lib.types.str;
-      default = "25.11";
+      default = "26.05";
    };
  };