From 25569795c4cd204d55fd88e8a6a500c59bf463dc Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 1 Jun 2025 14:04:09 -0400 Subject: [PATCH] add vesktop settings, add cosmic Signed-off-by: ahuston-0 --- flake.lock | 64 ++++++++++++++++++++------------- flake.nix | 31 +++++++++------- systems/artemision/programs.nix | 1 - users/alice/home/waybar.json | 2 +- users/alice/non-server.nix | 42 ++++++++++++++++++++++ 5 files changed, 101 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 17684d4..f886585 100644 --- a/flake.lock +++ b/flake.lock @@ -304,7 +304,9 @@ "inputs": { "nix": "nix", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1748756240, @@ -409,6 +411,35 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixpkgs-stable" + ], + "rust-overlay": [ + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1748776124, + "narHash": "sha256-vs2cMCHX9wnWJutXhQyWkWOpMF/Xbw0ZAUAFGsKLifA=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "e989a41092f6f0375e7afb789bc97cb30d01fdb8", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-generators": { "inputs": { "nixlib": "nixlib", @@ -470,16 +501,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748124805, - "narHash": "sha256-8A7HjmnvCpDjmETrZY1QwzKunR63LiP7lHu1eA5q6JI=", - "owner": "NixOS", + "lastModified": 1748762463, + "narHash": "sha256-rb8vudY2u0SgdWh83SAhM5QZT91ZOnvjOLGTO4pdGTc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "db1aed32009f408e4048c1dd0beaf714dd34ed93", + "rev": "0d0bc640d371e9e8c9914c42951b3d6522bc5dda", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05-small", + "owner": "nixos", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -515,22 +546,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1748762463, - "narHash": "sha256-rb8vudY2u0SgdWh83SAhM5QZT91ZOnvjOLGTO4pdGTc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0d0bc640d371e9e8c9914c42951b3d6522bc5dda", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -591,10 +606,11 @@ "hydra": "hydra", "hyprland-contrib": "hyprland-contrib", "nix-index-database": "nix-index-database", + "nixos-cosmic": "nixos-cosmic", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixos-modules": "nixos-modules", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "pre-commit-hooks": "pre-commit-hooks", "rust-overlay": "rust-overlay", diff --git a/flake.nix b/flake.nix index 1b71661..444e20e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,16 +6,19 @@ "https://cache.nixos.org/?priority=1&want-mass-query=true" "https://nix-community.cachix.org/?priority=10&want-mass-query=true" "https://attic.nayeonie.com/nix-cache" + "https://cosmic.cachix.org/" ]; trusted-substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" "https://attic.nayeonie.com/nix-cache" + "https://cosmic.cachix.org/" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-cache:grGRsHhqNDhkEuTODvHJXYmoCClntC+U8XAJQzwMaZM=" + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; trusted-users = [ "root" ]; allow-import-from-derivation = true; @@ -23,6 +26,7 @@ }; inputs = { + # flake inputs with no explicit deps (in alphabetic order) flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; flake-parts.url = "github:hercules-ci/flake-parts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; @@ -32,16 +36,7 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; systems.url = "github:nix-systems/default"; - # attic = { - # url = "github:zhaofengli/attic"; - # inputs = { - # nixpkgs.follows = "nixpkgs"; - # nixpkgs-stable.follows = "nixpkgs-stable"; - # flake-compat.follows = "flake-compat"; - # flake-parts.follows = "flake-parts"; - # }; - # }; - + # flake inputs with dependencies (in alphabetic order) firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs = { @@ -61,9 +56,9 @@ hydra = { url = "git+https://nayeonie.com/ahuston-0/hydra?ref=add-gitea-pulls"; - # inputs = { - # nixpkgs.follows = "nixpkgs"; - # }; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; }; hyprland-contrib = { @@ -76,6 +71,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs = { + flake-compat.follows = "flake-compat"; + nixpkgs.follows = "nixpkgs"; + nixpkgs-stable.follows = "nixpkgs-stable"; + rust-overlay.follows = "rust-overlay"; + }; + }; + nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/systems/artemision/programs.nix b/systems/artemision/programs.nix index 1a73a7c..470ce51 100644 --- a/systems/artemision/programs.nix +++ b/systems/artemision/programs.nix @@ -100,7 +100,6 @@ unipicker unzip uutils-coreutils-noprefix - vesktop vscode watchman wget diff --git a/users/alice/home/waybar.json b/users/alice/home/waybar.json index 759372e..7403558 100644 --- a/users/alice/home/waybar.json +++ b/users/alice/home/waybar.json @@ -4,8 +4,8 @@ "layer": "top", "position": "top", "output": [ - "eDP-2", "eDP-1", + "eDP-2", "HDMI-0", "DP-0" ], diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix index 891cac2..2a89f47 100644 --- a/users/alice/non-server.nix +++ b/users/alice/non-server.nix @@ -5,6 +5,48 @@ enable = true; package = pkgs.emacs30-pgtk; }; + programs.vesktop = { + enable = true; + settings = { + appBadge = false; + arRPC = true; + checkUpdates = false; + customTitleBar = false; + hardwareAcceleration = true; + }; + vencord.settings = { + autoUpdate = false; + autoUpdateNotification = false; + notifyAboutUpdates = false; + plugins = { + AnonymiseFileNames.enabled = true; + BetterFolders.enabled = true; + BetterGifAltText.enabled = true; + CallTimer.enabled = true; + ClearURLs.enabled = true; + CopyFileContents.enabled = true; + CtrlEnterSend.enabled = true; + CustomIdle = { + enabled = true; + settings = { + remainInIdle = false; + }; + }; + FriendsSince.enabled = true; + GameActivityToggle.enabled = true; + ImplicitRelationships.enabled = true; + MutualGroupDMs.enabled = true; + QuickMention.enabled = true; + QuickReply.enabled = true; + ReplaceGoogleSearch = { + enabled = true; + settings.customEngineName = "DuckDuckGo"; + }; + ReviewDB.enabled = true; + ShowConnections.enabled = true; + }; + }; + }; home.packages = with pkgs; [ cmake shellcheck