Compare commits

..

4 Commits

Author SHA1 Message Date
9bee43fc50 networking: random mac
Signed-off-by: unexplrd <unexplrd@linerds.us>
2025-04-28 22:53:03 +03:00
38e0f83009 hosts/disko: move disk to a variable
Signed-off-by: unexplrd <unexplrd@linerds.us>
2025-04-28 22:53:03 +03:00
37d57cdfb5 user/programs: refactor
Signed-off-by: unexplrd <unexplrd@linerds.us>
2025-04-28 22:53:03 +03:00
3b5775f58b flake.lock: bump
Signed-off-by: unexplrd <unexplrd@linerds.us>
2025-04-28 22:53:03 +03:00
8 changed files with 96 additions and 73 deletions

78
flake.lock generated
View File

@ -126,11 +126,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1745006048, "lastModified": 1745598511,
"narHash": "sha256-4ONXaEwnyZGPp84d6wjiqoR4xyTWygUobBTcSkILPzU=", "narHash": "sha256-GWYB7PngGwTJrp7gr0w6E5nnvwiblPvN2kjRCQw3ZEg=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "592094a02c4e43a9fa33559ade84d1ca015e8ada", "rev": "199cb288a85b15ed203089804c024ae5b3eacd7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745331218, "lastModified": 1745805923,
"narHash": "sha256-dA3K2EFeol9khPgrzLnkXL/LULqjQPNfUCQYELhnFFE=", "narHash": "sha256-Nf7s2EPyVyDxmyKKOQu/HpXxttR2PmRzidYT7tflPDk=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "a8ecbd631f095169413bf74e6f728a8910440567", "rev": "9ee0fe8c4db911e3b9c599699bcd610486a27c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,11 +209,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1745217425, "lastModified": 1745735608,
"narHash": "sha256-iZj8J+KzoeyBGQhtWVjeD84cAKxalF2LFHoi5+HstoI=", "narHash": "sha256-L0jzm815XBFfF2wCFmR+M1CF+beIEFj6SxlqVKF59Ec=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "4a599e8652a6ca89f79c42f6e05806813f5abd0b", "rev": "c39a78eba6ed2a022cc3218db90d485077101496",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -512,11 +512,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745256380, "lastModified": 1745771770,
"narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=", "narHash": "sha256-kC1yYNAO69i0Q9nnQFTxu5kdwcoHRE7x4jtJyIB5QSg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac", "rev": "0fbd8207e913b2d1660a7662f9ae80e5e639de65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,11 +532,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745330727, "lastModified": 1745810134,
"narHash": "sha256-GHnyrT5AXVjuQVtDFhgRNrJr/MRIpqg+b1DeUoPfBDM=", "narHash": "sha256-WfnYH/i7DFzn4SESQfWviXiNUZjohZhzODqLwKYHIPI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cf0c5e0105c5920f203473b571bbdc051c46995a", "rev": "be7cf1709b469a2a2c62169172a167d1fed3509f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -553,11 +553,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745198506, "lastModified": 1744618730,
"narHash": "sha256-0hVbHuqAnZUnnGaBTqNes0P0kfH+KKyup2boWDST0iI=", "narHash": "sha256-n3gN7aHwVRnnBZI64EDoKyJnWidNYJ0xezhqQtdjH2Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b0cc092405da805da6fa964f5a178343658ceaf0", "rev": "85dd758c703ffbf9d97f34adcef3a898b54b4014",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -642,11 +642,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1745328209, "lastModified": 1745795931,
"narHash": "sha256-eP3x+JNE1T6RjXhimaEnoc4GvNJcyzppW1vpAs287Zg=", "narHash": "sha256-i4zlEa2lnANuOZA1aA/X0cNGM7x9MLZqqmKP6fwfPEA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "241a4935a244f403fa7108259075b04c81ed258f", "rev": "f5c5cfa960c157c8df50b496f621290234ac4505",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -891,11 +891,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745044299, "lastModified": 1745487384,
"narHash": "sha256-/A/xjRjJY9CGcgOHQ5kTxV7VIJxac86i6NQ5CejMzZc=", "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "c7ff1a4578eb11ef84288941aa23e385b6fde635", "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -991,11 +991,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745120797, "lastModified": 1745725746,
"narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "69716041f881a2af935021c1182ed5b0cc04d40e", "rev": "187524713d0d9b2d2c6f688b81835114d4c2a7c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1027,11 +1027,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1744633460, "lastModified": 1745503349,
"narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1091,11 +1091,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1744440957, "lastModified": 1745742390,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1123,11 +1123,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1744932701, "lastModified": 1745526057,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1250,11 +1250,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745178985, "lastModified": 1745694049,
"narHash": "sha256-Gw627dJW6/IJydIUCQnI8c2oilpMxhZIwHb7ppGX7hk=", "narHash": "sha256-fxvRYH/tS7hGQeg9zCVh5RBcSWT+JGJet7RA8Ss+rC0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "723121e5958cf282db3fdb06970776724a7326d5", "rev": "d8887c0758bbd2d5f752d5bd405d4491e90e7ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,4 +1,6 @@
{inputs, ...}: { {inputs, ...}: let
disk = "/dev/disk/by-id/nvme-eui.000000000000000100a075244b5d6185";
in {
imports = with inputs; [ imports = with inputs; [
disko.nixosModules.disko disko.nixosModules.disko
]; ];
@ -10,7 +12,7 @@
}; };
disko.devices.disk.main = { disko.devices.disk.main = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/nvme-eui.000000000000000100a075244b5d6185"; device = disk;
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {

View File

@ -2,6 +2,9 @@
networking = { networking = {
hostId = "c7f6c4a1"; hostId = "c7f6c4a1";
hostName = "dunamis"; hostName = "dunamis";
networkmanager.enable = true; networkmanager = {
enable = true;
ethernet.macAddress = "stable";
};
}; };
} }

