diff --git a/flake.lock b/flake.lock index e5d43ba1..5a0119a3 100644 --- a/flake.lock +++ b/flake.lock @@ -82,12 +82,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732047192, - "narHash": "sha256-QVvcbiOgQIMLM5+NrpKxpB3IRKH4ZbP7+WKBISKO1zM=", - "rev": "d3ec352824dbec68aa0c17851f7424fdc735ecc4", - "revCount": 1516, + "lastModified": 1732400024, + "narHash": "sha256-uf1QzIl0Jj5dr7+erWjHWiCUEvywLaR7ir1jcqGgjeQ=", + "rev": "376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc", + "revCount": 1522, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1516%2Brev-d3ec352824dbec68aa0c17851f7424fdc735ecc4/01934613-7358-7041-acf2-053fb4f76a4c/source.tar.gz?rev=d3ec352824dbec68aa0c17851f7424fdc735ecc4&revCount=1516" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1522%2Brev-376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc/01935b1b-736f-7162-bf26-076b2462de75/source.tar.gz?rev=376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc&revCount=1522" }, "original": { "type": "tarball", @@ -169,11 +169,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1732084544, - "narHash": "sha256-0p50xdUCAvKWh3s7seOiGN4BaXwPAk852gYvNc13hWc=", + "lastModified": 1732429952, + "narHash": "sha256-kTXRYkTpvYn4AtYY8OUVpO7h9xNjPAaHxtTuz1N4l9g=", "owner": "nix-community", "repo": "fenix", - "rev": "6120ce1d29263ed58981e7e223e55942702de853", + "rev": "39603febfbb0b494a368905a5c5c1b13bd6e1e53", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731479417, - "narHash": "sha256-NZ+Jc9XecxUIC6RBE5TdDo8hKzI704fMBKTz6lEH32w=", + "lastModified": 1732284611, + "narHash": "sha256-SH7WRJnFSXDJ6f9UzMUdaa6cS5Fc2kACSW8wB9BA8WU=", "owner": "helix-editor", "repo": "helix", - "rev": "6cca98264fe308bd6a4f7f85be2d821b58f60b4a", + "rev": "cbbeca6c5227e65bebdbe9abbadbd2202ffc1005", "type": "github" }, "original": { @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -458,11 +458,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { @@ -547,11 +547,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732100541, - "narHash": "sha256-ryxqTo2N5EOwHjrDXCoVFKuG1ZKpoMlRmCjqqUhjQPU=", + "lastModified": 1732545731, + "narHash": "sha256-1DqEbNPnp294THiHgBPTII6F8Bee92yysPuzB6messY=", "owner": "hyprwm", "repo": "hyprland", - "rev": "940f7aa990dbc99815bab8d355999d8277534b17", + "rev": "268778823676ef2bbda42050d78946e1fc27fc31", "type": "github" }, "original": { @@ -689,11 +689,11 @@ ] }, "locked": { - "lastModified": 1729890887, - "narHash": "sha256-Vg98Dm6MaglEUNNTRgLF2Lxy02FrU5ntnlwsMkBSTKg=", + "lastModified": 1732281484, + "narHash": "sha256-0a+oP7iBgAsgMQ2Vz7LlZVfqfvj4W1iuyjHgIs0VEYM=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "3f8cc92109209364e9d39789b3631e9ac109987a", + "rev": "0b5e350011116f4bfa0d004a7b3b8c8e30425619", "type": "github" }, "original": { @@ -816,11 +816,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732055037, - "narHash": "sha256-gTl7l/jJReaxhKn1HA6JJp1mfq/eu8XJbeK88NVeGnw=", + "lastModified": 1732533143, + "narHash": "sha256-m/dBgSxItXrWzTlNannj2loipflOgACfemE/imMICNo=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "230dd8b13b024eb039613c579f940802ea5857e5", + "rev": "a181d4e2571b369e619917d4dc592f64bd16ec1b", "type": "github" }, "original": { @@ -921,11 +921,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1731980711, - "narHash": "sha256-6oOIuAMih3tN1Fjo9cQp1Q5LNe1t3eueA2i0IV1QAVI=", + "lastModified": 1732543374, + "narHash": "sha256-suhk41NhdsnN3aa7gpsr8KnYJtbaLeZBJMB2vqWbkzA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d89390fd1c6e070e03b9e19d48d884612132a14f", + "rev": "18b8f0796f3e9dd8b9d9f262a56f2914a0586a22", "type": "github" }, "original": { @@ -1023,11 +1023,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1116,11 +1116,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1210,11 +1210,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1732050317, - "narHash": "sha256-G5LUEOC4kvB/Xbkglv0Noi04HnCfryur7dVjzlHkgpI=", + "lastModified": 1732388649, + "narHash": "sha256-N6zhzSLdGWUZnyRgCRyOy4Nyz8TkekXgXD2ZhCKAjzE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "c0bbbb3e5d7d1d1d60308c8270bfd5b250032bb4", + "rev": "a2bb0149144e0e6330e60abe4683b4e1a7ab3582", "type": "github" }, "original": { @@ -1408,11 +1408,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1731893168, - "narHash": "sha256-nijDZdYKT9UWF+kMgM3lq1OkbFKvDs6JXKRXI8cpprE=", + "lastModified": 1732483970, + "narHash": "sha256-WO+oXVHr0se8P2Ay8T6av+B5j0+73VX+emON0aGSq+Y=", "ref": "refs/heads/main", - "rev": "9f580b251ca66950bb436c09afd2b9585eed74ba", - "revCount": 840, + "rev": "5f7599fa7afc8990e48dd5ff9631f109117d3d26", + "revCount": 854, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" diff --git a/modules/home/programs/hyprland/rules.nix b/modules/home/programs/hyprland/rules.nix index 37839aef..d547235d 100644 --- a/modules/home/programs/hyprland/rules.nix +++ b/modules/home/programs/hyprland/rules.nix @@ -37,6 +37,10 @@ in { "center, class:^(nwg-look)$" "float, class:^(nwg-look)$" + # === OCULANTE SETTINGS === + "center, class:^(oculante)$" + "float, class:^(oculante)$" + # === PAVUCONTROL SETTINGS === "move 100%-w-20 40, class:^(pavucontrol)$" "size 741 585, class:^(pavucontrol)$" @@ -54,7 +58,6 @@ in { "float, class:^(polkit-gnome-authentication-agent-1)$" "float, class:^(org.gnome.Calculator)$" "float, class:^(Lxappearance)$" - "float, class:^(imv)$" "float, class:^(com.github.hluk.copyq)$" "float, class:^(blueman-manager)$" "float, class:^(floatranger)$" diff --git a/modules/home/programs/ironbar/default.nix b/modules/home/programs/ironbar/default.nix index 8c585df5..c438ed59 100644 --- a/modules/home/programs/ironbar/default.nix +++ b/modules/home/programs/ironbar/default.nix @@ -17,278 +17,278 @@ in { config = mkIf cfg.enable { programs.ironbar = { enable = true; - config = let - workspaces = { - type = "workspaces"; - all_monitors = false; - favorites = map (n: builtins.toString n) [1 2 3 4 5 6 7 8 9 10]; - hidden = ["special"]; - name_map = let - workspaces = lib.genAttrs (map (n: builtins.toString n) [1 2 3 4 5 6 7 8 9 10]); - mkColorfull = text: color: "${text}"; # "${text}"; - dotify = _: mkColorfull "●"; - c = builtins.mapAttrs dotify (import ./colors.nix).base; - in - workspaces ( - i: - if i == "1" - then c.red - else if i == "2" - then c.maroon - else if i == "3" - then c.peach - else if i == "4" - then c.yellow - else if i == "5" - then c.green - else if i == "6" - then c.teal - else if i == "7" - then c.sky - else if i == "8" - then c.sapphire - else if i == "9" - then c.blue - else if i == "10" - then c.lavender - else c.mauve - ); - }; + # config = let + # workspaces = { + # type = "workspaces"; + # all_monitors = false; + # favorites = map (n: builtins.toString n) [1 2 3 4 5 6 7 8 9 10]; + # hidden = ["special"]; + # name_map = let + # workspaces = lib.genAttrs (map (n: builtins.toString n) [1 2 3 4 5 6 7 8 9 10]); + # mkColorfull = text: color: "${text}"; # "${text}"; + # dotify = _: mkColorfull "●"; + # c = builtins.mapAttrs dotify (import ./colors.nix).base; + # in + # workspaces ( + # i: + # if i == "1" + # then c.red + # else if i == "2" + # then c.maroon + # else if i == "3" + # then c.peach + # else if i == "4" + # then c.yellow + # else if i == "5" + # then c.green + # else if i == "6" + # then c.teal + # else if i == "7" + # then c.sky + # else if i == "8" + # then c.sapphire + # else if i == "9" + # then c.blue + # else if i == "10" + # then c.lavender + # else c.mauve + # ); + # }; - music = let - state_path = "${config.xdg.stateHome}/music-ctrls-state"; - show-script = pkgs.writeShellApplication { - name = "mctrls-shower"; - runtimeInputs = with pkgs; [coreutils]; - text = '' - ${pkgs.coreutils}/bin/touch ${state_path} - out=$(< ${state_path}) - if [[ $out != "show" ]]; then - echo -ne "show" > ${state_path} - fi - ''; - }; - hide-script = pkgs.writeShellApplication { - name = "mctrls-hider"; - runtimeInputs = with pkgs; [coreutils]; - text = '' - ${pkgs.coreutils}/bin/touch ${state_path} - out=$(< ${state_path}) - if [[ $out == "show" ]]; then - echo -ne "" >${state_path} - fi - ''; - }; - in { - type = "music"; - player_type = "mpris"; - format = "{title}"; - truncate = "end"; - #icons.play = "icon:media-playback-start"; - #icons.pause = "icon:media-playback-pause"; - music_dir = config.xdg.userDirs.music; - show_status_icon = false; - on_mouse_enter.cmd = "${show-script}/bin/mctrls-shower"; - on_mouse_exit.cmd = "${hide-script}/bin/mctrls-hider"; - #icon_size = 64; - #cover_image_size = 256; - }; - music_img = rec { - type = "custom"; - name = "music-img"; - class = name; - on_mouse_enter = music.on_mouse_enter; - on_mouse_exit = music.on_mouse_exit; - bar = [ - { - type = "image"; - class = name + "-img"; - #src = ''{{poll:5000:${pkgs.playerctl}/bin/playerctl metadata mpris:artUrl}}''; - src = ''{{watch:${pkgs.playerctl}/bin/playerctl -F metadata mpris:artUrl}}''; - } - ]; - }; - music_inline_controls = let - check-script = pkgs.writeShellApplication { - name = "mctrls-checker"; - runtimeInputs = with pkgs; [coreutils]; - text = let - state_path = "${config.xdg.stateHome}/music-ctrls-state"; - in '' - ${pkgs.coreutils}/bin/touch ${state_path} - if [[ $(< ${state_path}) == "show" ]]; then - exit 0 - else - exit 1 - fi - ''; - }; - play-icon-script = pkgs.writeShellApplication { - name = "pp-icon"; - runtimeInputs = [pkgs.playerctl]; - text = '' - if [[ $(${pkgs.playerctl}/bin/playerctl status) == "Playing" ]]; then - echo "" - else - echo "" - fi - ''; - }; - in rec { - type = "custom"; - name = "music-ctrls"; - class = name; - show_if = { - mode = "poll"; - interval = 1000; - cmd = "${check-script}/bin/mctrls-checker"; - }; - on_mouse_enter = music.on_mouse_enter; - on_mouse_exit = music.on_mouse_exit; - transition_type = "slide_start"; - bar = let - pctl = cmd: - "!" - + (pkgs.writeShellApplication { - name = "iron-${cmd}"; - runtimeInputs = [pkgs.playerctl]; - text = "${pkgs.playerctl}/bin/playerctl ${cmd}"; - }) - + "/bin/iron-${cmd}"; - in [ - { - type = "button"; - class = name + "-prev"; - label = "󰒮"; - on_click = pctl "previous"; - } - { - type = "button"; - class = name + "-pp"; - label = "{{poll:100:${play-icon-script}/bin/pp-icon}}"; - on_click = pctl "play-pause"; - } - { - type = "button"; - class = name + "-next"; - label = "󰒭"; - on_click = pctl "next"; - } - ]; - }; - sys_info = { - type = "sys_info"; - format = [" {cpu_percent}%" " {memory_percent}%"]; - }; - battery = { - type = "upower"; - format = "{percentage}%"; - }; + # music = let + # state_path = "${config.xdg.stateHome}/music-ctrls-state"; + # show-script = pkgs.writeShellApplication { + # name = "mctrls-shower"; + # runtimeInputs = with pkgs; [coreutils]; + # text = '' + # ${pkgs.coreutils}/bin/touch ${state_path} + # out=$(< ${state_path}) + # if [[ $out != "show" ]]; then + # echo -ne "show" > ${state_path} + # fi + # ''; + # }; + # hide-script = pkgs.writeShellApplication { + # name = "mctrls-hider"; + # runtimeInputs = with pkgs; [coreutils]; + # text = '' + # ${pkgs.coreutils}/bin/touch ${state_path} + # out=$(< ${state_path}) + # if [[ $out == "show" ]]; then + # echo -ne "" >${state_path} + # fi + # ''; + # }; + # in { + # type = "music"; + # player_type = "mpris"; + # format = "{title}"; + # truncate = "end"; + # #icons.play = "icon:media-playback-start"; + # #icons.pause = "icon:media-playback-pause"; + # music_dir = config.xdg.userDirs.music; + # show_status_icon = false; + # on_mouse_enter.cmd = "${show-script}/bin/mctrls-shower"; + # on_mouse_exit.cmd = "${hide-script}/bin/mctrls-hider"; + # #icon_size = 64; + # #cover_image_size = 256; + # }; + # music_img = rec { + # type = "custom"; + # name = "music-img"; + # class = name; + # on_mouse_enter = music.on_mouse_enter; + # on_mouse_exit = music.on_mouse_exit; + # bar = [ + # { + # type = "image"; + # class = name + "-img"; + # #src = ''{{poll:5000:${pkgs.playerctl}/bin/playerctl metadata mpris:artUrl}}''; + # src = ''{{watch:${pkgs.playerctl}/bin/playerctl -F metadata mpris:artUrl}}''; + # } + # ]; + # }; + # music_inline_controls = let + # check-script = pkgs.writeShellApplication { + # name = "mctrls-checker"; + # runtimeInputs = with pkgs; [coreutils]; + # text = let + # state_path = "${config.xdg.stateHome}/music-ctrls-state"; + # in '' + # ${pkgs.coreutils}/bin/touch ${state_path} + # if [[ $(< ${state_path}) == "show" ]]; then + # exit 0 + # else + # exit 1 + # fi + # ''; + # }; + # play-icon-script = pkgs.writeShellApplication { + # name = "pp-icon"; + # runtimeInputs = [pkgs.playerctl]; + # text = '' + # if [[ $(${pkgs.playerctl}/bin/playerctl status) == "Playing" ]]; then + # echo "" + # else + # echo "" + # fi + # ''; + # }; + # in rec { + # type = "custom"; + # name = "music-ctrls"; + # class = name; + # show_if = { + # mode = "poll"; + # interval = 1000; + # cmd = "${check-script}/bin/mctrls-checker"; + # }; + # on_mouse_enter = music.on_mouse_enter; + # on_mouse_exit = music.on_mouse_exit; + # transition_type = "slide_start"; + # bar = let + # pctl = cmd: + # "!" + # + (pkgs.writeShellApplication { + # name = "iron-${cmd}"; + # runtimeInputs = [pkgs.playerctl]; + # text = "${pkgs.playerctl}/bin/playerctl ${cmd}"; + # }) + # + "/bin/iron-${cmd}"; + # in [ + # { + # type = "button"; + # class = name + "-prev"; + # label = "󰒮"; + # on_click = pctl "previous"; + # } + # { + # type = "button"; + # class = name + "-pp"; + # label = "{{poll:100:${play-icon-script}/bin/pp-icon}}"; + # on_click = pctl "play-pause"; + # } + # { + # type = "button"; + # class = name + "-next"; + # label = "󰒭"; + # on_click = pctl "next"; + # } + # ]; + # }; + # sys_info = { + # type = "sys_info"; + # format = [" {cpu_percent}%" " {memory_percent}%"]; + # }; + # battery = { + # type = "upower"; + # format = "{percentage}%"; + # }; - tray = {type = "tray";}; - clock = { - type = "clock"; - format = "%l:%M %P"; - }; + # tray = {type = "tray";}; + # clock = { + # type = "clock"; + # format = "%l:%M %P"; + # }; - cava = { - type = "script"; - mode = "watch"; - cmd = - (pkgs.writeShellApplication { - name = "cava"; - runtimeInputs = [pkgs.cava pkgs.gnused]; - text = '' - printf "[general]\nframerate=160\nbars = 7\n[output]\nmethod = raw\nraw_target = /dev/stdout\ndata_format = ascii\nascii_max_range = 7\n" | cava -p /dev/stdin | sed -u 's/;//g;s/0/▁/g;s/1/▂/g;s/2/▃/g;s/3/▄/g;s/4/▅/g;s/5/▆/g;s/6/▇/g;s/7/█/g; ' - ''; - }) - + "/bin/cava"; - }; - dash = rec { - type = "custom"; - name = "nix-launcher"; - class = name; - bar = [ - { - type = "button"; - label = "󰇙 "; - on_click = "popup:toggle"; - } - ]; - popup = [ - { - type = "box"; - orientation = "v"; - widgets = [ - #{ - # type = "label"; - # label = "{{${pkgs.macchina}/bin/macchina}}"; - #} - { - type = "box"; - widgets = [ - { - type = "button"; - label = "󱗼 Applications"; - on_click = "!tuirun-toggle"; - } - { - type = "button"; - label = "󰕾 Sound"; - on_click = "!${pkgs.pavucontrol}/bin/pavucontrol"; - } - { - type = "button"; - label = "󰐥 Power"; - on_click = "!${pkgs.nwg-bar}/bin/nwg-bar"; - } - ]; - } - ]; - } - ]; - }; + # cava = { + # type = "script"; + # mode = "watch"; + # cmd = + # (pkgs.writeShellApplication { + # name = "cava"; + # runtimeInputs = [pkgs.cava pkgs.gnused]; + # text = '' + # printf "[general]\nframerate=160\nbars = 7\n[output]\nmethod = raw\nraw_target = /dev/stdout\ndata_format = ascii\nascii_max_range = 7\n" | cava -p /dev/stdin | sed -u 's/;//g;s/0/▁/g;s/1/▂/g;s/2/▃/g;s/3/▄/g;s/4/▅/g;s/5/▆/g;s/6/▇/g;s/7/█/g; ' + # ''; + # }) + # + "/bin/cava"; + # }; + # dash = rec { + # type = "custom"; + # name = "nix-launcher"; + # class = name; + # bar = [ + # { + # type = "button"; + # label = "󰇙 "; + # on_click = "popup:toggle"; + # } + # ]; + # popup = [ + # { + # type = "box"; + # orientation = "v"; + # widgets = [ + # #{ + # # type = "label"; + # # label = "{{${pkgs.macchina}/bin/macchina}}"; + # #} + # { + # type = "box"; + # widgets = [ + # { + # type = "button"; + # label = "󱗼 Applications"; + # on_click = "!tuirun-toggle"; + # } + # { + # type = "button"; + # label = "󰕾 Sound"; + # on_click = "!${pkgs.pavucontrol}/bin/pavucontrol"; + # } + # { + # type = "button"; + # label = "󰐥 Power"; + # on_click = "!${pkgs.nwg-bar}/bin/nwg-bar"; + # } + # ]; + # } + # ]; + # } + # ]; + # }; - left = [ - #focused - dash - workspaces - ]; - right = [ - tray - sys_info - cava - battery - clock - ]; - center = [ - music_img - music - music_inline_controls - ]; - in { - anchor_to_edges = true; - position = "top"; - start = left; - end = right; - center = center; - #center = [ - # { - # type = "label"; - # label = "random num: {{500:playerctl metadata mpris:artUrl}}"; - # } - #]; - height = 32; - icon_theme = config.gtk.iconTheme.name; - }; - style = let - built = pkgs.callPackage ./scss-pkg.nix { - src = ./styles; - entry = "main"; - }; - in '' - @import url("${built}/out.css"); - ''; + # left = [ + # #focused + # dash + # workspaces + # ]; + # right = [ + # tray + # sys_info + # cava + # battery + # clock + # ]; + # center = [ + # music_img + # music + # music_inline_controls + # ]; + # in { + # anchor_to_edges = true; + # position = "top"; + # start = left; + # end = right; + # center = center; + # #center = [ + # # { + # # type = "label"; + # # label = "random num: {{500:playerctl metadata mpris:artUrl}}"; + # # } + # #]; + # height = 32; + # icon_theme = config.gtk.iconTheme.name; + # }; + # style = let + # built = pkgs.callPackage ./scss-pkg.nix { + # src = ./styles; + # entry = "main"; + # }; + # in '' + # @import url("${built}/out.css"); + # ''; }; }; } diff --git a/modules/home/programs/misc/default.nix b/modules/home/programs/misc/default.nix index b6d2fc12..03566d12 100644 --- a/modules/home/programs/misc/default.nix +++ b/modules/home/programs/misc/default.nix @@ -50,6 +50,7 @@ in { libnotify pamixer # TUI sound control ripgrep + oculante file fd gnused diff --git a/modules/home/services/xdg/default.nix b/modules/home/services/xdg/default.nix index e1ac350d..c477af7f 100644 --- a/modules/home/services/xdg/default.nix +++ b/modules/home/services/xdg/default.nix @@ -43,18 +43,18 @@ in { "application/x-extension-xht" = browser; "application/xhtml+xml" = browser; "application/json" = browser; - "application/pdf" = "org.pwmt.zathura.desktop"; + "application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop"; "inode/directory" = "thunar.desktop"; - "image/apng" = "feh.desktop"; - "image/avif" = "feh.desktop"; - "image/bmp" = "feh.desktop"; - "image/gif" = "feh.desktop"; - "image/jpeg" = "feh.desktop"; - "image/png" = "feh.desktop"; - "image/svg+xml" = "feh.desktop"; - "image/tiff" = "feh.desktop"; - "image/webp" = "feh.desktop"; + "image/apng" = "oculante.desktop"; + "image/avif" = "oculante.desktop"; + "image/bmp" = "oculante.desktop"; + "image/gif" = "oculante.desktop"; + "image/jpeg" = "oculante.desktop"; + "image/png" = "oculante.desktop"; + "image/svg+xml" = "oculante.desktop"; + "image/tiff" = "oculante.desktop"; + "image/webp" = "oculante.desktop"; "video/H264" = ["mpv.desktop" "vlc.desktop"]; "video/x-msvideo" = ["mpv.desktop" "vlc.desktop"]; diff --git a/nix/shell/default.nix b/nix/shell/default.nix index 842a0f35..7aeb9b0f 100644 --- a/nix/shell/default.nix +++ b/nix/shell/default.nix @@ -21,6 +21,7 @@ gnumake # GNU Make pkg-config # Manages library paths during compilation perl # Scripting language, sometimes needed during builds + gtk-layer-shell # Version control git # Version control system