From 2748983e065364d04a90c968276eb308b318f1d7 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Sun, 23 Oct 2022 15:28:26 +0200 Subject: [PATCH] stuffs --- common.nix | 6 ++++++ flake.lock | 24 ++++++++++++------------ modules/desktop.nix | 11 ++++++----- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/common.nix b/common.nix index 6bde911..1303f83 100644 --- a/common.nix +++ b/common.nix @@ -11,6 +11,10 @@ with builtins; imports = [ ./modules ]; nixpkgs.config.allowUnfree = true; + nixpkgs.overlays = [ + (import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay + ]; + nix = { package = pkgs.nixVersions.stable; extraOptions = '' @@ -116,6 +120,7 @@ with builtins; environment.sessionVariables = rec { QT_QPA_PLATFORMTHEME = "qt5ct"; + TERMINAL = "kitty"; }; users.users.jade = { @@ -147,6 +152,7 @@ with builtins; mullvad mullvad-vpn sl lolcat ifuse cava + prismlauncher ]; environment.pathsToLink = [ diff --git a/flake.lock b/flake.lock index 914c80c..f247445 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1665271265, - "narHash": "sha256-4Nn0T5YoR3bBLFnPy6Tkc8zzmzMTBjSGZq05c5hKhEI=", + "lastModified": 1666253070, + "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1f1160284198a68ea8c7fffbbb1436f99e46ef9", + "rev": "c485669ca529e01c1505429fa9017c9a93f15559", "type": "github" }, "original": { @@ -24,9 +24,9 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1664744853, - "narHash": "sha256-i5EFVTIDHQCtFg/OFLmjOzbJqhpwy4MjwBmFUnq0DjI=", - "path": "/home/jade/mac-brcm-fw", + "lastModified": 1, + "narHash": "sha256-ewzM8IBKNFCx73ah5rflcdx605ukRF3oTWwih2CTsvs=", + "path": "./mac-brcm-fw", "type": "path" }, "original": { @@ -36,11 +36,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1664809701, - "narHash": "sha256-frvDid3QEiqetcdykMbOhGNggWu8TPWukd9XuD9VtnI=", + "lastModified": 1666285205, + "narHash": "sha256-iPTpH8TxpckbqccQfxo6M+FlgFe5bAw/FMJ3YG5bt3s=", "owner": "kekrby", "repo": "nixos-hardware", - "rev": "70d0c6ad6bd227ca5faecc973910ac2900264ed1", + "rev": "03c4b1f5bd8ab5aa817a59b5982c4dc7ca09a89b", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665293210, - "narHash": "sha256-qQTfWlvaEfyuIpnD9dU5f2B/YoZbmSq+T5B7ryOgciM=", + "lastModified": 1666333455, + "narHash": "sha256-oHXIeLB/sPWxKNcSdV1DQi1ddNVoJ17T1yDiMMeygL4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce1a1bdb98547274597258330b46c86b71e87e5b", + "rev": "93e0ac196106dce51878469c9a763c6233af5c57", "type": "github" }, "original": { diff --git a/modules/desktop.nix b/modules/desktop.nix index 1d5f3e0..e00b028 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -29,6 +29,7 @@ in with lib; { i3lock-fancy rofi rofimoji volumeicon feh xorg.xinput dunst arandr lxappearance gruvbox-dark-gtk gruvbox-dark-icons-gtk gruvterial-theme flameshot tesseract5 imagemagick xclip polybar kitty + nomacs # image viewer xkeysnail gtk-engine-murrine playerctl xmacro pa_applet brightnessctl drawing # drwaing! libqalculate # needed by menu-qalc @@ -369,11 +370,11 @@ in with lib; { name = "phinger-cursors"; size = 30; }; - font = { - package = pkgs.montserrat; - name = "Montserrat"; - size = 11; - }; + #font = { + #package = pkgs.montserrat; + #name = "Montserrat"; + #size = 11; + #}; iconTheme = { package = pkgs.gruvbox-dark-icons-gtk; name = "gruvbox-dark-icons";