system/desktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2026-07-04

Browse source
This commit is contained in:
root 2026-07-04 09:54:45 -03:00
parent 0de07cd804
commit 749bfdf50d
No known key found for this signature in database
12 changed files with 80 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

79
flake.lock generated
View file

@ -24,15 +24,14 @@
"dms": { "dms": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"quickshell": "quickshell"
}, },
"locked": { "locked": {
"lastModified": 1777675128, "lastModified": 1781822553,
"narHash": "sha256-2zuDs9Lju99dg8MsSPf1frKPPgCRakDn+CEGX71cHJ0=", "narHash": "sha256-lINO2V/B5MxB6RXGahrPlaL07WvFiJur1WDF6rTYuyk=",
"owner": "AvengeMedia", "owner": "AvengeMedia",
"repo": "DankMaterialShell", "repo": "DankMaterialShell",
"rev": "c1cbd0994f5a3585dded85069f2c9103c54f5285", "rev": "4203148cabb74abfb17e5c02f3b76c28b52601e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777679572, "lastModified": 1781906751,
"narHash": "sha256-egYNbRrkn+6SwTHinhdb6WUfzzdC3nXfCRqS321VylY=", "narHash": "sha256-6Ld1PqmptFtFKblE+SynhRgyBApUWcmrISetWqWHeeo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9cb587ade2aa1b4a7257f0238d41072690b0ca4f", "rev": "37f21dfa5d27e71b75bacd9418b156f9265e312e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +163,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1771283045, "lastModified": 1781817881,
"narHash": "sha256-AgD3KAkrQ4cs34kKZE8v/+FyFTc1Vq2sOJaPrWiCRio=", "narHash": "sha256-pRPtSWYy9XsVnvjHhXhaGX3uwqFdfAn2fXvxQ0xKXnk=",
"owner": "argosnothing", "owner": "argosnothing",
"repo": "niri", "repo": "niri",
"rev": "eab116015a5a4d8f027c915dbd7b0a90e1e9a5e1", "rev": "cd36d0374d6e66bc07248899d02478f42719ecc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,11 +202,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776169885, "lastModified": 1778443072,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,11 +250,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1777731324, "lastModified": 1781960011,
"narHash": "sha256-piLMdJYPP/9+/yiHxVMpqbAAoP8EnsqRO5921ilx0lk=", "narHash": "sha256-66fKJZTRbxFJ48dE3kDdCaHTbux6nmApvIQhtwcaI0E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "38e436af6ec1a3b1c9b666ceea098bf5ef05fc66", "rev": "c1b9ab3ad7c39b61915438b2222e3655b7d8a16f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +265,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1777578337, "lastModified": 1781577229,
"narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +285,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1777729540, "lastModified": 1781959811,
"narHash": "sha256-tF5WMS4SSSmDvEZ7qgOosh8q0BVdz/ynb4Wnruc1rgY=", "narHash": "sha256-ZKWWQbvWnZwHU6YTWB7uoIgeXw70z82mJglH7DmCTDg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1091dd1d0f6589dc9a88d808052dda9b85835670", "rev": "8ccedaa4ba8b650594426145a6f67201b685359c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,28 +298,6 @@
"type": "github" "type": "github"
} }
}, },
"quickshell": {
"inputs": {
"nixpkgs": [
"dms",
"nixpkgs"
]
},
"locked": {
"lastModified": 1776854048,
"narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=",
"ref": "refs/heads/master",
"rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
"revCount": 806,
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
},
"original": {
"rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
@ -342,11 +319,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767322002, "lastModified": 1781752752,
"narHash": "sha256-yHKXXw2OWfIFsyTjduB4EyFwR0SYYF0hK8xI9z4NIn0=", "narHash": "sha256-kVG5tV9hddPviGAgqf9sGSuStvv+HAB9onfKqGptV0k=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "03c6e38661c02a27ca006a284813afdc461e9f7e", "rev": "c06d86dabe5b92982b9d67acccb9990d58da3a0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,11 +357,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777338324, "lastModified": 1781943681,
"narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/agents.nix
View file

@ -227,7 +227,7 @@ let
enable = true; enable = true;
setSessionVariables = false; setSessionVariables = false;
extraConfig = { extraConfig = {
XDG_CACHE_HOME = "$HOME/.cache"; XDG_CACHE_HOME = "${HOME}/.cache";
}; };
}; };
}; };

33
home/nvim/default.nix
View file

