starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-01-11 20:40:24 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #191 from ryan4yin/i3-kickstarter-nixos-25.05

Browse Source 
feat: upgrade to nixos-25.05
This commit is contained in:
Ryan Yin
2025-05-29 12:25:29 +08:00
committed by GitHub
parent 7a5587d14d 1f0a26524b
commit d4847c44ce
7 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -13,6 +13,6 @@ Nix allows for easy to manage, collaborative, reproducible deployments. This mea
After installed NixOS with `nix-command` & `flake` enabled, you can deploy this flake with the following command:
```bash
sudo nixos-rebuild switch .#nixos-test
sudo nixos-rebuild switch --flake .#nixos-test
```

26
flake.lock generated
View File

@@ -3,11 +3,11 @@
"catppuccin-bat": {
"flake": false,
"locked": {
"lastModified": 1722864529,
"narHash": "sha256-s0CHTihXlBMCKmbBBb8dUhfgOOQu9PBCQ+uviy7o47w=",
"lastModified": 1734996624,
"narHash": "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=",
"owner": "catppuccin",
"repo": "bat",
"rev": "d3feec47b16a8e99eabb34cdfbaa115541d374fc",
"rev": "699f60fc8ec434574ca7451b444b880430319941",
"type": "github"
},
"original": {
@@ -18,37 +18,35 @@
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": ["nixpkgs"]
},
"locked": {
"lastModified": 1720042825,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"lastModified": 1748487945,
"narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1723556749,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
"lastModified": 1748302896,
"narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4a92571f9207810b559c9eac203d1f4d79830073",
"rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}

4
flake.nix
View File

@@ -21,8 +21,8 @@
};
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
home-manager.url = "github:nix-community/home-manager/release-24.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
catppuccin-bat = {

2
home/core.nix
View File

@@ -13,7 +13,7 @@
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = "24.05";
stateVersion = "25.05";
};
# Let Home Manager install and manage itself.

25
hosts/msi-rtx4090/default.nix
View File

@@ -1,18 +1,18 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{
imports =
[
../../modules/system.nix
../../modules/i3.nix
config,
pkgs,
...
}: {
imports = [
../../modules/system.nix
../../modules/i3.nix
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Bootloader.
boot.loader = {
@@ -48,8 +48,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.05"; # Did you read the comment?
system.stateVersion = "25.05"; # Did you read the comment?
}

27
hosts/nixos-test/default.nix
View File

@@ -1,18 +1,18 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{
imports =
[
../../modules/system.nix
../../modules/i3.nix
config,
pkgs,
...
}: {
imports = [
../../modules/system.nix
../../modules/i3.nix
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Bootloader.
boot.loader = {
@@ -22,7 +22,7 @@
# };
grub = {
enable = true;
device = "/dev/sda"; # "nodev"
device = "/dev/sda"; # "nodev"
efiSupport = false;
useOSProber = true;
#efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work for your system
@@ -46,8 +46,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.05"; # Did you read the comment?
system.stateVersion = "25.05"; # Did you read the comment?
}

13
modules/system.nix
View File

@@ -76,11 +76,15 @@
# normal fonts
noto-fonts
noto-fonts-cjk
noto-fonts-cjk-sans
noto-fonts-emoji
# nerdfonts
(nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable-small/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
nerd-fonts.symbols-only # symbols icon only
nerd-fonts.fira-code
nerd-fonts.jetbrains-mono
nerd-fonts.iosevka
];
# use fonts specified by user rather than default ones
@@ -133,8 +137,7 @@
];
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
services.pulseaudio.enable = false;
services.power-profiles-daemon = {
enable = true;
};
@@ -158,6 +161,6 @@
#media-session.enable = true;
};
udev.packages = with pkgs; [gnome.gnome-settings-daemon];
udev.packages = with pkgs; [gnome-settings-daemon];
};
}