diff --git a/flake.lock b/flake.lock index 1162a64..159fdeb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1736566337, - "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", + "lastModified": 1734808813, + "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "owner": "ipetkov", "repo": "crane", - "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", + "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1736577158, - "narHash": "sha256-ngnAENZ+vmzOFgnj0EDtHj22nuH7MQB+EqzUmdbvaqA=", + "lastModified": 1735626869, + "narHash": "sha256-hWGkpAWB59YWAOtBC6AE3DDnhMrBaqtiOaw1g+/mdLU=", "owner": "nix-community", "repo": "fenix", - "rev": "05dcdb02ea657f81b13d99bd0ca36b09d25f4c43", + "rev": "120e688c881f2233f053dca5a5ddb8945d8ca5d7", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1736602937, - "narHash": "sha256-KVw1PMrxlC1m+FT99BQxOO2nG2zQ5xDCoDgH7u3kO8A=", + "lastModified": 1735674113, + "narHash": "sha256-X2+0+s6qNxrD+ySlD15jr5H314jOKMKJHBzbtNw1cBk=", "owner": "helix-editor", "repo": "helix", - "rev": "b26903cd13fdf8976bda43abbc5e85a50130d12f", + "rev": "b1759f998d527b7014b6be1eb26a518e1b5927c4", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -172,7 +172,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1727366922, + "lastModified": 1735699162, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -215,26 +215,26 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "type": "indirect" } }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1736603572, - "narHash": "sha256-yOZxepSF/z6ZDAOlJ3VZRIGOKfroa6CmOm2x6ud8S3s=", + "lastModified": 1735667141, + "narHash": "sha256-OdxSR4u4QQ/cnBWJBdbg9gMHQkJ2AQaOFif9965iciE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "376250fab39653e93864b4dfd9ab161751fbe430", + "rev": "ffd125e27fecc4e5b935413276143a97449fcfd8", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1736517563, - "narHash": "sha256-YJ5ajpMsyXITc91ZfnI0Mdocd+tmCFkZ3BLozUkB44M=", + "lastModified": 1735570005, + "narHash": "sha256-ekN1mLeHM9upiAXykoNm646ctsm0qcS8+G2SjGtXp5k=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "4f35021ca9a8e7f9ed4344139b9eaf770a2e5725", + "rev": "1c6b83852b0d3bc129a3558386663373f126337e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 98b4fbc..3ea114b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "nixpkgs/nixos-24.05"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; helix-inline-diags = { url = "github:helix-editor/helix"; diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index ed65d9f..5c20795 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -1,11 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ - pkgs, - pkgs-stable, - ... -}: { +{pkgs, ...}: { imports = [ ./hardware-configuration.nix ../../common.nix @@ -38,6 +34,8 @@ networking.hostName = "monosodium-glutamate-g"; services = { + # monitor control + ddccontrol.enable = true; xserver = { layout = "us"; xkbVariant = "altgr-intl"; diff --git a/modules/desktop-environment/audio.nix b/modules/desktop-environment/audio.nix index dd5be85..eebad68 100644 --- a/modules/desktop-environment/audio.nix +++ b/modules/desktop-environment/audio.nix @@ -15,7 +15,9 @@ volumeicon playerctl + pulseaudioFull helvum ]; + hardware.pulseaudio.enable = pkgs.lib.mkForce false; # sound.mediaKeys.enable = true; } diff --git a/modules/desktop-environment/home/panels/eww/configDir/scripts/bat.nu b/modules/desktop-environment/home/panels/eww/configDir/scripts/bat.nu index fc2efae..4136585 100755 --- a/modules/desktop-environment/home/panels/eww/configDir/scripts/bat.nu +++ b/modules/desktop-environment/home/panels/eww/configDir/scripts/bat.nu @@ -40,7 +40,11 @@ def get_bat_charging_status [ ] { let status = open $"/sys/class/power_supply/($path)/status"; - $status like Charging + if ($status == Charging) { + true + } else { + false + } } def get_bat_icon [ diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index 648a5da..d3a42ca 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -10,10 +10,7 @@ gimp inkscape-with-extensions obs-studio - kdePackages.kdenlive - glaxnimate - - pixelorama + kdenlive scribus diff --git a/modules/desktop/firefox.nix b/modules/desktop/firefox.nix index b52c74c..9cfc37a 100644 --- a/modules/desktop/firefox.nix +++ b/modules/desktop/firefox.nix @@ -32,7 +32,6 @@ "return-youtube-dislikes" "multi-account-containers" "tabby-cat-friend" - "indie-wiki-buddy" ]; Extensions.Uninstall = [ "google@search.mozilla.org" diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 8bf82af..53ea07e 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -31,15 +31,15 @@ bufferline = "multiple"; color-modes = true; cursorline = true; - # auto-save = { - # focus-lost = true; - # after-delay.enable = true; - # after-delay.timeout = 10000; - # }; + auto-save = { + focus-lost = true; + after-delay.enable = true; + after-delay.timeout = 10000; + }; auto-format = true; end-of-line-diagnostics = "hint"; # slightly optimized based on my layout - jump-label-alphabet = "jfkdhaslgwenuiopbcmyzqrtvx"; + jump-label-alphabet = "jfkdaslghwenuiopbcmyzqrtvx"; clipboard-provider = "wayland"; inline-diagnostics = { cursor-line = "hint"; @@ -75,19 +75,20 @@ indent-guides = { render = true; character = "│"; - skip-levels = 3; + skip-levels = 2; }; soft-wrap = { enable = true; }; whitespace = { render = { - space = "none"; + space = "all"; tab = "all"; newline = "none"; }; characters = { - nbsp = "·"; + space = "·"; + nbsp = "⍽"; tab = "→"; }; }; diff --git a/modules/shell/nu/aliases.nu b/modules/shell/nu/aliases.nu index 7876154..20fe226 100644 --- a/modules/shell/nu/aliases.nu +++ b/modules/shell/nu/aliases.nu @@ -32,6 +32,3 @@ alias guni = cd ~/Docs/uni/info1; alias gunids = cd ~/Docs/uni/design; alias gunida = cd ~/Docs/uni/dramaturgie; alias gunm = cd ~/Docs/uni/mathe1-3; - -# typos -alias juts = just;