b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

chore: update to 23.11!

Browse source
This commit is contained in:
Benjamin Bädorf 2023-12-17 17:14:19 +01:00
parent 0accd47e62
commit f87d183cc4
No known key found for this signature in database
GPG key ID: 1B7BF5B77A521346
13 changed files with 30 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -161,16 +161,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695108154, "lastModified": 1702676849,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07682fff75d41f18327a871088d20af2710d4744", "rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -307,16 +307,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1701615100, "lastModified": 1702346276,
"narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=", "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

8
flake.nix
View file

@ -5,14 +5,14 @@
inputs = { inputs = {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-master.url = "github:nixos/nixpkgs/master";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-compat.flake = false; flake-compat.flake = false;
home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
@ -79,8 +79,8 @@
deploy-rs deploy-rs
terraform # terraform
terraform-backend-git # terraform-backend-git
]; ];
shellHook = '' shellHook = ''

2
modules/desktop-extended/default.nix
View file

@ -40,7 +40,7 @@ in {
]; ];
fonts = { fonts = {
fonts = with pkgs; [ packages = with pkgs; [
dejavu_fonts dejavu_fonts
fira-code fira-code
fira-code-symbols fira-code-symbols

2
modules/gaming/default.nix
View file

@ -14,7 +14,7 @@ in {
users.users."${psCfg.user.name}".packages = with pkgs; [ users.users."${psCfg.user.name}".packages = with pkgs; [
playonlinux playonlinux
godot godot3
obs-studio obs-studio
obs-studio-plugins.wlrobs obs-studio-plugins.wlrobs
]; ];

4
modules/graphical/default.nix
View file

@ -73,11 +73,11 @@ in {
services.yubikey-agent.enable = true; services.yubikey-agent.enable = true;
fonts = { fonts = {
fonts = with pkgs; [ packages = with pkgs; [
dejavu_fonts dejavu_fonts
powerline-fonts powerline-fonts
]; ];
enableDefaultFonts = true; enableDefaultPackages = true;
fontconfig.enable = true; fontconfig.enable = true;
fontconfig.defaultFonts = { fontconfig.defaultFonts = {
monospace = ["DejaVu Sans Mono for Powerline"]; monospace = ["DejaVu Sans Mono for Powerline"];

2
modules/nix/default.nix
View file

@ -11,7 +11,7 @@
"steam-run" "steam-run"
"hplip" "hplip"
"cups-brother-hl3140cw" "cups-brother-hl3140cw"
"uhk-agent-2.1.2" "uhk-agent"
"uhk-udev-rules" "uhk-udev-rules"
]; ];

4
modules/terminal-life/bash/default.nix
View file

@ -99,8 +99,8 @@ in {
vi = "nvim"; vi = "nvim";
vim = "nvim"; vim = "nvim";
mutt = "neomutt"; mutt = "neomutt";
ls = "exa"; ls = "eza";
la = "exa --group-directories-first -lag"; la = "eza --group-directories-first -lag";
wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts"; wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi"; irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone"; drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";

2
modules/terminal-life/default.nix
View file

@ -26,7 +26,7 @@ in {
asciinema asciinema
bat bat
blesh blesh
exa eza
fd fd
jump jump
(nnn.overrideAttrs (o: { (nnn.overrideAttrs (o: {

1
overlays/default.nix
View file

@ -37,7 +37,6 @@
}) })
(import ../pkgs) (import ../pkgs)
(import ./blesh.nix) (import ./blesh.nix)
(import ./manix.nix)
(import ./rnix-lsp.nix) (import ./rnix-lsp.nix)
(import ./neovim-plugins.nix) (import ./neovim-plugins.nix)
(import ./signal-desktop.nix) (import ./signal-desktop.nix)

5
overlays/manix.nix
View file

@ -1,5 +0,0 @@
final: prev: {
manix = prev.manix.overrideAttrs (o: rec {
inherit (prev.sources.manix) pname version src;
});
}

12
overlays/neovim-plugins.nix
View file

@ -2,22 +2,22 @@ final: prev: {
vimPlugins = vimPlugins =
prev.vimPlugins prev.vimPlugins
// { // {
instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { instant-nvim-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.instant-nvim-nvfetcher) pname version src; inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
}; };
vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vimagit-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vimagit-nvfetcher) pname version src; inherit (prev.sources.vimagit-nvfetcher) pname version src;
}; };
vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src; inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src;
}; };
vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-workspace-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-workspace-nvfetcher) pname version src; inherit (prev.sources.vim-workspace-nvfetcher) pname version src;
}; };
vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-beautify-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-beautify-nvfetcher) pname version src; inherit (prev.sources.vim-beautify-nvfetcher) pname version src;
}; };
vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-apprentice-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-apprentice-nvfetcher) pname version src; inherit (prev.sources.vim-apprentice-nvfetcher) pname version src;
}; };
}; };

20
pkgs/_sources/generated.nix
View file

@ -3,17 +3,17 @@
{ {
blesh-nvfetcher = { blesh-nvfetcher = {
pname = "blesh-nvfetcher"; pname = "blesh-nvfetcher";
version = "4089c4e1cb411121472180189953664b978d8972"; version = "d1a1d538e15adb04cc30e421f3ac094589c0a2f5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akinomyoga"; owner = "akinomyoga";
repo = "ble.sh"; repo = "ble.sh";
rev = "4089c4e1cb411121472180189953664b978d8972"; rev = "d1a1d538e15adb04cc30e421f3ac094589c0a2f5";
fetchSubmodules = true; fetchSubmodules = true;
deepClone = false; deepClone = false;
leaveDotGit = true; leaveDotGit = true;
sha256 = "sha256-ZLkiBm3vsRe42crLffM9Z8F5yzKvNRV2/AqK9RkuU+8="; sha256 = "sha256-Pvnk/JnewbczdrUHpvDgJaIjVm/8FcDpUGfRGfnBDIE=";
}; };
date = "2023-07-18"; date = "2023-12-13";
}; };
instant-nvim-nvfetcher = { instant-nvim-nvfetcher = {
pname = "instant-nvim-nvfetcher"; pname = "instant-nvim-nvfetcher";
@ -27,18 +27,6 @@
}; };
date = "2022-06-25"; date = "2022-06-25";
}; };
manix = {
pname = "manix";
version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
src = fetchFromGitHub {
owner = "mlvzk";
repo = "manix";
rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
fetchSubmodules = false;
sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
};
date = "2021-04-20";
};
rnix-lsp-nvfetcher = { rnix-lsp-nvfetcher = {
pname = "rnix-lsp-nvfetcher"; pname = "rnix-lsp-nvfetcher";
version = "95d40673fe43642e2e1144341e86d0036abd95d9"; version = "95d40673fe43642e2e1144341e86d0036abd95d9";

4
pkgs/sources.toml
View file

@ -1,8 +1,4 @@
# nvfetcher.toml # nvfetcher.toml
[manix]
src.git = "https://github.com/mlvzk/manix"
fetch.github = "mlvzk/manix"
[rnix-lsp-nvfetcher] [rnix-lsp-nvfetcher]
src.git = "https://github.com/nix-community/rnix-lsp" src.git = "https://github.com/nix-community/rnix-lsp"
fetch.github = "nix-community/rnix-lsp" fetch.github = "nix-community/rnix-lsp"