kenryuS/nixos-flake
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
kenryuS committed 2026-08-15 20:47:19 +09:00
1 parent d0c05a7b85
commit 7e83464c5b
10 files changed
+119 -98
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

flake.lock
Generated
+26 -86
View File
@@ -1,29 +1,15 @@
{ {
"nodes": { "nodes": {
"fetchurl-sources": {
"flake": false,
"locked": {
"path": "./consumer-overridable/fetchurl-sources.nix",
"type": "path"
},
"original": {
"path": "./consumer-overridable/fetchurl-sources.nix",
"type": "path"
},
"parent": [
"xlibre-overlay"
]
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1778716662, "lastModified": 1782949081,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -57,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782704057, "lastModified": 1785119570,
"narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=", "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "868d0a692de703c2de98fab61968e4e310b7c28e", "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -93,11 +79,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1782562157, "lastModified": 1786528975,
"narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", "narHash": "sha256-8KuasCs+mVQ7WbLONUf/QB7NZeQvovyXRyxAj4nOOzY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a9cf7546a938c737b079e738de73934a13de9784", "rev": "3e7edd9afe17e45521300e041c65de3015f4a302",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -122,11 +108,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1777168982, "lastModified": 1782614948,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -137,11 +123,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1782467914, "lastModified": 1786599213,
"narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -153,11 +139,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1782535326, "lastModified": 1786535285,
"narHash": "sha256-ZeRxu4yn6shd3SNF5ZUQb4r7BaVo1zBKMjRhfoNSBmw=", "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "714a5f8c4ead6b31148d829288440ed033ccc041", "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -169,11 +155,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1780243769, "lastModified": 1784356753,
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -208,49 +194,17 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"flake": false,
"locked": {
"path": "./systems.nix",
"type": "path"
},
"original": {
"path": "./systems.nix",
"type": "path"
},
"parent": [
"xlibre-overlay"
]
},
"xlibre-drivers-overlay-choice": {
"flake": false,
"locked": {
"path": "./consumer-overridable/drivers-overlay-choice.nix",
"type": "path"
},
"original": {
"path": "./consumer-overridable/drivers-overlay-choice.nix",
"type": "path"
},
"parent": [
"xlibre-overlay"
]
},
"xlibre-overlay": { "xlibre-overlay": {
"inputs": { "inputs": {
"fetchurl-sources": "fetchurl-sources",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3"
"systems": "systems_2",
"xlibre-drivers-overlay-choice": "xlibre-drivers-overlay-choice",
"xserver-meson-flags": "xserver-meson-flags"
}, },
"locked": { "locked": {
"lastModified": 1782758637, "lastModified": 1785768669,
"narHash": "sha256-4ST7CjS2g6os38Q+slq995Ca4zmJ2ZPweMgcIkC7DMs=", "narHash": "sha256-KPmK8Lj4NhrdzIuz67bV7/3sP1lirTQw3FoVjrGOB+0=",
"ref": "dev-for-26.05", "ref": "dev-for-26.05",
"rev": "e49386b85f80f76f273a4722064ae06e83c23b28", "rev": "3c9798f7e261eb3be40dbd7e9407b6bdefe8c7e9",
"revCount": 139, "revCount": 236,
"type": "git", "type": "git",
"url": "https://codeberg.org/takagemacoed/xlibre-overlay" "url": "https://codeberg.org/takagemacoed/xlibre-overlay"
}, },
@@ -259,20 +213,6 @@
"type": "git", "type": "git",
"url": "https://codeberg.org/takagemacoed/xlibre-overlay" "url": "https://codeberg.org/takagemacoed/xlibre-overlay"
} }
},
"xserver-meson-flags": {
"flake": false,
"locked": {
"path": "./consumer-overridable/xserver-meson-flags.nix",
"type": "path"
},
"original": {
"path": "./consumer-overridable/xserver-meson-flags.nix",
"type": "path"
},
"parent": [
"xlibre-overlay"
]
} }
}, },
"root": "root", "root": "root",
home/browser.nix
+1 -1
View File
@@ -2,6 +2,6 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
firefox-bin firefox-bin
vimb #vimb
]; ];
} }
home/cads.nix
+2 -3
View File
@@ -1,11 +1,10 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
home.packages = (with pkgs.unstable; [ home.packages = (with pkgs; [
openscad
kicad kicad
kicadAddons.kikit kicadAddons.kikit
freecad freecad
openscad-unstable
]) ++ (with pkgs; [
librecad librecad
]); ]);
} }
home/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ in
./tmux.nix ./tmux.nix
./vim.nix ./vim.nix
./xterm.nix ./xterm.nix
./zed.nix #./zed.nix
./zsh.nix ./zsh.nix
]; ];
home/zed.nix
+1
View File
@@ -25,6 +25,7 @@
]; ];
extraPackages = with pkgs; [ extraPackages = with pkgs; [
clang-tools clang-tools
rust-analyzer
rustfmt rustfmt
nil nil
]; ];
hosts/waku/default.nix
+25 -2
View File
@@ -61,7 +61,6 @@
programs.steam = { programs.steam = {
enable = true; enable = true;
#extest.enable = true;
fontPackages = with pkgs; [ fontPackages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
@@ -74,17 +73,29 @@
u2fSupport = false; u2fSupport = false;
}; };
programs.wireshark = {
package = pkgs.wireshark;
enable = true;
dumpcap.enable = true;
usbmon.enable = true;
};
programs.virt-manager.enable = true;
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
amdgpu_top amdgpu_top
arduino-ide arduino-ide
kdePackages.xdg-desktop-portal-kde kdePackages.xdg-desktop-portal-kde
my-ricing-assets my-ricing-assets
opencode opencode
python3
rocmPackages.amdsmi rocmPackages.amdsmi
rocmPackages.rocm-smi rocmPackages.rocm-smi
saleae-logic-2 saleae-logic-2
sqlite
sqlite-utils
tmux tmux
unixodbc
unixodbcDrivers.sqlite
vim vim
xdg-desktop-portal-gnome xdg-desktop-portal-gnome
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
@@ -102,6 +113,18 @@
networking.hostName = "wakugumi-hitoroku"; networking.hostName = "wakugumi-hitoroku";
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.allowedTCPPortRanges = [
{
from = 8000;
to = 9000;
}
];
networking.firewall.allowedUDPPortRanges = [
{
from = 4000;
to = 5000;
}
];
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }
hosts/waku/hardware-configuration.nix
+51
View File
@@ -32,7 +32,58 @@
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.udev.extraRules = '' services.udev.extraRules = ''
# =====
# CH552
# =====
SUBSYSTEM=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", MODE="0666" SUBSYSTEM=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", MODE="0666"
# =========
# ADALM2000
# =========
# allow "plugdev" group read/write access to ADI M2K devices
SUBSYSTEM=="usb", ATTRS{idVendor}=="0456", ATTRS{idProduct}=="b672", MODE="0664", GROUP="plugdev"
SUBSYSTEM=="usb", ATTRS{idVendor}=="0456", ATTRS{idProduct}=="b675", MODE="0664", GROUP="plugdev"
# tell the ModemManager (part of the NetworkManager suite) that the device is not a modem,
# and don't send AT commands to it
SUBSYSTEM=="usb", ATTRS{idVendor}=="0456", ATTRS{idProduct}=="b672", ENV{ID_MM_DEVICE_IGNORE}="1"
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", GROUP="plugdev", MODE="0660"
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", GROUP="dialout", MODE="0660"
# ========
# WCH Link
# ========
# Programmer in ARM mode
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8012", GROUP="plugdev", MODE="0660"
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8012", GROUP="dialout", MODE="0660"
# Programmer in IAP mode
SUBSYSTEM=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", GROUP="plugdev", MODE="0660"
SUBSYSTEM=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", GROUP="dialout", MODE="0660"
# CH57x in self-program mode
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="55e0", GROUP="plugdev", MODE="0660"
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="55e0", GROUP="dialout", MODE="0660"
SUBSYSTEM=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="4004", GROUP="plugdev", MODE="0660"
SUBSYSTEM=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="4004", GROUP="dialout", MODE="0660"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="4004", GROUP="plugdev", MODE="0660"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="4004", GROUP="dialout", MODE="0660"
# rv003usb bootloader
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b003", GROUP="plugdev", MODE="0660"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b003", GROUP="dialout", MODE="0660"
#KERNEL=="hiddev*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b003", GROUP="plugdev", MODE="0660"
#KERNEL=="hiddev*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b003", GROUP="dialout", MODE="0660"
# ch32v003 programming rvswdio dongle
SUBSYSTEM=="usb", ATTRS{idVendor}=="1206", ATTRS{idProduct}=="5d10", GROUP="plugdev", MODE="0660"
SUBSYSTEM=="usb", ATTRS{idVendor}=="1206", ATTRS{idProduct}=="5d10", GROUP="dialout", MODE="0660"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1206", ATTRS{idProduct}=="5d10", GROUP="plugdev", MODE="0660"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1206", ATTRS{idProduct}=="5d10", GROUP="dialout", MODE="0660"
''; '';
hardware.saleae-logic.enable = true; hardware.saleae-logic.enable = true;
overlays/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@
); );
}) })
# reverting version to 0.16.1 due to bug with IME # reverting version to 0.16.1 due to bug with IME (gh issue: #8907)
(final: prev: { (final: prev: {
alacritty = prev.alacritty.overrideAttrs ( alacritty = prev.alacritty.overrideAttrs (
finalAttrs: prevAttrs: { finalAttrs: prevAttrs: {
profiles/base.nix
+11 -2
View File
@@ -5,7 +5,10 @@
enable32Bit = true; enable32Bit = true;
}; };
networking.wireless.iwd.enable = true; networking.wireless.iwd = {
enable = true;
package = pkgs.unstable.iwd;
};
networking.networkmanager = { networking.networkmanager = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
appendNameservers = [ "1.1.1.1" ]; appendNameservers = [ "1.1.1.1" ];
@@ -137,7 +140,13 @@
nix.gc = { nix.gc = {
automatic = true; automatic = true;
dates = "monthly"; dates = "weekly";
persistent = true;
};
nix.optimise = {
automatic = true;
dates = "weekly";
persistent = true; persistent = true;
}; };
profiles/desktop.nix
-2
View File
@@ -80,9 +80,7 @@
kdePackages.polkit-kde-agent-1 kdePackages.polkit-kde-agent-1
kdePackages.spectacle kdePackages.spectacle
keepassxc keepassxc
libreoffice-fresh
owncloud-client owncloud-client
thunderbird-bin
xfe xfe
]) ++ (with pkgs.skkDictionaries; [ ]) ++ (with pkgs.skkDictionaries; [
l l