From 88401c01bee3b28a9ec2e608d461b6e72a1ec1b9 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 26 Aug 2025 20:22:59 +0200 Subject: [PATCH] meow meow meow meow --- common.nix | 5 +- flake.lock | 229 +++++++----------- flake.nix | 15 +- .../modules/graphics.nix | 2 +- .../monosodium-glutamate-g/modules/input.nix | 12 +- modules/desktop-legacy/social.nix | 2 +- modules/desktop/home/browser.nix | 4 +- modules/desktop/home/eww/configDir/eww.yuck | 13 + modules/desktop/home/niri/binds.nix | 3 +- modules/shell/nu/env.nu | 2 +- modules/shell/nu/shell-startup.nu | 2 +- 11 files changed, 131 insertions(+), 158 deletions(-) diff --git a/common.nix b/common.nix index 0cc32c8..42c7faa 100644 --- a/common.nix +++ b/common.nix @@ -22,6 +22,8 @@ with builtins; htmlq + intiface-central + ausweisapp prusa-slicer wget @@ -41,7 +43,6 @@ with builtins; lolcat cool-retro-term - jetbrains.idea-ultimate jdk libsecret @@ -75,6 +76,8 @@ with builtins; hardware.graphics.enable = true; + virtualisation.waydroid.enable = true; + services = { systemd-lock-handler.enable = true; openssh = { diff --git a/flake.lock b/flake.lock index 9c929df..c555f64 100644 --- a/flake.lock +++ b/flake.lock @@ -157,22 +157,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -243,6 +227,39 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -296,17 +313,8 @@ "type": "github" } }, - "lix-module": { - "inputs": { - "flake-compat": "flake-compat", - "nix2container": "nix2container", - "nix_2_18": "nix_2_18", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": "pre-commit-hooks" - }, + "lix": { + "flake": false, "locked": { "lastModified": 1755945570, "narHash": "sha256-KKxBCVhKuTdN5gdph4Nw1x2XJ7VN2dcWYvSgNt8hRgQ=", @@ -319,27 +327,34 @@ "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" } }, - "lowdown-src": { - "flake": false, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" + "lastModified": 1755826886, + "narHash": "sha256-AzCj0tc+JHFg74VqvLYgro5xSJ6eT0NoS6zxhavc4eo=", + "rev": "71bd6a06def2404b7e0f68e57bf5a08c634f5041", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/71bd6a06def2404b7e0f68e57bf5a08c634f5041.tar.gz?rev=71bd6a06def2404b7e0f68e57bf5a08c634f5041" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" } }, "niri": { "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -391,55 +406,11 @@ "type": "github" } }, - "nix2container": { - "flake": false, - "locked": { - "lastModified": 1724996935, - "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "nix_2_18": { - "inputs": { - "flake-compat": [ - "lix-module", - "flake-compat" - ], - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": [ - "lix-module", - "nixpkgs-regression" - ] - }, - "locked": { - "lastModified": 1730375271, - "narHash": "sha256-RrOFlDGmRXcVRV2p2HqHGqvzGNyWoD0Dado/BNlJ1SI=", - "owner": "NixOS", - "repo": "nix", - "rev": "0f665ff6779454f2117dcc32e44380cda7f45523", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.18.9", - "repo": "nix", - "type": "github" - } - }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1755966580, @@ -471,16 +442,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -512,22 +483,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1755704039, @@ -575,22 +530,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1754028485, "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", @@ -606,7 +545,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1755615617, "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", @@ -621,7 +560,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", @@ -637,7 +576,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -678,32 +617,17 @@ "type": "github" } }, - "pre-commit-hooks": { - "flake": false, - "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "crane": "crane", "fenix": "fenix", "home-manager": "home-manager", + "lix": "lix", "lix-module": "lix-module", "niri": "niri", "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable-small": "nixpkgs-unstable-small", "stylix": "stylix", @@ -765,9 +689,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -818,6 +742,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -904,9 +843,9 @@ "crane": "crane_2", "fenix": "fenix_2", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "rust-manifest": "rust-manifest", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1739736913, diff --git a/flake.nix b/flake.nix index e591afc..778eb68 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,22 @@ typst-within.url = "github:schrottkatze/typst"; crane.url = "github:ipetkov/crane"; nixcord.url = "github:kaylorben/nixcord"; + # lix-module = { + # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + + # url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + # + lix = { + url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + flake = false; + }; + lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; }; home-manager = { url = "github:nix-community/home-manager"; diff --git a/hosts/monosodium-glutamate-g/modules/graphics.nix b/hosts/monosodium-glutamate-g/modules/graphics.nix index f4b1efa..da9b07c 100644 --- a/hosts/monosodium-glutamate-g/modules/graphics.nix +++ b/hosts/monosodium-glutamate-g/modules/graphics.nix @@ -3,6 +3,6 @@ environment.systemPackages = [ pkgs.nvtopPackages.amd pkgs.radeontop - pkgs.rgp + # pkgs.rgp ]; } diff --git a/hosts/monosodium-glutamate-g/modules/input.nix b/hosts/monosodium-glutamate-g/modules/input.nix index 54ddc8f..41486b2 100644 --- a/hosts/monosodium-glutamate-g/modules/input.nix +++ b/hosts/monosodium-glutamate-g/modules/input.nix @@ -18,18 +18,24 @@ ]; } { - input = [ "KEY_W" ]; + input = [ "KEY_SPACE" ]; output = [ "KEY_LEFTMETA" "KEY_G" ]; } + { + input = [ "KEY_W" ]; + output = [ + "KEY_LEFTMETA" + "KEY_P" + ]; + } { input = [ "KEY_S" ]; output = [ "KEY_LEFTMETA" - "KEY_LEFTCTRL" - "KEY_G" + "KEY_N" ]; } ]; diff --git a/modules/desktop-legacy/social.nix b/modules/desktop-legacy/social.nix index 895f41e..24926f3 100644 --- a/modules/desktop-legacy/social.nix +++ b/modules/desktop-legacy/social.nix @@ -34,7 +34,7 @@ with lib; disableMinSize = true; plugins = { alwaysTrust.enable = true; - betterFolders.enable = true; + # betterFolders.enable = true; betterGifAltText.enable = true; callTimer.enable = true; clearURLs.enable = true; diff --git a/modules/desktop/home/browser.nix b/modules/desktop/home/browser.nix index 2271c38..9b7eec1 100644 --- a/modules/desktop/home/browser.nix +++ b/modules/desktop/home/browser.nix @@ -305,8 +305,8 @@ "browser.urlbar.speculativeConnect.enabled" = false; "browser.urlbar.suggest.quicksuggest.nonsponsored" = false; "browser.urlbar.suggest.quicksuggest.sponsored" = false; - "browser.search.suggest.enabled" = true; - "browser.urlbar.suggest.searches" = true; + "browser.search.suggest.enabled" = false; + "browser.urlbar.suggest.searches" = false; "browser.urlbar.trending.featureGate" = false; "security.ssl.require_safe_negotiation" = true; diff --git a/modules/desktop/home/eww/configDir/eww.yuck b/modules/desktop/home/eww/configDir/eww.yuck index 5e5d10d..5b0f9b6 100644 --- a/modules/desktop/home/eww/configDir/eww.yuck +++ b/modules/desktop/home/eww/configDir/eww.yuck @@ -1,2 +1,15 @@ (include "topBar/topBar.yuck") (include "bottomBar/bottomBar.yuck") + +(defwindow streamUi + :monitor 0 + :stacking "fg" + :wm-ignore true + :exclusive true + :geometry (geometry + :width "640px" + :height "100%" + :anchor "center right") + (box + (label :text "hi") + )) diff --git a/modules/desktop/home/niri/binds.nix b/modules/desktop/home/niri/binds.nix index 2dc622a..7b10064 100644 --- a/modules/desktop/home/niri/binds.nix +++ b/modules/desktop/home/niri/binds.nix @@ -72,8 +72,7 @@ "Mod+Ctrl+L".action.move-column-right = [ ]; "Mod+R".action.switch-preset-column-width = [ ]; - "Mod+G".action.open-overview = [ ]; - "Mod+Ctrl+G".action.close-overview = [ ]; + "Mod+G".action.toggle-overview = [ ]; "Mod+V".action.toggle-window-floating = [ ]; "Mod+Shift+V".action.switch-focus-between-floating-and-tiling = [ ]; diff --git a/modules/shell/nu/env.nu b/modules/shell/nu/env.nu index 91332be..cb5a74f 100644 --- a/modules/shell/nu/env.nu +++ b/modules/shell/nu/env.nu @@ -30,7 +30,7 @@ def create_right_prompt [] { $env.PROMPT_COMMAND = {|| starship prompt --cmd-duration $env.CMD_DURATION_MS $'--status=($env.LAST_EXIT_CODE)' | lines - | filter { is-not-empty } + | where { is-not-empty } | update 0 {|item| let len = (term size | get columns) - ($item | ansi strip | str length --grapheme-clusters) - (create_right_prompt | ansi strip | str length --grapheme-clusters); # $item | append (flag $TRANS "-" $len) | str join diff --git a/modules/shell/nu/shell-startup.nu b/modules/shell/nu/shell-startup.nu index 133f149..f0297cd 100644 --- a/modules/shell/nu/shell-startup.nu +++ b/modules/shell/nu/shell-startup.nu @@ -51,7 +51,7 @@ def main [] { let next_events = open ~/Docs/dates.csv | update datetime {|ev| $ev.datetime | into datetime } | sort-by datetime - | filter {|ev| ($ev.datetime > (date now))}; + | where {|ev| ($ev.datetime > (date now))}; let evstr = if ($next_events | is-not-empty) { let ev = $next_events | first;