fix broken/deprecated things

This commit is contained in:
Schrottkatze 2024-09-02 19:07:58 +02:00
parent 6aab08ec9b
commit 47ba1e5796
No known key found for this signature in database
5 changed files with 24 additions and 39 deletions

View file

@ -1,17 +1,12 @@
{
"nodes": {
"crane": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1724537630,
"narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=",
"lastModified": 1725125250,
"narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=",
"owner": "ipetkov",
"repo": "crane",
"rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0",
"rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f",
"type": "github"
},
"original": {
@ -28,11 +23,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1724567349,
"narHash": "sha256-w2G1EJlGvgRSC1OAm2147mCzlt6ZOWIiqX/TSJUgrGE=",
"lastModified": 1725258763,
"narHash": "sha256-7s5RfYlTljWnKGkK4hOMJCJ0sNQoLYjMxezX3Vijy/0=",
"owner": "nix-community",
"repo": "fenix",
"rev": "71fe264f6e208831aa0e7e54ad557a283c375014",
"rev": "0774f58cf1025bbb713971deecc7f07c856be6ed",
"type": "github"
},
"original": {
@ -104,11 +99,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1724401716,
"narHash": "sha256-LXTYUVhv6Kz9Iy9DxXSI0J+2/hunUj2fj0Kvw2eDarQ=",
"lastModified": 1724856988,
"narHash": "sha256-JBLe2CxAhG+J8+x8qmbzkGHNYmGcSiuY2QO4Zhb72lI=",
"owner": "helix-editor",
"repo": "helix",
"rev": "620dfceb849d6b68d41d4f7678bb4675009fef4d",
"rev": "1b5295a3f3d7cccd96eed5bfd394807a4dae87fc",
"type": "github"
},
"original": {
@ -124,11 +119,11 @@
]
},
"locked": {
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"lastModified": 1725180166,
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"type": "github"
},
"original": {
@ -205,11 +200,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
@ -235,11 +230,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1724558323,
"narHash": "sha256-uPXidysk1BXSayGzpxDW8JUgGvLWS+L1CTlBV3xcQB4=",
"lastModified": 1725274606,
"narHash": "sha256-xXINAjCR8eTmp3AxZTk/PIH9nNoFNN0OM7MUw6eB7oQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ba0c72cea47a45556ccd5bc566433bd1242a0f93",
"rev": "66a352a3f27a2eb2f27e42a13c6fe245d3be2b98",
"type": "github"
},
"original": {
@ -265,11 +260,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1724480527,
"narHash": "sha256-C+roFDGk6Bn/C58NGpyt7cneLCetdRMUfFTkm3O4zWM=",
"lastModified": 1725191098,
"narHash": "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "74a6427861eb8d1e3b7c6090b2c2890ff4c53e0e",
"rev": "779d9eee2ea403da447278a7007c9627c8878856",
"type": "github"
},
"original": {

View file

@ -27,9 +27,6 @@
};
crane = {
url = "github:ipetkov/crane";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};
fenix = {
url = "github:nix-community/fenix";
@ -55,7 +52,7 @@
pkgs = nixpkgs.legacyPackages.${system};
pkgs-stable = nixpkgs-stable.legacyPackages.${system};
pkgs-unstable-small = nixpkgs-unstable-small.legacyPackages.${system};
crane-lib = crane.lib.${system};
crane-lib = crane.mkLib nixpkgs.legacyPackages.${system};
rs-toolchain = with fenix.packages.${system};
combine [
complete.toolchain

View file

@ -42,7 +42,7 @@
systemd.services."ModemManager".wantedBy = ["multi-user.target"];
environment.variables = {
VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
VDPAU_DRIVER = lib.mkIf config.hardware.graphics.enable (lib.mkDefault "va_gl");
S10E_JRNL_FILE_LOC = "/home/jade/Docs/jrnl.md";
};

View file

@ -13,6 +13,7 @@
# sway = {
# default = ["wlr"];
# };
config.common.default = "*";
};
services.swayidle = {

View file

@ -30,14 +30,6 @@ in
./x.nix
];
i18n.inputMethod = {
enabled = "fcitx5";
fcitx5.addons = with pkgs; [
fcitx5-mozc
fcitx5-gtk
];
};
programs.seahorse.enable = true;
security.pam.services.jade.enableGnomeKeyring = true;