@ -61,13 +61,13 @@ in
}) })
''; '';
} }
{ # {
plugin = comment-nvim; # plugin = comment-nvim;
type = "lua"; # type = "lua";
config = '' # config = ''
require('Comment').setup() # require('Comment').setup()
''; # '';
} # }
{ {
plugin = conform-nvim; plugin = conform-nvim;
type = "lua"; type = "lua";
@ -107,14 +107,6 @@ in
''; '';
} }
leap-nvim leap-nvim
{
plugin = lsp_lines-nvim;
type = "lua";
config = ''
require("lsp_lines").setup()
vim.keymap.set("n", "<localleader>it", require("lsp_lines").toggle, { desc = "Toggle LSP lines" })
'';
}
{ {
plugin = mini-icons; plugin = mini-icons;
type = "lua"; type = "lua";
@ -380,23 +372,12 @@ in
require("ts-autotag").setup() require("ts-autotag").setup()
''; '';
} }
# {
# plugin = toggleterm-nvim;
# type = "lua";
# config = ''
# require("toggleterm").setup()
# vim.keymap.set("n", "<leader>nt", "<cmd>ToggleTerm size=120 direction=tab name=ttermh<cr>", { desc = "Toggle tterm tab" })
# vim.keymap.set("n", "<leader>ns", "<cmd>ToggleTerm direction=vertical name=ttermv<cr>", { desc = "Toggle tterm vertical" })
# vim.keymap.set("n", "<C-n>", "<cmd>ToggleTerm direction=float name=ttermf<cr>", { desc = "Toggle tterm float" })
# '';
# }
{ {
plugin = trouble-nvim; plugin = trouble-nvim;
type = "lua"; type = "lua";
config = '' config = ''
require("trouble").setup({}) require("trouble").setup({})
vim.keymap.set("n", "<localleader>id", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Trouble project" }) vim.keymap.set("n", "<localleader>id", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Trouble project" })
-- vim.keymap.set("n", "<localleader>io", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", { desc = "Trouble buffer" })
''; '';
} }
{ {

12
home/nvim/plugins.lua
View file

@ -152,15 +152,3 @@ vim.api.nvim_create_autocmd("CmdlineLeave", {
vim.keymap.set({ "n", "x", "o" }, "s", "<Plug>(leap)", { desc = "leap" }) vim.keymap.set({ "n", "x", "o" }, "s", "<Plug>(leap)", { desc = "leap" })
vim.keymap.set({ "n", "x", "o" }, "S", "<Plug>(leap-from-window)", { desc = "leap across window" }) vim.keymap.set({ "n", "x", "o" }, "S", "<Plug>(leap-from-window)", { desc = "leap across window" })
require("neotest").setup({
adapters = {
require("neotest-pest"),
},
})
vim.keymap.set("n", "<localleader>pn", function()
require("neotest").run.run()
end, { desc = "test nearest" })
vim.keymap.set("n", "<localleader>pe", function()
require("neotest").run.run(vim.fn.expand("%"))
end, { desc = "test file" })

2
home/nvim/settings.lua
View file

@ -114,7 +114,7 @@ vim.diagnostic.config({
virtual_lines = true, virtual_lines = true,
signs = true, signs = true,
underline = true, underline = true,
update_in_insert = false, update_in_insert = true,
severity_sort = true, severity_sort = true,
}) })

2
home/root.nix
View file

@ -19,7 +19,7 @@
ssh = { ssh = {
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
matchBlocks = { settings = {
"icefox.sh" = { "icefox.sh" = {
user = "git"; user = "git";
identityFile = "/root/.ssh/desktop"; identityFile = "/root/.ssh/desktop";

10
home/user.nix
View file

@ -229,7 +229,7 @@
extraConfig = { extraConfig = {
SCREENSHOTS = "$HOME/pictures/screenshots"; SCREENSHOTS = "$HOME/pictures/screenshots";
XDG_CACHE_HOME = "$HOME/.cache"; XDG_CACHE_HOME = "${HOME}/.cache";
}; };
}; };
@ -238,7 +238,7 @@
ssh = { ssh = {
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
matchBlocks = { settings = {
"*" = { "*" = {
serverAliveInterval = 60; serverAliveInterval = 60;
serverAliveCountMax = 3; serverAliveCountMax = 3;
@ -275,15 +275,15 @@
user = { user = {
name = "felipematos"; name = "felipematos";
email = "5471818+fnzr@users.noreply.github.com"; email = "5471818+fnzr@users.noreply.github.com";
signingkey = "E6C30AB4CD83BB00"; signingkey = "${HOME}/.ssh/desktop.pub";
}; };
}; };
} }
]; ];
settings = { settings = {
user = { user = {
email = "felipe@icefox.sh"; email = "felipe@imatos.dev";
name = "icefox"; name = "fmatos";
signingkey = "${HOME}/.ssh/desktop.pub"; signingkey = "${HOME}/.ssh/desktop.pub";
}; };
gpg.format = "ssh"; gpg.format = "ssh";

4
kernel/default.nix
View file

@ -57,6 +57,10 @@ in
runAs = "root"; runAs = "root";
keepEnv = true; keepEnv = true;
persist = true; persist = true;
setEnv = [
"EDITOR"
"TERM"
];
} }
{ {
users = [ "user" ]; users = [ "user" ];

79
networking.nix
View file

@ -15,9 +15,8 @@
networking = { networking = {
hostName = hostname; hostName = hostname;
nameservers = [ "192.168.88.3" ];
networkmanager.enable = false; networkmanager.enable = false;
firewall.trustedInterfaces = [ "vlan66" ]; nameservers = [ "192.168.88.3" ];
useDHCP = false; useDHCP = false;
useNetworkd = true; useNetworkd = true;
@ -72,20 +71,28 @@
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
# netdevs."30-vlan66" = { networks."30-vm-1" = {
# netdevConfig = { matchConfig.Name = "vm-1";
# Kind = "vlan"; address = [ "10.0.0.1/24" ];
# Name = "vlan66"; networkConfig.IPMasquerade = "both";
# }; };
# vlanConfig = {
# Id = 66;
# };
# };
# networks."30-vlan66" = { };
# matchConfig.Name = "vlan66";
# networkConfig.DHCP = "yes"; networking.nat = {
# }; enable = true;
internalInterfaces = [ "vm-*" ];
externalInterface = "br0";
};
services.resolved = {
enable = true;
settings = {
Resolve = {
Domains = [ "~." ];
FallbackDNS = null;
};
};
}; };
services.wireguard-netns = { services.wireguard-netns = {
@ -113,46 +120,4 @@
}; };
}; };
}; };
# systemd.services."netns@wg0ns" = {
# description = "wg0 network namespace";
# before = [ "network.target" ];
# serviceConfig = {
# Type = "oneshot";
# RemainAfterExit = true;
# ExecStart = pkgs.writers.writeBash "wg0ns-up" ''
# ${pkgs.coreutils}/bin/mkdir -p /etc/netns/wg0ns
# echo "nameserver $(cat ${config.sops.secrets."wg0/dns".path})" > /etc/netns/wg0ns/resolv.conf
# ${pkgs.iproute2}/bin/ip netns add wg0ns
# '';
# ExecStop = "${pkgs.iproute2}/bin/ip netns del wg0ns";
# };
# };
#
# systemd.services.wg0 = {
# description = "wg0 network interface";
# bindsTo = [ "netns@wg0ns.service" ];
# requires = [ "network-online.target" ];
# after = [ "netns@wg0ns.service" ];
# wants = [ "network-online.target" ];
# wantedBy = [ "multi-user.target" ];
# serviceConfig = {
# Type = "oneshot";
# RemainAfterExit = true;
# ExecStart = pkgs.writers.writeBash "wg-up" ''
# ${pkgs.iproute2}/bin/ip link add wg0 type wireguard
# ${pkgs.iproute2}/bin/ip link set wg0 netns wg0ns
# ${pkgs.iproute2}/bin/ip -n wg0ns address add $(< ${config.sops.secrets."wg0/address".path}) dev wg0
# ${pkgs.iproute2}/bin/ip netns exec wg0ns \
# ${pkgs.wireguard-tools}/bin/wg setconf wg0 ${config.sops.secrets."wg0/conf".path}
# ${pkgs.iproute2}/bin/ip -n wg0ns link set lo up
# ${pkgs.iproute2}/bin/ip -n wg0ns link set wg0 up
# ${pkgs.iproute2}/bin/ip -n wg0ns route add default dev wg0
# '';
# ExecStop = pkgs.writers.writeBash "wg-down" ''
# ${pkgs.iproute2}/bin/ip -n wg0ns route del default dev wg0
# ${pkgs.iproute2}/bin/ip -n wg0ns link del wg0
# '';
# };
# };
} }

4
packages.nix
View file

@ -19,7 +19,7 @@
clang-tools clang-tools
clevis clevis
cliphist cliphist
chromium ungoogled-chromium
distrobox distrobox
dos2unix dos2unix
dnsutils dnsutils
@ -38,7 +38,6 @@
git git
gh gh
ghostty ghostty
go
google-chrome google-chrome
gopass gopass
gopass-jsonapi gopass-jsonapi
@ -118,6 +117,7 @@
vscode-langservers-extracted vscode-langservers-extracted
watchexec watchexec
wayland wayland
waypipe
wgsl-analyzer wgsl-analyzer
# wineWowPackages.waylandFull # wineWowPackages.waylandFull
wineWow64Packages.waylandFull wineWow64Packages.waylandFull

7
storage.nix
View file

@ -32,6 +32,13 @@
"noatime" "noatime"
]; ];
}; };
"@downloads" = {
mountpoint = "/home/user/downloads";
mountOptions = [
"compress=zstd"
"noatime"
];
};
}; };
}; };
}; };

3
users.nix
View file

@ -7,7 +7,7 @@
imports = [ imports = [
./home/user.nix ./home/user.nix
./home/root.nix ./home/root.nix
./home/agents.nix # ./home/agents.nix
]; ];
sops.secrets."user/password" = { sops.secrets."user/password" = {
neededForUsers = true; neededForUsers = true;
@ -77,6 +77,7 @@
"sandbox" "sandbox"
"audio" "audio"
"video" "video"
"render"
"bluetooth" "bluetooth"
# "work" # "work"
]; ];