feat: bump nixos to 24.05

This commit is contained in:
Ryan Yin
2024-08-16 11:11:37 +08:00
parent adc91138c5
commit d384607345
7 changed files with 42 additions and 46 deletions
Generated
+11 -11
View File
@@ -3,11 +3,11 @@
"catppuccin-bat": { "catppuccin-bat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668065083, "lastModified": 1722864529,
"narHash": "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=", "narHash": "sha256-s0CHTihXlBMCKmbBBb8dUhfgOOQu9PBCQ+uviy7o47w=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "bat", "repo": "bat",
"rev": "ba4d16880d63e656acced2b7d4e034e4a93f74b1", "rev": "d3feec47b16a8e99eabb34cdfbaa115541d374fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -23,32 +23,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700814205, "lastModified": 1720042825,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a", "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701952659, "lastModified": 1723556749,
"narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
+2 -2
View File
@@ -21,8 +21,8 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
catppuccin-bat = { catppuccin-bat = {
+1 -1
View File
@@ -13,7 +13,7 @@
# You can update Home Manager without changing this value. See # You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version # the Home Manager release notes for a list of state version
# changes in each release. # changes in each release.
stateVersion = "23.11"; stateVersion = "24.05";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
+1 -1
View File
@@ -37,7 +37,7 @@
yarn yarn
# db related # db related
dbeaver dbeaver-bin
mycli mycli
pgcli pgcli
]; ];
+1 -1
View File
@@ -48,7 +48,7 @@
# 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 = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }
+1 -1
View File
@@ -46,7 +46,7 @@
# 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 = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }
+25 -29
View File
@@ -1,10 +1,7 @@
{pkgs, ...}: {pkgs, ...}: {
{
# i3 related options # i3 related options
environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw environment.pathsToLink = ["/libexec"]; # links /libexec from derivations to /run/current-system/sw
services.displayManager.defaultSession = "none+i3";
services.xserver = { services.xserver = {
enable = true; enable = true;
@@ -13,36 +10,35 @@
}; };
displayManager = { displayManager = {
defaultSession = "none+i3"; lightdm.enable = false;
lightdm.enable = false; gdm.enable = true;
gdm.enable = true;
}; };
windowManager.i3 = { windowManager.i3 = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
rofi # application launcher, the same as dmenu rofi # application launcher, the same as dmenu
dunst # notification daemon dunst # notification daemon
i3blocks # status bar i3blocks # status bar
i3lock # default i3 screen locker i3lock # default i3 screen locker
xautolock # lock screen after some time xautolock # lock screen after some time
i3status # provide information to i3bar i3status # provide information to i3bar
i3-gaps # i3 with gaps i3-gaps # i3 with gaps
picom # transparency and shadows picom # transparency and shadows
feh # set wallpaper feh # set wallpaper
acpi # battery information acpi # battery information
arandr # screen layout manager arandr # screen layout manager
dex # autostart applications dex # autostart applications
xbindkeys # bind keys to commands xbindkeys # bind keys to commands
xorg.xbacklight # control screen brightness xorg.xbacklight # control screen brightness
xorg.xdpyinfo # get screen information xorg.xdpyinfo # get screen information
sysstat # get system information sysstat # get system information
]; ];
}; };
# Configure keymap in X11 # Configure keymap in X11
layout = "us"; xkb.layout = "us";
xkbVariant = ""; xkb.variant = "";
}; };
# thunar file manager(part of xfce) related options # thunar file manager(part of xfce) related options
@@ -52,4 +48,4 @@
]; ];
services.gvfs.enable = true; # Mount, trash, and other functionalities services.gvfs.enable = true; # Mount, trash, and other functionalities
services.tumbler.enable = true; # Thumbnail support for images services.tumbler.enable = true; # Thumbnail support for images
} }