From 653dd043bba553f8892755f59f5abbcf8d15aab0 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 24 Jun 2026 03:25:50 +0200 Subject: [PATCH] i hate my life --- common.nix | 5 +++-- flake.lock | 4 ++-- flake.nix | 4 ++-- modules/desktop-legacy/default.nix | 6 +++--- modules/desktop/audio.nix | 1 + modules/desktop/home/browser.nix | 8 +++++--- modules/desktop/home/niri/default.nix | 23 +++++++++++++++++++---- modules/desktop/home/swayidle.nix | 14 ++++---------- modules/desktop/themeing.nix | 3 ++- modules/editors/helix/default.nix | 2 +- modules/shell/git.nix | 9 --------- 11 files changed, 42 insertions(+), 37 deletions(-) diff --git a/common.nix b/common.nix index c6c03c2..40e5000 100644 --- a/common.nix +++ b/common.nix @@ -14,7 +14,7 @@ with builtins; environment = { systemPackages = with pkgs; [ - nixfmt-rfc-style + nixfmt overskride transmission_4-gtk @@ -39,6 +39,7 @@ with builtins; iw nodejs nautilus + lixPackageSets.latest.colmena cmatrix sl @@ -88,7 +89,7 @@ with builtins; nixpkgs-review nix-eval-jobs nix-fast-build - colmena + # colmena ; }) ]; diff --git a/flake.lock b/flake.lock index d721470..00062a5 100644 --- a/flake.lock +++ b/flake.lock @@ -557,13 +557,13 @@ "locked": { "lastModified": 1777835090, "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=", - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "rev": "7989a1054b01153212dede6005abfd1576b8328c", "type": "github" }, "original": { - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 1b8f88f..7b48da1 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; - stylix.url = "github:danth/stylix"; + stylix.url = "github:nix-community/stylix"; typst-within.url = "github:schrottkatze/typst"; crane.url = "github:ipetkov/crane"; nixcord.url = "github:kaylorben/nixcord"; @@ -53,7 +53,7 @@ }; in { - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt; devShells."x86_64-linux".default = pkgs.mkShell { buildInputs = [ rs-toolchain diff --git a/modules/desktop-legacy/default.nix b/modules/desktop-legacy/default.nix index 17932c5..40f3c63 100644 --- a/modules/desktop-legacy/default.nix +++ b/modules/desktop-legacy/default.nix @@ -42,9 +42,9 @@ with lib; magic-wormhole-rs # filemanager - xfce.thunar - xfce.tumbler - xfce.thunar-archive-plugin + thunar + tumbler + thunar-archive-plugin file-roller # from environment.systemPackages cleanup diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix index 925fcf6..cfcaac1 100644 --- a/modules/desktop/audio.nix +++ b/modules/desktop/audio.nix @@ -16,5 +16,6 @@ pulsemixer wiremix crosspipe + lmms ]; } diff --git a/modules/desktop/home/browser.nix b/modules/desktop/home/browser.nix index abe1ca1..f82f557 100644 --- a/modules/desktop/home/browser.nix +++ b/modules/desktop/home/browser.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: { home.file = { ".tridactylrc" = { @@ -15,6 +15,8 @@ pkgs.tridactyl-native ]; }; + + configPath = ".mozilla/firefox"; policies = { DefaultDownloadDirectory = "\${home}/Downloads"; Extensions.Install = map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}") [ @@ -172,7 +174,7 @@ } ]; icon = "https://lib.rs/favicon.png"; - definedAliases = [ "libs" ]; + definedAliases = [ "rl" ]; }; "gleam packages" = { urls = [ @@ -187,7 +189,7 @@ } ]; icon = "https://packages.gleam.run/static/packages-icon.svg"; - definedAliases = [ "libs" ]; + definedAliases = [ "gl" ]; }; "rust docs" = { urls = [ diff --git a/modules/desktop/home/niri/default.nix b/modules/desktop/home/niri/default.nix index 83655b9..9615afc 100644 --- a/modules/desktop/home/niri/default.nix +++ b/modules/desktop/home/niri/default.nix @@ -14,9 +14,23 @@ |> lib.mapAttrsToList (filename: _value: "include \"${./kdl}/${filename}\""); startups = [ - [ "eww" "open-many" "topBar" "bottomBar" ] - [ "${pkgs.swaybg}/bin/swaybg" "-i" "${./wallpaper.jpg}" "-m" "fill" ] - [ "touch" ".config/niri/live.kdl" ] + [ + "eww" + "open-many" + "topBar" + "bottomBar" + ] + [ + "${pkgs.swaybg}/bin/swaybg" + "-i" + "${./wallpaper.jpg}" + "-m" + "fill" + ] + [ + "touch" + ".config/niri/live.kdl" + ] ] |> map (map (word: "\"${word}\"")) |> map (lib.concatStringsSep " ") @@ -24,7 +38,8 @@ other = [ "include \"live.kdl\"" "output \"eDP-1\" { scale 1.1; }" - "animations { window-open { duration-ms 3000; curve \"linear\"; custom-shader r\"\n${builtins.readFile ./shaders/arc.frag}\";};}" + # conflicts with blur + # "animations { window-open { duration-ms 3000; curve \"linear\"; custom-shader r\"\n${builtins.readFile ./shaders/arc.frag}\";};}" "binds {Mod+Shift+I { spawn \"${./scripts/cpdate.sh}\"; }; }" ]; in diff --git a/modules/desktop/home/swayidle.nix b/modules/desktop/home/swayidle.nix index 427023e..ee7b453 100644 --- a/modules/desktop/home/swayidle.nix +++ b/modules/desktop/home/swayidle.nix @@ -4,15 +4,9 @@ services.swayidle = { enable = true; - events = [ - { - event = "before-sleep"; - command = "${pkgs.swaylock}/bin/swaylock -fF -c 442244"; - } - { - event = "lock"; - command = "swaylock -c 441144"; - } - ]; + events = { + "before-sleep" = "${pkgs.swaylock}/bin/swaylock -fF -c 442244"; + "lock" = "swaylock -c 441144"; + }; }; } diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index 6264aa4..36edbb3 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -27,7 +27,7 @@ }; }; home-manager.users.jade = - { pkgs, ... }: + { config, pkgs, ... }: { stylix.targets = { firefox = { @@ -43,6 +43,7 @@ }; gtk = { enable = true; + gtk4.theme = config.gtk.theme; cursorTheme = { package = pkgs.phinger-cursors; name = "phinger-cursors"; diff --git a/modules/editors/helix/default.nix b/modules/editors/helix/default.nix index 408fef7..4771a20 100644 --- a/modules/editors/helix/default.nix +++ b/modules/editors/helix/default.nix @@ -126,7 +126,7 @@ "discord-presence-lsp" ]; formatter = { - command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; + command = "${pkgs.nixfmt}/bin/nixfmt"; args = [ "--quiet" ]; }; auto-format = true; diff --git a/modules/shell/git.nix b/modules/shell/git.nix index fbccfe7..3e86776 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -19,15 +19,6 @@ signByDefault = true; }; }; - programs.jujutsu = { - enable = true; - settings = { - user = { - name = config.programs.git.userName; - email = config.programs.git.userEmail; - }; - }; - }; programs.gitui = { enable = true; keyConfig = ''