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

feat: upgrade nixpkgs to 23.11

Browse Source
This commit is contained in:
Ryan Yin
2023-11-15 01:16:54 +08:00
parent d624ab4323
commit ada780afc8
14 changed files with 152 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
flake.lock generated
View File

@@ -45,16 +45,16 @@
"astronvim": {
"flake": false,
"locked": {
"lastModified": 1691678898,
"narHash": "sha256-uydWNOkk1HnYvLHBRyCqFZMeXJue2fueXhvk0MXhOkw=",
"lastModified": 1699528269,
"narHash": "sha256-cC1isyscpvNQ07n/Eb6rlfvuQ/K+7mCjdGJq4m/PUHk=",
"owner": "AstroNvim",
"repo": "AstroNvim",
"rev": "1910b86d3df873bea4f880f9299dbf66fe1e65fe",
"rev": "59d657c223038359b2b5e230805abca8d919280d",
"type": "github"
},
"original": {
"owner": "AstroNvim",
"ref": "v3.36.0",
"ref": "v3.37.12",
"repo": "AstroNvim",
"type": "github"
}
@@ -286,11 +286,11 @@
]
},
"locked": {
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github"
},
"original": {
@@ -301,7 +301,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
@@ -345,16 +345,16 @@
]
},
"locked": {
"lastModified": 1695108154,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"lastModified": 1699783872,
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "07682fff75d41f18327a871088d20af2710d4744",
"rev": "280721186ab75a76537713ec310306f0eba3e407",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.05",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
@@ -363,20 +363,21 @@
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_2",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1691078410,
"narHash": "sha256-t1Ksv5/xwRgi8oH9jyoIEuMHi9cYIZSg3yEJLYMb78Y=",
"lastModified": 1699726486,
"narHash": "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "9654749244117f7f150c6f2a2ce4dede6e8cbb25",
"rev": "9afdd61adeaf413afbe853dbc5fdf6853c8bde21",
"type": "github"
},
"original": {
"owner": "hyprwm",
"ref": "v0.28.0",
"ref": "v0.32.3",
"repo": "Hyprland",
"type": "github"
}
@@ -386,14 +387,18 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1684265364,
"narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
@@ -408,11 +413,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1697976504,
"narHash": "sha256-sU8q83TEaafIe5d7L6Dc2alRhWT898aB0+6EXcfao1I=",
"lastModified": 1699790908,
"narHash": "sha256-8CO4KQhiEyO7rce4KVOq8arpk9802fVwxtN/oLeRFag=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "2e96d2f9d80f80bd22cd7c603985f2b03cf186fc",
"rev": "6c60a229fa422698325b2788e93dfeeba3f11391",
"type": "github"
},
"original": {
@@ -462,11 +467,11 @@
]
},
"locked": {
"lastModified": 1698429334,
"narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=",
"lastModified": 1699867978,
"narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7",
"rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f",
"type": "github"
},
"original": {
@@ -478,15 +483,16 @@
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_2",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_6",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1697679370,
"narHash": "sha256-E4iEs004owoShYK0MBDD6uRXCgZdxl//hYijvSakg0k=",
"lastModified": 1699952346,
"narHash": "sha256-l+8awD7Gq5iIZSbzC7BNO3e5sFBgm1Ivea8WyawRMlQ=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "01a606e119963957eefaf1b22ef92b69b90f5b85",
"rev": "333af7cb0f3dc54e893d2032e4032821bc90e145",
"type": "github"
},
"original": {
@@ -495,6 +501,28 @@
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1698974481,
"narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1693701915,
@@ -587,27 +615,27 @@
},
"nixpkgs-darwin": {
"locked": {
"lastModified": 1698300480,
"narHash": "sha256-s7EmRTsmoRs0z4kV1Z27DFhzXRC+iOFCI3gFkyvgn+8=",
"lastModified": 1699725108,
"narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dd5e0f5697d1fe7c86de787f457c86b9d2c4b866",
"rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-23.05-darwin",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1697935651,
"narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
"lastModified": 1699750082,
"narHash": "sha256-4Vx6Vr975vPGzGACyu4u6JfWo2Auwy0AeC6sTSOXdTQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
"rev": "55682344eae38a1975ccd2cfac0dcb4197faedf8",
"type": "github"
},
"original": {
@@ -618,11 +646,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"lastModified": 1699781429,
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
"type": "github"
},
"original": {
@@ -640,11 +668,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1698459598,
"narHash": "sha256-2etAvtTLoPsvEJ4P6rKnHE8Ipp6MVNMGlik1JqHdqL0=",
"lastModified": 1699967945,
"narHash": "sha256-oghYgECEGWBVqNQ+fczJ3J5wYy/rILYAPO+mszLd17M=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "bcadcb13f0248fa7e6355a35c3c263fc76edc632",
"rev": "0cfb157a692a733481daa5dd3b4566e6440567bb",
"type": "github"
},
"original": {
@@ -655,11 +683,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1690179384,
"narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
"lastModified": 1698134075,
"narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
"rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github"
},
"original": {
@@ -703,27 +731,27 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1698288402,
"narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=",
"lastModified": 1699781429,
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "60b9db998f71ea49e1a9c41824d09aa274be1344",
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1697677194,
"narHash": "sha256-lN2eJCsOzjhxrvTQsNcW7r0E9hMJ7ABrKDQWpmYFRkM=",
"lastModified": 1699839047,
"narHash": "sha256-FAoWKSDZ9vpd8sLeJYeVGUnSlOCqkSochTEvOA7+qeM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "18e505d654892d057f308c817d220faf962dbf23",
"rev": "8423b2dff7b10463eb97f9242bd62a1ff8d2ee3e",
"type": "github"
},
"original": {
@@ -735,11 +763,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"lastModified": 1699781429,
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
"type": "github"
},
"original": {
@@ -786,17 +814,17 @@
"nushell-scripts": {
"flake": false,
"locked": {
"lastModified": 1692380718,
"narHash": "sha256-bisOoEATqMGxC+B8m4xjB+E7JhCXVg5+FKvxYUMB/3M=",
"lastModified": 1699979604,
"narHash": "sha256-XRObmaD2dRwc2jlOHIpFIqSURfx23kyc90sELqo9N4I=",
"owner": "nushell",
"repo": "nu_scripts",
"rev": "459b8c9d4fcb6b6200165593707e454411c23750",
"rev": "1fd3a3fa6ac454080fa726142e6ef2470fd5e51a",
"type": "github"
},
"original": {
"owner": "nushell",
"ref": "main",
"repo": "nu_scripts",
"rev": "459b8c9d4fcb6b6200165593707e454411c23750",
"type": "github"
}
},
@@ -832,6 +860,21 @@
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -872,11 +915,11 @@
]
},
"locked": {
"lastModified": 1697388351,
"narHash": "sha256-63N2eBpKaziIy4R44vjpUu8Nz5fCJY7okKrkixvDQmY=",
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "aae39f64f5ecbe89792d05eacea5cb241891292a",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
@@ -905,18 +948,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1690165843,
"narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=",
"lastModified": 1699292815,
"narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
"type": "gitlab"
}
},
@@ -929,14 +972,18 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1685385764,
"narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"lastModified": 1697981233,
"narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
"type": "github"
},
"original": {

15
flake.nix
View File

@@ -277,11 +277,13 @@
# which represents the GitHub repository URL + branch/commit-id/tag.
# Official NixOS package source, using nixos's stable branch by default
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
# nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# for macos
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin";
# nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin";
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nix-darwin = {
url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs-darwin";
@@ -289,7 +291,8 @@
# home-manager, used for managing user configuration
home-manager = {
url = "github:nix-community/home-manager/release-23.05";
# url = "github:nix-community/home-manager/release-23.05";
url = "github:nix-community/home-manager/master";
# The `follows` keyword in inputs is used for inheritance.
# Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake,
# to avoid problems caused by different versions of nixpkgs dependencies.
@@ -297,7 +300,7 @@
};
# modern window compositor
hyprland.url = "github:hyprwm/Hyprland/v0.28.0";
hyprland.url = "github:hyprwm/Hyprland/v0.32.3";
# community wayland nixpkgs
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
# anyrun - a wayland launcher
@@ -319,13 +322,13 @@
# AstroNvim is an aesthetic and feature-rich neovim config.
astronvim = {
url = "github:AstroNvim/AstroNvim/v3.36.0";
url = "github:AstroNvim/AstroNvim/v3.37.12";
flake = false;
};
# useful nushell scripts, such as auto_completion
nushell-scripts = {
url = "github:nushell/nu_scripts/459b8c9d4fcb6b6200165593707e454411c23750";
url = "github:nushell/nu_scripts/main";
flake = false;
};

2
home/base/desktop/neovim/default.nix
View File

@@ -53,7 +53,7 @@
gcc # c/c++ compiler, required by nvim-treesitter!
llvmPackages.clang-unwrapped # c/c++ tools with clang-tools such as clangd
gdb
lldb
# lldb # TODO - fix python3.11's package conflict - six.py
#-- python
nodePackages.pyright # python language server

2
home/base/server/core.nix
View File

@@ -67,7 +67,7 @@
# A modern replacement for ‘ls’
# useful in bash/zsh prompt, not in nushell.
exa = {
eza = {
enable = true;
enableAliases = true;
git = true;

2
home/base/server/nushell/config.nu
View File

@@ -71,7 +71,7 @@ let catppuccin_theme = {
}
# The default config record. This is where much of your global configuration is setup.
let-env config = {
$env.config = {
color_config: $catppuccin_theme # <-- this is the theme
use_ansi_coloring: true

2
home/base/server/nushell/default.nix
View File

@@ -4,7 +4,7 @@
configFile.source = ./config.nu;
extraConfig = ''
let-env PATH = ([
$env.PATH = ([
"${config.home.homeDirectory}/bin"
"${config.home.homeDirectory}/.local/bin"
"${config.home.homeDirectory}/go/bin"

2
home/darwin/nushell.nix
View File

@@ -2,7 +2,7 @@
# nix-darwin do not set PATH for nushell! so we need to do it manually
# this is a workaround to add nix's PATH to nushell
programs.nushell.extraConfig = ''
let-env PATH = ([
$env.PATH = ([
"${config.home.homeDirectory}/bin"
"${config.home.homeDirectory}/.local/bin"
"${config.home.homeDirectory}/go/bin"

2
home/linux/desktop/creative.nix
View File

@@ -11,7 +11,7 @@
inkscape # vector graphics
krita # digital painting
musescore # music notation
reaper # audio production
# reaper # audio production
pkgs-unstable.sonic-pi # music programming
# this app consumes a lot of storage, so do not install it currently

11
home/linux/hyprland/hypr-conf/hyprland.conf
View File

@@ -50,16 +50,17 @@ general {
# Decoration settings like Rounded Corners, Opacity, Blur, etc.
decoration {
rounding=8 # Original: rounding=-1
multisample_edges=0
active_opacity=1.0
inactive_opacity=0.9
fullscreen_opacity=1.0
blur=0
blur_size=3 # minimum 1
blur_passes=1 # minimum 1, more passes = more resource intensive.
blur_ignore_opacity=0
blur {
enabled=true
size=3 # minimum 1
passes=1 # minimum 1, more passes = more resource intensive.
ignore_opacity=false
}
# Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts.
# if you want heavy blur, you need to up the blur_passes.

4
hosts/idols/ai/default.nix
View File

@@ -36,6 +36,7 @@
"cifs" # mount windows share
];
boot.kernelParams = [ "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ];
# Bootloader.
boot.loader = {
efi = {
@@ -43,6 +44,7 @@
efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
};
systemd-boot.enable = true;
};
networking = {
@@ -78,7 +80,7 @@
services.xserver.videoDrivers = ["nvidia"]; # will install nvidia-vaapi-driver by default
hardware.nvidia = {
# Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable;
# package = config.boot.kernelPackages.nvidiaPackages.stable;
# Modesetting is needed for most Wayland compositors
modesetting.enable = true;

2
modules/darwin/system.nix
View File

@@ -154,7 +154,7 @@
# use fonts specified by user rather than default ones
fontDir.enable = true;
fonts = with pkgs; [
packages = with pkgs; [
# icon fonts
material-design-icons
font-awesome

16
modules/nixos/core-desktop.nix
View File

@@ -60,10 +60,14 @@
# https://github.com/rvaiya/keyd
services.keyd = {
enable = true;
settings = {
main = {
# overloads the capslock key to function as both escape (when tapped) and control (when held)
capslock = "overload(control, esc)";
keyboards = {
default = {
settings = {
main = {
# overloads the capslock key to function as both escape (when tapped) and control (when held)
capslock = "overload(control, esc)";
};
};
};
};
};
@@ -152,10 +156,10 @@
# all fonts are linked to /nix/var/nix/profiles/system/sw/share/X11/fonts
fonts = {
# use fonts specified by user rather than default ones
enableDefaultFonts = false;
enableDefaultPackages = false;
fontDir.enable = true;
fonts = with pkgs; [
packages = with pkgs; [
# icon fonts
material-design-icons
font-awesome

2
modules/nixos/fhs-fonts.nix
View File

@@ -22,7 +22,7 @@
};
aggregatedFonts = pkgs.buildEnv {
name = "system-fonts";
paths = config.fonts.fonts;
paths = config.fonts.packages;
pathsToLink = ["/share/fonts"];
};
in {

3
modules/nixos/hyprland.nix
View File

@@ -49,10 +49,9 @@
xwayland = {
enable = true;
hidpi = true;
};
nvidiaPatches = true;
enableNvidiaPatches = true;
};
# monitor backlight control