alarsyo/nixos-config
alarsyo/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: alarsyo:beta-25.11
Branches Tags
alarsyo:main
alarsyo:beta-25.11
alarsyo:framework
alarsyo:matrix-synapse-auto-compress
alarsyo:tmux-thumbs
..
compare: alarsyo:main
Branches Tags
alarsyo:beta-25.11
alarsyo:main
alarsyo:framework
alarsyo:matrix-synapse-auto-compress
alarsyo:tmux-thumbs

No commits in common. "beta-25.11" and "main" have entirely different histories.
beta-25.11 ... main

10 changed files with 131 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/gui-programs.nix
View file

@ -47,7 +47,7 @@ in {
};
};
logind.settings.Login.HandleLidSwitch = "suspend";
logind.lidSwitch = "suspend";
printing = {
enable = true;
@ -71,7 +71,7 @@ in {
obs-studio
pavucontrol
spotify
telegram-desktop
tdesktop
thunderbird
virt-manager
xcolor

100
flake.lock generated
View file

@ -81,6 +81,24 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -109,27 +127,50 @@
]
},
"locked": {
"lastModified": 1764536451,
"narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
"lastModified": 1758463745,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.11",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"jujutsu": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1762395739,
"narHash": "sha256-YUrjP2tzABdy4eAV1hPmgYWU8ChcJ5B4IlmQUGm95ro=",
"owner": "jj-vcs",
"repo": "jj",
"rev": "aa2b76978c4a23cb01c61629a11b1254af3ad0d9",
"type": "github"
},
"original": {
"owner": "jj-vcs",
"ref": "v0.35.0",
"repo": "jj",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1764440730,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"lastModified": 1762847253,
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"type": "github"
},
"original": {
@ -189,16 +230,16 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1764522689,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"lastModified": 1763622513,
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
@ -209,11 +250,33 @@
"disko": "disko",
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
"jujutsu": "jujutsu",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixpkgs-unstable-small": "nixpkgs-unstable-small"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"jujutsu",
"nixpkgs"
]
},
"locked": {
"lastModified": 1755139244,
"narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@ -243,6 +306,21 @@
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

13
flake.nix
View file

@ -5,7 +5,7 @@
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-25.11";
ref = "nixos-25.05";
};
nixpkgs-unstable-small = {
@ -25,7 +25,7 @@
type = "github";
owner = "nix-community";
repo = "home-manager";
ref = "release-25.11";
ref = "release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -49,6 +49,14 @@
repo = "disko";
ref = "master";
};
jujutsu = {
type = "github";
owner = "jj-vcs";
repo = "jj";
ref = "v0.35.0";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
@ -91,6 +99,7 @@
})
agenix.overlays.default
inputs.jujutsu.overlays.default
]
++ builtins.attrValues self.overlays;
sharedModules =

35
home/git.nix
View file

@ -17,18 +17,19 @@ in {
config = mkIf cfg.enable {
programs.git = {
enable = true;
delta = {
enable = true;
options = {
syntax-theme = "Solarized (light)";
};
};
lfs.enable = true;
settings = {
user = {
name = "Antoine Martin";
email = "antoine@alarsyo.net";
};
alias = {
push-wip = "push -o ci.skip";
push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
};
userEmail = "antoine@alarsyo.net";
userName = "Antoine Martin";
extraConfig = {
commit = {verbose = true;};
core = {editor = "vim";};
init = {defaultBranch = "main";};
@ -37,6 +38,12 @@ in {
maintenance.prefetch.enabled = false;
};
aliases = {
push-wip = "push -o ci.skip";
push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
};
includes = [
{
condition = "gitdir:~/work/lrde/";
@ -57,13 +64,5 @@ in {
"/.envrc"
];
};
programs.delta = {
enable = true;
enableGitIntegration = true;
options = {
syntax-theme = "Solarized (light)";
};
};
};
}

1
home/ssh.nix
View file

@ -18,7 +18,6 @@ in {
config = mkIf cfg.enable {
programs.ssh = {
enable = true;
enableDefaultConfig = false;
matchBlocks = let
addGPGAgentForwarding = hostConf:

7
hosts/hades/default.nix
View file

@ -24,13 +24,6 @@ in {
devices = ["/dev/sda" "/dev/sdb"];
};
# TODO: I've setup the address to avoid a spurious failure of the `mdmonitor`
# systemd unit, but sending email is not actually setup on this server. Might
# need to setup Postfix or msmtp
boot.swraid.mdadmConf = ''
MAILADDR=antoine@alarsyo.net
'';
boot.tmp.useTmpfs = true;
networking.hostName = "hades"; # Define your hostname.

4
hosts/hades/secrets.nix
View file

@ -36,6 +36,10 @@
"paperless/admin-password" = {};
"paperless/secret-key" = {};
"pleroma/pleroma-config" = {
owner = "pleroma";
};
"restic-backup/hades-credentials" = {};
"restic-backup/hades-password" = {};

14
hosts/talos/home.nix
View file

@ -95,7 +95,7 @@ in {
};
};
fonts = {
names = ["Iosevka Fixed" "FontAwesome7FreeSolid"];
names = ["Iosevka Fixed" "FontAwesome6Free"];
size = 9.0;
};
bars = [];
@ -207,12 +207,12 @@ in {
# FIXME: belongs elsewhere
services = {
logind = {
settings.Login = {
HandleLidSwitch = "suspend";
HandleLidSwitchExternalPower = "ignore";
IdleAction = "suspend";
IdleActionSec = "10min";
};
lidSwitch = "suspend";
lidSwitchExternalPower = "ignore";
extraConfig = ''
IdleAction=suspend
IdleActionSec=10min
'';
};
upower.enable = true;
};

2
services/nextcloud.nix
View file

@ -62,7 +62,7 @@ in {
hostName = "cloud.${domain}";
https = true;
package = pkgs.nextcloud32;
package = pkgs.nextcloud31;
maxUploadSize = "1G";

2
services/transmission.nix
View file

@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
...
}: let
inherit
@ -48,7 +47,6 @@ in {
services.transmission =
{
enable = true;
package = pkgs.transmission_4;
group = "media";
settings = {