felixalbpc: Minor fixes, new packages, etc. Update flake inputs.

This commit is contained in:
Felix Albrigtsen 2024-09-23 14:23:22 +02:00
parent 2688f28aaf
commit 85ea8f5ac3
5 changed files with 48 additions and 13 deletions

View File

@ -145,6 +145,18 @@
"type": "indirect"
}
},
"nixpkgs-2211": {
"locked": {
"lastModified": 1658083977,
"narHash": "sha256-yqLXI+viN5+Vx5YpG9gNapKL3/+P6Pkprc36xNdyqSU=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1710628718,
@ -179,11 +191,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1723688146,
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"lastModified": 1726838390,
"narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
"type": "github"
},
"original": {
@ -201,6 +213,7 @@
"nix-darwin": "nix-darwin",
"nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs_3",
"nixpkgs-2211": "nixpkgs-2211",
"sops-nix": "sops-nix",
"unstable": "unstable"
}
@ -243,11 +256,11 @@
},
"unstable": {
"locked": {
"lastModified": 1723637854,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"lastModified": 1726755586,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github"
},
"original": {

View File

@ -4,6 +4,7 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-2211.url = "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"; # old nixpgks for e.g. remmina
nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
@ -27,6 +28,7 @@
, nix-minecraft
, nix-darwin
, nixpkgs
, nixpkgs-2211
, sops-nix
, unstable
, extra-config
@ -34,6 +36,7 @@
let
pkgs-overlay = final: prev: {
unstable = unstable.legacyPackages.${prev.system};
nixpkgs-2211 = nixpkgs-2211.legacyPackages.${prev.system};
python311 = prev.python311.override {
packageOverrides = self: super: {
@ -43,6 +46,11 @@
});
};
};
tlclient = final.unstable.tlclient.overrideAttrs (finalAttrs: previousAttrs: {
# nixpkgs.config.allowUnfreePredicate doesn't work for the unstable overlay, as it is a different "nixpkgs"
meta.license.free = true;
});
};
in
{

View File

@ -25,9 +25,11 @@
console.keyMap = "no";
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
nixpkgs.config = {
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"copilot.vim"
];
};
users.users.felixalb = {
uid = 1328256;

View File

@ -2,9 +2,8 @@
{
services.xserver = {
enable = true;
displayManager.gdm = {
displayManager.lightdm = {
enable = true;
wayland = true;
};
xkb = {
options = "ctrl:nocaps";
@ -28,10 +27,15 @@
libnotify
pamixer
pavucontrol
picom
sxhkd
xclip
xss-lock
];
programs.alacritty.settings = {
font.size = lib.mkForce 11;
};
};
hardware.opengl.enable = true;

View File

@ -11,14 +11,19 @@
dante
dig
element-desktop
hunspellDicts.en_US
hunspellDicts.nb_NO
jq
libreoffice
maim
mpv
nixpkgs-2211.remmina
oauth2ms
openssl
openstackclient
pwgen
remmina
traceroute
tlclient
w3m
(python311.withPackages (ps: with ps; [
@ -34,7 +39,10 @@
alacritty.enable = true;
firefox.enable = true;
git.extraConfig.user.email = "felix.albrigtsen@ntnu.no";
rofi.enable = true;
rofi = {
enable = true;
theme = "iggy";
};
zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
neovim.plugins = with pkgs.vimPlugins; [ copilot-vim ];