Skip to content

Commit b13acb2

Browse files
committed
Update to 26.05
1 parent 73e1059 commit b13acb2

8 files changed

Lines changed: 29 additions & 31 deletions

File tree

common/nixos.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
hardware.i2c.enable = true;
6868

6969
programs.steam.enable = true;
70-
programs.adb.enable = true;
7170

7271
systemd.user.services.tmux = {
7372
script = "${pkgs.tmux}/bin/tmux new-session -d";

components/apps.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ in {
4343
spotify
4444
telegram-desktop
4545
threema-desktop
46-
wireshark-qt
46+
wireshark
4747
wl-clipboard
4848
xsel
4949
pkgs-unstable.rpi-imager

components/cli.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
caddy
1111
pkgs-unstable.claude-code
1212
csvlens
13-
dogdns
13+
doggo
1414
dust
1515
entr
1616
fd
@@ -23,7 +23,7 @@
2323
mani
2424
miller
2525
nmap
26-
nodePackages.svgo
26+
svgo
2727
nvd
2828
ocrmypdf
2929
pdfcpu

components/git.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ in {
2222
source ${gitPackage}/share/bash-completion/completions/git-prompt.sh
2323
'';
2424

25-
programs.mergiraf.enable = true;
25+
programs.mergiraf = {
26+
enable = true;
27+
enableGitIntegration = true;
28+
};
2629

2730
programs.git = {
2831
enable = true;

components/web.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
home.packages = with pkgs; [
33
nodejs
44
yarn
5-
nodePackages.pnpm
5+
pnpm
66
jetbrains.webstorm
77
];
88
}

flake.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
inputs.systems.follows = "systems";
1111
};
1212
nixpkgs = {
13-
url = "github:nixos/nixpkgs/nixos-25.11";
13+
url = "github:nixos/nixpkgs/nixos-26.05";
1414
};
1515
nixpkgs-unstable = {
1616
url = "github:nixos/nixpkgs";
1717
};
1818
home-manager = {
19-
url = "github:nix-community/home-manager/release-25.11";
19+
url = "github:nix-community/home-manager/release-26.05";
2020
inputs.nixpkgs.follows = "nixpkgs";
2121
};
2222
color-scheme-sync = {
2323
url = "git+https://codeberg.org/tautropfli/color-scheme-sync.git";
2424
inputs.nixpkgs.follows = "nixpkgs";
2525
};
2626
darwin = {
27-
url = "github:lnl7/nix-darwin/nix-darwin-25.11";
27+
url = "github:lnl7/nix-darwin/nix-darwin-26.05";
2828
inputs.nixpkgs.follows = "nixpkgs";
2929
};
3030
mac-app-util = {

zephyr/nixos-configuration.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@
2828
};
2929
};
3030

31-
environment.systemPackages = [pkgs.ecryptfs];
32-
security.pam.enableEcryptfs = true;
33-
3431
boot = {
35-
kernelModules = ["ecryptfs"];
3632
loader = {
3733
grub = {
3834
enable = true;

0 commit comments

Comments
 (0)