xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to release-24.11

Browse Source
This commit is contained in:
xenia 2024-11-19 13:09:53 +01:00
parent c1fc4d12aa
commit 5909cb0865
5 changed files with 65 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
flake.lock
View File

@ -155,16 +155,16 @@
]
},
"locked": {
"lastModified": 1716736833,
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"lastModified": 1731832479,
"narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
@ -213,17 +213,15 @@
"nixos-apple-silicon": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1718588737,
"narHash": "sha256-06acqoMEYtc+/w5gWiIIuUFfdtdOBKlp1qrC/InRiBY=",
"lastModified": 1731473366,
"narHash": "sha256-sE2WfD3YyNrCROfRZKqMDR77g3KV4FXUaJ7NWe+A7ro=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "b0a2376f6c164a0af963d47386c064cc6fdcd5ea",
"rev": "3eee753e4b074790342fadb1c4e7183d037ddac4",
"type": "github"
},
"original": {
@ -234,16 +232,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726062281,
"narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -268,11 +266,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1728249353,
"narHash": "sha256-7NBJm1jfMeAowE1J2oljYqWVvI9X7FyyxBY4O8uB/Os=",
"lastModified": 1731763621,
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c8a17040be4a20b29589cb4043a9e0c36af1930e",
"rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d",
"type": "github"
},
"original": {
@ -282,6 +280,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1731858824,
"narHash": "sha256-0KhJ6SOyWjx408tsgcoVQFx9nEn55DwrhFbCE49Oyac=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7937932921ea34c51c1b586e2505574f6f0be5a7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"agda": "agda",
@ -290,7 +304,7 @@
"kak": "kak",
"nix-darwin": "nix-darwin",
"nixos-apple-silicon": "nixos-apple-silicon",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"unambig-path": "unambig-path",
"unispect": "unispect"

8
flake.nix
View File

@ -3,10 +3,11 @@
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# TODO: We run whole system unstable until 24.11 drops, then the gpu drivers should work
nixpkgs.url = "github:nixos/nixpkgs/release-24.11";
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@ -37,7 +38,8 @@
};
nixos-apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs";
# TODO: when nixos-24.11 drops, change this
# inputs.nixpkgs.follows = "nixpkgs";
};
};

4
home/alacritty/alacritty.nix
View File

@ -62,8 +62,8 @@ esac";
foreground = "#ebdbb2";
};
shell.program = "${pkgs.zsh}/bin/zsh";
shell.args = [ "--login" "-c" "${tmux-menu}" ];
terminal.shell.program = "${pkgs.zsh}/bin/zsh";
terminal.shell.args = [ "--login" "-c" "${tmux-menu}" ];
keyboard.bindings = import ./keybinds.nix { bind-broken-mac-keybinds = stdenv.isDarwin; };
};

2
nixos/graphical.nix
View File

@ -36,7 +36,7 @@ in
console.useXkbConfig = true;
sound.enable = false; # let pipewire handle sound
# sound.enable = false; # let pipewire handle sound
services.pipewire = {
enable = true;
alsa.enable = true;

31
nixos/tiny-dfr.nix
View File

@ -1,16 +1,35 @@
{
pkgs,
}:
let tiny-dfr = pkgs.tiny-dfr.overrideAttrs (old: {
src = pkgs.fetchFromGitHub {
let tiny-dfr = with pkgs; rustPlatform.buildRustPackage rec {
pname = "tiny-dfr";
version = "0.3.2";
src = fetchFromGitHub {
owner = "xeniagda";
repo = "tiny-dfr";
rev = "master";
hash = "sha256-I2R28wQz4Vd8VonbDcM6TZOn5lnWSXqwX4w/sieaQL8=";
rev = "v${version}";
hash = "sha256-6BzUMh6Mrae6QNwEWNmZVeKGJ8e2uFmx/O10bxt5k8I=";
};
});
cargoHash = "sha256-IfjXuXDMZ1hOwPWSXgNk5rin/uwFc2iFE+XusjQ3kKE=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ];
postConfigure = ''
substituteInPlace etc/systemd/system/tiny-dfr.service \
--replace-fail /usr/bin $out/bin
substituteInPlace src/*.rs --replace-quiet /usr/share $out/share
'';
postInstall = ''
cp -R etc $out/lib
cp -R share $out
'';
};
in
assert tiny-dfr.version == "0.3.1";
{
services.udev.packages = [ tiny-dfr ];
systemd.services.tiny-dfr = {