From f10feaadddf3ec91030add49fb2fc1282982fe82 Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Mon, 19 May 2025 21:25:06 +0200 Subject: [PATCH] Update to 25.05 and add git-cliff Signed-off-by: Noah Knegt --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- home-manager/IDEs/vscode.nix | 4 ++-- home-manager/git/cliff.nix | 11 +++++++++++ home-manager/git/default.nix | 6 +++++- home-manager/home.nix | 7 ++++--- nixos/boot.nix | 1 + nixos/configuration.nix | 8 ++++---- 8 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 home-manager/git/cliff.nix diff --git a/flake.lock b/flake.lock index f77e3f4..8bcc6d3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1740463929, - "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index be02b2f..b01d44c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "A very basic flake"; 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"; }; diff --git a/home-manager/IDEs/vscode.nix b/home-manager/IDEs/vscode.nix index 24fda93..4faf53f 100644 --- a/home-manager/IDEs/vscode.nix +++ b/home-manager/IDEs/vscode.nix @@ -3,7 +3,7 @@ { programs.vscode = { enable = true; - extensions = with pkgs.vscode-extensions; [ + profiles.default.extensions = with pkgs.vscode-extensions; [ catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons @@ -20,7 +20,7 @@ ms-vscode.cpptools ]; - userSettings = { + profiles.default.userSettings = { # Theme "workbench.iconTheme" = "catppuccin-mocha"; "workbench.colorTheme" = "Catppuccin Mocha"; diff --git a/home-manager/git/cliff.nix b/home-manager/git/cliff.nix new file mode 100644 index 0000000..84ab44c --- /dev/null +++ b/home-manager/git/cliff.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: + +{ + programs.git-cliff = { + enable = true; + + settings = { + trim = true; + }; + } +} diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix index d781f56..4b234f1 100644 --- a/home-manager/git/default.nix +++ b/home-manager/git/default.nix @@ -1,6 +1,10 @@ { pkgs, ... }: { + imports = [ + ./cliff.nix + ]; + programs.git = { enable = true; package = pkgs.gitFull; @@ -13,10 +17,10 @@ signing = { key = "~/.ssh/id_ed25519.pub"; signByDefault = true; + format = "ssh"; }; extraConfig = { - gpg = { format = "ssh"; }; push = { autoSetupRemote = true; }; pull = { rebase = true; }; fetch = { prune = true; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 178506d..458ed93 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -51,7 +51,8 @@ homeDirectory = "/home/noahk"; packages = with pkgs; [ - (nerdfonts.override { fonts = [ "SourceCodePro" ]; }) + nerd-fonts.sauce-code-pro + nerd-fonts.zed-mono # Desktop env discord @@ -82,5 +83,5 @@ systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.11"; -} + home.stateVersion = "25.05"; +} \ No newline at end of file diff --git a/nixos/boot.nix b/nixos/boot.nix index 438eb08..2f10da5 100644 --- a/nixos/boot.nix +++ b/nixos/boot.nix @@ -4,4 +4,5 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.configurationLimit = 5; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3cb7167..150532b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -30,8 +30,8 @@ }; channel.enable = false; - }; + networking = { hostName = "NixOS_Desktop"; # Define your hostname. networkmanager.enable = true; @@ -84,7 +84,7 @@ services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -125,7 +125,7 @@ xfce.xfce4-whiskermenu-plugin ]; - virtualisation.podman.enable = true9; + virtualisation.podman.enable = true; # This value determines the NixOS release from which the default # 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. # Before changing this value read the documentation for this option # (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? }