diff --git a/.config/eww/scripts/geticons b/.config/eww/scripts/geticons new file mode 160000 index 0000000..2f0215d --- /dev/null +++ b/.config/eww/scripts/geticons @@ -0,0 +1 @@ +Subproject commit 2f0215d4e1003599a72a9b140ee3abe3c83fa799 diff --git a/.config/firefox/chrome/ShyFox/shy-floating-search.css b/.config/firefox/chrome/ShyFox/shy-floating-search.css index 4899494..ab8757c 100644 --- a/.config/firefox/chrome/ShyFox/shy-floating-search.css +++ b/.config/firefox/chrome/ShyFox/shy-floating-search.css @@ -39,11 +39,11 @@ Cool floating search panel pointer-events: none; border-radius: var(--rounding); - width: 100vw; - height: 100vh; + width: 200vw; + height: 200vh; - top: 0px; - left: 0px; + top: -30vh; + left: -30vw; background-color: color-mix(in srgb, var(--bg-col) 80%, transparent); } diff --git a/.config/rofi/bak b/.config/rofi/bak new file mode 100644 index 0000000..5ee821a --- /dev/null +++ b/.config/rofi/bak @@ -0,0 +1,220 @@ +/*-*- mode: css; -*-*/ +/** Configured For Applets **/ + + +configuration { + icon-theme: "Papirus"; + terminal: "konsole"; + sidebar-mode: true; + run-command: "bash -c {cmd}"; + run-list-command: "fish -c functions"; + display-drun: " "; + display-run: " "; + display-window: " "; + display-combi: " "; + drun-display-format: "{name} [({generic})]";/* - {exec}*/ + threads: 0; + scroll-method: 0; + disable-history: false; + kb-accept-entry: "Return"; + kb-remove-to-eol: "Control-D"; + kb-remove-char-back: "BackSpace"; + kb-mode-complete: "Control-M"; + kb-row-down: "Control-j"; + kb-row-up: "Control-k"; + kb-row-left: "Control-h"; + kb-row-right: "Control-l"; + font: "VictorMono Nerd Font 12.0"; + timeout { + delay: 15; + action: "kb-cancel"; + } +} + +* { + backgrounkd: #12121222; + background-color: #00222b33; + background-entry: #000000; + foreground-selected: #ffffff; + urgent: #E91E63; + urgent-selected: #E91E63; + transparent: #00000000; + base00: #282a36; + base01: #34353e; + base02: #43454f; + base03: #78787e; + base04: #a5a5a9; + base05: #e2e4e5; + base06: #eff0eb; + base07: #f1f1f0; + base08: #ff5c57; + base09: #ff9f43; + base0A: #f3f99d; + base0B: #5af78e; + base0C: #9aedfe; + base0D: #57c7ff; + base0E: #ff6ac1; + base0F: #b2643c; + base00t: #282a3655; + background-alt: @base02; +} + +window { + background-color: @base00; + text-color: @base05; + /* transparency: "real"; */ + border-radius: 20px; + border: 0px; + width: 60%; + location: center; + anchor: center; + x-offset: 0; + y-offset: 0; + margin: 0px; + padding: 0px; +} + +mainbox { + border-radius: 16; + /* background-color: @transparent; */ + background-color: @base00; + text-color: @base05; + transparency: "real"; +} + +inputbar { + /* background-color: @transparent; */ + background-color: @base00; + text-color: @base05; + expand: false; + border-radius: 36px; + margin: 0px 0px 0px 0px; + padding: 20px 6px 20px 6px; + position: north; +} + +prompt { + enabled: true; + padding: 0px 6px 0px 5px; + /* background-color: @transparent; */ + background-color: @base00; + text-color: @base05; + border: 0px; + font: "VictorMono Nerd Font 22.0"; +} + +entry { + /* background-color: @transparent; */ + background-color: @base00; + color: @base00; + placeholder-color: @base05; + text-color: @base05; + expand: true; + horizontal-align: 0; + placeholder: ""; + blink: true; + border: 0px; + padding: 0px 0px 0px 6px; + font: "VictorMono Nerd Font 22.0"; +} + +case-indicator { + background-color: @transparent; + text-color: @base05; + spacing: 0; + border: 0px; +} + +sidebar { + border: 2px 0 0; +} + +mainbox { + /* background-color: @base00t; */ + background-color: @base00; + text-color: @transparent; + children: [ inputbar, listview, message ]; + spacing: 5px; + padding: 10px 10px 10px 10px; +} + +message { + border: 0px 0 0; + padding: 0px; + background-color: @transparent; +} + +textbox { + highlight: @base0B; + text-color: @base0B; + background-color: @transparent; + padding: 10px 90px 10px 90px; +} + +listview { + /* background-color: @transparent; */ + background-color: @base00; + columns: 1; + spacing: 4px; + cycle: false; + dynamic: true; + layout: vertical; + lines: 10; + scrollbar: false; + border: 0px; + fixed-height: false; +} + +element { + background-color: @transparent; + text-color: @base05; + orientation: horizontal; + border-radius: 55px; + padding: 5px 5px 5px 10px; +} + +element-icon { + background-color: @transparent; + size: 30px; + border: 0px; + padding: 0px 0px 0px; +} + +element-text { + expand: true; + background-color: @transparent; + text-color: @base05; + vertical-align: 0.5; +} + +element normal.urgent, +element alternate.urgent { + background-color: @urgent; + text-color: @base08; + border-radius: 9px; +} + +element normal.active, +element alternate.active { + background-color: @background-alt; + text-color: @base0B; +} + +element selected { + background-color: @background-alt; + text-color: @base0A; +} + +element selected.urgent { + background-color: @urgent-selected; + text-color: @base08; +} + +element selected.active { + background-color: @background-alt; + color: @base0A; +} + +window { + background-color: @base00; +} diff --git a/flake.lock b/flake.lock index 4123b19..153406d 100644 --- a/flake.lock +++ b/flake.lock @@ -102,10 +102,28 @@ "type": "gitlab" } }, + "darkly": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1741543504, + "narHash": "sha256-IwN6eZusfeGIEtdubpJpp1wrzToi0Umwi9jbXc4AF90=", + "owner": "Bali10050", + "repo": "Darkly", + "rev": "40ccf235ae340ace5a55c7740db78f15d1285105", + "type": "github" + }, + "original": { + "owner": "Bali10050", + "repo": "Darkly", + "type": "github" + } + }, "emacs": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixos-unstable-small" ], "nixpkgs-stable": "nixpkgs-stable" }, @@ -175,11 +193,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1739223196, - "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -373,11 +391,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -432,11 +450,11 @@ ] }, "locked": { - "lastModified": 1741378606, - "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", + "lastModified": 1741879521, + "narHash": "sha256-GylyCwdUe2Kd69bC8txEX+A3H/DXBZl2a+GcmTcJw/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", + "rev": "1b0efe3d335f452595512c7b275e5dddfbfb28a5", "type": "github" }, "original": { @@ -454,11 +472,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "type": "github" }, "original": { @@ -471,15 +489,15 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1739709805, - "narHash": "sha256-8/OuhPELneYOtncScsPrAwmlzBNSAFotoTKd6JxU6OA=", + "lastModified": 1741725077, + "narHash": "sha256-p9mLfWb9PPLtRUKlJoQG71jFH6xU4Ox+rzPkExvAglY=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "bff10a66e50f6a3387b3e5acbbdf2519c624e8bc", + "rev": "875d25066d4ad4df2ced3a0a16be0e40bb469d95", "type": "github" }, "original": { @@ -514,15 +532,15 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1741360124, - "narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=", + "lastModified": 1741864154, + "narHash": "sha256-A39pa4ZmUqSjuE2L4swvHKGUQ2maKiY0P5UduZ+yE90=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "5be89641d8b9190460af05d59f6dbe4cb8695399", + "rev": "05f8b43a311b3a1f914af89a94480b19d2eceac6", "type": "github" }, "original": { @@ -533,11 +551,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -547,6 +565,22 @@ "type": "github" } }, + "nixos-unstable-small": { + "locked": { + "lastModified": 1741874442, + "narHash": "sha256-NBj9G0yQ7FVqC8Pi61+D6Jv2EfJ9TRpHI301fgVzQn0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "01f44b8389188522fba255168c70eda093867746", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1716509168, @@ -596,11 +630,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1741196730, - "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", + "lastModified": 1741724370, + "narHash": "sha256-WsD+8uodhl58jzKKcPH4jH9dLTLFWZpVmGq4W1XDVF4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", + "rev": "95600680c021743fd87b3e2fe13be7c290e1cac4", "type": "github" }, "original": { @@ -612,11 +646,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1741196730, - "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", + "lastModified": 1741724370, + "narHash": "sha256-WsD+8uodhl58jzKKcPH4jH9dLTLFWZpVmGq4W1XDVF4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", + "rev": "95600680c021743fd87b3e2fe13be7c290e1cac4", "type": "github" }, "original": { @@ -628,11 +662,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739451785, - "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", + "lastModified": 1741678040, + "narHash": "sha256-rmBsz7BBcDwfvDkxnKHmolKceGJrr0nyz5PQYZg0kMk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", + "rev": "3ee8818da146871cd570b164fc4f438f78479a50", "type": "github" }, "original": { @@ -660,27 +694,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -690,7 +708,39 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_5": { + "locked": { + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1735264675, "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", @@ -704,7 +754,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -729,11 +779,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1740408283, - "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=", + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", "owner": "nix-community", "repo": "NUR", - "rev": "496a4a11162bdffb9a7b258942de138873f019f7", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", "type": "github" }, "original": { @@ -790,7 +840,7 @@ "quickemu": { "inputs": { "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1735561406, @@ -808,12 +858,14 @@ "root": { "inputs": { "anipy-cli": "anipy-cli", + "darkly": "darkly", "emacs": "emacs", "eww": "eww", "home-manager": "home-manager", "nix-bitcoin": "nix-bitcoin", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", + "nixos-unstable-small": "nixos-unstable-small", "nixpkgs": [ "nixos-cosmic", "nixpkgs" @@ -850,7 +902,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { @@ -892,11 +944,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741381249, - "narHash": "sha256-lr62m73oNjkSX0ar7tPalTSTzaqCsuZCEYyK8mPbXPU=", + "lastModified": 1741880767, + "narHash": "sha256-tXtop1zIJMyRt1LDERIWwMAMVKdfDtFp/g37YKy2Ke4=", "owner": "danth", "repo": "stylix", - "rev": "4891f1471b682af073574dc51fa4810f1470ef8f", + "rev": "5053a63c87fea3508439b7e9c1a66fa6979a4694", "type": "github" }, "original": { @@ -1001,11 +1053,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1740351358, - "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=", + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", "owner": "tinted-theming", "repo": "schemes", - "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", "type": "github" }, "original": { @@ -1017,11 +1069,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740272597, - "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 53c3228..82be9b5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixos-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixpkgs.follows = "nixos-cosmic/nixpkgs"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -38,7 +39,8 @@ emacs = { url = "github:nix-community/emacs-overlay/dd38645351b6f14cda47c81456131c86b11386db"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixos-unstable-small"; }; nix-bitcoin = { url = "github:fort-nix/nix-bitcoin/release"; }; simple-nixos-mailserver = { @@ -46,6 +48,7 @@ }; nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; }; anipy-cli = { url = "github:sdaqo/anipy-cli"; }; + darkly = { url = "github:Bali10050/Darkly"; }; # rust-overlay = { # url = "github:oxalica/rust-overlay"; # inputs.nixpkgs.follows = "nixpkgs"; @@ -54,7 +57,7 @@ outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager, plasma-manager , nixos-cosmic, quickemu, nixos-hardware, emacs, nix-bitcoin, eww - , simple-nixos-mailserver, anipy-cli, + , simple-nixos-mailserver, anipy-cli, darkly, # ags, stylix, ... }: let @@ -112,8 +115,9 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # home-manager.extraSpecialArgs = { inherit ags; }; + home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.chris = import ./home/home.nix; + home-manager.backupFileExtension = "bck"; home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; } diff --git a/home/home.nix b/home/home.nix index 72ef2d2..f4d566b 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: let laptop = builtins.readFile "/etc/hostname" == '' @@ -45,15 +45,15 @@ in { enable = true; config = { common = { - default = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; - "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; + default = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-cosmic ]; + "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" ]; }; hyprland = { default = [ "hyprland" ]; - "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; + "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" ]; }; }; - extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; + extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-cosmic ]; }; mimeApps = { enable = true; @@ -71,7 +71,7 @@ in { "video/H265" = "mpv.desktop"; "video/H264" = "mpv.desktop"; "video/vnd.youtube.yt" = "mpv.desktop"; - "inode/directory" = "thunar.desktop"; + "inode/directory" = "com.system76.CosmicFiles.desktop"; "image/gif" = "imv-rifle.desktop"; "image/jpeg" = "imv-rifle.desktop"; "image/heif" = "imv-rifle.desktop"; @@ -85,17 +85,17 @@ in { "audio/opus" = "mpv-slow.desktop"; "audio/x-opus" = "mpv-slow.desktop"; "audio/x-opus+ogg" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; - "text/html" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "text/html" = "firefox.desktop"; "text/org" = "emacsclient.desktop"; "text/md" = "emacsclient.desktop"; "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; "application/pdf" = "emacsclient.desktop"; - "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/about" = "firefox.desktop"; + "x-scheme-handler/unknown" = "firefox.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; }; defaultApplications = { @@ -112,7 +112,7 @@ in { "video/H265" = "mpv.desktop"; "video/H264" = "mpv.desktop"; "video/vnd.youtube.yt" = "mpv.desktop"; - "inode/directory" = "thunar.desktop"; + "inode/directory" = "com.system76.CosmicFiles.desktop"; "image/gif" = "imv-rifle.desktop"; "image/jpeg" = "imv-rifle.desktop"; "image/heif" = "imv-rifle.desktop"; @@ -124,17 +124,17 @@ in { "audio/flac" = "mpv-slow.desktop"; "audio/wav" = "mpv-slow.desktop"; "audio/opus" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; - "text/html" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "text/html" = "firefox.desktop"; "text/org" = "emacsclient.desktop"; "text/md" = "emacsclient.desktop"; "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; "application/pdf" = "emacsclient.desktop"; - "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/about" = "firefox.desktop"; + "x-scheme-handler/unknown" = "firefox.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; }; }; @@ -158,7 +158,15 @@ in { # ''; }; - qt = { enable = true; }; + qt = { + enable = true; + # style.package = [ + # inputs.darkly.packages.${pkgs.system}.darkly-qt5 + # inputs.darkly.packages.${pkgs.system}.darkly-qt6 + # pkgs.kdePackages.callPackage ../pkgs/darkly-pkg.nix { } + # ]; + platformTheme.name = "qtct"; + }; accounts.email = { maildirBasePath = "mail"; @@ -543,18 +551,18 @@ in { recursive = true; }; - home.file.".librewolf/nw77o6yc.default/chrome" = { + home.file.".mozilla/firefox/nw77o6yc.default/chrome" = { source = ../.config/firefox/chrome; recursive = true; }; - home.file.".librewolf/nw77o6yc.default/user.js" = { + home.file.".mozilla/firefox/nw77o6yc.default/user.js" = { text = '' // userchrome.css usercontent.css activate user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); - // disable new sidebar - user_pref("sidebar.revamp", false); + // enable new sidebar + user_pref("sidebar.revamp", true); // Fill SVG Color user_pref("svg.context-properties.content.enabled", true); @@ -585,9 +593,9 @@ in { recursive = true; }; - programs.librewolf = { + programs.firefox = { enable = true; - package = pkgs.librewolf-wayland.override { + package = pkgs.firefox-wayland.override { nativeMessagingHosts = [ pkgs.kdePackages.plasma-browser-integration pkgs.tridactyl-native ]; }; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index a773590..c254872 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -259,7 +259,7 @@ in "SUPER,E,exec,/home/chris/bin/emacslof" "SUPER,d,exec,emacsclient -c -e '(dired-jump)'" "SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi | cliphist decode | wl-copy" - "SUPER,B,exec,/home/chris/bin/qblof" + "SUPER,B,exec,/home/chris/bin/fflof" "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer" "SUPERCTRL,i,exec,alacritty --class btop -e btop" ",Print,exec,screenshot" diff --git a/pkgs/darkly-pkg.nix b/pkgs/darkly-pkg.nix new file mode 100644 index 0000000..fb5bf34 --- /dev/null +++ b/pkgs/darkly-pkg.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + cmake, + qtbase, + wrapQtAppsHook, + kwindowsystem, + kiconthemes, + kdecoration, + kcoreaddons, + kcolorscheme ? null, + kcmutils, + frameworkintegration, + extra-cmake-modules, + darkly-qt6 ? null, +}: +let + inherit (builtins) baseNameOf; + inherit (lib.sources) cleanSourceWith cleanSource; + inherit (lib.strings) hasSuffix; + isQt5 = lib.versionOlder qtbase.version "6"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "darkly-qt${if isQt5 then "5" else "6"}"; + version = lib.removeSuffix "\n" (builtins.readFile ../VERSION); + + src = cleanSourceWith { + filter = + name: _type: + let + baseName = baseNameOf (toString name); + in + !(hasSuffix ".nix" baseName); + src = cleanSource ../.; + }; + + postInstall = lib.optionalString isQt5 '' + rm -r $out/share + ln -s "${darkly-qt6}/share" "$out/share" + ln -s "${darkly-qt6}/bin" "$out/bin" + ''; + + buildInputs = [ qtbase ]; + + propagatedBuildInputs = + [ + frameworkintegration + kcmutils + kcoreaddons + kdecoration + kiconthemes + kwindowsystem + ] + ++ lib.optionals (!isQt5) [ + kcolorscheme + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_QT5" isQt5) + (lib.cmakeBool "BUILD_QT6" (!isQt5)) + ]; + + outputs = [ + "out" + "dev" + ]; + + meta = with lib; { + description = "Fork of the Darkly breeze theme style that aims to be visually modern and minimalistic"; + mainProgram = "darkly-settings6"; + homepage = "https://github.com/Bali10050/Darkly"; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +}) diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index e1b68e0..8ce93ab 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -118,6 +118,8 @@ wmctrl xcape xclip + lapce + zed-editor # maim unclutter-xfixes bluez-tools diff --git a/scripts/buildapp b/scripts/buildapp new file mode 100755 index 0000000..540fd24 Binary files /dev/null and b/scripts/buildapp differ diff --git a/scripts/fflof b/scripts/fflof index f3ae5bc..1e5e74b 100755 --- a/scripts/fflof +++ b/scripts/fflof @@ -2,17 +2,17 @@ export MOZ_ENABLE_WAYLAND=1 echo $MOZ_ENABLE_WAYLAND -# Check to see if librewolf is running -if [ $(pgrep -c librewolf) -gt 0 ]; then +# Check to see if firefox is running +if [ $(pgrep -c firefox) -gt 0 ]; then echo "ff running" if [ "$XDG_SESSION_TYPE" = "x11" ]; then #X11 - ffrg=$(wmctrl -lx | rg librewolf | awk '{print $1}') + ffrg=$(wmctrl -lx | rg firefox | awk '{print $1}') # echo $emacsrg if [ -z $ffrg ]; then - exec librewolf + exec firefox exit else exec wmctrl -ia $ffrg @@ -21,7 +21,7 @@ if [ $(pgrep -c librewolf) -gt 0 ]; then else if [ "$KDE_FULL_SESSION" = "true" ]; then echo "KDE" - exec /home/chris/bin/ww -fa librewolf -c librewolf + exec /home/chris/bin/ww -fa firefox -c librewolf exit else # WAYLAND @@ -35,5 +35,5 @@ if [ $(pgrep -c librewolf) -gt 0 ]; then fi fi else - exec librewolf --name "lw" + exec firefox --name "lw" fi