View File

@ -1,11 +1,12 @@
{ {
lib,
inputs, inputs,
pkgs,
... ...
}: { }: {
imports = with inputs; [ imports = with inputs; [
nix-flatpak.homeManagerModules.nix-flatpak nix-flatpak.homeManagerModules.nix-flatpak
]; ];
home.packages = with pkgs; [flatpak];
services.flatpak = { services.flatpak = {
enable = true; enable = true;
uninstallUnmanaged = true; uninstallUnmanaged = true;

View File

@ -8,6 +8,9 @@
syncthing.enable = true; syncthing.enable = true;
terminal.wezterm.enable = true; terminal.wezterm.enable = true;
terminal.ghostty.enable = true; terminal.ghostty.enable = true;
systemd.user.settings.Manager.DefaultEnvironment = {
TERMINAL = "ghostty";
};
services = { services = {
pueue.enable = true; # process queue in rust pueue.enable = true; # process queue in rust
@ -49,30 +52,35 @@
zoxide.enable = true; # fuzzy cd in rust zoxide.enable = true; # fuzzy cd in rust
}; };
home.packages = with pkgs; [ home.packages = with pkgs;
alejandra # nix formatter in rust [
bluetuith # bluetooth tui in go # development utils
devenv # programming deps in rust alejandra # nix formatter in rust
dua # disk space usage in rust devenv # programming deps in rust
duf # better df in go jj-fzf # fuzzy finder jujutsu tui
fend # calculator in rust just # make in rust
flatpak # flatpak cli silicon # create code pics in rust
jj-fzf # fuzzy finder jujutsu tui ]
just # make in rust ++ [
mprocs # process runner in rust # console utils
ouch # archive manager in rust bluetuith # bluetooth tui in go
overskride # bluetooth gui in rust dua # disk space usage in rust
pika-backup # borg gui in rust duf # better df in go
pinentry-qt # pinentry for rbw fend # calculator in rust
procs # ps in rust mprocs # process runner in rust
rbw # bitwarden cli in rust ouch # archive manager in rust
sd # sed in rust procs # ps in rust
silicon # create code pics in rust rbw # bitwarden cli in rust
trashy # trash cli in rust sd # sed in rust
# vial # qmk keyboard configuring app trashy # trash cli in rust
virt-manager # libvirt gui ]
waycheck # check wayland protocols ++ [
]; # misc apps
# vial # qmk keyboard configuring app
pinentry-qt # pinentry for rbw
virt-manager # libvirt gui
waycheck # check wayland protocols
];
xdg.desktopEntries = { xdg.desktopEntries = {
uni = { uni = {

View File

@ -1,4 +1,7 @@
{inputs, ...}: { {inputs, ...}: let
disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_BTHH81460QC2256B";
disk1 = "/dev/disk/by-id/nvme-WDC_PC_SN730_SDBPNTY-1T00-1101_21114D802446";
in {
imports = with inputs; [ imports = with inputs; [
disko.nixosModules.disko disko.nixosModules.disko
]; ];
@ -10,7 +13,7 @@
}; };
disko.devices.disk.main = { disko.devices.disk.main = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_BTHH81460QC2256B"; device = disk;
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
@ -80,7 +83,7 @@
}; };
disko.devices.disk.second = { disko.devices.disk.second = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/nvme-WDC_PC_SN730_SDBPNTY-1T00-1101_21114D802446"; device = disk1;
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {

View File

@ -1,4 +1,6 @@
{inputs, ...}: { {inputs, ...}: let
disk = "/dev/disk/by-id/nvme-eui.0025385911b36714";
in {
imports = with inputs; [ imports = with inputs; [
disko.nixosModules.disko disko.nixosModules.disko
]; ];
@ -10,7 +12,7 @@
}; };
disko.devices.disk.main = { disko.devices.disk.main = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/nvme-eui.0025385911b36714"; device = disk;
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {

View File

@ -12,7 +12,11 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
networking = { networking = {
networkmanager.wifi.backend = "iwd"; networkmanager.wifi = {
backend = "iwd";
macAddress = "random";
scanRandMacAddress = true;
};
wireless.iwd = { wireless.iwd = {
enable = true; enable = true;
settings = { settings = {