update nixpkgs

This commit is contained in:
Clayton Hickey 2025-11-04 13:58:52 -05:00
parent 697ba800a6
commit a6f6bdde02
5 changed files with 21 additions and 59 deletions

View file

@ -101,8 +101,6 @@
enable = true; enable = true;
qemu = { qemu = {
swtpm.enable = true; swtpm.enable = true;
ovmf.enable = true;
ovmf.packages = [ pkgs.OVMFFull.fd ];
}; };
}; };
virtualbox.host = { virtualbox.host = {
@ -202,6 +200,8 @@
discord discord
aseprite aseprite
pixelorama pixelorama
dig
ncdu
]; ];
sessionVariables = { sessionVariables = {
EDITOR = "${inputs.cnvim.packages.x86_64-linux.default}/bin/nvim"; EDITOR = "${inputs.cnvim.packages.x86_64-linux.default}/bin/nvim";
@ -212,7 +212,7 @@
packages = with pkgs; [ packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-color-emoji
liberation_ttf liberation_ttf
fira-code fira-code
fira-code-symbols fira-code-symbols
@ -222,7 +222,7 @@
font-awesome font-awesome
libre-baskerville libre-baskerville
corefonts corefonts
vistafonts vista-fonts
]; ];
}; };

61
flake.lock generated
View file

@ -2,7 +2,9 @@
"nodes": { "nodes": {
"cnvim": { "cnvim": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": [
"nixpkgs"
],
"nixvimFlake": "nixvimFlake" "nixvimFlake": "nixvimFlake"
}, },
"locked": { "locked": {
@ -84,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759761710, "lastModified": 1761845621,
"narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=", "narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c", "rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,27 +149,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759632233, "lastModified": 1761672384,
"narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1759381078,
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -177,7 +163,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742422364, "lastModified": 1742422364,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
@ -276,7 +262,7 @@
"penn-nix": { "penn-nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1742609439, "lastModified": 1742609439,
@ -297,10 +283,9 @@
"cnvim": "cnvim", "cnvim": "cnvim",
"home-manager": "home-manager", "home-manager": "home-manager",
"mapnix": "mapnix", "mapnix": "mapnix",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"osm-bikeability": "osm-bikeability", "osm-bikeability": "osm-bikeability",
"penn-nix": "penn-nix", "penn-nix": "penn-nix"
"winboat": "winboat"
} }
}, },
"systems": { "systems": {
@ -347,26 +332,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"winboat": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1760459934,
"narHash": "sha256-OQn5UqCOXsvaAwOG0p3ZiXmR+WfN3wf7H3zlc+uiByM=",
"owner": "TibixDev",
"repo": "winboat",
"rev": "eac9a7f48ce9bf9c60b9e7743aaf53d5a0f6351e",
"type": "github"
},
"original": {
"owner": "TibixDev",
"repo": "winboat",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -8,7 +8,7 @@
penn-nix.url = "github:clay53/penn-nix"; penn-nix.url = "github:clay53/penn-nix";
cnvim = { cnvim = {
url = "github:clay53/cnvim"; url = "github:clay53/cnvim";
#inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
mapnix = { mapnix = {
url = "github:clay53/mapnix"; url = "github:clay53/mapnix";
@ -17,10 +17,6 @@
url = "github:clay53/osm-bikeability"; url = "github:clay53/osm-bikeability";
flake = false; flake = false;
}; };
winboat = {
url = "github:TibixDev/winboat";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, ... }@inputs: { outputs = { self, nixpkgs, ... }@inputs: {
nixosConfigurations.clhickey-nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.clhickey-nixos = nixpkgs.lib.nixosSystem {

View file

@ -37,7 +37,7 @@ let cfg = config.cos.hyprland; in
waylandFrontend = true; waylandFrontend = true;
addons = with pkgs; [ addons = with pkgs; [
fcitx5-gtk fcitx5-gtk
fcitx5-configtool qt6Packages.fcitx5-configtool
fcitx5-mozc fcitx5-mozc
]; ];
}; };
@ -55,6 +55,7 @@ let cfg = config.cos.hyprland; in
kdePackages.ark kdePackages.ark
kdePackages.gwenview kdePackages.gwenview
yaru-theme yaru-theme
hyprpaper
]; ];
services.hypridle.enable = true; services.hypridle.enable = true;

View file

@ -11,7 +11,7 @@ in
cos.docker.enable = true; cos.docker.enable = true;
environment.systemPackages = [ environment.systemPackages = [
inputs.winboat.packages.x86_64-linux.winboat pkgs.winboat
pkgs.freerdp pkgs.freerdp
]; ];
}; };