25.05 -> unstable

This commit is contained in:
Simon Gardling 2025-11-12 23:34:01 -05:00
parent 1db6fe09da
commit 8f0492f03b
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
6 changed files with 32 additions and 46 deletions

View File

@ -35,7 +35,7 @@
enable = true;
settings = {
default_session = {
command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
command = "${lib.getExe pkgs.tuigreet} --time --cmd niri-session";
user = username;
};
};

View File

@ -27,24 +27,6 @@
# PST
# time.timeZone = lib.mkForce "America/Los_Angeles";
services.greetd = {
enable = true;
settings = {
default_session = {
command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
user = username;
};
};
};
system.activationScripts = {
# FIX: https://github.com/NixOS/nix/issues/2982
"profile-channel-dummy".text = ''
#!/bin/sh
mkdir -p /nix/var/nix/profiles/per-user/root/channels
'';
};
# weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
# if I move to another lock screen program, i will have to replace `swaylock`
security.pam.services.swaylock = { };

33
flake.lock generated
View File

@ -62,11 +62,11 @@
]
},
"locked": {
"lastModified": 1762938833,
"narHash": "sha256-DAyy8XG0qsbv6JZ+AXTcEA+b9W//pQnNQJBiOzdOO/0=",
"lastModified": 1762997295,
"narHash": "sha256-/4kxhVbD/wHVVg9B2srm1NzXEEmEI239JwMtyNYgZQQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "d144aad6de2aeccf61ba8e3283059f95b93acb24",
"rev": "4897d454109bd9965a8372363169a5b676753094",
"type": "github"
},
"original": {
@ -141,16 +141,15 @@
]
},
"locked": {
"lastModified": 1758463745,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"lastModified": 1762964643,
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
@ -300,16 +299,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1762756533,
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
"lastModified": 1762844143,
"narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
"rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -362,11 +361,11 @@
]
},
"locked": {
"lastModified": 1762915112,
"narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=",
"lastModified": 1763001554,
"narHash": "sha256-wsfhRTuxu6f06RMmP4JWcq3wWRlmYtQaJZ6b3f+EJ94=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02",
"rev": "315d97eb753cee8e1aa039a5e622b84d32a454bb",
"type": "github"
},
"original": {
@ -433,11 +432,11 @@
]
},
"locked": {
"lastModified": 1762903129,
"narHash": "sha256-4vxtwKSBiiJ950ccLo8kQvBGwyNjhglOgWI5b/sjGXY=",
"lastModified": 1763007974,
"narHash": "sha256-XMgjrDIHonLqIjc1eMQkLeemGcNqqYU0Dq+zNmeMYOI=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "d03a5917aef22219df1f97b6da6fe5b8039be8de",
"rev": "eff1c79c78950ebb4ce70c3d51513e294cf30b52",
"type": "github"
},
"original": {

View File

@ -2,7 +2,7 @@
description = "System nixOS flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
lanzaboote = {
url = "github:nix-community/lanzaboote";
@ -13,7 +13,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};

View File

@ -62,7 +62,7 @@
#fonts
noto-fonts
noto-fonts-emoji
noto-fonts-color-emoji
liberation_ttf
#for ebook reading

View File

@ -157,7 +157,7 @@ in
ffmpeg-full
# microcontroller tooling
probe-rs
probe-rs-tools
(python312.withPackages (
ps: with ps; [
@ -226,20 +226,19 @@ in
programs.git = {
enable = true;
package = pkgs.git;
userName = "Simon Gardling";
userEmail = "titaniumtown@proton.me";
# better way to view diffs
delta.enable = true;
lfs.enable = true;
extraConfig = {
settings = {
init = {
# master -> main
defaultBranch = "main";
};
push.autoSetupRemote = true;
user = {
name = "Simon Gardling";
email = "titaniumtown@proton.me";
};
};
# gpg signing keys
@ -248,4 +247,10 @@ in
signByDefault = true;
};
};
# better way to view diffs
programs.delta = {
enable = true;
enableGitIntegration = true;
};
}