diff --git a/flake.lock b/flake.lock index c577544..33025fe 100644 --- a/flake.lock +++ b/flake.lock @@ -38,24 +38,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, - "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, "locked": { "lastModified": 1785627969, "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", @@ -88,28 +70,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": [ - "mango", - "scenefx", - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -168,31 +128,9 @@ "type": "github" } }, - "mango": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "scenefx": "scenefx" - }, - "locked": { - "lastModified": 1788238778, - "narHash": "sha256-BhA+TEkGryxU9hppp8UItTNBllZz09hX8pwMjtk1Jdo=", - "owner": "mangowm", - "repo": "mango", - "rev": "53d729c0476fc50534835dcdaf58ad314a32a34d", - "type": "github" - }, - "original": { - "owner": "mangowm", - "repo": "mango", - "type": "github" - } - }, "nixcord": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], @@ -230,21 +168,6 @@ } }, "nixpkgs-lib": { - "locked": { - "lastModified": 1782614948, - "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1785031560, "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", @@ -280,7 +203,6 @@ "base16": "base16", "helium": "helium", "home-manager": "home-manager", - "mango": "mango", "nixcord": "nixcord", "nixpkgs": "nixpkgs", "tt-discord": "tt-discord", @@ -289,29 +211,6 @@ "tt-terminal": "tt-terminal" } }, - "scenefx": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "mango", - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1782624992, - "narHash": "sha256-vUjLG6eubEhJJVa9LPygIcVmNoHwYbSUTJcWEcbxnU4=", - "owner": "wlrfx", - "repo": "scenefx", - "rev": "37ccd723bef49e6891156ffafce8f549f01446cc", - "type": "github" - }, - "original": { - "owner": "wlrfx", - "repo": "scenefx", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -327,21 +226,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -366,11 +250,11 @@ "tt-discord": { "flake": false, "locked": { - "lastModified": 1788292449, - "narHash": "sha256-YiNFAa/w72k/b/aqf+TFHvqNvIx/MsXEaKJVzg92DhQ=", + "lastModified": 1775215536, + "narHash": "sha256-tgavgso+bdyG9VRWR4D0qLqD7zsuaoLXh1CAL5SDgVg=", "ref": "refs/heads/main", - "rev": "dcf9db7194b5281a67f5af1452f9d8eb0ca78811", - "revCount": 6, + "rev": "b6d440de0ce02178b2e9670e610a18fa4786ebc6", + "revCount": 5, "type": "git", "url": "https://git.lucy.rip/lucy/tinted-discord.git" }, diff --git a/flake.nix b/flake.nix index 436603b..040cb98 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,6 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixcord.url = "github:4evy/nixcord"; nixcord.inputs.nixpkgs.follows = "nixpkgs"; - mango = { - url = "github:mangowm/mango"; - inputs.nixpkgs.follows = "nixpkgs"; - }; helium = { url = "github:AlvaroParker/helium-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -39,13 +35,11 @@ base16, home-manager, nixcord, - mango, ... }@inputs: let boilerplate = [ ./modules/theming - mango.nixosModules.mango home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/modules/home/screenshot b/modules/home/screenshot deleted file mode 100644 index 3b38f63..0000000 --- a/modules/home/screenshot +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -case "${1:-fullscreen}" in - region) - g=$(slurp -d); [ -z "$g" ] && exit 1 - grim -g "$g" - | wl-copy ;; - window) - g=$(mmsg get focusing-client | jq -r '"\(.x),\(.y) \(.width)x\(.height)"') - [ -z "$g" ] && exit 1 - grim -g "$g" - | wl-copy ;; - output) - grim -o "$(mmsg get cursorpos | jq -r .monitor)" - | wl-copy;; - *) grim - | wl-copy;; -esac diff --git a/modules/hosts/base/configuration.nix b/modules/hosts/base/configuration.nix index 1624b21..f2a81b0 100644 --- a/modules/hosts/base/configuration.nix +++ b/modules/hosts/base/configuration.nix @@ -21,7 +21,6 @@ time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "en_US.UTF-8"; services.displayManager.gdm.enable = true; - programs.mango.enable = true; programs.niri = { enable = true; }; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 024948b..eac32a1 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -1,13 +1,10 @@ -{ inputs, ... }: { +{ imports = [ - inputs.mango.hmModules.mango ./foot.nix ./niri.nix ./emacs.nix ./fuzzel.nix ./quickshell.nix ./nixcord.nix - ./mango.nix - ]; } diff --git a/modules/programs/mango.nix b/modules/programs/mango.nix deleted file mode 100644 index 5b7011c..0000000 --- a/modules/programs/mango.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ - config, - ... -}: -let - c = config.scheme; - in -{ - home.file.screenshot = { - enable = true; - executable = true; - source = ../home/screenshot; - target = ".config/mango/scripts/screenshot"; - }; - wayland.windowManager.mango = { - enable = true; - settings = { - rootcolor = "0x${c.base00}ff"; - bordercolor = "0x${c.base02}ff"; - focuscolor = "0x${c.base0D}ff"; - dropcolor = "0x${c.base09}ff"; - cursor_theme = "macOS"; - cursor_size = 24; - border_radius = 20; - animations = 1; - layer_animations = 0; - animation_type_open = "slide"; - animation_type_close = "slide"; - animation_fade_in = 1; - animation_fade_out = 1; - tag_animation_direction = 1; - zoom_initial_ratio = 0.4; - zoom_end_ratio = 0.8; - fadein_begin_opacity = 0; - fadeout_begin_opacity = 1; - animation_duration_move = 500; - animation_duration_open = 400; - animation_duration_tag = 350; - animation_duration_close = 800; - animation_duration_focus = 0; - animation_curve = { - open = "0.23,1.0,0.32,1.05"; - move = "0.23,1.0,0.32,1"; - tag = "0.23,1.0,0.32,1.03"; - close = "0.23,1.0,0.32,1"; - focus = "0.23,1.0,0.32,1"; - opafadeout = "0.5,0.5,0.5,0"; - opafadein = "0.46,1.0,0.29,0"; - }; - new_is_master = 0; - tag_num = 9; - repeat_rate = 25; - repeat_delay = 600; - xkb_rules_layout = "eu"; - tap_to_click = 1; - mouse_accel_profile = 1; - mouse_accel_speed = -0.4; - gappih = 5; - gappiv = 5; - gappoh = 10; - gappov = 10; - borderpx = 4; - bind = [ - - # reload config - "SUPER,r,reload_config" - - "SUPER,space,spawn,fuzzel" - "SUPER,Return,spawn,foot" - - "SUPER+SHIFT,q,quit" - "SUPER,q,killclient" - - "SUPER+SHIFT,S,spawn_shell,$HOME/.config/mango/scripts/screenshot region" - "ALT+SHIFT,S,spawn_shell,$HOME/.config/mango/scripts/screenshot output" - "ALT+CTRL,S,spawn_shell,$HOME/.config/mango/scripts/screenshot window" - - "SUPER+SHIFT,Up,exchange_client,up" - "SUPER+SHIFT,Down,exchange_client,down" - "SUPER+SHIFT,Left,exchange_client,left" - "SUPER+SHIFT,Right,exchange_client,right" - "SUPER,Up,focusdir,up" - "SUPER,Down,focusdir,down" - "SUPER,Left,focusdir,left" - "SUPER,Right,focusdir,right" - - "SUPER,v,togglefloating" - - "SUPER,1,view,1,0" - "SUPER,2,view,2,0" - "SUPER,3,view,3,0" - "SUPER,4,view,4,0" - "SUPER,5,view,5,0" - "SUPER,6,view,6,0" - "SUPER,7,view,7,0" - "SUPER,8,view,8,0" - "SUPER,9,view,9,0" - - "SUPER+SHIFT,1,tag,1,0" - "SUPER+SHIFT,2,tag,2,0" - "SUPER+SHIFT,3,tag,3,0" - "SUPER+SHIFT,4,tag,4,0" - "SUPER+SHIFT,5,tag,5,0" - "SUPER+SHIFT,6,tag,6,0" - "SUPER+SHIFT,7,tag,7,0" - "SUPER+SHIFT,8,tag,8,0" - "SUPER+SHIFT,9,tag,9,0" - - "SUPER,comma,focusmon,left" - "SUPER,period,focusmon,right" - - "NONE,XF86MonBrightnessUp,spawn,brightnessctl s +10%" - "NONE,XF86MonBrightnessDown,spawn,brightnessctl s 10%-" - - "NONE,XF86AudioRaiseVolume,spawn,wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" - "NONE,XF86AudioLowerVolume,spawn,wpctl set-volume @DEFAULT_SINK@ 5%-" - "NONE,XF86AudioMute,spawn,wpctl set-mute @DEFAULT_SINK@ toggle" - "SHIFT,XF86AudioMute,spawn,wpctl set-mute @DEFAULT_SOURCE@ toggle" - - "NONE,XF86AudioNext,spawn,playerctl next" - "NONE,XF86AudioPrev,spawn,playerctl previous" - "NONE,XF86AudioPlay,spawn,playerctl play-pause" - - ]; - mousebind = [ - "SUPER,btn_left,moveresize,curmove" - "SUPER,btn_right,moveresize,curresize" - "ALT,btn_left,moveresize,curresize" - ]; - }; - }; -} diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix index 6ea8222..480aa90 100644 --- a/modules/programs/nixcord.nix +++ b/modules/programs/nixcord.nix @@ -10,7 +10,9 @@ discord.enable = false; enable = true; vesktop.enable = true; - quickCss = builtins.readFile (config.scheme inputs.tt-discord); + # tt-discord's templates/config.yaml uses the filetype/output keys, which + # base16.nix can't read; give it the extension directly so it skips that file. + quickCss = builtins.readFile (config.scheme); config = { useQuickCss = true; plugins = {