diff --git a/.gitignore b/.gitignore index ceae988..a7b47ba 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ backup/ .secrets -result +result* $HOME .env diff --git a/flake.lock b/flake.lock index 39a1041..90aabfc 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1759677488, - "narHash": "sha256-fhRv6OdFLSfuiDDJpcfmmGRzy0fSSzOHbdMpuvwysTU=", + "lastModified": 1759784494, + "narHash": "sha256-iqoNDK6hwk+k+NdHabeImjogGaFpHOA5+TEWJDHoqVM=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "fa3bc416ab08a7ab849ef878c01009c0710725b4", + "rev": "3d1977ca4338fb217d1bc67567dd91dc7340f053", "type": "github" }, "original": { @@ -74,6 +74,25 @@ "type": "github" } }, + "grim-hyprland": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1741705247, + "narHash": "sha256-4m2QFT8mY6CM3YSebMJhd/kJWaRxTYOS/nvAs2TaIQs=", + "owner": "eriedaberrie", + "repo": "grim-hyprland", + "rev": "4a3d6f5b87b01e92c404b9393b79057b85f58c60", + "type": "github" + }, + "original": { + "owner": "eriedaberrie", + "repo": "grim-hyprland", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -97,7 +116,7 @@ }, "hu-tao-cursor": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1758768962, @@ -116,11 +135,11 @@ "hyprland-dots": { "flake": false, "locked": { - "lastModified": 1759689455, - "narHash": "sha256-GsuG+Gbs3XMbmmkK1azoWF+ZUJ891OhRMy3S6Fv8qo0=", + "lastModified": 1759800466, + "narHash": "sha256-XtxsPQphUPG9W335/PK7vgfqLHZ0u0T6Ya7lfpSNq3s=", "ref": "refs/heads/master", - "rev": "3c8faf70c7b92a09399f6ab48bb7b06c47a7b833", - "revCount": 19, + "rev": "b9180ab4a3f94a5b10a774ade0a340b7d65d5a1b", + "revCount": 20, "type": "git", "url": "ssh://git@github.com/alsaiduq-lab/hyprland-dots" }, @@ -137,11 +156,11 @@ ] }, "locked": { - "lastModified": 1759629535, - "narHash": "sha256-VIXcJ2ahRgoqIUySwAz3r5mtITO2dp6tXGCVKVW6FmA=", + "lastModified": 1759801625, + "narHash": "sha256-hf6YIe5E0RDTe76dJuJGWHdrJXOxOu07KeSo5K6XjqY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "df388c42b54714bd121796a9cec9322b7fa2894e", + "rev": "789f074c93425294989766a75fb0efe27f78a171", "type": "github" }, "original": { @@ -192,6 +211,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1758346548, "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", @@ -207,13 +242,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "type": "github" }, "original": { @@ -262,11 +297,12 @@ "root": { "inputs": { "ghostty": "ghostty", + "grim-hyprland": "grim-hyprland", "home-manager": "home-manager", "hu-tao-cursor": "hu-tao-cursor", "hyprland-dots": "hyprland-dots", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim-dots": "nvim-dots", "quickshell": "quickshell", "unstable": "unstable" @@ -287,6 +323,21 @@ "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" + } + }, "unstable": { "locked": { "lastModified": 1759632233, diff --git a/flake.nix b/flake.nix index c775b79..5c209b9 100644 --- a/flake.nix +++ b/flake.nix @@ -41,14 +41,23 @@ url = "github:ghostty-org/ghostty"; }; + grim-hyprland = { + url = "github:eriedaberrie/grim-hyprland"; + }; + # TODO: sops-nix = { # url = "github:Mic92/sops-nix"; # inputs.nixpkgs.follows = "nixpkgs"; # }; - # Hyprspace = { - # url = "github:rich/Hyprspace"; - # }; + hyprland = { + url = "github:hyprwm/Hyprland"; + }; + + hyprspace = { + url = "github:KZDKM/Hyprspace/7a3adf6"; + inputs.hyprland.follows = "hyprland"; + }; }; outputs = { @@ -60,6 +69,7 @@ ghostty, hu-tao-cursor, #sops-nix, + hyprspace, ... } @ inputs: let system = "x86_64-linux"; @@ -96,9 +106,13 @@ hostPlatform = system; overlays = [ (final: prev: { - ollama = unstablePkgs.ollama; + ollama = unstablePkgs.ollama-cuda; rpcs3 = unstablePkgs.rpcs3; quickshell = unstable.legacyPackages.${system}.quickshell; + ghostty = inputs.ghostty.packages.${system}.default; + hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default; + grim-hyprland = inputs.grim-hyprland.packages.${system}.default; + hyprspace = inputs.hyprspace.packages.${system}.default; }) (final: prev: { inherit @@ -114,8 +128,6 @@ clear-sans = prev.clear-sans.clear-sans; binary-font = prev.binary-font.binary-clock-font; }) - (final: prev: {ghostty = inputs.ghostty.packages.${system}.default;}) - (final: prev: {hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default;}) ]; }; } diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index a0c3b3f..cef6349 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -7,12 +7,12 @@ ... }: { imports = [ + ../settings.nix ./init.nix ./modules/fish.nix ./modules/ghostty.nix ./modules/lazygit.nix ./modules/nvim.nix - ./modules/rofi.nix ./modules/starship.nix ./modules/zellij.nix ./modules/ffmpeg.nix @@ -22,23 +22,24 @@ ./modules/spotify.nix ./modules/obs.nix ./modules/mpv.nix - ./modules/waybar.nix ./modules/ani-cli.nix ./modules/quickshell.nix - # currently broken - # ./modules/hyprspace.nix + ./modules/hyprspace.nix ./modules/cava.nix ./modules/matugen.nix ./modules/rgb.nix + ./modules/anyrun.nix ]; - home.username = "cobray"; - home.homeDirectory = "/home/cobray"; + home.username = "${config.theme.user}"; + home.homeDirectory = "/home/${config.theme.user}"; home.stateVersion = "24.11"; programs.home-manager.enable = true; home.enableNixpkgsReleaseCheck = false; xdg.mime.enable = false; + + # TODO: move these somewhere else; undecided home.packages = with pkgs; [ btop nvtopPackages.full diff --git a/home-manager/modules/anyrun.nix b/home-manager/modules/anyrun.nix new file mode 100644 index 0000000..2d4812d --- /dev/null +++ b/home-manager/modules/anyrun.nix @@ -0,0 +1,286 @@ +{ + config, + pkgs, + ... +}: { + programs.anyrun = { + enable = true; + + config = { + x = {fraction = 0.5;}; + y = {fraction = 0.3;}; + width = {absolute = 600;}; + height = {absolute = 0;}; + + hideIcons = false; + ignoreExclusiveZones = false; + layer = "overlay"; + hidePluginInfo = false; + closeOnClick = true; + showResultsImmediately = false; + maxEntries = 8; + + plugins = [ + "${pkgs.anyrun}/lib/libapplications.so" + "${pkgs.anyrun}/lib/libdictionary.so" + "${pkgs.anyrun}/lib/libkidex.so" + "${pkgs.anyrun}/lib/librandr.so" + "${pkgs.anyrun}/lib/librink.so" + "${pkgs.anyrun}/lib/libshell.so" + "${pkgs.anyrun}/lib/libstdin.so" + "${pkgs.anyrun}/lib/libsymbols.so" + "${pkgs.anyrun}/lib/libtranslate.so" + "${pkgs.anyrun}/lib/libwebsearch.so" + ]; + }; + + extraCss = '' + * { + all: unset; + font-family: "Clear Sans", monospace; + font-size: 12px; + } + + #window { + background: transparent; + } + + #main { + background-color: rgba(30, 32, 48, 0.95); + border: 2px solid #82aaff; + border-radius: 16px; + padding: 8px; + box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5); + } + + #entry { + background-color: transparent; + color: #c8d3f5; + padding: 12px 16px; + border-radius: 8px; + margin: 4px 0; + transition: all 0.2s ease; + } + + #entry:selected { + background-color: #2f334d; + border-left: 3px solid #82aaff; + } + + #entry:hover { + background-color: rgba(47, 51, 77, 0.5); + } + + #entry #match { + color: #c8d3f5; + padding: 4px; + } + + #entry #match:selected { + color: #82aaff; + font-weight: bold; + } + + box#main entry { + color: #828bb8; + } + + box#main entry:selected { + color: #86e1fc; + } + + #plugin { + color: #86e1fc; + font-weight: bold; + padding: 8px 16px; + margin-top: 4px; + border-top: 1px solid rgba(130, 170, 255, 0.3); + } + + #match-desc { + color: #828bb8; + font-size: 12px; + opacity: 0.8; + } + + list#main { + padding: 8px; + } + + scrollbar { + background-color: transparent; + } + + scrollbar slider { + background-color: #2f334d; + border-radius: 8px; + min-width: 6px; + } + + scrollbar slider:hover { + background-color: #82aaff; + } + + image { + margin-right: 8px; + opacity: 0.9; + } + ''; + + extraConfigFiles = { + "websearch.ron".text = '' + Config( + prefix: "?", + engines: [Custom] + ) + Custom( + name: "searxng", + url: "127.0.0.1:11212", + ) + ''; + + "dictionary.ron".text = '' + Config( + prefix: "D ", + max_entries: 5, + ) + ''; + + "translate.ron".text = '' + Config( + prefix: "T ", + language_delimiter: ">", + max_entries: 5, + ) + ''; + + "symbols.ron".text = '' + Config( + prefix: "S ", + symbols: { + "alpha": "α", + "beta": "β", + "gamma": "γ", + "delta": "δ", + "epsilon": "ε", + "lambda": "λ", + "mu": "μ", + "pi": "π", + "sigma": "σ", + "omega": "ω", + "check": "✓", + "cross": "✗", + "star": "★", + "heart": "♥", + "shrug": "¯\\_(ツ)_/¯", + "jhha": "は", + "jhhe": "へ", + "jhwo": "を", + "jhn": "ん", + "jhka": "か", + "jhki": "き", + "jhku": "く", + "jhke": "け", + "jhko": "こ", + "jhsa": "さ", + "jhshi": "し", + "jhsu": "す", + "jhse": "せ", + "jhso": "そ", + "jhta": "た", + "jhchi": "ち", + "jhtsu": "つ", + "jhte": "て", + "jhto": "と", + "jhna": "な", + "jhni": "に", + "jhnu": "ぬ", + "jhne": "ね", + "jhno": "の", + "jhma": "ま", + "jhmi": "み", + "jhmu": "む", + "jhme": "め", + "jhmo": "も", + "jhya": "や", + "jhyu": "ゆ", + "jhyo": "よ", + "jhra": "ら", + "jhri": "り", + "jhru": "る", + "jhre": "れ", + "jhro": "ろ", + "jhwa": "わ", + "jkha": "ハ", + "jkhe": "ヘ", + "jkwo": "ヲ", + "jkn": "ン", + "jkka": "カ", + "jkki": "キ", + "jkku": "ク", + "jkku": "ケ", + "jkko": "コ", + "jksa": "サ", + "jkshi": "シ", + "jksu": "ス", + "jkse": "セ", + "jkso": "ソ", + "jkta": "タ", + "jkchi": "チ", + "jktsu": "ツ", + "jkte": "テ", + "jkto": "ト", + "ichiK": "一", + "niK": "二", + "sanK": "三", + "yonK": "四", + "goK": "五", + "rokuK": "六", + "nanaK": "七", + "hachi": "八", + "kyuu": "九", + "jyuu": "十", + "hyaku": "百", + "senK": "千", + "manK": "万", + "j~": "〜", + "j,": "、", + "j.": "。", + }, + max_entries: 5, + ) + ''; + + "shell.ron".text = '' + Config( + prefix: "SH ", + shell: Some("${config.theme.Shell}"), + ) + ''; + + "randr.ron".text = '' + Config( + prefix: ":randr", + max_entries: 5, + ) + ''; + + "applications.ron".text = '' + Config( + desktop_actions: false, + max_entries: 10, + terminal: Some("${config.theme.Terminal}"), + ) + ''; + # cant get this to work for some reason + #"nix-run.ron".text = '' + # Config( + # prefix: ":nr", + # allow_unfree: true, + # channel: "nixpkgs-unstable", + # max_entries: 5, + # ) + #''; + }; + }; +} diff --git a/home-manager/modules/emulators.nix b/home-manager/modules/emulators.nix index 7c0dbd7..6a94df8 100644 --- a/home-manager/modules/emulators.nix +++ b/home-manager/modules/emulators.nix @@ -5,5 +5,6 @@ retroarch waydroid rpcs3 + input-remapper ]; } diff --git a/home-manager/modules/ffmpeg.nix b/home-manager/modules/ffmpeg.nix index b42ed78..edf345c 100644 --- a/home-manager/modules/ffmpeg.nix +++ b/home-manager/modules/ffmpeg.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { - home.packages = [ - pkgs.ffmpeg + home.packages = with pkgs; [ + ffmpeg + wf-recorder ]; } diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix index de46f50..5270f27 100644 --- a/home-manager/modules/fish.nix +++ b/home-manager/modules/fish.nix @@ -7,5 +7,6 @@ fd ugrep yazi + chafa ]; } diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix index dd97c70..36b6689 100644 --- a/home-manager/modules/ghostty.nix +++ b/home-manager/modules/ghostty.nix @@ -10,12 +10,13 @@ ]; programs.ghostty = { + # TODO: figure another way to do this enable = true; enableFishIntegration = true; settings = { command = "${pkgs.fish}/bin/fish --login --interactive"; - font-family = "0xProto Nerd Font"; + font-family = "${config.theme.TerminalFont}"; font-size = 12; theme = "TokyoNight Storm"; window-padding-x = 10; diff --git a/home-manager/modules/rofi.nix b/home-manager/modules/rofi.nix deleted file mode 100644 index a0f45ef..0000000 --- a/home-manager/modules/rofi.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - rofi - ]; -} diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 9d95260..0f31194 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -4,6 +4,7 @@ {...}: { imports = [ # Include the results of the hardware scan. + ../settings.nix ./hardware-configuration.nix ./system-packages.nix ]; diff --git a/hosts/modules/boot.nix b/hosts/modules/boot.nix index 542f93c..bc0eaa6 100644 --- a/hosts/modules/boot.nix +++ b/hosts/modules/boot.nix @@ -8,12 +8,20 @@ efi.canTouchEfiVariables = true; timeout = 5; }; - tmp = { - cleanOnBoot = true; - }; + tmp.cleanOnBoot = true; kernelPackages = pkgs.linuxPackages; + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "udev.log_priority=3" + "rd.systemd.show_status=auto" + ]; }; + # some people really like putting #/bin/sh or #/bin/bash system.activationScripts.binbash = { deps = []; text = '' diff --git a/hosts/modules/core.nix b/hosts/modules/core.nix index b0d18e7..6ce2c60 100644 --- a/hosts/modules/core.nix +++ b/hosts/modules/core.nix @@ -1,11 +1,8 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - tree + busybox # in case im missing something random fd jq - gawk - psmisc - unzip wrk bitwarden hashcat @@ -27,7 +24,6 @@ argc appimage-run clang - rsync openssl ]; } diff --git a/hosts/modules/go.nix b/hosts/modules/go.nix deleted file mode 100644 index 73a97aa..0000000 --- a/hosts/modules/go.nix +++ /dev/null @@ -1,7 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - go - go-tools - gopls - ]; -} diff --git a/hosts/modules/hyprland.nix b/hosts/modules/hyprland.nix index 2bab322..86d6172 100644 --- a/hosts/modules/hyprland.nix +++ b/hosts/modules/hyprland.nix @@ -28,14 +28,12 @@ hyprland.default = ["hyprland" "gtk"]; }; }; - systemd.user.services.xdg-desktop-portal-hyprland.unitConfig.ConditionPathExists = "%t/wayland-0"; security.polkit.enable = true; environment.systemPackages = with pkgs; [ qt5.qtwayland qt6.qtwayland - polkit_gnome candy-icons hu-tao-animated-cursor tokyonight-gtk-theme @@ -46,12 +44,18 @@ wofi hyprshot hypridle - polkit_gnome - grim + hyprpolkitagent + grim-hyprland slurp swappy + satty imv syshud hyprpaper + hyprpicker + nwg-look + gsimplecal + hyprspace + kdePackages.xwaylandvideobridge ]; } diff --git a/hosts/modules/java.nix b/hosts/modules/java.nix deleted file mode 100644 index 6e93996..0000000 --- a/hosts/modules/java.nix +++ /dev/null @@ -1,8 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - jdk17 - maven - gradle - visualvm - ]; -} diff --git a/hosts/modules/nixos.nix b/hosts/modules/nixos.nix index e0bfb38..8571c05 100644 --- a/hosts/modules/nixos.nix +++ b/hosts/modules/nixos.nix @@ -5,14 +5,24 @@ nix.settings = { auto-optimise-store = true; + max-jobs = "auto"; + cores = 0; experimental-features = ["nix-command" "flakes"]; substituters = [ "https://cache.nixos.org" "https://nix-gaming.cachix.org" + "https://anyrun.cachix.org" + "https://ghostty.cachix.org" + "https://hyprland.cachix.org" + "https://nix-community.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; } diff --git a/hosts/modules/npm.nix b/hosts/modules/npm.nix index faf73f3..166911a 100644 --- a/hosts/modules/npm.nix +++ b/hosts/modules/npm.nix @@ -1,5 +1,9 @@ -{ config, pkgs, lib, ... }: { + config, + pkgs, + lib, + ... +}: { options.npm.enable = lib.mkEnableOption "npm setup"; config = lib.mkIf config.npm.enable { @@ -10,46 +14,5 @@ bun nodePackages.typescript ]; - - systemd.user.services."npm-init" = { - wantedBy = [ "default.target" ]; - serviceConfig.Type = "oneshot"; - script = '' - set -eu - H="$HOME" - mkdir -p "$H/.npm-global/bin" "$H/.npm" - tmp="$(mktemp)" - cat > "$tmp" < $out/share/applications/thorium.desktop + [ -d usr/share/icons ] && cp -r usr/share/icons/* $out/share/icons/ + [ -d usr/share/pixmaps ] && cp -r usr/share/pixmaps/* $out/share/icons/ + [ ! -d "$out/share/icons/hicolor" ] && mkdir -p $out/share/icons/hicolor/256x256/apps && \ + find $out/opt/thorium -name "product_logo_*.png" -exec cp {} $out/share/icons/hicolor/256x256/apps/thorium.png \; -quit + runHook postInstall + ''; - installPhase = '' - runHook preInstall - mkdir -p $out/opt/thorium $out/bin $out/share/applications $out/share/icons + postFixup = '' + wrapProgram $out/bin/thorium \ + --prefix PATH : ${lib.makeBinPath [xdg-utils gnome-settings-daemon]} \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ + --add-flags "--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,UseOzonePlatform" \ + --add-flags "--ozone-platform-hint=auto" \ + --set-default CHROME_VERSION_EXTRA "Thorium AVX2" + ''; - if [ -d opt/chromium.org/thorium ]; then - srcdir=opt/chromium.org/thorium - else - srcdir=opt/thorium-browser - fi - - cp -r "$srcdir"/* $out/opt/thorium/ - - rm -f $out/opt/thorium/libqt5_shim.so $out/opt/thorium/libqt6_shim.so || true - - ln -sf $out/opt/thorium/thorium $out/bin/thorium - ln -sf $out/bin/thorium $out/bin/thorium-browser - - desk_in= - for f in usr/share/applications/thorium-browser.desktop usr/share/applications/thorium.desktop; do - [ -f "$f" ] && desk_in="$f" && break - done - if [ -n "$desk_in" ]; then - mkdir -p $out/share/applications - sed -E \ - -e "s|^Exec=.*|Exec=thorium %U|" \ - -e "s|/opt/[^/]*/thorium|$out/bin/thorium|g" \ - "$desk_in" > $out/share/applications/thorium.desktop - fi - - if [ -d usr/share/icons ]; then - cp -r usr/share/icons/* $out/share/icons/ || true - fi - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/bin/thorium \ - --prefix PATH : ${lib.makeBinPath [xdg-utils]} \ - --set-default CHROME_VERSION_EXTRA "Thorium" \ - --set LD_LIBRARY_PATH ${lib.makeLibraryPath libs} - ''; - - meta = with lib; { - description = "Thorium Browser (Chromium fork)"; - homepage = "https://github.com/Alex313031/Thorium"; - license = licenses.unfreeRedistributable; - platforms = ["x86_64-linux"]; - mainProgram = "thorium"; - maintainers = ["Cobray"]; - }; - } + meta = { + description = "Thorium Browser (Chromium fork)"; + homepage = "https://github.com/Alex313031/Thorium"; + license = lib.licenses.bsd3; + platforms = ["x86_64-linux"]; + maintainers = ["Cobray"]; + mainProgram = "thorium"; + }; +} diff --git a/hosts/settings.nix b/settings.nix similarity index 96% rename from hosts/settings.nix rename to settings.nix index 6ecfce1..db82b60 100644 --- a/hosts/settings.nix +++ b/settings.nix @@ -20,12 +20,10 @@ with lib; { }; gtkThemeMode = mkOption { type = types.str; - # light or dark mode default = "dark"; }; qtTheme = mkOption { type = types.str; - # qt5 or 6 it seems default = "qt6ct"; }; qtOverride = mkOption {