From 8921e962513eee32eefe13eecb1d6c7872e4fc58 Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 13 Dec 2022 18:57:27 +0100 Subject: [PATCH] yeye meow --- common.nix | 2 +- flake.nix | 1 + modules/desktop.nix | 2 +- monosodium-glutamate-g/configuration.nix | 3 ++- potatobook-g/configuration.nix | 15 ++++++++++++++- scripts/desktop/macros/record.sh | 7 ------- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/common.nix b/common.nix index 45be50f..09f2114 100644 --- a/common.nix +++ b/common.nix @@ -152,7 +152,7 @@ with builtins; mullvad mullvad-vpn sl lolcat ifuse cava - prismlauncher + #prismlauncher gitg gnome-builder gpick qdirstat file whois ffmpeg_5 scribus p7zip file nmap cmatrix tree socat libreoffice ]; diff --git a/flake.nix b/flake.nix index e01946f..f1302fd 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ flake = false; }; mms.url = "github:mkaito/nixos-modded-minecraft-servers"; + easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git"; }; outputs = { self, nixpkgs, home-manager, nixos-hardware, mac-brcm-fw, ... }@inputs: { diff --git a/modules/desktop.nix b/modules/desktop.nix index eefec62..9886702 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -279,7 +279,7 @@ in with lib; { cursor-click = "pointer"; cursor-scroll = "ns-resize"; enable-ipc = true; - wm-restack = "i3"; + wm-restack = "i3wm"; override-redirect = false; }; diff --git a/monosodium-glutamate-g/configuration.nix b/monosodium-glutamate-g/configuration.nix index b5bb14e..93a5449 100644 --- a/monosodium-glutamate-g/configuration.nix +++ b/monosodium-glutamate-g/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ inputs, config, pkgs, ... }: { imports = [ ./hardware-configuration.nix @@ -37,6 +37,7 @@ # missing: menu-qalc picom-jonaburg environment.systemPackages = with pkgs; [ # TODO: clean up. + prismlauncher nvtop-amd ]; diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix index 94d34d6..6673092 100644 --- a/potatobook-g/configuration.nix +++ b/potatobook-g/configuration.nix @@ -1,5 +1,13 @@ { inputs, config, pkgs, ... }: { + nix.settings = { + trusted-substituters = [ + "https://t2linux.cachix.org" + ]; + trusted-public-keys = [ + "t2linux.cachix.org-1:P733c5Gt1qTcxsm+Bae0renWnT8OLs0u9+yfaK2Bejw=" + ]; + }; imports = [ # ./t2.nix # "${builtins.fetchGit { url = "https://github.com/kekrby/nixos-hardware.git"; }}/apple/t2" @@ -73,12 +81,13 @@ # }; hardware.bluetooth.enable = true; - hardware.keyboard.uhk.enable = true; + hardware.keyboard.uhk.enable = true; # missing: menu-qalc picom-jonaburg environment.systemPackages = with pkgs; [ # TODO: clean up. + miraclecast ]; environment.pathsToLink = [ @@ -145,6 +154,10 @@ }; }; + services.logind.extraConfig = '' + RuntimeDirectorySize=12G + ''; + networking = { #nameservers = [ #"192.168.8.205" diff --git a/scripts/desktop/macros/record.sh b/scripts/desktop/macros/record.sh index b768c5b..f08ce07 100644 --- a/scripts/desktop/macros/record.sh +++ b/scripts/desktop/macros/record.sh @@ -1,12 +1,5 @@ mkdir -p $HOME/xmacros -register=$(ls $HOME/xmacros | rofi -dmenu) -count=$(echo "2;5;10;20;50;100" | rofi -dmenu -sep ";" -l 5) - -for i in $(seq $count); do - echo $i - xmacroplay "$DISPLAY" < $HOME/xmacros/$register -done register=$(ls $HOME/xmacros | rofi -dmenu) xmacrorec2 > $HOME/xmacros/$register