diff --git a/flake.lock b/flake.lock index 3a7764a..b1fe86f 100644 --- a/flake.lock +++ b/flake.lock @@ -66,6 +66,28 @@ "type": "github" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -115,19 +137,17 @@ } }, "flake-compat_4": { - "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, "flake-compat_5": { @@ -147,6 +167,22 @@ } }, "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -183,6 +219,46 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "small-nvim", @@ -204,7 +280,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "small-nvim", @@ -299,6 +375,24 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { "inputs": { "systems": [ "stylix", @@ -337,8 +431,41 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": [ + "nvim-nix", + "nixvim", + "flake-compat" + ], "gitignore": "gitignore", + "nixpkgs": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_2", "nixpkgs": [ "small-nvim", "neovim-nightly-overlay", @@ -365,6 +492,29 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "nvim-nix", + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "small-nvim", @@ -441,7 +591,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_5", "nixpkgs": [ "small-nvim", "neovim-nightly-overlay", @@ -483,6 +633,28 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e83414058edd339148dc142a8437edb9450574c8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -503,6 +675,36 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nvim-nix", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nvim-nix", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "microvm": { "inputs": { "flake-utils": "flake-utils", @@ -527,9 +729,9 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_4", + "git-hooks": "git-hooks_2", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", "nixpkgs": [ @@ -567,6 +769,50 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ], + "umu": "umu" + }, + "locked": { + "lastModified": 1730598103, + "narHash": "sha256-o8Lb4oN8MjEUVhoFUT7vEJqSBLs0qhd9YhJzaTkJ9JY=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "43f595b011c0f7f11807ace038abfde05c73d86b", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -648,6 +894,18 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1728538411, @@ -680,6 +938,35 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "nvim-nix", + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1730214386, + "narHash": "sha256-FNXiFunXR2DnNrjmA0ofLznTTHcEDJjNWvCQtQExtL0=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "7d882356a486cf44b7fab842ac26885ecd985af3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1730329096, @@ -695,6 +982,30 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_5", + "ixx": "ixx", + "nixpkgs": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730044642, + "narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", + "owner": "NuschtOS", + "repo": "search", + "rev": "e373332c1f8237fc1263901745b0fe747228c8ba", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "nvfetcher": { "inputs": { "flake-compat": "flake-compat_3", @@ -717,6 +1028,27 @@ "type": "github" } }, + "nvim-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nixvim": "nixvim" + }, + "locked": { + "lastModified": 1730794096, + "narHash": "sha256-YZcA3XE0juPDMfEYDra8wpFlk3dNlk3tLHtD62CMBEY=", + "owner": "xunuwu", + "repo": "nvim-nix", + "rev": "b74cbd01b090707fe839bb4bbae50239f68dd52d", + "type": "github" + }, + "original": { + "owner": "xunuwu", + "repo": "nvim-nix", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -724,17 +1056,19 @@ "haumea": "haumea", "home-manager": "home-manager", "microvm": "microvm", + "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nur": "nur", "nvfetcher": "nvfetcher", + "nvim-nix": "nvim-nix", "small-nvim": "small-nvim", "sobercookie": "sobercookie", "sops-nix": "sops-nix", "stylix": "stylix", - "umu": "umu", + "umu": "umu_2", "vpn-confinement": "vpn-confinement" } }, @@ -749,15 +1083,13 @@ "locked": { "lastModified": 1729288975, "narHash": "sha256-3knRNR2DPlgyM5fvs0rzaX8mznceoVYh+WbIgP5fbmc=", - "owner": "xunuwu", - "repo": "small-nvim", + "path": "/nix/store/q3ajji7ipf9zyy92mzmqc0s4xzdf5vp4-source", "rev": "062d9c3125ea18d03e87f2dc8403ede52ddb70ce", - "type": "github" + "type": "path" }, "original": { - "owner": "xunuwu", - "repo": "small-nvim", - "type": "github" + "id": "small-nvim", + "type": "indirect" } }, "sobercookie": { @@ -823,12 +1155,12 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_6", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_3", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -937,6 +1269,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -986,7 +1333,54 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nvim-nix", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730025913, + "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "umu": { + "inputs": { + "nixpkgs": [ + "nix-gaming", + "nixpkgs" + ] + }, + "locked": { + "dir": "packaging/nix", + "lastModified": 1730559589, + "narHash": "sha256-o4NT2Kt7yEA63j38Ic5mrh2U/iQjs3YSNvIbCccIYP0=", + "ref": "refs/heads/main", + "rev": "70645c290dfc6ed10282bf4d2ae38c0bf7b1a3fb", + "revCount": 830, + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + }, + "original": { + "dir": "packaging/nix", + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + } + }, + "umu_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1010,7 +1404,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index d2ed04c..31e35ad 100644 --- a/flake.nix +++ b/flake.nix @@ -55,8 +55,10 @@ hardware.url = "github:nixos/nixos-hardware"; home-manager.url = "github:nix-community/home-manager"; - small-nvim.url = "github:xunuwu/small-nvim"; - # small-nvim.url = "/home/xun/dots/small-nvim"; + nvim-nix = { + url = "github:xunuwu/nvim-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; stylix.url = "github:danth/stylix"; nur.url = "github:nix-community/NUR"; sops-nix.url = "github:Mic92/sops-nix"; @@ -75,6 +77,10 @@ url = "github:nix-community/haumea"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-gaming = { + url = "github:fufexan/nix-gaming"; + inputs.nixpkgs.follows = "nixpkgs"; + }; ## deduplication flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; diff --git a/home-modules/xun/develop/default.nix b/home-modules/xun/develop/default.nix index 8c1fbbc..feac245 100644 --- a/home-modules/xun/develop/default.nix +++ b/home-modules/xun/develop/default.nix @@ -24,6 +24,7 @@ in { csharp.enable = enableOption false; shell.enable = enableOption false; zig.enable = enableOption false; + lua.enable = enableOption false; }; }; @@ -67,7 +68,7 @@ in { }; }) (lib.mkIf cfg.lang.c.enable { - home.packages = with pkgs; [clang-tools buckle]; + home.packages = with pkgs; [clang-tools buckle gdb lldb]; }) (lib.mkIf cfg.lang.csharp.enable { home.packages = with pkgs; [ @@ -76,6 +77,12 @@ in { roslyn-ls ]; }) + (lib.mkIf cfg.lang.lua.enable { + home.packages = with pkgs; [ + stylua + lua-language-server + ]; + }) (lib.mkIf cfg.lang.shell.enable { home.packages = with pkgs; [ shellcheck diff --git a/home/profiles/kidney/default.nix b/home/profiles/kidney/default.nix index c12a298..fabb468 100644 --- a/home/profiles/kidney/default.nix +++ b/home/profiles/kidney/default.nix @@ -5,7 +5,6 @@ }: { imports = [ self.homeManagerModules.xun - inputs.small-nvim.homeManagerModules.small-nvim ../../editors/emacs.nix # ../../terminal/shell/zsh.nix # ../../terminal/programs @@ -15,14 +14,6 @@ ]; xun = { - small-nvim = { - enable = true; - colorscheme = { - name = "dayfox"; - package = "EdenEast/nightfox.nvim"; - }; - wakatime.enable = false; - }; develop = { enable = true; lang = { diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index 0c4ce58..d41f1d6 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -6,7 +6,6 @@ }: { imports = [ self.homeManagerModules.xun - inputs.small-nvim.homeManagerModules.small-nvim ./kanshi.nix ./defaults.nix @@ -72,16 +71,10 @@ ../../services/system/polkit-agent.nix ../../services/system/udiskie.nix # although i dont need this for usb memory, it is quite convenient for flashing qmk ]; + home.packages = [inputs.nvim-nix.packages.${pkgs.system}.default]; xun = let enabled = {enable = true;}; in { - small-nvim = { - enable = true; - colorscheme = { - name = "carbonfox"; - package = "EdenEast/nightfox.nvim"; - }; - }; desktop = { xdg = enabled; }; @@ -99,6 +92,7 @@ c = enabled; csharp = enabled; zig = enabled; + lua = enabled; }; }; gaming = { diff --git a/home/programs/misc/discord.nix b/home/programs/misc/discord.nix index ff88db2..ee95bf8 100644 --- a/home/programs/misc/discord.nix +++ b/home/programs/misc/discord.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { home.packages = with pkgs; [ vesktop - # (discord.override { - # withOpenASAR = true; - # }) + (discord.override { + withOpenASAR = true; + }) ]; # services.arrpc.enable = true; # RPC with vesktop (disabled since it uses way more cpu than is reasonable for such a program) } diff --git a/hosts/machines/default.nix b/hosts/machines/default.nix index a5e401c..930f315 100644 --- a/hosts/machines/default.nix +++ b/hosts/machines/default.nix @@ -118,7 +118,7 @@ in { # programs.gamemode # TEMP: TODO # programs.gamescope # TEMP: TODO # programs.steam # TEMP: TODO - # programs.RE.default + programs.RE.default ]) { diff --git a/hosts/machines/kidney/fonts.nix b/hosts/machines/kidney/fonts.nix index e840d3d..564478a 100644 --- a/hosts/machines/kidney/fonts.nix +++ b/hosts/machines/kidney/fonts.nix @@ -4,26 +4,7 @@ font-awesome iosevka emacs-all-the-icons-fonts - (stdenv.mkDerivation { - # font piracy? i would never - pname = "Cartograph-CF"; - version = "0.1"; - src = pkgs.fetchFromGitHub { - owner = "xiyaowong"; - repo = "Cartograph-CF"; - rev = "619de85c103dbd5c150e1d5df039357f8ac2ed52"; - hash = "sha256-NVqHxLQZnHb0lMjODkaDwSoglGPkUVJHL1xTmASoER4="; - }; - dontBuild = true; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts - cp -r $src $out/share/fonts - - runHook postInstall - ''; - }) + self.packages.${pkgs.system}.cartograph-cf ]; enableDefaultPackages = false; fontconfig.defaultFonts = { diff --git a/hosts/machines/nixdesk/default.nix b/hosts/machines/nixdesk/default.nix index 335c889..ca37aa2 100644 --- a/hosts/machines/nixdesk/default.nix +++ b/hosts/machines/nixdesk/default.nix @@ -23,10 +23,9 @@ rocmSupport = true; allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "discord" "steam" - "steam-original" "steam-unwrapped" - "apple_cursor" # bwuh this is NOT unfree!! ]; }; diff --git a/pkgs/cartograph-cf/default.nix b/pkgs/cartograph-cf/default.nix new file mode 100644 index 0000000..1a1885e --- /dev/null +++ b/pkgs/cartograph-cf/default.nix @@ -0,0 +1,24 @@ +{ + stdenv, + fetchFromGitHub, +}: (stdenv.mkDerivation { + # font piracy? i would never + # TODO: use pkgs.nerd-font-patcher + pname = "Cartograph-CF"; + version = "0.1"; + src = fetchFromGitHub { + owner = "xiyaowong"; + repo = "Cartograph-CF"; + rev = "619de85c103dbd5c150e1d5df039357f8ac2ed52"; + hash = "sha256-NVqHxLQZnHb0lMjODkaDwSoglGPkUVJHL1xTmASoER4="; + }; + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts + cp -r $src/Nerd\ Font $out/share/fonts + + runHook postInstall + ''; +}) diff --git a/pkgs/cartographer/default.nix b/pkgs/cartographer/default.nix new file mode 100644 index 0000000..5303cca --- /dev/null +++ b/pkgs/cartographer/default.nix @@ -0,0 +1,16 @@ +{ + stdenv, + lib, + fetchFromGitHub, + kernel, + kmod, +}: +stdenv.mkDerivation { + pname = "cartographer"; + version = "0.1"; + src = fetchFromGitHub { + owner = "LWSS"; + repo = "Cartographer"; + rev = ""; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 1d20e40..17994e6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -7,4 +7,5 @@ in { binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {}; krunker = pkgs.callPackage ./krunker {inherit nv_generated;}; ida-pro = pkgs.callPackage ./ida-pro {}; + cartograph-cf = pkgs.callPackage ./cartograph-cf {}; } diff --git a/pkgs/ida-pro/default.nix b/pkgs/ida-pro/default.nix index 08b3f86..a99f064 100644 --- a/pkgs/ida-pro/default.nix +++ b/pkgs/ida-pro/default.nix @@ -46,10 +46,7 @@ in }; icon = fetchurl { - urls = [ - "https://www.hex-rays.com/products/ida/news/8_1/images/icon_free.png" - "https://web.archive.org/web/20221105181231if_/https://hex-rays.com/products/ida/news/8_1/images/icon_free.png" - ]; + url = "https://web.archive.org/web/20221105181231if_/https://hex-rays.com/products/ida/news/8_1/images/icon_free.png"; sha256 = "sha256-widkv2VGh+eOauUK/6Sz/e2auCNFAsc8n9z0fdrSnW0="; }; diff --git a/systemProfiles/programs/fonts.nix b/systemProfiles/programs/fonts.nix index 0ea8cfa..008bf42 100644 --- a/systemProfiles/programs/fonts.nix +++ b/systemProfiles/programs/fonts.nix @@ -1,8 +1,8 @@ -{ +_: { + pkgs, self, - super, - root, -}: {pkgs, ...}: { + ... +}: { fonts = { packages = with pkgs; [ powerline-fonts @@ -15,26 +15,7 @@ nerdfonts #(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) - (stdenv.mkDerivation { - # font piracy? i would never - pname = "Cartograph-CF"; - version = "0.1"; - src = pkgs.fetchFromGitHub { - owner = "xiyaowong"; - repo = "Cartograph-CF"; - rev = "619de85c103dbd5c150e1d5df039357f8ac2ed52"; - hash = "sha256-NVqHxLQZnHb0lMjODkaDwSoglGPkUVJHL1xTmASoER4="; - }; - dontBuild = true; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts - cp -r $src $out/share/fonts - - runHook postInstall - ''; - }) + self.packages.${pkgs.system}.cartograph-cf ]; # causes more issues than it solves diff --git a/systemProfiles/services/pipewire.nix b/systemProfiles/services/pipewire.nix index 642d9d7..08177b3 100644 --- a/systemProfiles/services/pipewire.nix +++ b/systemProfiles/services/pipewire.nix @@ -1,10 +1,22 @@ -{lib, ...}: { +{ + lib, + inputs, + ... +}: { + imports = [inputs.nix-gaming.nixosModules.pipewireLowLatency]; + services.pipewire = { enable = true; alsa.enable = true; alsa.support32Bit = true; jack.enable = true; pulse.enable = true; + + lowLatency = { + enable = true; + quantum = 64; + rate = 48000; + }; }; hardware.pulseaudio.enable = lib.mkForce false; diff --git a/systemProfiles/themes/dark.nix b/systemProfiles/themes/dark.nix index 8e2a17a..0dd8dd0 100644 --- a/systemProfiles/themes/dark.nix +++ b/systemProfiles/themes/dark.nix @@ -1,4 +1,8 @@ -_: {pkgs, ...}: { +_: { + pkgs, + self, + ... +}: { stylix = { enable = true; autoEnable = true;