updated to 26.05

This commit is contained in:
2026-05-31 18:38:43 +09:00
parent df41182acd
commit 562e5d0e97
9 changed files with 95 additions and 55 deletions
Generated
+37 -21
View File
@@ -57,16 +57,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1778905220, "lastModified": 1779726825,
"narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", "rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11", "ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -89,12 +89,15 @@
"parent": [] "parent": []
}, },
"nixos-hardware": { "nixos-hardware": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": { "locked": {
"lastModified": 1779258371, "lastModified": 1780065812,
"narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -106,18 +109,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1779102034, "lastModified": 1767892417,
"narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
"owner": "NixOS", "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"repo": "nixpkgs", "type": "tarball",
"rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "type": "tarball",
"ref": "nixos-25.11", "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@@ -137,11 +137,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1778869304, "lastModified": 1779560665,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -151,12 +151,28 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1779971959,
"narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ec942ba042dad5ef097e2ef3a3effc034241f011",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"my-ricing-assets": "my-ricing-assets", "my-ricing-assets": "my-ricing-assets",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"xlibre-overlay": "xlibre-overlay" "xlibre-overlay": "xlibre-overlay"
} }
+2 -2
View File
@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
xlibre-overlay = { xlibre-overlay = {
+1 -1
View File
@@ -22,6 +22,6 @@ in
username = name; username = name;
homeDirectory = "/home/${name}"; homeDirectory = "/home/${name}";
stateVersion = "25.11"; stateVersion = "26.05";
}; };
} }
+1
View File
@@ -27,6 +27,7 @@ in
{ command = "fcitx5 -r"; always = true; notification = false; } { command = "fcitx5 -r"; always = true; notification = false; }
{ command = "owncloud"; always = true; notification = false;} { command = "owncloud"; always = true; notification = false;}
{ command = "feh-wallpaper-getRandom"; always = false; notification = false; } { command = "feh-wallpaper-getRandom"; always = false; notification = false; }
{ command = "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"; always = true; notification = false; }
]; ];
modes = { modes = {
resize = { resize = {
+1 -1
View File
@@ -12,7 +12,7 @@ let
{ {
name = "battery 1"; name = "battery 1";
settings = { settings = {
format = "%status %remaining (%emptytime)"; format = "%status %percentage (%remaining)";
format_percentage = "%.01f%s"; format_percentage = "%.01f%s";
format_down = "No BAT"; format_down = "No BAT";
status_chr = "CHR"; status_chr = "CHR";
+16 -12
View File
@@ -17,6 +17,8 @@
"armv7l-linux" "armv7l-linux"
]; ];
networking.networkmanager.wifi.macAddress = "preserve";
virtualisation = { virtualisation = {
podman = { podman = {
enable = true; enable = true;
@@ -36,8 +38,7 @@
services.ollama = { services.ollama = {
enable = true; enable = true;
acceleration = "rocm"; package = pkgs.unstable.ollama-rocm;
package = pkgs.unstable.ollama;
}; };
services.open-webui = { services.open-webui = {
enable = true; enable = true;
@@ -69,27 +70,30 @@
}; };
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
vim
tmux
saleae-logic-2
my-ricing-assets
amdgpu_top amdgpu_top
scilab-bin arduino-ide
kdePackages.xdg-desktop-portal-kde
my-ricing-assets
opencode
python3
qucs-s qucs-s
sage sage
python3 saleae-logic-2
opencode scilab-bin
arduino-ide tmux
xdg-desktop-portal-gtk vim
xdg-desktop-portal-gnome xdg-desktop-portal-gnome
xdg-desktop-portal-gtk
xdg-desktop-portal-xapp xdg-desktop-portal-xapp
kdePackages.xdg-desktop-portal-kde xournalpp
]); ]);
environment.variables = { environment.variables = {
MY_RICING_ASSETS_PATH = "${pkgs.my-ricing-assets}/"; MY_RICING_ASSETS_PATH = "${pkgs.my-ricing-assets}/";
}; };
hardware.opentabletdriver.enable = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
networking.hostName = "wakugumi-hitoroku"; networking.hostName = "wakugumi-hitoroku";
+4
View File
@@ -30,4 +30,8 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.udev.extraRules = ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", MODE="0666"
'';
} }
+29 -18
View File
@@ -1,6 +1,17 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
networking.networkmanager.enable = lib.mkDefault true; networking.wireless.iwd.enable = true;
networking.networkmanager = {
enable = lib.mkDefault true;
appendNameservers = [ "1.1.1.1" ];
wifi = {
backend = "iwd";
};
};
networking.resolvconf = {
dnsExtensionMechanism = false;
};
time.timeZone = "Asia/Tokyo"; time.timeZone = "Asia/Tokyo";
i18n = { i18n = {
@@ -91,23 +102,23 @@
stdenv.cc.cc stdenv.cc.cc
systemd systemd
util-linux util-linux
xorg.libICE libICE
xorg.libSM libSM
xorg.libX11 libX11
xorg.libXcomposite libXcomposite
xorg.libXcursor libXcursor
xorg.libXdamage libXdamage
xorg.libXext libXext
xorg.libXfixes libXfixes
xorg.libXi libXi
xorg.libXmu libXmu
xorg.libXrandr libXrandr
xorg.libXrender libXrender
xorg.libXt libXt
xorg.libXtst libXtst
xorg.libXxf86vm libXxf86vm
xorg.libxcb libxcb
xorg.libxshmfence libxshmfence
xz xz
zlib zlib
zstd zstd
+4
View File
@@ -21,6 +21,7 @@
enable = true; enable = true;
}; };
}; };
wacom.enable = true;
}; };
fonts = { fonts = {
@@ -66,6 +67,8 @@
security.polkit.enable = true; security.polkit.enable = true;
programs.nm-applet.enable = true;
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
alacritty alacritty
arandr arandr
@@ -79,6 +82,7 @@
kdePackages.spectacle kdePackages.spectacle
kdePackages.gwenview kdePackages.gwenview
kdePackages.okular kdePackages.okular
kdePackages.polkit-kde-agent-1
fontconfig fontconfig
brightnessctl brightnessctl
]) ++ (with pkgs.skkDictionaries; [ ]) ++ (with pkgs.skkDictionaries; [