From 84356a8885591080c12afdc712c4125ba9345a1b Mon Sep 17 00:00:00 2001 From: DashieTM Date: Mon, 22 Apr 2024 20:36:33 +0200 Subject: [PATCH] chore: Add various programs --- nix/base/login_manager.nix | 3 +++ nix/flake.lock | 6 +++--- nix/flake.nix | 5 ++++- nix/override/oxinoti.nix | 2 +- nix/programs/coding.nix | 1 + nix/programs/common.nix | 5 ++--- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/nix/base/login_manager.nix b/nix/base/login_manager.nix index 0ca56bc..826d19c 100644 --- a/nix/base/login_manager.nix +++ b/nix/base/login_manager.nix @@ -44,6 +44,9 @@ }; }; }; + environment.etc."greetd/environments".text = '' + Hyprland + ''; # unlock GPG keyring on login security.pam.services.greetd.enableGnomeKeyring = true; diff --git a/nix/flake.lock b/nix/flake.lock index 634fa52..1762ed5 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -332,11 +332,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713088362, - "narHash": "sha256-ttDSOqkEBinjA1dlMWkBjaXzTqjiAPt5lNkoONbz25Y=", + "lastModified": 1713625742, + "narHash": "sha256-8MD2uCuGs0v09S/sLR8xC0gYXk6RFSwWdyqYyTpCnes=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f32598c9fb112c47d43050a9475327a9c9bc19aa", + "rev": "141867ab45d3f1dba928d61dea643bd5a98778fb", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index 132e882..4d1b5f7 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -35,7 +35,10 @@ }; overlays = [ # because allowing rust nightly is too hard by default.... - (import (fetchTarball { url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"; sha256 = "sha256:06al2zlkyf14pz0i0q0ah18ygijra8l5qwd8rnm1bp9l6g8gp5zk"; })) + (import (fetchTarball { + url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"; + sha256 = "sha256:02p0zzglgi3980iyam46wv8ajr83wj6myjhrjjfv96vkafl6pycg"; + })) ]; }; base_imports = [ diff --git a/nix/override/oxinoti.nix b/nix/override/oxinoti.nix index 78d933c..30c76b2 100644 --- a/nix/override/oxinoti.nix +++ b/nix/override/oxinoti.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { owner = "DashieTM"; repo = "OxiNoti"; rev = "${version}"; - hash = "sha256-XZMfJ2kUTd8+XiDgZFbG1sOPt37e4M+1rgp4Bdlej7s="; + hash = "sha256-fsrtLb14mCuYb1ibJAzPCrPNXdlcU/J7ZGYoVfppFBM="; }; cargoHash = "sha256-jIdev6K5MQ8jASDo1KWU89rSLd9UhI2MhTT4l7pP+tA="; diff --git a/nix/programs/coding.nix b/nix/programs/coding.nix index d20269d..c03c75a 100644 --- a/nix/programs/coding.nix +++ b/nix/programs/coding.nix @@ -24,5 +24,6 @@ pkg-config sqlite plantuml + vscodium ]; } diff --git a/nix/programs/common.nix b/nix/programs/common.nix index 7a9f0f6..9016273 100644 --- a/nix/programs/common.nix +++ b/nix/programs/common.nix @@ -45,9 +45,8 @@ in satty pulseaudio playerctl - (callPackage - ../override/ncspot.nix - { }) + ncspot + poppler_utils (callPackage ../override/oxinoti.nix { })