diff --git a/flake.lock b/flake.lock index d75fa2b..e7bf7b3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "alejandra": { + "inputs": { + "fenix": "fenix_2", + "flakeCompat": "flakeCompat", + "nixpkgs": [ + "webcord", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658427149, + "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", + "owner": "kamadorueda", + "repo": "alejandra", + "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", + "type": "github" + }, + "original": { + "owner": "kamadorueda", + "repo": "alejandra", + "type": "github" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat", @@ -24,6 +48,22 @@ "type": "github" } }, + "crane": { + "flake": false, + "locked": { + "lastModified": 1654444508, + "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "db5482bf225acc3160899124a1df5a617cfa27b5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat_2", @@ -43,6 +83,51 @@ "type": "indirect" } }, + "devshell": { + "flake": false, + "locked": { + "lastModified": 1653917170, + "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=", + "owner": "numtide", + "repo": "devshell", + "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "dream2nix": { + "inputs": { + "alejandra": "alejandra", + "crane": "crane", + "devshell": "devshell", + "flake-utils-pre-commit": "flake-utils-pre-commit", + "gomod2nix": "gomod2nix", + "mach-nix": "mach-nix", + "nixpkgs": [ + "webcord", + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1661948914, + "narHash": "sha256-596RJgybMFUOWKkoMehqT5a7XuR6JkJg5zyqX/t1LuY=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "dc3530785e7388398c40c2b4f5893a674b8bd557", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -65,6 +150,30 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "webcord", + "dream2nix", + "alejandra", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1657607339, + "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "owner": "nix-community", + "repo": "fenix", + "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -142,6 +251,21 @@ "type": "github" } }, + "flake-utils-pre-commit": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "locked": { "lastModified": 1644229661, @@ -185,6 +309,22 @@ "type": "indirect" } }, + "flakeCompat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "gitignore-nix": { "flake": false, "locked": { @@ -201,6 +341,22 @@ "type": "github" } }, + "gomod2nix": { + "flake": false, + "locked": { + "lastModified": 1627572165, + "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -293,6 +449,21 @@ "type": "github" } }, + "mach-nix": { + "flake": false, + "locked": { + "lastModified": 1634711045, + "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", + "owner": "DavHau", + "repo": "mach-nix", + "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", + "type": "github" + }, + "original": { + "id": "mach-nix", + "type": "indirect" + } + }, "minecraft-servers": { "inputs": { "nixpkgs": [ @@ -488,6 +659,50 @@ "type": "indirect" } }, + "poetry2nix": { + "flake": false, + "locked": { + "lastModified": 1632969109, + "narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "1.21.0", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-utils": [ + "webcord", + "dream2nix", + "flake-utils-pre-commit" + ], + "nixpkgs": [ + "webcord", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1646153636, + "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "riff": { "inputs": { "fenix": "fenix", @@ -518,7 +733,8 @@ "nixpkgs": "nixpkgs_2", "riff": "riff", "serokell-nix": "serokell-nix", - "vault-secrets": "vault-secrets" + "vault-secrets": "vault-secrets", + "webcord": "webcord" } }, "rust-analyzer-src": { @@ -538,6 +754,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1657557289, + "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "caf23f29144b371035b864a1017dbc32573ad56d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "serokell-nix": { "inputs": { "deploy-rs": "deploy-rs", @@ -665,6 +898,44 @@ "type": "github" } }, + "webcord": { + "inputs": { + "dream2nix": "dream2nix", + "nixpkgs": [ + "nixpkgs" + ], + "webcord": "webcord_2" + }, + "locked": { + "lastModified": 1662387088, + "narHash": "sha256-eB9O9UIkeKHKyCF5oNw3a+wukeaLQMNl4OvJIeR5hRo=", + "owner": "fufexan", + "repo": "webcord-flake", + "rev": "6a2a625df8a607c4a42aa921877ad65be73a2eb0", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "webcord-flake", + "type": "github" + } + }, + "webcord_2": { + "flake": false, + "locked": { + "lastModified": 1661854465, + "narHash": "sha256-/2f+Jb/1MstWtzbnG/gNLG/ds8K7qultXWfb5nlth08=", + "owner": "SpacingBat3", + "repo": "WebCord", + "rev": "83ad1578b2cbcb1c4e5470ca85a0a6e6f5f8c42e", + "type": "github" + }, + "original": { + "owner": "SpacingBat3", + "repo": "WebCord", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index dc70960..4f87838 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -15,7 +15,6 @@ home.packages = with pkgs; [ brightnessctl calibre - discord element-desktop-wayland fluxcd fusee-launcher @@ -40,6 +39,7 @@ rsync rust-analyzer rustup + solo2-cli steam-run texlive.combined.scheme-full wf-recorder # Screenrecorder diff --git a/nixos/hosts/thalassa/null/home/eww/eww.yuck b/nixos/hosts/thalassa/null/home/eww/eww.yuck index fbf04d3..187cabf 100644 --- a/nixos/hosts/thalassa/null/home/eww/eww.yuck +++ b/nixos/hosts/thalassa/null/home/eww/eww.yuck @@ -14,12 +14,7 @@ ) ) -;; Variables -; (defvar time false) -; (defvar cal false) - ;; ━━━ WIFI ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -(defvar wifi "{}") (defpoll wifi :interval "30s" "./scripts/wifi.sh") (defwidget wifi [] @@ -71,7 +66,6 @@ ) ;; ━━━ VOLUME ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -(defvar volume "{}") (defpoll volume :interval "1s" "./scripts/volume.sh") (defwidget volume [] (eventbox :onclick "pamixer -t" diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index 1f30795..5f51e6b 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -6,7 +6,7 @@ final: prev: { ''; }); - discord = prev.discord.override { withOpenASAR = true; }; + discord-canary = prev.discord-canary.override { withOpenASAR = true; }; catppuccin.cursors = prev.callPackage ./catppuccin/cursors { };