Update to 25.05 and add git-cliff

Signed-off-by: Noah Knegt <git@noahknegt.com>
This commit is contained in:
2025-05-19 21:25:06 +02:00
parent 9fc0b33228
commit f10feaaddd
8 changed files with 37 additions and 20 deletions

16
flake.lock generated
View File

@@ -7,32 +7,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739757849, "lastModified": 1747556831,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1740463929, "lastModified": 1747610100,
"narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@@ -2,9 +2,9 @@
description = "A very basic flake"; description = "A very basic flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -3,7 +3,7 @@
{ {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
extensions = with pkgs.vscode-extensions; [ profiles.default.extensions = with pkgs.vscode-extensions; [
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc-icons
@@ -20,7 +20,7 @@
ms-vscode.cpptools ms-vscode.cpptools
]; ];
userSettings = { profiles.default.userSettings = {
# Theme # Theme
"workbench.iconTheme" = "catppuccin-mocha"; "workbench.iconTheme" = "catppuccin-mocha";
"workbench.colorTheme" = "Catppuccin Mocha"; "workbench.colorTheme" = "Catppuccin Mocha";

View File

@@ -0,0 +1,11 @@
{ pkgs, ... }:
{
programs.git-cliff = {
enable = true;
settings = {
trim = true;
};
}
}

View File

@@ -1,6 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [
./cliff.nix
];
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitFull; package = pkgs.gitFull;
@@ -13,10 +17,10 @@
signing = { signing = {
key = "~/.ssh/id_ed25519.pub"; key = "~/.ssh/id_ed25519.pub";
signByDefault = true; signByDefault = true;
format = "ssh";
}; };
extraConfig = { extraConfig = {
gpg = { format = "ssh"; };
push = { autoSetupRemote = true; }; push = { autoSetupRemote = true; };
pull = { rebase = true; }; pull = { rebase = true; };
fetch = { prune = true; }; fetch = { prune = true; };

View File

@@ -51,7 +51,8 @@
homeDirectory = "/home/noahk"; homeDirectory = "/home/noahk";
packages = with pkgs; [ packages = with pkgs; [
(nerdfonts.override { fonts = [ "SourceCodePro" ]; }) nerd-fonts.sauce-code-pro
nerd-fonts.zed-mono
# Desktop env # Desktop env
discord discord
@@ -82,5 +83,5 @@
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
home.stateVersion = "24.11"; home.stateVersion = "25.05";
} }

View File

@@ -4,4 +4,5 @@
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.configurationLimit = 5;
} }

View File

@@ -30,8 +30,8 @@
}; };
channel.enable = false; channel.enable = false;
}; };
networking = { networking = {
hostName = "NixOS_Desktop"; # Define your hostname. hostName = "NixOS_Desktop"; # Define your hostname.
networkmanager.enable = true; networkmanager.enable = true;
@@ -84,7 +84,7 @@
services.printing.enable = true; services.printing.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
hardware.pulseaudio.enable = false; services.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
@@ -125,7 +125,7 @@
xfce.xfce4-whiskermenu-plugin xfce.xfce4-whiskermenu-plugin
]; ];
virtualisation.podman.enable = true9; virtualisation.podman.enable = true;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
@@ -133,5 +133,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }