From 72f0a9765686ebf78bfeed6c71f819ddbd94aea3 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 8 Jan 2025 19:04:23 -0500 Subject: [PATCH] general updates and cleanup --- dotfiles/dot_config/ghostty/config | 1 + flake.lock | 46 +++++++++++++++--------------- flake.nix | 3 -- home/home.nix | 4 --- system/eddie/configuration.nix | 24 ++++++++-------- system/eddie/razer-speaker-fix.nix | 6 ++-- 6 files changed, 39 insertions(+), 45 deletions(-) diff --git a/dotfiles/dot_config/ghostty/config b/dotfiles/dot_config/ghostty/config index f117c9c..a3bcdb4 100644 --- a/dotfiles/dot_config/ghostty/config +++ b/dotfiles/dot_config/ghostty/config @@ -28,3 +28,4 @@ keybind = ctrl+alt+right=next_tab keybind = ctrl+alt+up=goto_split:left keybind = ctrl+alt+down=goto_split:right keybind = ctrl+backspace=text:\x1b\x7f +keybind = ctrl+shift+k=clear_screen diff --git a/flake.lock b/flake.lock index 2a800b0..11843b8 100644 --- a/flake.lock +++ b/flake.lock @@ -134,11 +134,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736186781, - "narHash": "sha256-jiKBu/hVN6bKxShMCFS4RHXUQkRfmiuRYZXNc4iAiIc=", + "lastModified": 1736372994, + "narHash": "sha256-iCb3+KniUL0Ic1AUkaM3CpO2UGNW6CQSigVzuVUQ8T0=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "037de64ea2c3f6201948236559524986f41a72f7", + "rev": "eb40cce45e6593a4065a32681d27c75c4ca3a9c9", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1736366465, + "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", "type": "github" }, "original": { @@ -288,11 +288,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1735913600, + "lastModified": 1736334301, "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "78ed84ff81e8d8510926e7165d508bcacef49ff1", + "rev": "5f4ec93d432cd5288f6fe20d8842dceb5a065885", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736283893, + "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1736064798, - "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 835dc4b..917998a 100644 --- a/flake.nix +++ b/flake.nix @@ -37,9 +37,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # nix-ld.url = "github:Mic92/nix-ld"; - # nix-ld.inputs.nixpkgs.follows = "nixpkgs"; - ghostty = { url = "github:ghostty-org/ghostty"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/home.nix b/home/home.nix index da56ec8..751c49a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -17,8 +17,6 @@ }; }; - imports = [ (inputs.home-manager-unstable + "/modules/programs/ghostty.nix") ]; - home = { packages = with pkgs; [ inputs.affinity-nix.packages.x86_64-linux.photo @@ -318,8 +316,6 @@ mpv plugdata pavucontrol - pwvucontrol - sonusmix qpwgraph helvum coppwr diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index e0a3068..fca73c2 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -118,7 +118,7 @@ powerManagement.enable = true; powerManagement.finegrained = true; - forceFullCompositionPipeline = true; + # forceFullCompositionPipeline = true; package = config.boot.kernelPackages.nvidiaPackages.beta; @@ -137,17 +137,17 @@ }; }; - specialisation = { - gpupower.configuration = { - system.nixos.tags = [ "gpupower" ]; - hardware.nvidia = { - prime.offload.enable = lib.mkForce false; - prime.offload.enableOffloadCmd = lib.mkForce false; - prime.sync.enable = lib.mkForce true; - powerManagement.finegrained = lib.mkForce false; - }; - }; - }; + # specialisation = { + # gpupower.configuration = { + # system.nixos.tags = [ "gpupower" ]; + # hardware.nvidia = { + # prime.offload.enable = lib.mkForce false; + # prime.offload.enableOffloadCmd = lib.mkForce false; + # prime.sync.enable = lib.mkForce true; + # powerManagement.finegrained = lib.mkForce false; + # }; + # }; + # }; musnix = { enable = true; diff --git a/system/eddie/razer-speaker-fix.nix b/system/eddie/razer-speaker-fix.nix index 46dddd7..491f50e 100644 --- a/system/eddie/razer-speaker-fix.nix +++ b/system/eddie/razer-speaker-fix.nix @@ -2011,9 +2011,9 @@ hda-verb /dev/snd/hwC2D0 0x20 0x400 0x0 hda-verb /dev/snd/hwC2D0 0x20 0x500 0x23 hda-verb /dev/snd/hwC2D0 0x20 0x400 0xdd00 -amixer sset Master unmute -amixer sset Speaker unmute -amixer sset Headphone unmute +# amixer sset Master unmute +# amixer sset Speaker unmute +# amixer sset Headphone unmute '';