From d699e89ac27264ba794354aeb5f7e287c2d24f64 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sat, 29 Mar 2025 15:22:10 -0700 Subject: [PATCH 1/8] change bulwark to plus model --- provision/hosts/bulwark/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix index 2a758d3b..af20e518 100644 --- a/provision/hosts/bulwark/configuration.nix +++ b/provision/hosts/bulwark/configuration.nix @@ -14,7 +14,7 @@ # Modules modules = { - extra.enable = true; + base-plus.enable = true; desktop = { enable = true; gnome.enable = true; From 67b2b8fdebc2ee4c443fdc7e066b83c6ce88a6c0 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Tue, 1 Apr 2025 19:33:03 -0700 Subject: [PATCH 2/8] remove stacks in gnome and update panel monitor for monitor changes --- provision/modules/desktop/gnome.nix | 1 - provision/overlays/default.nix | 1 - provision/pkgs/gnome-set-panel-monitor.nix | 6 ++--- provision/pkgs/stacks-in-gnome.nix | 31 ---------------------- 4 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 provision/pkgs/stacks-in-gnome.nix diff --git a/provision/modules/desktop/gnome.nix b/provision/modules/desktop/gnome.nix index 56d86da3..1fadda05 100644 --- a/provision/modules/desktop/gnome.nix +++ b/provision/modules/desktop/gnome.nix @@ -26,7 +26,6 @@ in { gnomeExtensions.custom-hot-corners-extended # GNOME Shell extension for changing window focus behavior gnomeExtensions.alphabetical-app-grid # Alphabetically order the app grid and folders gnome-set-panel-monitor # Set monitor for panel to appear on - stacks-in-gnome # TBD gnome-randr # Xrandr-like CLI for configuring displays on GNOME/Wayland ftw # Build custom ftl wallpapers in a complicated way for no reason ]; diff --git a/provision/overlays/default.nix b/provision/overlays/default.nix index d1adb681..3ba8c7b1 100644 --- a/provision/overlays/default.nix +++ b/provision/overlays/default.nix @@ -1,6 +1,5 @@ final: prev: { ftw = final.callPackage ../pkgs/ftw.nix {}; gnome-set-panel-monitor = final.callPackage ../pkgs/gnome-set-panel-monitor.nix {}; - stacks-in-gnome = final.callPackage ../pkgs/stacks-in-gnome.nix {}; pySVS = final.callPackage ../pkgs/pySVS.nix {}; } diff --git a/provision/pkgs/gnome-set-panel-monitor.nix b/provision/pkgs/gnome-set-panel-monitor.nix index c79326b3..a536c915 100644 --- a/provision/pkgs/gnome-set-panel-monitor.nix +++ b/provision/pkgs/gnome-set-panel-monitor.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gnome-set-panel-monitor"; - version = "git-2024-08-28"; + version = "git-2025-04-01"; src = fetchFromGitHub { owner = "starr-dusT"; repo = "gnome-set-panel-monitor"; - rev = "89204ab29a4872c201f8185cee758384be073a73"; - hash = "sha256-MJVUjvrEe5b38MkRPt96NOH3cz1FzjoQWTPNtRFRVck="; + rev = "9afeb755297c467a3236d07b58ff9feae04ba13d"; + hash = "sha256-EDR7qsiTQag0NytrokCPTUEygvAXfOP9bGT1W+hVkZY="; }; installPhase = '' diff --git a/provision/pkgs/stacks-in-gnome.nix b/provision/pkgs/stacks-in-gnome.nix deleted file mode 100644 index e1ccc5d1..00000000 --- a/provision/pkgs/stacks-in-gnome.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib }: - -stdenv.mkDerivation { - pname = "stacks-in-gnome"; - version = "git-2025-01-10"; - - src = fetchFromGitHub { - owner = "starr-dusT"; - repo = "gnome-shell-extension-stacks-in-gnome"; - rev = "dbd3edd8134f3331a60f45f44a9bdec4af9beefe"; - hash = "sha256-RbidDs9de2BLxZaPp4TVY6AYGKZKXeLioTHFCcvVF2Q="; - }; - - installPhase = '' - runHook preInstall - mkdir -p "$out/share/gnome-shell/extensions/stacks-in-gnome@tstarr.us" - cp -r * "$out/share/gnome-shell/extensions/stacks-in-gnome@tstarr.us" - runHook postInstall - ''; - - passthru = { - extensionUuid = "stacks-in-gnome@tstarr.us"; - extensionPortalSlug = "stacks-in-gnome"; - }; - - meta = with lib; { - description = ""; - maintainers = with maintainers; [ starr-dusT ]; - homepage = "https://github.com/starr-dusT/gnome-shell-extension-stacks-in-gnome"; - }; -} From 3f4fffa0303524ab3b45d5077ee8be5ed30964be Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Mon, 7 Apr 2025 18:53:11 -0700 Subject: [PATCH 3/8] add just to base config --- provision/modules/base/terminal.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/provision/modules/base/terminal.nix b/provision/modules/base/terminal.nix index b01e0f46..e53914ef 100644 --- a/provision/modules/base/terminal.nix +++ b/provision/modules/base/terminal.nix @@ -11,6 +11,7 @@ vim # Text editor that is highly configurable and widely used, especially in the Unix environment sesh # Smart session manager for the terminal + just # Hand way to save and run project-specific commands zoxide # Fast cd command that learns your habits ripgrep # Line-oriented search tool that recursively searches directories for a regex pattern fzf # Command-line fuzzy finder for Unix-like operating systems From 58aae74b83a5985bcc18cf1815e4097b97a071e2 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 13 Apr 2025 16:41:27 -0700 Subject: [PATCH 4/8] add base configs to base module --- provision/hosts/bulwark/configuration.nix | 1 + provision/hosts/bulwark/default.nix | 4 +- provision/hosts/default/default.nix | 51 ----------------- .../hosts/default/physical/configuration.nix | 15 ----- provision/hosts/htpc/configuration.nix | 1 + provision/hosts/htpc/default.nix | 4 +- provision/hosts/kestrel/configuration.nix | 1 + provision/hosts/kestrel/default.nix | 4 +- provision/hosts/osprey/configuration.nix | 1 + provision/hosts/osprey/default.nix | 4 +- provision/hosts/shivan/configuration.nix | 1 + provision/hosts/shivan/default.nix | 4 +- provision/hosts/torus/configuration.nix | 1 + provision/hosts/torus/default.nix | 4 +- provision/hosts/wsl/default.nix | 3 +- provision/modules/base/default.nix | 57 ++++++++++++++++++- provision/modules/base/physical.nix | 11 ++++ 17 files changed, 79 insertions(+), 88 deletions(-) delete mode 100644 provision/hosts/default/default.nix delete mode 100644 provision/hosts/default/physical/configuration.nix create mode 100644 provision/modules/base/physical.nix diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix index af20e518..819d201c 100644 --- a/provision/hosts/bulwark/configuration.nix +++ b/provision/hosts/bulwark/configuration.nix @@ -15,6 +15,7 @@ # Modules modules = { base-plus.enable = true; + physical.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/bulwark/default.nix b/provision/hosts/bulwark/default.nix index 251b177a..fa47c546 100644 --- a/provision/hosts/bulwark/default.nix +++ b/provision/hosts/bulwark/default.nix @@ -6,9 +6,7 @@ in { inherit system; specialArgs = { inherit user hostname inputs home-manager jovian-nixos; }; modules = [ - ../default # shared by all configs - ../default/physical/configuration.nix # shared by physical machines - ./configuration.nix # bulwark specific + ./configuration.nix ./hardware.nix ../../modules agenix.nixosModules.default diff --git a/provision/hosts/default/default.nix b/provision/hosts/default/default.nix deleted file mode 100644 index 2c65560a..00000000 --- a/provision/hosts/default/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, pkgs, user, lib, inputs, ... }: -{ - nix = { - package = pkgs.nixVersions.stable; - extraOptions = "experimental-features = nix-command flakes"; - settings.auto-optimise-store = true; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - }; - - # Add user age key to identity path - age.identityPaths = [ - "/home/${user}/.ssh/keys/age" - "/etc/ssh/ssh_host_ed25519_key" - "/etc/ssh/ssh_host_rsa_key" - ]; - - # Add non-free packages - nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = import ../../lib/overlays.nix; - - # Set your time zone. - time.timeZone = "America/Los_Angeles"; - i18n.defaultLocale = "en_US.UTF-8"; - - environment.systemPackages = with pkgs; [ - inputs.agenix.packages.x86_64-linux.default - ]; - - # Define user account. - users.users.${user} = { - isNormalUser = true; - extraGroups = [ "dialout" "wheel" "docker" "libvirtd" ]; - shell = pkgs.bash; - }; - - # Did you read the comment? - system.stateVersion = "23.11"; - - home-manager.users.${user} = { - home.username = "${user}"; - home.homeDirectory = "/home/${user}"; - programs.home-manager.enable = true; - - # Did you read the comment? - home.stateVersion = "23.11"; - }; -} diff --git a/provision/hosts/default/physical/configuration.nix b/provision/hosts/default/physical/configuration.nix deleted file mode 100644 index 3434637e..00000000 --- a/provision/hosts/default/physical/configuration.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, pkgs, user, lib, inputs, ... }: -{ - nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" "openssl-1.1.1w" ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - home-manager.users.${user} = { - programs.vscode = { - enable = true; - package = pkgs.vscode.fhs; - }; - }; -} diff --git a/provision/hosts/htpc/configuration.nix b/provision/hosts/htpc/configuration.nix index 4f5357e1..bef0e2ef 100644 --- a/provision/hosts/htpc/configuration.nix +++ b/provision/hosts/htpc/configuration.nix @@ -11,6 +11,7 @@ # Modules modules = { base-plus.enable = true; + physical.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/htpc/default.nix b/provision/hosts/htpc/default.nix index 29312e91..2b3f1af4 100644 --- a/provision/hosts/htpc/default.nix +++ b/provision/hosts/htpc/default.nix @@ -6,9 +6,7 @@ in { inherit system; specialArgs = { inherit user hostname inputs home-manager; }; modules = [ - ../default # shared by all configs - ../default/physical/configuration.nix # shared by physical machines - ./configuration.nix # htpc specific + ./configuration.nix ../../modules /etc/nixos/hardware-configuration.nix agenix.nixosModules.default diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index 5a323653..66174ab4 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -33,6 +33,7 @@ # Modules modules = { base-plus.enable = true; + physical.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/kestrel/default.nix b/provision/hosts/kestrel/default.nix index 0f63c0f7..04a495c8 100644 --- a/provision/hosts/kestrel/default.nix +++ b/provision/hosts/kestrel/default.nix @@ -6,9 +6,7 @@ in { inherit system; specialArgs = { inherit user hostname inputs home-manager; }; modules = [ - ../default # shared by all configs - ../default/physical/configuration.nix # shared by physical machines - ./configuration.nix # kestrel specific + ./configuration.nix ./hardware.nix ../../modules agenix.nixosModules.default diff --git a/provision/hosts/osprey/configuration.nix b/provision/hosts/osprey/configuration.nix index d8e94ab5..e09fa85d 100644 --- a/provision/hosts/osprey/configuration.nix +++ b/provision/hosts/osprey/configuration.nix @@ -29,6 +29,7 @@ # Modules modules = { base-plus.enable = true; + physical.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/osprey/default.nix b/provision/hosts/osprey/default.nix index 48de2f26..04a495c8 100644 --- a/provision/hosts/osprey/default.nix +++ b/provision/hosts/osprey/default.nix @@ -6,9 +6,7 @@ in { inherit system; specialArgs = { inherit user hostname inputs home-manager; }; modules = [ - ../default # shared by all configs - ../default/physical/configuration.nix # shared by physical machines - ./configuration.nix # osprey specific + ./configuration.nix ./hardware.nix ../../modules agenix.nixosModules.default diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix index 437b524b..1bb0eaaa 100644 --- a/provision/hosts/shivan/configuration.nix +++ b/provision/hosts/shivan/configuration.nix @@ -15,6 +15,7 @@ # Modules modules = { base-plus.enable = true; + physical.enable = true; desktop = { enable = true; gnome.enable = true; diff --git a/provision/hosts/shivan/default.nix b/provision/hosts/shivan/default.nix index 1210b7e3..7e035318 100644 --- a/provision/hosts/shivan/default.nix +++ b/provision/hosts/shivan/default.nix @@ -6,9 +6,7 @@ in { inherit system; specialArgs = { inherit user inputs home-manager; }; modules = [ - ../default # shared by all configs - ../default/physical/configuration.nix # shared by physical machines - ./configuration.nix # shivan specific + ./configuration.nix ./hardware.nix ../../modules agenix.nixosModules.default diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix index 64bf58fe..65d7f9f6 100644 --- a/provision/hosts/torus/configuration.nix +++ b/provision/hosts/torus/configuration.nix @@ -98,6 +98,7 @@ # Modules modules = { base-plus.enable = true; + physical.enable = true; services = { ssh.enable = true; syncthing = { diff --git a/provision/hosts/torus/default.nix b/provision/hosts/torus/default.nix index 60b9005b..04a495c8 100644 --- a/provision/hosts/torus/default.nix +++ b/provision/hosts/torus/default.nix @@ -6,9 +6,7 @@ in { inherit system; specialArgs = { inherit user hostname inputs home-manager; }; modules = [ - ../default # shared by all configs - ../default/physical/configuration.nix # shared by physical machines - ./configuration.nix # torus specific + ./configuration.nix ./hardware.nix ../../modules agenix.nixosModules.default diff --git a/provision/hosts/wsl/default.nix b/provision/hosts/wsl/default.nix index 805ea5f7..216c7d6a 100644 --- a/provision/hosts/wsl/default.nix +++ b/provision/hosts/wsl/default.nix @@ -6,8 +6,7 @@ in { inherit system; specialArgs = { inherit user hostname inputs nixos-wsl home-manager; }; modules = [ - ../default # shared by all configs - ./configuration.nix # wsl specific + ./configuration.nix ../../modules agenix.nixosModules.default home-manager.nixosModules.home-manager { diff --git a/provision/modules/base/default.nix b/provision/modules/base/default.nix index aa064c8e..f66ac428 100644 --- a/provision/modules/base/default.nix +++ b/provision/modules/base/default.nix @@ -1,10 +1,63 @@ -{ ... }: +{ config, lib, inputs, pkgs, user, home-manager, ... }: { imports = [ ./terminal.nix - ./plus ../programs/chezmoi.nix ../programs/git.nix ../programs/nvim.nix + ./physical.nix + ./plus ]; + + # base nix options + nix = { + package = pkgs.nixVersions.stable; + extraOptions = "experimental-features = nix-command flakes"; + settings.auto-optimise-store = true; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + }; + + # Add user age key to identity path + age.identityPaths = [ + "/home/${user}/.ssh/keys/age" + "/etc/ssh/ssh_host_ed25519_key" + "/etc/ssh/ssh_host_rsa_key" + ]; + + # Add non-free packages + nixpkgs.config.allowUnfree = true; + nixpkgs.overlays = import ../../lib/overlays.nix; + + # Set your time zone. + time.timeZone = "America/Los_Angeles"; + i18n.defaultLocale = "en_US.UTF-8"; + + # system packages + environment.systemPackages = with pkgs; [ + inputs.agenix.packages.x86_64-linux.default + ]; + + # define user account. + users.users.${user} = { + isNormalUser = true; + extraGroups = [ "dialout" "wheel" "docker" "libvirtd" ]; + shell = pkgs.bash; + }; + + # Did you read the comment? + system.stateVersion = "23.11"; + + # base home manager config + home-manager.users.${user} = { + home.username = "${user}"; + home.homeDirectory = "/home/${user}"; + programs.home-manager.enable = true; + + # Did you read the comment? + home.stateVersion = "23.11"; + }; } diff --git a/provision/modules/base/physical.nix b/provision/modules/base/physical.nix new file mode 100644 index 00000000..fbad4166 --- /dev/null +++ b/provision/modules/base/physical.nix @@ -0,0 +1,11 @@ +{ config, pkgs, user, lib, inputs, ... }: + +let cfg = config.modules.physical; +in { + options.modules.physical.enable = lib.mkEnableOption "physical"; + config = lib.mkIf cfg.enable { + # use the systemd-boot EFI boot loader + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + }; +} From 6023bbab3b9083411e361c942670d38ed2358d4b Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 14 May 2025 22:09:34 -0700 Subject: [PATCH 5/8] update flake --- provision/flake.lock | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/provision/flake.lock b/provision/flake.lock index 6f1bba60..3190ae2f 100644 --- a/provision/flake.lock +++ b/provision/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1746892839, + "narHash": "sha256-0b9us0bIOgA1j/s/6zlxVyP3m97yAh0U+YwKayJ6mmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "12e67385964d9c9304daa81d0ad5ba3b01fdd35e", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "jovian-nixos": { "flake": false, "locked": { - "lastModified": 1738443663, - "narHash": "sha256-Rx3E+LRYRYvWFhjIE2bMpybL6Ac5NgdSpEOX70NATuE=", + "lastModified": 1746681524, + "narHash": "sha256-c5kDVFh+vVfQSEXdVIudFRzPH3LO8j2ImgsBeo8v+Eo=", "ref": "development", - "rev": "bdf32c9d74f824250e683003bd44596f0b93c81a", - "revCount": 1099, + "rev": "14eb8f7d2b0cca74691db620292037bdb813ceb7", + "revCount": 1224, "type": "git", "url": "https://github.com/Jovian-Experiments/Jovian-NixOS" }, @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1736095716, - "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", + "lastModified": 1746453552, + "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", + "rev": "be618645aa0adf461f778500172b6896d5ab2d01", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { From 4d73636ae811250b9d893653b788cd5d49023509 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 14 May 2025 22:10:16 -0700 Subject: [PATCH 6/8] change back to discord --- provision/modules/desktop/default.nix | 2 +- provision/modules/desktop/gnome.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/provision/modules/desktop/default.nix b/provision/modules/desktop/default.nix index f94b5460..9203a170 100644 --- a/provision/modules/desktop/default.nix +++ b/provision/modules/desktop/default.nix @@ -17,7 +17,7 @@ in { environment.systemPackages = with pkgs; [ bc # Arbitrary-precision arithmetic language gamemode # Optimizes system performance for gaming by adjusting system settings - vesktop # Voice, video, and text communication platform for communities and friends + discord # Voice, video, and text communication platform for communities and friends inkscape # Vector graphics editor for creating illustrations, icons, logos, diagrams, and more libreoffice-fresh # Office suite compatible with Microsoft Office mpv # Media player for playing audio and video files diff --git a/provision/modules/desktop/gnome.nix b/provision/modules/desktop/gnome.nix index 1fadda05..f013fad1 100644 --- a/provision/modules/desktop/gnome.nix +++ b/provision/modules/desktop/gnome.nix @@ -118,7 +118,7 @@ in { "kitty.desktop" "org.gnome.Nautilus.desktop" "steam.desktop" - "vesktop.desktop" + "discord.desktop" ]; disable-user-extensions = false; enabled-extensions = [ @@ -213,7 +213,7 @@ in { "terminal" = { binding = "Return"; command = "kitty"; name = "Open Terminal"; }; "browser" = { binding = "b"; command = "google-chrome-stable"; name = "Open Browser"; }; "steam" = { binding = "s"; command = "steam"; name = "Open Steam"; }; - "vesktop" = { binding = "d"; command = "vesktop"; name = "Open Vesktop"; }; + "discord" = { binding = "d"; command = "discord"; name = "Open Discord"; }; "nautilus" = { binding = "f"; command = "nautilus"; name = "Open File Manager"; }; }; }; From 131bfbb6ef5e031f9e28ab542e5e35e6adf69473 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 14 May 2025 22:11:21 -0700 Subject: [PATCH 7/8] add dysk --- provision/modules/base/terminal.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/provision/modules/base/terminal.nix b/provision/modules/base/terminal.nix index e53914ef..1f832aef 100644 --- a/provision/modules/base/terminal.nix +++ b/provision/modules/base/terminal.nix @@ -20,5 +20,6 @@ btop # Terminal-based resource monitor, providing an interactive view of system resources nnn # Terminal file manager with a focus on performance and ease of use + dysk # A linux utility listing your filesystems ]; } From 2cb37324a0c5e720799d8370ac5a6d5c837b3fa6 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 14 May 2025 22:11:31 -0700 Subject: [PATCH 8/8] remove mutter overlay --- provision/overlays/mutter.nix | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 provision/overlays/mutter.nix diff --git a/provision/overlays/mutter.nix b/provision/overlays/mutter.nix deleted file mode 100644 index 6ab4ef6f..00000000 --- a/provision/overlays/mutter.nix +++ /dev/null @@ -1,12 +0,0 @@ -self: super: { - gnome = super.gnome.overrideScope (gnomeFinal: gnomePrev: { - mutter = gnomePrev.mutter.overrideAttrs ( old: { - src = super.fetchgit { - url = "https://gitlab.gnome.org/vanvugt/mutter.git"; - # GNOME 46: triple-buffering-v4-46 - rev = "94f500589efe6b04aa478b3df8322eb81307d89f"; - sha256 = "sha256-fkPjB/5DPBX06t7yj0Rb3UEuu5b9mu3aS+jhH18+lpI="; - }; - }); - }); -}