diff --git a/flake.lock b/flake.lock index f650af9..c2f4558 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "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", @@ -37,8 +15,8 @@ ] }, "locked": { - "lastModified": 1771726756, - "narHash": "sha256-IoIB96vTFWEWovjKIuahnSvdj4f/CtmZUH1ItikpkeY=", + "lastModified": 1771650297, + "narHash": "sha256-7A952ZrngNdgSJWPLvKdVyGCXn1WtuBUMG4JoRTSCso=", "path": "/home/me/cry/mk/cerulean", "type": "path" }, @@ -49,7 +27,7 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "cerulean", "nixpkgs" @@ -97,22 +75,6 @@ } }, "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, @@ -128,7 +90,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -307,24 +269,9 @@ "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_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -429,62 +376,18 @@ }, "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 9aebbd1..2b50529 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,17 @@ }; }; + 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 = { @@ -32,29 +43,6 @@ 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 d550fa5..7e09671 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -1,15 +1,20 @@ { + inputs, pkgs, + upkgs, config, ... }: { - imports = [ + imports = with inputs; [ ./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 = { @@ -26,8 +31,8 @@ # sddm relies on pkgs.libsForQt5.qt5.qtgraphicaleffects sddm = { enable = true; - wayland.enable = ! config.services.xserver.enable; # experimental - # theme = "corners"; + wayland.enable = true; # experimental + theme = "corners"; }; defaultSession = "hyprland" @@ -106,9 +111,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 4b9e668..09c0a67 100644 --- a/groups/cryde/programs.nix +++ b/groups/cryde/programs.nix @@ -6,7 +6,7 @@ # ---- SYSTEM PACKAGES ----- environment.systemPackages = with pkgs; [ # User Environment - awww # swww + swww helvum easyeffects pavucontrol diff --git a/homes/me/default.nix b/homes/me/default.nix index 5cc251d..73a4074 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -7,16 +7,14 @@ ../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 - ../modules/apps/firefox.nix + ../modules/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/apps/firefox.nix b/homes/modules/firefox.nix similarity index 100% rename from homes/modules/apps/firefox.nix rename to homes/modules/firefox.nix diff --git a/homes/modules/apps/nixcord.nix b/homes/modules/nixcord.nix similarity index 97% rename from homes/modules/apps/nixcord.nix rename to homes/modules/nixcord.nix index 96ec353..97e6b15 100644 --- a/homes/modules/apps/nixcord.nix +++ b/homes/modules/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 = true; + enabledGlobally = false; }; startupTimings.enable = true; typingIndicator.enable = true; @@ -160,7 +160,6 @@ # "1436965652861685891" # "1436968495190642722" # "1465424321919975454" - # "1468324280445046824" # ]; # } # { @@ -185,8 +184,6 @@ # "1461885176534794427" # "1462155159470866443" # "1468735915076878407" - # "1461929299727749145" - # "1470963392121536657" # ]; # } # { @@ -226,11 +223,12 @@ # "1449513783893692589" # "1463737720961634461" # "1463000874392748249" + # "1461929299727749145" # "1436984534712451105" # "1436983282582683813" # "1437283420312047659" # "1437089201651847315" - # "1467307140443148288" + # "1468324280445046824" # ]; # } # { diff --git a/overlays/default.nix b/overlays/default.nix index 6fb9e05..ac0af8a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,8 +1,4 @@ -{ - inputs, - system, - ... -}: ( +{...}: ( self: super: { angry-oxide = import ../packages/angryoxide { pkgs = super; @@ -33,7 +29,5 @@ }) ]; }); - - awww = inputs.awww.packages.${system}.awww; } ) diff --git a/snow.nix b/snow.nix index 86c40f6..7b2e878 100644 --- a/snow.nix +++ b/snow.nix @@ -1,12 +1,8 @@ {inputs, ...} @ args: { nodes = { base = inputs.nixpkgs; - homeManager = inputs.home-manager; - args = {inherit inputs;}; - modules = [ - inputs.sddm-silent.nixosModules.default - ]; + homeManager = inputs.home-manager; groups = { # wait.. that's too cold... @@ -23,20 +19,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