jordan/nix-config
1
1
Fork 0
Code Issues 10 Pull Requests Actions Projects 3 Wiki Activity

treewide: update to NixOS 25.05
All checks were successful
Check flake / build-amd64-linux (push) Successful in 1m33s
Details

Browse Source
This commit is contained in:
Jordan Holt
2025-05-24 11:55:47 +01:00
parent dc1b485276
commit 0aecdd6b87
9 changed files with 69 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -2,7 +2,7 @@
description = "NixOS system configuration";
inputs = {
nixpkgs.url = "nixpkgs/nixos-24.11";
nixpkgs.url = "nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
# nixpkgs-master.url = "nixpkgs";
agenix.url = "github:ryantm/agenix";
@ -12,7 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
gitea-github-theme = {
@ -30,7 +30,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim/nixos-24.11";
url = "github:nix-community/nixvim/nixos-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
pre-commit-hooks = {
@ -41,7 +41,7 @@
url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
flake = false;
};
stylix.url = "github:danth/stylix/release-24.11";
stylix.url = "github:danth/stylix/release-25.05";
thunderbird-gnome-theme = {
url = "github:rafaelmardojai/thunderbird-gnome-theme";
flake = false;

2
hosts/common.nix
View File

@ -8,7 +8,7 @@
{
imports = [
inputs.agenix.nixosModules.age
inputs.home-manager.nixosModule
inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix
../modules/nixos
];

17
hosts/desktop.nix
View File

@ -11,15 +11,12 @@
nixpkgs = {
config.allowUnfree = true;
overlays = [
(import ../overlays/gnome.nix)
];
};
services.printing.enable = true;
services.openssh.startWhenNeeded = true;
hardware.pulseaudio.enable = false;
services.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
@ -56,14 +53,10 @@
fonts.packages = with pkgs; [
corefonts
noto-fonts
(nerdfonts.override {
fonts = [
"BigBlueTerminal"
"ComicShannsMono"
"Terminus"
"UbuntuMono"
];
})
nerd-fonts.bigblue-terminal
nerd-fonts.comic-shanns-mono
nerd-fonts.terminess-ttf
nerd-fonts.ubuntu-mono
];
modules = {

2
modules/nixos/hardware/presonus-studio/default.nix
View File

@ -100,7 +100,7 @@ in
};
};
pipewire-pulse."40-upmix" = upmixConfig;
client-rt."40-upmix" = upmixConfig;
client."40-upmix" = upmixConfig;
};
};
}

21
overlays/gnome.nix
View File

@ -1,21 +0,0 @@
final: prev: {
gvdb = prev.fetchgit {
url = "https://gitlab.gnome.org/GNOME/gvdb.git";
rev = "b54bc5da25127ef416858a3ad92e57159ff565b3"; # From gvdb_wrap
sha256 = "c56yOepnKPEYFcU1B1TrDl8ydU0JU+z6R8siAQP4d2A=";
};
mutter = prev.mutter.overrideAttrs (attrs: {
src = prev.fetchurl {
url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-47/mutter-triple-buffering-v4-47.tar.gz";
sha256 = "LoGAOCFopDT5+fV/6FffBzwlqK5XtozEGaOHTEXmkmg=";
};
postPatch = ''
mkdir -p subprojects/gvdb
cp -r ${final.gvdb}/* subprojects/gvdb/
${attrs.postPatch or ""}
'';
});
}

4
users/jordan/common/optional/graphical/firefox.nix
View File

@ -13,8 +13,8 @@
enable = true;
profiles.Default = {
search = {
default = "DuckDuckGo";
privateDefault = "DuckDuckGo";
default = "ddg";
privateDefault = "ddg";
force = true;
};
settings = {

2
users/jordan/common/optional/graphical/gnome.nix
View File

@ -239,5 +239,5 @@ in
[ ]
);
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
}

2
users/jordan/common/optional/graphical/hyprland/default.nix
View File

@ -298,5 +298,5 @@ in
unclutter.enable = true;
};
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
}

96
users/jordan/common/shell.nix
View File

@ -1,8 +1,14 @@
{
lib,
pkgs,
...
}:
let
inherit (lib)
mkMerge
mkOrder
;
in
{
programs = {
zsh = {
@ -27,56 +33,62 @@
size = 1000000;
};
initExtra = ''
## Colors
autoload -U colors && colors
initContent =
let
zshConfigBeforeCompInit = mkOrder 550 ''
setopt HASH_LIST_ALL
'';
zshConfig = mkOrder 1000 ''
## Colors
autoload -U colors && colors
## Directories
setopt AUTO_PUSHD
setopt CDABLE_VARS
setopt PUSHD_IGNORE_DUPS
setopt PUSHD_SILENT
setopt PUSHD_TO_HOME
## Directories
setopt AUTO_PUSHD
setopt CDABLE_VARS
setopt PUSHD_IGNORE_DUPS
setopt PUSHD_SILENT
setopt PUSHD_TO_HOME
## Expansion and globbing
setopt EXTENDED_GLOB
unsetopt GLOB_DOTS
unsetopt NOMATCH
## Expansion and globbing
setopt EXTENDED_GLOB
unsetopt GLOB_DOTS
unsetopt NOMATCH
## History
setopt BANG_HIST
setopt HIST_VERIFY
setopt INC_APPEND_HISTORY_TIME
## History
setopt BANG_HIST
setopt HIST_VERIFY
setopt INC_APPEND_HISTORY_TIME
## I/O
setopt INTERACTIVE_COMMENTS
setopt MULTIOS
unsetopt CLOBBER
## I/O
setopt INTERACTIVE_COMMENTS
setopt MULTIOS
unsetopt CLOBBER
## Jobs
setopt LONG_LIST_JOBS
setopt AUTO_RESUME
unsetopt BG_NICE
unsetopt NOTIFY
unsetopt HUP
unsetopt CHECK_JOBS
## Jobs
setopt LONG_LIST_JOBS
setopt AUTO_RESUME
unsetopt BG_NICE
unsetopt NOTIFY
unsetopt HUP
unsetopt CHECK_JOBS
## Shell emulation
setopt APPEND_CREATE
## Shell emulation
setopt APPEND_CREATE
## Prompt
PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
## Prompt
PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
## Vi mode
export KEYTIMEOUT=1
## Vi mode
export KEYTIMEOUT=1
## Zsh line editor
unsetopt BEEP
'';
initExtraBeforeCompInit = ''
setopt HASH_LIST_ALL
'';
## Zsh line editor
unsetopt BEEP
'';
in
mkMerge [
zshConfigBeforeCompInit
zshConfig
];
localVariables = {
# Prevent zsh-vi-mode overriding other keybinds