dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit dacececc96d820bd7405d845cca46fdc00097b4c parent 8c1b7240718a21f13b43dd1e82dc569d62ed0ef1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 16:34:24 +0530 chore: Update `inputs` + Add Cursor Theme + Flake lock file updates: • Updated input 'gaming': 'github:fufexan/nix-gaming/7b4cd87ed09d1176a5a7024679183d21b73a1ee3' (2023-09-29) → 'github:fufexan/nix-gaming/01ceb9c45463880a6c1d2432110e3439f2c55069' (2023-11-13) • Updated input 'gaming/flake-parts': 'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01) → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01) • Updated input 'gaming/flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31) → 'github:NixOS/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735?dir=lib' (2023-10-29) • Updated input 'gaming/nixpkgs': 'github:NixOS/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21) → 'github:NixOS/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07) • Updated input 'hardware': 'github:nixos/nixos-hardware/adcfd6aa860d1d129055039696bc457af7d50d0e' (2023-09-28) → 'github:nixos/nixos-hardware/b689465d0c5d88e158e7d76094fca08cc0223aad' (2023-11-11) • Updated input 'home': 'github:nix-community/home-manager/c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19' (2023-10-19) → 'github:nix-community/home-manager/280721186ab75a76537713ec310306f0eba3e407' (2023-11-12) • Updated input 'hooks': 'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24) → 'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06) • Updated input 'hooks/nixpkgs-stable': 'github:NixOS/nixpkgs/5550a85a087c04ddcace7f892b0bdc9d8bb080c8' (2023-10-21) → 'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03) • Updated input 'impermanence': 'github:nix-community/impermanence/e9643d08d0d193a2e074a19d4d90c67a874d932e' (2023-09-13) → 'github:nix-community/impermanence/0f317c2e9e56550ce12323eb39302d251618f5b5' (2023-10-14) • Updated input 'index': 'github:Mic92/nix-index-database/031d4b22505fdea47bd53bfafad517cd03c26a4f' (2023-10-01) → 'github:Mic92/nix-index-database/8aff4ca3dee60d1422489fe8d52c2f837b3ad113' (2023-11-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7c9cc5a6e5d38010801741ac830a3f8fd667a7a0' (2023-10-19) → 'github:NixOS/nixpkgs/85f1ba3e51676fa8cc604a3d863d729026a6b8eb' (2023-11-04) • Updated input 'nur': 'github:nix-community/NUR/02ba0aeaddf56c02b8030f81d765e8de3d342f5b' (2023-09-30) → 'github:nix-community/NUR/ac604416daf471d4644f3be174d095263f09f810' (2023-11-13) • Updated input 'sops': 'github:Mic92/sops-nix/2f375ed8702b0d8ee2430885059d5e7975e38f78' (2023-09-21) → 'github:Mic92/sops-nix/2fc3c9edc3029ed396ec917f39a7253acc3d8999' (2023-11-12) • Updated input 'sops/nixpkgs': 'github:NixOS/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15) → 'github:NixOS/nixpkgs/9b92dad3804b543a8b5db878aabf7132d601fa91' (2023-11-07) • Updated input 'sops/nixpkgs-stable': 'github:NixOS/nixpkgs/596611941a74be176b98aeba9328aa9d01b8b322' (2023-09-16) → 'github:NixOS/nixpkgs/9502d0245983bb233da8083b55d60d96fd3c29ff' (2023-11-12) • Updated input 'stylix': 'github:danth/stylix/b2f73724d11868d020207fb87fb2d9c3ae96976d' (2023-10-19) → 'github:danth/stylix/5c6f7fd709be441505998fc51a25b645a44d359e' (2023-11-08) • Updated input 'wine': 'github:emmanuelrosa/erosanix/be9d77ab60e6bd8087d8ae7e8dbd63dd3316ce9b' (2023-09-29) → 'github:emmanuelrosa/erosanix/7f828a460c3bf46df0073cf4a9874f93e234c730' (2023-11-10) --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: maydayv7 <maydayv7@gmail.com>
Diffstat:
| M | README.md | | | 7 | ++++++- |
| M | devices/Vortex/default.nix | | | 2 | +- |
| M | flake.lock | | | 102 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | modules/apps/office.nix | | | 1 | + |
| M | modules/default.nix | | | 5 | +++++ |
| M | modules/gui/desktop/gnome.nix | | | 48 | +++++++++++++++++++----------------------------- |
| M | modules/gui/desktop/xfce.nix | | | 9 | +++++---- |
| M | modules/gui/theme.nix | | | 6 | ++++++ |
| M | modules/hardware/virtualisation/default.nix | | | 3 | ++- |
| M | packages/overlays/discord.nix | | | 4 | ++-- |
10 files changed, 98 insertions(+), 89 deletions(-)
diff --git a/README.md b/README.md @@ -412,6 +412,11 @@ You can navigate to the `README`s present in the various directories to know mor <details> <summary><b>Changelog</b></summary> +### vNEXT + +- Fix Emoji Support +- Miscellaneous Updates + ### v13 - Follow NixOS Unstable @@ -623,7 +628,7 @@ You can navigate to the `README`s present in the various directories to know mor </details> -> Last Updated: **October** 2023 +> Last Updated: **November** 2023 If you like this project, consider leaving a [star](https://github.com/maydayv7/dotfiles) diff --git a/devices/Vortex/default.nix b/devices/Vortex/default.nix @@ -6,7 +6,7 @@ timezone = "Asia/Kolkata"; locale = "IN"; - kernel = "zen"; + kernel = "lqx"; kernelModules = ["nvme" "thunderbolt"]; imports = [./secrets]; diff --git a/flake.lock b/flake.lock @@ -198,11 +198,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -251,11 +251,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1695949836, - "narHash": "sha256-EL3ucC2ZBPnFgywfDMjKjeUxlp/AYGSjT0llkRin9mg=", + "lastModified": 1699838063, + "narHash": "sha256-V1KLZVi73S3vxkO0ZYBpD7xY2B1MIFUqZ5d/FyuWdI4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "7b4cd87ed09d1176a5a7024679183d21b73a1ee3", + "rev": "01ceb9c45463880a6c1d2432110e3439f2c55069", "type": "github" }, "original": { @@ -285,11 +285,11 @@ }, "hardware": { "locked": { - "lastModified": 1695887975, - "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", + "lastModified": 1699701045, + "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", + "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1697688028, - "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -334,11 +334,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "lastModified": 1699271226, + "narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "rev": "ea758da1a6dcde6dc36db348ed690d09b9864128", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "impermanence": { "locked": { - "lastModified": 1694622745, - "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=", + "lastModified": 1697303681, + "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", "owner": "nix-community", "repo": "impermanence", - "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e", + "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1696131323, - "narHash": "sha256-Y47r8Jo+9rs+XUWHcDPZtkQs6wFeZ24L4CQTfVwE+vY=", + "lastModified": 1699760693, + "narHash": "sha256-u/gkNUHQR/q23voqE5J4xmEWQIAqR+g3lUnCtzn0k7Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "031d4b22505fdea47bd53bfafad517cd03c26a4f", + "rev": "8aff4ca3dee60d1422489fe8d52c2f837b3ad113", "type": "github" }, "original": { @@ -419,11 +419,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { @@ -436,11 +436,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697851979, - "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { @@ -469,11 +469,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1694908564, - "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=", + "lastModified": 1699756042, + "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "596611941a74be176b98aeba9328aa9d01b8b322", + "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", "type": "github" }, "original": { @@ -501,11 +501,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -532,11 +532,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1694760568, - "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", + "lastModified": 1699374756, + "narHash": "sha256-X21OIoVcJejN9JKoLuoZSx3ZZkMh/iSpJ+GGrSNQyGU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", + "rev": "9b92dad3804b543a8b5db878aabf7132d601fa91", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nur": { "locked": { - "lastModified": 1696112267, - "narHash": "sha256-49s4Pm+H1/7D8RBuhKBFfnfauSIF0GteMwsDRLJmbdw=", + "lastModified": 1699858418, + "narHash": "sha256-PJ7S5Ej0Gowg0XuVTa+68CEuZfLHSERK+3h3WAgT0ko=", "owner": "nix-community", "repo": "NUR", - "rev": "02ba0aeaddf56c02b8030f81d765e8de3d342f5b", + "rev": "ac604416daf471d4644f3be174d095263f09f810", "type": "github" }, "original": { @@ -608,11 +608,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1695284550, - "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", + "lastModified": 1699770333, + "narHash": "sha256-tWIifHuqPZKCuAVjewewX/LyC6LCf5dsIkyDHlXr7DM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", + "rev": "2fc3c9edc3029ed396ec917f39a7253acc3d8999", "type": "github" }, "original": { @@ -640,11 +640,11 @@ ] }, "locked": { - "lastModified": 1697720625, - "narHash": "sha256-4/k6fyBWWJktsyPVnaa+olOR0PRpn3GDa9YiNyFzTso=", + "lastModified": 1699477454, + "narHash": "sha256-PueVBJDRM+q/ONSwMptLH4i6cny7BnNcuBpjI2e5rYo=", "owner": "danth", "repo": "stylix", - "rev": "b2f73724d11868d020207fb87fb2d9c3ae96976d", + "rev": "5c6f7fd709be441505998fc51a25b645a44d359e", "type": "github" }, "original": { @@ -760,11 +760,11 @@ ] }, "locked": { - "lastModified": 1695992551, - "narHash": "sha256-fs4d5pZZibqlq7iTA7EXct3BD4ajCdL9PuFDeWMxK/k=", + "lastModified": 1699650836, + "narHash": "sha256-/auIpjUuhyXzL7oCabcIXftC2hyDxeDCLHU7hwYkyRA=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "be9d77ab60e6bd8087d8ae7e8dbd63dd3316ce9b", + "rev": "7f828a460c3bf46df0073cf4a9874f93e234c730", "type": "github" }, "original": { diff --git a/modules/apps/office.nix b/modules/apps/office.nix @@ -12,6 +12,7 @@ in { # Applications environment.systemPackages = with pkgs; [ # Productivity + easyeffects gscan2pdf handbrake hunspell diff --git a/modules/default.nix b/modules/default.nix @@ -138,6 +138,11 @@ in { inherit (files.path) flake; }; + switch.enable = + if (format != null) + then false + else true; + # Version stateVersion = fileContents "${inputs.nixpkgs}/.version"; configurationRevision = diff --git a/modules/gui/desktop/gnome.nix b/modules/gui/desktop/gnome.nix @@ -30,7 +30,7 @@ in { ]; } - # Full-Fledged GNOME Desktop Configuration + ## Full-Fledged GNOME Desktop Configuration (mkIf (desktop == "gnome") { # Desktop Integration gui = { @@ -40,6 +40,7 @@ in { programs = { dconf.enable = true; + firefox.enable = true; gnupg.agent.pinentryFlavor = mkIf config.programs.gnupg.agent.enable "gnome3"; }; @@ -58,7 +59,7 @@ in { }; }; - # User Configuration + ## User Configuration user.home = { # Dconf Keys imports = [gnome.dconf]; @@ -91,18 +92,6 @@ in { video = ["io.github.celluloid_player.Celluloid.desktop"]; }; - # Code Editor Settings - programs.vscode = mkIf (elem pkgs.vscode apps) { - extensions = [pkgs.vscode-extensions.piousdeer.adwaita-theme]; - userSettings = { - "workbench.preferredDarkColorTheme" = "Adwaita Dark"; - "workbench.preferredLightColorTheme" = "Adwaita Light"; - "workbench.productIconTheme" = "adwaita"; - "window.titleBarStyle" = "custom"; - "terminal.external.linuxExec" = "blackbox"; - }; - }; - home.file = { # Initial Setup ".config/gnome-initial-setup-done".text = "yes"; @@ -132,11 +121,23 @@ in { # Firefox GNOME Theme ".mozilla/firefox/default/chrome/userChrome.css".text = ''@import "${pkgs.custom.firefox-gnome-theme}/userChrome.css";''; ".mozilla/firefox/default/chrome/userContent.css".text = firefox.theme; - ".mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/lib/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + }; + + ## 3rd Party Apps Configuration + # Code Editor + programs.vscode = mkIf (elem pkgs.vscode apps) { + extensions = [pkgs.vscode-extensions.piousdeer.adwaita-theme]; + userSettings = { + "workbench.preferredDarkColorTheme" = "Adwaita Dark"; + "workbench.preferredLightColorTheme" = "Adwaita Light"; + "workbench.productIconTheme" = "adwaita"; + "window.titleBarStyle" = "custom"; + "terminal.external.linuxExec" = "blackbox"; + }; }; }; - # Color Scheme + ## Color Scheme stylix = { base16Scheme = colors.adwaita; targets.gnome.enable = false; @@ -150,7 +151,7 @@ in { theme=KvLibadwaitaDark ''; - # Package List + ## Package List systemPackages = with pkgs; [libsForQt5.qtstyleplugin-kvantum custom.kvlibadwaita] ++ (with pkgs.gnome; [ @@ -190,17 +191,6 @@ in { celluloid dconf2nix gnuchess - - (firefox.override (args: - args - // { - cfg = - args.cfg - or {} - // { - enableGnomeExtensions = true; - }; - })) ]) ++ (with pkgs.gnomeExtensions; [ # GNOME Shell Extensions @@ -257,7 +247,7 @@ in { ]; }) - # Minimal GNOME Desktop Configuration + ## Minimal GNOME Desktop Configuration (mkIf (desktop == "gnome-minimal") { # Disable Suspension services.xserver = { diff --git a/modules/gui/desktop/xfce.nix b/modules/gui/desktop/xfce.nix @@ -54,7 +54,7 @@ in { }; } - # Full-Fledged XFCE Desktop Configuration + ## Full-Fledged XFCE Desktop Configuration (mkIf (desktop == "xfce") { # Desktop Integration gui.fonts.enable = true; @@ -117,7 +117,7 @@ in { style = "gtk2"; }; - # User Configuration + ## User Configuration user.home = { # GTK+ Theming stylix.targets.xfce.enable = false; @@ -164,7 +164,8 @@ in { replaceStrings ["@system" "@wallpaper"] [path.system wallpaper] (readFile file)) ".xml"); - # Code Editor Settings + ## 3rd Party Apps Configuration + # Code Editor programs.vscode = mkIf (elem pkgs.vscode apps) { extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { @@ -182,7 +183,7 @@ in { }; }) - # Minimal XFCE Desktop Configuration + ## Minimal XFCE Desktop Configuration (mkIf (desktop == "xfce-minimal") { # Utilities environment.systemPackages = [pkgs.epiphany]; diff --git a/modules/gui/theme.nix b/modules/gui/theme.nix @@ -2,6 +2,7 @@ config, lib, inputs, + pkgs, files, ... }: let @@ -23,6 +24,11 @@ in { { autoEnable = false; image = cfg.wallpaper; + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Original-Classic"; + size = 28; + }; } // ( if (cfg.desktop == "" || hasSuffix "-minimal" cfg.desktop) diff --git a/modules/hardware/virtualisation/default.nix b/modules/hardware/virtualisation/default.nix @@ -34,7 +34,8 @@ in { }; # VM Packages - environment.systemPackages = with pkgs; [libguestfs virt-manager]; + environment.systemPackages = [pkgs.libguestfs]; + programs.virt-manager.enable = true; # VM Utilities virtualisation = { diff --git a/packages/overlays/discord.nix b/packages/overlays/discord.nix @@ -1,11 +1,11 @@ final: prev: { # Update Discord to Latest Version discord = prev.discord.overrideAttrs (_: rec { - version = "0.0.24"; + version = "0.0.34"; src = prev.fetchzip { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-qPK+A3zvmoemWF+FL0VJSZO+s/zbkgZvUs4zNMpH9yA="; + sha256 = "sha256-cLkc3ezMABO7y62HFyuxB0nTs0M0sg0S0oxiTsO2IYE="; }; }); }