diff --git a/flake.lock b/flake.lock index b164569..0121c1f 100644 --- a/flake.lock +++ b/flake.lock @@ -57,16 +57,16 @@ ] }, "locked": { - "lastModified": 1778905220, - "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", + "lastModified": 1779726825, + "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", + "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -89,12 +89,15 @@ "parent": [] }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1779258371, - "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", + "lastModified": 1780065812, + "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", + "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144", "type": "github" }, "original": { @@ -106,18 +109,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779102034, - "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", - "type": "github" + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixpkgs-lib": { @@ -137,11 +137,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -151,12 +151,28 @@ "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": { "inputs": { "home-manager": "home-manager", "my-ricing-assets": "my-ricing-assets", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "xlibre-overlay": "xlibre-overlay" } diff --git a/flake.nix b/flake.nix index 0d5e275..f45428f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { 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"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; xlibre-overlay = { diff --git a/home/default.nix b/home/default.nix index 672b651..73babff 100644 --- a/home/default.nix +++ b/home/default.nix @@ -22,6 +22,6 @@ in username = name; homeDirectory = "/home/${name}"; - stateVersion = "25.11"; + stateVersion = "26.05"; }; } diff --git a/home/i3.nix b/home/i3.nix index 28691f0..62d860c 100644 --- a/home/i3.nix +++ b/home/i3.nix @@ -27,6 +27,7 @@ in { command = "fcitx5 -r"; always = true; notification = false; } { command = "owncloud"; always = true; 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 = { resize = { diff --git a/home/i3status.nix b/home/i3status.nix index c485daa..c198073 100644 --- a/home/i3status.nix +++ b/home/i3status.nix @@ -12,7 +12,7 @@ let { name = "battery 1"; settings = { - format = "%status %remaining (%emptytime)"; + format = "%status %percentage (%remaining)"; format_percentage = "%.01f%s"; format_down = "No BAT"; status_chr = "CHR"; diff --git a/hosts/waku/default.nix b/hosts/waku/default.nix index 47364cd..4f10e96 100644 --- a/hosts/waku/default.nix +++ b/hosts/waku/default.nix @@ -17,6 +17,8 @@ "armv7l-linux" ]; + networking.networkmanager.wifi.macAddress = "preserve"; + virtualisation = { podman = { enable = true; @@ -36,8 +38,7 @@ services.ollama = { enable = true; - acceleration = "rocm"; - package = pkgs.unstable.ollama; + package = pkgs.unstable.ollama-rocm; }; services.open-webui = { enable = true; @@ -69,27 +70,30 @@ }; environment.systemPackages = (with pkgs; [ - vim - tmux - saleae-logic-2 - my-ricing-assets amdgpu_top - scilab-bin + arduino-ide + kdePackages.xdg-desktop-portal-kde + my-ricing-assets + opencode + python3 qucs-s sage - python3 - opencode - arduino-ide - xdg-desktop-portal-gtk + saleae-logic-2 + scilab-bin + tmux + vim xdg-desktop-portal-gnome + xdg-desktop-portal-gtk xdg-desktop-portal-xapp - kdePackages.xdg-desktop-portal-kde + xournalpp ]); environment.variables = { MY_RICING_ASSETS_PATH = "${pkgs.my-ricing-assets}/"; }; + hardware.opentabletdriver.enable = true; + nixpkgs.config.allowUnfree = true; networking.hostName = "wakugumi-hitoroku"; diff --git a/hosts/waku/hardware-configuration.nix b/hosts/waku/hardware-configuration.nix index e923d85..9c8a2e8 100644 --- a/hosts/waku/hardware-configuration.nix +++ b/hosts/waku/hardware-configuration.nix @@ -30,4 +30,8 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", MODE="0666" + ''; } diff --git a/profiles/base.nix b/profiles/base.nix index 7ccf155..b3577a5 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -1,6 +1,17 @@ { 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"; i18n = { @@ -91,23 +102,23 @@ stdenv.cc.cc systemd util-linux - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXmu - xorg.libXrandr - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXxf86vm - xorg.libxcb - xorg.libxshmfence + libICE + libSM + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXmu + libXrandr + libXrender + libXt + libXtst + libXxf86vm + libxcb + libxshmfence xz zlib zstd diff --git a/profiles/desktop.nix b/profiles/desktop.nix index c6b0353..8fe8cd2 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -21,6 +21,7 @@ enable = true; }; }; + wacom.enable = true; }; fonts = { @@ -66,6 +67,8 @@ security.polkit.enable = true; + programs.nm-applet.enable = true; + environment.systemPackages = (with pkgs; [ alacritty arandr @@ -79,6 +82,7 @@ kdePackages.spectacle kdePackages.gwenview kdePackages.okular + kdePackages.polkit-kde-agent-1 fontconfig brightnessctl ]) ++ (with pkgs.skkDictionaries; [