diff --git a/flake.lock b/flake.lock index 0e1d2fe..f57bfb4 100644 --- a/flake.lock +++ b/flake.lock @@ -196,11 +196,11 @@ "wezterm-src": "wezterm-src" }, "locked": { - "lastModified": 1688281534, - "narHash": "sha256-AOBSeLKmDyr2022DhX8dOxf/9brGPVicoTHb0LK7A/U=", + "lastModified": 1688454338, + "narHash": "sha256-n2yR1GB3tecKShuc5+xNuqIzaV98uGdBaVC4skU86pQ=", "owner": "nekowinston", "repo": "nur", - "rev": "812e322dadb722be8bbe063cd9c2d7b3d16d4f28", + "rev": "0d1549b6499842afb749a1a4d810ef4e89d1f46e", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1688348068, - "narHash": "sha256-zfqzsSrJP7C0zgZjIllLb6ZXi5vatDsizFHRL8XJ/Fk=", + "lastModified": 1688434343, + "narHash": "sha256-EsGumlCCCoBCIG+A5B3SZOx4b1IKaT4CKeO30S2K+Og=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0d3490d9ab18d777a0d20c62f40efabfd6263111", + "rev": "967d796e7d6252423f31e35f2e3220202b694903", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1688221086, - "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", + "lastModified": 1688403656, + "narHash": "sha256-zmNai3dKWUCKpKubPWsEJ1Q7od96KebWVDJNCnk+fr0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", + "rev": "453da3c28f7a95374b73d1f3fd665dd40e6049e9", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nur": { "locked": { - "lastModified": 1688410025, - "narHash": "sha256-MU8IwFndC9aOBPRn4ssjF0a9xueE8Vy/skjHegbJbsI=", + "lastModified": 1688457350, + "narHash": "sha256-M+Vt3CKilvjY44vlodUmcj18nGAFJIMUN654NIgAUVw=", "owner": "nix-community", "repo": "nur", - "rev": "b944caccd70802b9589882544d61b11477b1bf4d", + "rev": "a7780363dafaf0f4715ae0c3c37d2fe44601e019", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "wezterm-src": { "flake": false, "locked": { - "lastModified": 1688050920, - "narHash": "sha256-X7Y37sfUUZBGa+NwGtTe4JYIwu7D3btZ0yhLkO4VHVg=", + "lastModified": 1688415824, + "narHash": "sha256-Ooa3QEgg4hLhIS+MOBDSfjcYNdl/81z4whgOYQDCeN0=", "ref": "refs/heads/main", - "rev": "f376468f461d668ef3748c82fa40eab5b955d677", - "revCount": 7263, + "rev": "9459f64cce393a56b9be6deddc6a622332aff7c8", + "revCount": 7268, "submodules": true, "type": "git", "url": "https://github.com/wez/wezterm" diff --git a/home/apps/gtk.nix b/home/apps/gtk.nix index 97df156..d6e4d0d 100644 --- a/home/apps/gtk.nix +++ b/home/apps/gtk.nix @@ -1,62 +1,52 @@ { config, - lib, pkgs, ... -}: let - cfg = config.dotfiles.gtk; -in - with lib; { - options.dotfiles.gtk = { - enable = mkEnableOption "GTK settings"; +}: rec { + gtk = { + enable = true; + cursorTheme = { + name = "Numix-Cursor"; + package = pkgs.numix-cursor-theme; }; - - config = mkIf cfg.enable rec { - gtk = { - enable = true; - cursorTheme = { - name = "Numix-Cursor"; - package = pkgs.numix-cursor-theme; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { - flavor = "mocha"; - accent = "pink"; - }; - }; - theme = { - name = "Catppuccin-Mocha-Compact-Pink-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = ["pink"]; - variant = "mocha"; - size = "compact"; - }; - }; - gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - gtk2.extraConfig = '' - gtk-xft-antialias=1 - gtk-xft-hinting=1 - gtk-xft-hintstyle="hintslight" - gtk-xft-rgba="rgb" - ''; - gtk3.extraConfig = { - gtk-xft-antialias = 1; - gtk-xft-hinting = 1; - gtk-xft-hintstyle = "hintslight"; - gtk-xft-rgba = "rgb"; - }; - }; - - xdg = let - themeDir = "${gtk.theme.package}/share/themes/${gtk.theme.name}"; - in { - configFile."gtk-4.0/assets" = { - source = "${themeDir}/gtk-4.0/assets"; - recursive = true; - }; - configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css"; - configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css"; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.catppuccin-papirus-folders.override { + flavor = "mocha"; + accent = "pink"; }; }; - } + theme = { + name = "Catppuccin-Mocha-Compact-Pink-Dark"; + package = pkgs.catppuccin-gtk.override { + accents = ["pink"]; + variant = "mocha"; + size = "compact"; + }; + }; + gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + gtk2.extraConfig = '' + gtk-xft-antialias=1 + gtk-xft-hinting=1 + gtk-xft-hintstyle="hintslight" + gtk-xft-rgba="rgb" + ''; + gtk3.extraConfig = { + gtk-xft-antialias = 1; + gtk-xft-hinting = 1; + gtk-xft-hintstyle = "hintslight"; + gtk-xft-rgba = "rgb"; + }; + }; + + xdg = let + themeDir = "${gtk.theme.package}/share/themes/${gtk.theme.name}"; + in { + configFile."gtk-4.0/assets" = { + source = "${themeDir}/gtk-4.0/assets"; + recursive = true; + }; + configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css"; + configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css"; + }; +} diff --git a/home/apps/media.nix b/home/apps/media.nix index fbfa9e8..28da41e 100644 --- a/home/apps/media.nix +++ b/home/apps/media.nix @@ -60,10 +60,6 @@ in { mpd-mpris.enable = isLinux; }; - systemd.user.tmpfiles.rules = lib.mkIf isLinux [ - "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0" - ]; - launchd.agents.mpd = { enable = true; config = let diff --git a/home/apps/rice.nix b/home/apps/rice.nix index 0266a86..82f52ff 100644 --- a/home/apps/rice.nix +++ b/home/apps/rice.nix @@ -18,8 +18,6 @@ size = 12.0; }; in { - dotfiles.gtk.enable = isLinux; - programs.i3status-rust = lib.mkIf isLinux { enable = true; bars.top = { diff --git a/home/default.nix b/home/default.nix index 2365756..76d4468 100644 --- a/home/default.nix +++ b/home/default.nix @@ -28,10 +28,14 @@ in { sops ] ++ lib.optionals isLinux [ + (discord.override { + withOpenASAR = true; + withTTS = true; + }) _1password-gui - kooha jetbrains.goland jetbrains.webstorm + kooha ]); sessionVariables = lib.mkIf isDarwin { SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh";