From 4cca1dc32721c40b8f67b501050408fd3ef3e61b Mon Sep 17 00:00:00 2001 From: zack Date: Sun, 19 Jan 2025 15:04:19 -0500 Subject: [PATCH] theme qt6 among other things.. --- flake.lock | 173 ++++++++++-------- flake.nix | 6 +- homes/x86_64-linux/zoey@earth/default.nix | 58 +++--- modules/home/apps/helpers/rofi/default.nix | 2 +- modules/home/apps/term/ghostty/default.nix | 2 +- modules/home/apps/term/kitty/default.nix | 2 +- .../tools/neovim/config/lua/plugins/core.lua | 13 +- modules/home/apps/tools/tmux/default.nix | 17 +- modules/home/rice/qt/default.nix | 24 +++ modules/home/shells/zsh/default.nix | 2 +- modules/home/wms/hyprland/default.nix | 4 - .../nixos/hardware/gpu-passthru/default.nix | 7 +- modules/nixos/protocols/wayland/default.nix | 3 +- modules/nixos/ui/fonts/default.nix | 94 ++++++++-- systems/x86_64-linux/earth/default.nix | 51 +++++- systems/x86_64-linux/pluto/default.nix | 4 +- 16 files changed, 326 insertions(+), 136 deletions(-) create mode 100644 modules/home/rice/qt/default.nix diff --git a/flake.lock b/flake.lock index ddf0e8d..abef93a 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "nuscht-search": "nuscht-search" }, "locked": { - "lastModified": 1736785029, - "narHash": "sha256-xHe4X4Je/4WjBL3BPlI1KGqA5N7VQpi4x57YYU9ZOlI=", + "lastModified": 1736957255, + "narHash": "sha256-qZZ/K5XheRMjCNYgle90QESuys0PIFJNPJJswMJ0GEA=", "owner": "catppuccin", "repo": "nix", - "rev": "4a5ac694d7f8a63dec75cbe0ac1c84c818b6b789", + "rev": "f06fcadf9a61b6581b392e72f230fa6783fe36e4", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1737038063, + "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1736788127, - "narHash": "sha256-ssFq6P15HEhT1gVU8LD464hlnhapYRky449Y1R7QXfA=", + "lastModified": 1737162568, + "narHash": "sha256-cwgeBqXtMKHoK+627GEGGkbIILxhP/OrqNMQhUp/6dQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2126f88367e999c4ec9b50cd3966b32f7a27c66e", + "rev": "ac3dfdca835c5b8f7c27d5dcec2b9c4580299a7c", "type": "github" }, "original": { @@ -550,11 +550,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -862,11 +862,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736780823, - "narHash": "sha256-0O+w/MYI7xC4h1MmNg8rPVUIGPIIZYv+Vq0ZAY+MnW4=", + "lastModified": 1737085478, + "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "132c4f1f68d75813370cadfc090f96a32be19705", + "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", "type": "github" }, "original": { @@ -885,11 +885,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737043064, + "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", "type": "github" }, "original": { @@ -973,11 +973,11 @@ ] }, "locked": { - "lastModified": 1735695978, - "narHash": "sha256-cwk53OX1S1bCFY09zydubZNmmwcx9l5XEba8mVYuNE4=", + "lastModified": 1736917206, + "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "f6233b5cfbada692d93a73d6ed35bdbfd0fdb9c4", + "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { @@ -1168,11 +1168,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1736701836, - "narHash": "sha256-gD2SA08Lfngi1Eguhoc4QHS5Tf4I76GaLr5ATpUXwwE=", + "lastModified": 1737197318, + "narHash": "sha256-qNyNJ6G1PhXkBTzmJgzbf+nD7HDxr3/DuvNXuTI0T3M=", "ref": "refs/heads/main", - "rev": "a6b263713a2b862ed41362082e2147e081934077", - "revCount": 5670, + "rev": "f56153a9c1b0a00fac0932a95e0cfa5a4f6c681f", + "revCount": 5685, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1516,11 +1516,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1736753650, - "narHash": "sha256-qSbPnZ2utGL39UD6lKi+K/7sWyZVl/kGZfOoy+xJEjA=", + "lastModified": 1737198077, + "narHash": "sha256-gvPE+J30kcc2fyb48Efn4LRHXsxvZunfx3jtqHchBOM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9e2c41b7c12adc3ca17b1b50589f5234bcc0bbac", + "rev": "83836b42458e62a4331b1cda72021df68773f8c6", "type": "github" }, "original": { @@ -1532,11 +1532,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1736752727, - "narHash": "sha256-sFD18EfXyQrN51ru6uzCt20C3DT4qBipJ1PbP9hnw80=", + "lastModified": 1737154590, + "narHash": "sha256-XRzVclKMgXicCkMtFBc8OMjs7GdHVWJL3OaxY63YKtE=", "owner": "neovim", "repo": "neovim", - "rev": "2c16c849986794682a4776ff4ec100d00eeba5ca", + "rev": "c6cc937512f59af12fd1b15ca4f7a11288f28ca0", "type": "github" }, "original": { @@ -1568,11 +1568,11 @@ ] }, "locked": { - "lastModified": 1736730523, - "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=", + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", "type": "github" }, "original": { @@ -1583,11 +1583,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -1673,11 +1673,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1736684107, - "narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=", + "lastModified": 1736916166, + "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "635e887b48521e912a516625eee7df6cf0eba9c1", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "type": "github" }, "original": { @@ -1721,11 +1721,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1736795688, - "narHash": "sha256-QRYJ/l4UcjcotdOWkT8Xdi5NNRRqWvIPhLjWtxwJHOk=", + "lastModified": 1737235555, + "narHash": "sha256-gUQJ3AOz/xSqA0q52kmYn4BGWPhr+oVkOLg2wkvvPbo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4616bdf77fdfc7c1b6276718c7496d305e4aa694", + "rev": "51aa6fea893421a41069c1e3fb3262dd476c9563", "type": "github" }, "original": { @@ -1785,11 +1785,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1736657626, - "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", + "lastModified": 1737003892, + "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", + "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", "type": "github" }, "original": { @@ -1801,11 +1801,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -1955,11 +1955,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -2188,11 +2188,11 @@ "systems": "systems_17" }, "locked": { - "lastModified": 1736732675, - "narHash": "sha256-8O/YgYql1hJz0h+ldLsgU9bXZdm3RVwLPG5vl7LqtkY=", + "lastModified": 1737161025, + "narHash": "sha256-Fc9LOAp9Q6o9QBdeNYPQfd5/3BGzYNI027vf3XM4yP8=", "owner": "raphamorim", "repo": "rio", - "rev": "d8a5e2e2c4f5b926c8183465983a5adba8366667", + "rev": "607c28d4aa0fc059f3f021ba1c2e019ab0838f0c", "type": "github" }, "original": { @@ -2231,6 +2231,7 @@ "solaar": "solaar", "spicetify-nix": "spicetify-nix", "systems": "systems_20", + "umu": "umu", "waybar": "waybar", "zen-browser": "zen-browser", "zoeycomputer": "zoeycomputer" @@ -2322,11 +2323,11 @@ ] }, "locked": { - "lastModified": 1736735482, - "narHash": "sha256-QOA4jCDyyUM9Y2Vba+HSZ/5LdtCMGaTE/7NkkUzBr50=", + "lastModified": 1737166965, + "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf960a1938ee91200fe0d2f7b2582fde2429d562", + "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de", "type": "github" }, "original": { @@ -2412,11 +2413,11 @@ ] }, "locked": { - "lastModified": 1736741830, - "narHash": "sha256-7cXbJ3t/gvuHTI1uJ8juBK1NmSs4tRSGsb0MtCGo70o=", + "lastModified": 1737173687, + "narHash": "sha256-+WxaXc30KhTuCa9U8Nv2mJApIBq85CfA5fbcVsvdfxo=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "e1a0822469d975d25de4953860a15662fe5d6595", + "rev": "c68c2ac0814ab386d2cbd3b9178e729b4fc805f0", "type": "github" }, "original": { @@ -2800,11 +2801,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1737103437, + "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", "type": "github" }, "original": { @@ -2813,6 +2814,28 @@ "type": "github" } }, + "umu": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "packaging/nix", + "lastModified": 1737161836, + "narHash": "sha256-v20q0DeglyrsIAbqwqOSxdzZ4JhEWtU9muWPlPz3Few=", + "owner": "Open-Wine-Components", + "repo": "umu-launcher", + "rev": "3fd4ef90e8427cfc74d94914654a288912edb2cf", + "type": "github" + }, + "original": { + "dir": "packaging/nix", + "owner": "Open-Wine-Components", + "repo": "umu-launcher", + "type": "github" + } + }, "waybar": { "inputs": { "flake-compat": "flake-compat_10", @@ -2880,15 +2903,15 @@ "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1736742126, - "narHash": "sha256-vncZtYaV+MKOZrDJW/OkvtXEu2a5bYvgO6ldN6s+1To=", - "owner": "0xc000022070", + "lastModified": 1736893989, + "narHash": "sha256-xP8Jld+e75iD+WxLo3lQUUMwv5onEm5gjarApYttyfM=", + "owner": "zackartz", "repo": "zen-browser-flake", - "rev": "ee8352faad5be12f7088431b979fa36088be65c4", + "rev": "a65e1082d933f131025dd72909d495479f2301f0", "type": "github" }, "original": { - "owner": "0xc000022070", + "owner": "zackartz", "repo": "zen-browser-flake", "type": "github" } diff --git a/flake.nix b/flake.nix index 05f8009..0d4b0a8 100644 --- a/flake.nix +++ b/flake.nix @@ -95,7 +95,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + umu.url = "github:Open-Wine-Components/umu-launcher?dir=packaging/nix"; + umu.inputs.nixpkgs.follows = "nixpkgs"; + + # zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser.url = "github:zackartz/zen-browser-flake"; zoeycomputer = { url = "git+https://git.zoeys.cloud/zoey/zoeys.computer"; diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index fdc09b9..e92ce07 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -38,6 +38,7 @@ shells.zsh.enable = true; rice.gtk.enable = true; + rice.qt.enable = true; services.lock.enable = true; services.music.enable = true; @@ -60,11 +61,11 @@ enable = true; defaultApplications = { - "text/html" = "zen.desktop"; - "x-scheme-handler/http" = "zen.desktop"; - "x-scheme-handler/https" = "zen.desktop"; - "x-scheme-handler/about" = "zen.desktop"; - "x-scheme-handler/unknown" = "zen.desktop"; + "text/html" = "zen_twilight.desktop"; + "x-scheme-handler/http" = "zen_twilight.desktop"; + "x-scheme-handler/https" = "zen_twilight.desktop"; + "x-scheme-handler/about" = "zen_twilight.desktop"; + "x-scheme-handler/unknown" = "zen_twilight.desktop"; "inode/directory" = ["org.gnome.Nautilus.desktop"]; @@ -76,6 +77,9 @@ "image/bmp" = ["org.gnome.Loupe.desktop"]; "image/x-icon" = ["org.gnome.Loupe.desktop"]; "image/svg+xml" = ["org.gnome.Loupe.desktop"]; + + "application/x-compressed-tar" = "org.gnome.FileRoller.desktop"; + "application/x-archive" = "org.gnome.FileRoller.desktop"; }; }; @@ -138,8 +142,6 @@ pkgs.nix-output-monitor pkgs.fastfetch - # inputs.g2claude.packages.${pkgs.system}.default - pkgs.signal-desktop pkgs.nh @@ -156,8 +158,10 @@ pkgs.zed-editor pkgs.rmpc - inputs.zen-browser.packages.${pkgs.system}.beta + inputs.zen-browser.packages.${pkgs.system}.twilight + pkgs.mpc-cli + pkgs.zathura pkgs.nautilus pkgs.nautilus-python @@ -170,14 +174,20 @@ pkgs.man-pages-posix ]; + programs.mpv = { + enable = true; + extraInput = '' + background-color='#000000" + ''; + }; + + catppuccin.mpv.enable = true; + programs.zoxide = { enable = true; options = ["--cmd cd"]; }; - catppuccin.helix.enable = true; - programs.helix.enable = true; - programs.cava = { enable = true; catppuccin.enable = true; @@ -201,19 +211,19 @@ catppuccin.enable = true; }; - systemd.user.services.xwaylandvideobridge = { - Unit = { - Description = "Tool to make it easy to stream wayland windows and screens to exisiting applications running under Xwayland"; - }; - Service = { - Type = "simple"; - ExecStart = lib.getExe pkgs.xwaylandvideobridge; - Restart = "on-failure"; - }; - Install = { - WantedBy = ["default.target"]; - }; - }; + # systemd.user.services.xwaylandvideobridge = { + # Unit = { + # Description = "Tool to make it easy to stream wayland windows and screens to exisiting applications running under Xwayland"; + # }; + # Service = { + # Type = "simple"; + # ExecStart = lib.getExe pkgs.xwaylandvideobridge; + # Restart = "on-failure"; + # }; + # Install = { + # WantedBy = ["default.target"]; + # }; + # }; services = { gpg-agent = { diff --git a/modules/home/apps/helpers/rofi/default.nix b/modules/home/apps/helpers/rofi/default.nix index e144ff4..1657c82 100644 --- a/modules/home/apps/helpers/rofi/default.nix +++ b/modules/home/apps/helpers/rofi/default.nix @@ -15,7 +15,7 @@ in { config = mkIf cfg.enable { programs.rofi = { enable = true; - package = pkgs.rofi; + package = pkgs.rofi-wayland; # Basic configuration terminal = "kitty"; diff --git a/modules/home/apps/term/ghostty/default.nix b/modules/home/apps/term/ghostty/default.nix index a65ef0c..7dcc845 100644 --- a/modules/home/apps/term/ghostty/default.nix +++ b/modules/home/apps/term/ghostty/default.nix @@ -16,7 +16,7 @@ in { # bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font"; # italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font"; # bold_italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font"; - normal = mkStringOpt "Iosevka" "Normal Font"; + normal = mkStringOpt "Pragmata Pro Mono" "Normal Font"; bold = mkStringOpt "Iosevka ExtraBold" "Bold Font"; italic = mkStringOpt "Iosevka Bold Italic" "Italic Font"; bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font"; diff --git a/modules/home/apps/term/kitty/default.nix b/modules/home/apps/term/kitty/default.nix index afef99b..29f12ce 100644 --- a/modules/home/apps/term/kitty/default.nix +++ b/modules/home/apps/term/kitty/default.nix @@ -41,7 +41,7 @@ in { settings = { window_padding_width = 12; - background_opacity = "0.8"; + background_opacity = "0.9"; }; }; }; diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua index 55a92c1..3cecc7a 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -16,8 +16,8 @@ return { preset = { header = [[ ／l、 - （ﾟ､ ｡ ７ - l ~ヽ + （ﾟ､ ｡ ７ + l ~ヽ じしf_,)ノ ]], }, @@ -26,9 +26,12 @@ return { }, { "catppuccin", - opts = { integrations = { - blink_cmp = true, - } }, + opts = { + transparent_background = true, + integrations = { + blink_cmp = true, + }, + }, }, "f-person/git-blame.nvim", { "nvim-lualine/lualine.nvim", enabled = false }, diff --git a/modules/home/apps/tools/tmux/default.nix b/modules/home/apps/tools/tmux/default.nix index baef463..2994f8f 100644 --- a/modules/home/apps/tools/tmux/default.nix +++ b/modules/home/apps/tools/tmux/default.nix @@ -35,7 +35,6 @@ in { set-window-option -g pane-base-index 1 set-option -g renumber-windows on - set -g @catppuccin_flavor "mocha" set -g @catppuccin_window_status_style "basic" set -g default-terminal "tmux-256color" set -g allow-passthrough on @@ -61,6 +60,22 @@ in { bind -n M-H previous-window bind -n M-L next-window + + + bind-key C-j display-popup -E "\ + tmux list-sessions -F '#{session_name}' |\ + fzf --reverse --header 'Switch sessions' |\ + xargs tmux switch-client -t" + + + set-option -g destroy-unattached on + set-option -g exit-empty on + set-option -g exit-unattached on + + set-hook -g after-new-session 'run-shell "tmux rename-session \"#{b:pane_current_path}\""' + set-hook -g after-new-window 'run-shell "tmux rename-session \"#{b:pane_current_path}\""' + set-hook -g after-kill-pane 'run-shell "tmux rename-session \"#{b:pane_current_path}\""' + set-hook -g pane-focus-in 'run-shell "tmux rename-session \"#{b:pane_current_path}\""' ''; }; }; diff --git a/modules/home/rice/qt/default.nix b/modules/home/rice/qt/default.nix new file mode 100644 index 0000000..b356538 --- /dev/null +++ b/modules/home/rice/qt/default.nix @@ -0,0 +1,24 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.rice.qt; +in { + options.rice.qt = with types; { + enable = mkBoolOpt false "Enable QT Customization"; + }; + + config = mkIf cfg.enable { + catppuccin.kvantum.enable = true; + catppuccin.kvantum.apply = true; + + qt.enable = true; + qt.style.name = "kvantum"; + qt.platformTheme.name = "kvantum"; + }; +} diff --git a/modules/home/shells/zsh/default.nix b/modules/home/shells/zsh/default.nix index e4df3a9..8e12e8c 100644 --- a/modules/home/shells/zsh/default.nix +++ b/modules/home/shells/zsh/default.nix @@ -60,7 +60,7 @@ in { bindkey "^[[1;5D" backward-word if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then - tmux attach-session -t default || tmux new-session -s default + tmux new-session fi ''; diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index be33666..bc2f269 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -39,10 +39,6 @@ in { }; config = mkIf cfg.enable { - home.packages = [ - pkgs.xwayland - ]; - wayland.windowManager.hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; diff --git a/modules/nixos/hardware/gpu-passthru/default.nix b/modules/nixos/hardware/gpu-passthru/default.nix index b1ec5c9..823121b 100644 --- a/modules/nixos/hardware/gpu-passthru/default.nix +++ b/modules/nixos/hardware/gpu-passthru/default.nix @@ -49,6 +49,7 @@ in { systemd ripgrep mullvad + killall sd ]; }; @@ -127,9 +128,9 @@ in { echo performance | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor # Isolate host to core 0 - systemctl set-property --runtime -- user.slice AllowedCPUs=0-6 - systemctl set-property --runtime -- system.slice AllowedCPUs=0-6 - systemctl set-property --runtime -- init.scope AllowedCPUs=0-6 + systemctl set-property --runtime -- user.slice AllowedCPUs=0-8 + systemctl set-property --runtime -- system.slice AllowedCPUs=0-8 + systemctl set-property --runtime -- init.scope AllowedCPUs=0-8 # disable vpn mullvad disconnect -w diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index c7d6178..81e41d8 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -40,6 +40,7 @@ in { programs.hyprland = { withUWSM = true; enable = true; + xwayland.enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }; @@ -84,7 +85,7 @@ in { config.common.default = "*"; extraPortals = [ pkgs.xdg-desktop-portal-gtk - pkgs.xwaylandvideobridge + # pkgs.xwaylandvideobridge ]; }; }; diff --git a/modules/nixos/ui/fonts/default.nix b/modules/nixos/ui/fonts/default.nix index cbbda9e..158478a 100644 --- a/modules/nixos/ui/fonts/default.nix +++ b/modules/nixos/ui/fonts/default.nix @@ -31,25 +31,93 @@ in { dejavu_fonts iosevka cantarell-fonts - # (iosevka.override { - # set = "Custom"; - # privateBuildPlan = '' - # [buildPlans.IosevkaCustom] - # family = "Iosevka" - # spacing = "normal" - # serifs = "sans" - # noCvSs = true - # exportGlyphNames = true + # (let + # bolder = writeText "bolder.py" '' + # #!/usr/bin/env python + # # Script shamelessly stolen from: https://github.com/shytikov/pragmasevka + # + # import sys + # import fontforge + # + # if len(sys.argv) < 2: + # print("Please provide path prefix of the font to update!") + # exit() + # + # prefix = sys.argv[1] + # + # glyphs = [ + # "exclam", "ampersand", "parenleft", "parenright", "asterisk", "plus", + # "comma", "hyphen", "period", "slash", "colon", "semicolon", "less", + # "equal", "greater", "question", "bracketleft", "backslash", "bracketright", + # "asciicircum", "braceleft", "bar", "braceright", "asciitilde", + # ] + # + # pairs = [ + # ['regular', 'semibold'], + # ['regularItalic', 'semiboldItalic'], + # ['bold', 'black'], + # ['boldItalic', 'blackItalic'], + # ] + # + # for [recipient, donor] in pairs: + # font = f"{prefix}{recipient}.ttf" + # donor_font = f"{prefix}{donor}.ttf" + # + # target = fontforge.open(font) + # # Finding all punctuation + # target.selection.select(*glyphs) + # # and deleting it to make space + # for i in target.selection.byGlyphs: + # target.removeGlyph(i) + # + # source = fontforge.open(donor_font) + # source.selection.select(*glyphs) + # source.copy() + # target.paste() + # + # target.generate(font) + # ''; + # in (iosevka.override + # { + # set = "Custom"; + # privateBuildPlan = '' + # [buildPlans.IosevkaCustom] + # family = "Iosevka" + # spacing = "normal" + # serifs = "sans" + # noCvSs = true + # exportGlyphNames = true # # [buildPlans.IosevkaCustom.variants] - # inherits = "ss03" + # inherits = "ss08" + # ''; + # })) + # .overrideAttrs (oldAttrs: { + # buildInputs = + # (oldAttrs.buildInputs or []) + # ++ [ + # pkgs.python3 + # pkgs.python3Packages.fontforge + # ]; + # + # postInstall = '' + # ${oldAttrs.postInstall or ""} + # + # echo $out + # + # cd $out/share/fonts/truetype + # + # PREFIX="IosevkaCustom-normal" + # + # python3 ${bolder} $PREFIX # ''; - # }) + # })) noto-fonts noto-fonts-cjk-sans noto-fonts-emoji jetbrains-mono nerd-fonts.iosevka + nerd-fonts.zed-mono # (nerdfonts.override {fonts = ["ZedMono" "Iosevka"];}) ]; @@ -59,8 +127,8 @@ in { fontconfig = { defaultFonts = { monospace = [ - # "ZedMono Nerd Font Mono" - "Iosevka" + "Pragmata Pro Mono" + # "Iosevka" "Noto Color Emoji" ]; sansSerif = ["Cantarell" "Noto Color Emoji"]; diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index 7a36302..1e91d7c 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -50,11 +50,15 @@ services.lorri.enable = true; services.udisks2.enable = true; services.transmission = { - enable = false; + enable = true; package = pkgs.transmission_4; settings = { - download-dir = "/home/zoey/dl"; + download-dir = "/home/zoey/Downloads"; + incomplete-dir = "/home/zoey/Downloads/.incomplete"; + incomplete-dir-enabled = true; }; + user = "zoey"; + group = "users"; }; services.gnome.gnome-keyring.enable = true; services.solaar = { @@ -94,19 +98,35 @@ time.timeZone = "America/Detroit"; + services.gvfs.enable = true; + services.gnome.sushi.enable = true; + + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + + services.blueman.enable = true; + environment.systemPackages = [ pkgs.sbctl pkgs.vesktop pkgs.mangohud pkgs.lutris + pkgs.bottles + pkgs.file-roller pkgs.podman-tui pkgs.dive pkgs.docker-compose pkgs.podman-compose pkgs.transmission_4 + pkgs.protonup-qt pkgs.restic + (inputs.umu.packages.${system}.umu.override { + version = inputs.umu.shortRev; + truststore = true; + cbor2 = true; + }) inputs.agenix.packages.${system}.agenix - inputs.awsvpnclient.packages."${pkgs.system}".awsvpnclient + inputs.awsvpnclient.packages.${system}.awsvpnclient pkgs.nautilus-python (pkgs.writeTextFile { @@ -168,6 +188,8 @@ users.groups.plugdev = {}; + home-manager.backupFileExtension = "bk"; + snowfallorg.users.zoey = { create = true; admin = true; @@ -177,6 +199,29 @@ }; }; + services.openssh = { + enable = true; + ports = [22]; + }; + + networking.firewall.allowedTCPPorts = [22]; + + services.samba = { + enable = true; + openFirewall = true; + shares = { + "SteamLibrary" = { + path = "/mnt/bk"; # Update this path to your drive's mount point + browseable = true; + writable = true; + guestOk = true; # Allow access without authentication + public = true; + createMask = "0775"; # File permissions + directoryMask = "0775"; # Directory permissions + }; + }; + }; + catppuccin.enable = true; programs.virt-manager.enable = true; diff --git a/systems/x86_64-linux/pluto/default.nix b/systems/x86_64-linux/pluto/default.nix index 6d0c4eb..dab7da8 100644 --- a/systems/x86_64-linux/pluto/default.nix +++ b/systems/x86_64-linux/pluto/default.nix @@ -240,7 +240,7 @@ }; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [80 443 6969 2022]; + networking.firewall.allowedTCPPorts = [80 443 6969 2022 16262]; networking.firewall.allowedTCPPortRanges = [ { from = 25565; @@ -251,7 +251,7 @@ to = 24464; } ]; - networking.firewall.allowedUDPPorts = [80 443 6969 2022]; + networking.firewall.allowedUDPPorts = [80 443 6969 2022 16262]; # Or disable the firewall altogether. # networking.firewall.enable = false;