From 8efd7c34ce283a290cb56794beab57414749b428 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sun, 22 Feb 2026 13:01:00 +1000 Subject: [PATCH 1/2] add nixcord for equibop --- homes/me/default.nix | 4 +++- homes/modules/{ => apps}/firefox.nix | 0 homes/modules/{ => apps}/nixcord.nix | 14 ++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) rename homes/modules/{ => apps}/firefox.nix (100%) rename homes/modules/{ => apps}/nixcord.nix (97%) diff --git a/homes/me/default.nix b/homes/me/default.nix index 73a4074..bdea530 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -13,8 +13,10 @@ ../modules/editor/helix.nix - ../modules/firefox.nix + ../modules/apps/firefox.nix ../modules/apps/thunderbird.nix + ../modules/apps/nixcord.nix + ../modules/wm/hypr/hyprlock.nix ../modules/kanshi.nix ../modules/mako.nix diff --git a/homes/modules/firefox.nix b/homes/modules/apps/firefox.nix similarity index 100% rename from homes/modules/firefox.nix rename to homes/modules/apps/firefox.nix diff --git a/homes/modules/nixcord.nix b/homes/modules/apps/nixcord.nix similarity index 97% rename from homes/modules/nixcord.nix rename to homes/modules/apps/nixcord.nix index 97e6b15..96ec353 100644 --- a/homes/modules/nixcord.nix +++ b/homes/modules/apps/nixcord.nix @@ -14,8 +14,8 @@ config = { enabledThemes = [ - # "aurorastheme.css" - # "base16-colors.css" + "aurorastheme.css" + "base16-colors.css" ]; plugins = { anonymiseFileNames = { @@ -48,7 +48,7 @@ showEditDiffs = true; separatedDiffs = false; }; - # fakeNitro.enable = true; + fakeNitro.enable = true; ghosted.enable = true; noF1.enable = true; noMaskedUrlPaste.enable = true; @@ -104,7 +104,7 @@ }; silentTyping = { enable = true; - enabledGlobally = false; + enabledGlobally = true; }; startupTimings.enable = true; typingIndicator.enable = true; @@ -160,6 +160,7 @@ # "1436965652861685891" # "1436968495190642722" # "1465424321919975454" + # "1468324280445046824" # ]; # } # { @@ -184,6 +185,8 @@ # "1461885176534794427" # "1462155159470866443" # "1468735915076878407" + # "1461929299727749145" + # "1470963392121536657" # ]; # } # { @@ -223,12 +226,11 @@ # "1449513783893692589" # "1463737720961634461" # "1463000874392748249" - # "1461929299727749145" # "1436984534712451105" # "1436983282582683813" # "1437283420312047659" # "1437089201651847315" - # "1468324280445046824" + # "1467307140443148288" # ]; # } # { From e4f2f7b6a73e6520dc138e8383034cf3c2dfc4cf Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sun, 22 Feb 2026 13:01:32 +1000 Subject: [PATCH 2/2] add awww --- flake.lock | 107 ++++++++++++++++++++++++++++++++++++-- flake.nix | 34 ++++++++---- groups/cryde/default.nix | 17 +++--- groups/cryde/programs.nix | 2 +- homes/me/default.nix | 2 +- overlays/default.nix | 8 ++- snow.nix | 22 ++++---- 7 files changed, 153 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index c2f4558..f650af9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "awww": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1770895252, + "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", + "ref": "refs/heads/main", + "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", + "revCount": 1331, + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + } + }, "cerulean": { "inputs": { "deploy-rs": "deploy-rs", @@ -15,8 +37,8 @@ ] }, "locked": { - "lastModified": 1771650297, - "narHash": "sha256-7A952ZrngNdgSJWPLvKdVyGCXn1WtuBUMG4JoRTSCso=", + "lastModified": 1771726756, + "narHash": "sha256-IoIB96vTFWEWovjKIuahnSvdj4f/CtmZUH1ItikpkeY=", "path": "/home/me/cry/mk/cerulean", "type": "path" }, @@ -27,7 +49,7 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": [ "cerulean", "nixpkgs" @@ -75,6 +97,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -90,7 +128,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -269,9 +307,24 @@ "type": "github" } }, + "nixcats": { + "locked": { + "lastModified": 1770584904, + "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=", + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "rev": "538fdde784d2909700d97a8ef307783b33a86fb1", + "type": "github" + }, + "original": { + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "type": "github" + } + }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -376,18 +429,62 @@ }, "root": { "inputs": { + "awww": "awww", "cerulean": "cerulean", "dobutterfliescry-net": "dobutterfliescry-net", "grub2-themes": "grub2-themes", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixcats": "nixcats", "nixcord": "nixcord", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nt": "nt", + "sddm-silent": "sddm-silent", "systems": "systems_3" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "awww", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764038373, + "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "sddm-silent": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769900466, + "narHash": "sha256-WeoJBj/PhqFCCJEIycTipqPbKm5BpQT2uzFTYcYZ30I=", + "owner": "uiriansan", + "repo": "SilentSDDM", + "rev": "a44caf771b4cb72f5c2514f7d488455b0fa860d2", + "type": "github" + }, + "original": { + "owner": "uiriansan", + "repo": "SilentSDDM", + "type": "github" + } + }, "spectrum": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 2b50529..9aebbd1 100644 --- a/flake.nix +++ b/flake.nix @@ -24,17 +24,6 @@ }; }; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - grub2-themes = { - url = "github:vinceliuice/grub2-themes"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nixcord = { - url = "github:FlameFlag/nixcord"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - dobutterfliescry-net = { url = "git+https://tearforge.net/cry/site"; inputs = { @@ -43,6 +32,29 @@ systems.follows = "systems"; }; }; + + awww = { + url = "git+https://codeberg.org/LGFae/awww"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + + nixcord = { + url = "github:FlameFlag/nixcord"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixcats.url = "github:BirdeeHub/nixCats-nvim"; + + grub2-themes = { + url = "github:vinceliuice/grub2-themes"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + sddm-silent = { + url = "github:uiriansan/SilentSDDM"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; nixConfig = { diff --git a/groups/cryde/default.nix b/groups/cryde/default.nix index 7e09671..d550fa5 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -1,20 +1,15 @@ { - inputs, pkgs, - upkgs, config, ... }: { - imports = with inputs; [ + imports = [ ./programs.nix ../../hosts/modules/bashistrans.nix ../../hosts/modules/wm/hyprland.nix ../../hosts/modules/steam.nix ../../hosts/modules/obsidian.nix - - grub2-themes.nixosModules.default - nix-flatpak.nixosModules.nix-flatpak ]; boot.loader.grub2-theme = { @@ -31,8 +26,8 @@ # sddm relies on pkgs.libsForQt5.qt5.qtgraphicaleffects sddm = { enable = true; - wayland.enable = true; # experimental - theme = "corners"; + wayland.enable = ! config.services.xserver.enable; # experimental + # theme = "corners"; }; defaultSession = "hyprland" @@ -111,9 +106,9 @@ # Hint Electrons apps to use Wayland NIXOS_OZONE_WL = "1"; }; - systemPackages = with pkgs; [ - sddm-theme-corners - ]; + # systemPackages = with pkgs; [ + # sddm-theme-corners + # ]; }; # ------- USERS ------- diff --git a/groups/cryde/programs.nix b/groups/cryde/programs.nix index 09c0a67..4b9e668 100644 --- a/groups/cryde/programs.nix +++ b/groups/cryde/programs.nix @@ -6,7 +6,7 @@ # ---- SYSTEM PACKAGES ----- environment.systemPackages = with pkgs; [ # User Environment - swww + awww # swww helvum easyeffects pavucontrol diff --git a/homes/me/default.nix b/homes/me/default.nix index bdea530..5cc251d 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -7,9 +7,9 @@ ../modules/fish.nix ../modules/btop.nix ../modules/tmux.nix - ../modules/term/foot.nix ../modules/git.nix ../modules/bat.nix + ../modules/term/foot.nix ../modules/editor/helix.nix diff --git a/overlays/default.nix b/overlays/default.nix index ac0af8a..6fb9e05 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,8 @@ -{...}: ( +{ + inputs, + system, + ... +}: ( self: super: { angry-oxide = import ../packages/angryoxide { pkgs = super; @@ -29,5 +33,7 @@ }) ]; }); + + awww = inputs.awww.packages.${system}.awww; } ) diff --git a/snow.nix b/snow.nix index 7b2e878..86c40f6 100644 --- a/snow.nix +++ b/snow.nix @@ -1,9 +1,13 @@ {inputs, ...} @ args: { nodes = { base = inputs.nixpkgs; - args = {inherit inputs;}; homeManager = inputs.home-manager; + args = {inherit inputs;}; + modules = [ + inputs.sddm-silent.nixosModules.default + ]; + groups = { # wait.. that's too cold... cryos = { @@ -19,20 +23,20 @@ lolcathost = { system = "x86_64-linux"; groups = groups: [groups.cryos.cryde]; - # modules = with inputs; [ - # grub2-themes.nixosModules.default - # nix-flatpak.nixosModules.nix-flatpak - # ]; + modules = with inputs; [ + grub2-themes.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + ]; }; # i be on my puter frfr myputer = { system = "x86_64-linux"; groups = groups: [groups.cryos.cryde]; - # modules = with inputs; [ - # grub2-themes.nixosModules.default - # nix-flatpak.nixosModules.nix-flatpak - # ]; + modules = with inputs; [ + grub2-themes.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + ]; }; # courtesy of aurora <3