diff --git a/flake.lock b/flake.lock index 3c143cd..ed8814a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1733743004, - "narHash": "sha256-ZgnLrPOLrDTpGpvdMpX9cPPn7GrisnKhEw/x8M6Vf4Y=", + "lastModified": 1738087375, + "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", "owner": "Aylur", "repo": "ags", - "rev": "ce27d3036f7fbebc3476ccbb5a1c51f0603c2475", + "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1731959031, - "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", + "lastModified": 1739298463, + "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", + "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1733520119, - "narHash": "sha256-6K07ZJTnFu1xASBCMtVc9cFTbBEauwSc7gGBmjLkLSk=", + "lastModified": 1737670815, + "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=", "owner": "aylur", "repo": "astal", - "rev": "4c19d8d06fa25cc6389f37abe8839b4d8be5c0d6", + "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042", "type": "github" }, "original": { @@ -129,6 +129,24 @@ "type": "github" } }, + "grayjay": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1742984519, + "narHash": "sha256-Vk9PkC/d3kyikJbOW8skUCqGWmUkQ5SrAcGqapvWyGo=", + "owner": "rishabh5321", + "repo": "grayjay-flake", + "rev": "798b83c2aa452004d955ba0a39a495773570710a", + "type": "github" + }, + "original": { + "owner": "rishabh5321", + "repo": "grayjay-flake", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -136,11 +154,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1740318342, + "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", "type": "github" }, "original": { @@ -166,11 +184,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -195,11 +213,11 @@ ] }, "locked": { - "lastModified": 1733248371, - "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -218,17 +236,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1733864105, - "narHash": "sha256-WjyOigIoneQijFAHxpu2xHCRdl4PcVctx0c1miPBBIA=", + "lastModified": 1740332129, + "narHash": "sha256-Z0+2cS8XPVPT2DMW3ZWQ5Y3RCbA7XmXHmq0MSWXdV7E=", "owner": "hyprwm", "repo": "hyprland", - "rev": "4d05677e8d398b6fa144eae7a98ad4f2a54acb92", + "rev": "2e81648980bf5dcaf96cbbc26aab5715599f2af3", "type": "github" }, "original": { @@ -249,11 +267,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -262,10 +280,49 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, "hyprland-qtutils": { "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -278,11 +335,11 @@ ] }, "locked": { - "lastModified": 1733472316, - "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -307,11 +364,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -332,11 +389,11 @@ ] }, "locked": { - "lastModified": 1732288281, - "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", + "lastModified": 1739891528, + "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", + "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", "type": "github" }, "original": { @@ -357,11 +414,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -376,15 +433,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1733708804, - "narHash": "sha256-PiUrztTiR4aVRC2fMdNcOWYWF1ojvqbrSUYmhtp3970=", + "lastModified": 1740308987, + "narHash": "sha256-/D6L1nqcf+GOO0Kr0tppkYVfRiU3Iy9auBQNhuBBkrA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "1531210f371ecf966ff67e87975f684553bdbbf7", + "rev": "42f72583bc88c8409894f52516adf29139d0d171", "type": "github" }, "original": { @@ -395,11 +451,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -411,27 +467,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1740162160, + "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "type": "github" }, "original": { @@ -443,11 +483,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1740126099, + "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "type": "github" }, "original": { @@ -457,7 +513,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -492,11 +548,11 @@ "plugin-rainbow-delimiters-nvim": { "flake": false, "locked": { - "lastModified": 1733870816, - "narHash": "sha256-40NE1+BFG6OPcHKGejfltuTANB/GTIPn1BfvAB55t9Q=", + "lastModified": 1739386719, + "narHash": "sha256-TjmtlTyiWYVQGqNYrbdsj+nFy1viHDgZGCvd5hTJUCw=", "owner": "HiPhish", "repo": "rainbow-delimiters.nvim", - "rev": "dc788723f717bdd3041838b8db34cce53c9aa920", + "rev": "011d98eaa3a73b5a51d82ce5bc6b1397dde95562", "type": "gitlab" }, "original": { @@ -528,15 +584,14 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -548,37 +603,17 @@ "root": { "inputs": { "ags": "ags", + "grayjay": "grayjay", "home-manager": "home-manager", "hyprland": "hyprland", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "plugin-harpoon1": "plugin-harpoon1", "plugin-rainbow-delimiters-nvim": "plugin-rainbow-delimiters-nvim", "plugin-undotree-nvim": "plugin-undotree-nvim", "zen-browser": "zen-browser" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733625333, - "narHash": "sha256-tIML2axjm4AnlKP29upVJxzBpj4Cy4ak+PKonqQtXmc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "430c8b054e45ea44fd2c9521a378306ada507a6c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1689347949, @@ -622,11 +657,11 @@ ] }, "locked": { - "lastModified": 1733157064, - "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { @@ -637,14 +672,14 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1737573247, - "narHash": "sha256-qYr17CTrtmudrwcDXBZjgZM6E8elQ8O7SfMhmZj7x00=", + "lastModified": 1739667343, + "narHash": "sha256-fNEz+Yd0t9jXz27qKRMAEBradTwYBeBLOECx+ydG25s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c3ea41c78e72866919a46116a5231c4e92062327", + "rev": "8c7f6ca49f87b4e114f775a4dad956ceb6df4220", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 693efd2..c7f82a4 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,9 @@ # Zen browser zen-browser.url = "github:0xc000022070/zen-browser-flake"; + # Grayjay + grayjay.url = "github:rishabh5321/grayjay-flake"; + # AGS ags.url = "github:Aylur/ags"; ags.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/kalle-pc/default.nix b/hosts/kalle-pc/default.nix index f53f7b6..24cc38a 100644 --- a/hosts/kalle-pc/default.nix +++ b/hosts/kalle-pc/default.nix @@ -19,8 +19,11 @@ ../../modules/git.nix ../../modules/direnv.nix ../../modules/firefox.nix + ../../modules/zen-browser.nix ../../modules/steam.nix ../../modules/nvim + ../../modules/grayjay.nix + ../../modules/signal.nix ]; boot.loader.systemd-boot.enable = true; @@ -147,10 +150,25 @@ vlc feishin cachix - inputs.zen-browser.packages.x86_64-linux.default ]; }; + # NOTE: For debugging staging server configs + networking.extraHosts = '' + 192.168.10.99 staging.kallestruik.nl + 192.168.10.99 service1.staging.kallestruik.nl + 192.168.10.99 service2.staging.kallestruik.nl + 192.168.10.99 service3.staging.kallestruik.nl + 192.168.10.99 service4.staging.kallestruik.nl + 192.168.10.99 service5.staging.kallestruik.nl + 192.168.10.99 service6.staging.kallestruik.nl + ''; + + services.udev.packages = [ + # Allow flashing android devices and using ADB + pkgs.android-udev-rules + ]; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It's perfectly fine and recommended to leave diff --git a/hosts/kalle-pc/hardware-configuration.override.nix b/hosts/kalle-pc/hardware-configuration.override.nix index eeead14..436a289 100644 --- a/hosts/kalle-pc/hardware-configuration.override.nix +++ b/hosts/kalle-pc/hardware-configuration.override.nix @@ -22,6 +22,10 @@ device = "/dev/disk/by-uuid/0ac05c3f-df12-458e-b145-e912febe1205"; fsType = "ext4"; }; + "/mnt/games-nvme" = { + device = "/dev/disk/by-uuid/7ae70244-cf8e-491e-b617-5d2d2ea3e4f1"; + fsType = "ext4"; + }; "/mnt/external" = { device = "/dev/disk/by-uuid/13e2dfc3-7b4d-44ac-9417-51b933a36917"; fsType = "ext4"; diff --git a/modules/grayjay.nix b/modules/grayjay.nix new file mode 100644 index 0000000..7d6a596 --- /dev/null +++ b/modules/grayjay.nix @@ -0,0 +1,10 @@ +{ + inputs, + pkgs, + ... +}: +{ + home-manager.users.kalle.home.packages = [ + inputs.grayjay.packages.${pkgs.system}.grayjay + ]; +} diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix index 4cfaf03..1fe0929 100644 --- a/modules/nvim/default.nix +++ b/modules/nvim/default.nix @@ -85,6 +85,11 @@ config = "colorscheme catppuccin-mocha"; } + { + plugin = oil-nvim; + config = toLua "require('oil').setup()"; + } + cmp-nvim-lsp cmp-nvim-lsp-signature-help cmp-buffer diff --git a/modules/signal.nix b/modules/signal.nix new file mode 100644 index 0000000..c8b7130 --- /dev/null +++ b/modules/signal.nix @@ -0,0 +1,9 @@ +{ + pkgs, + ... +}: +{ + home-manager.users.kalle.home.packages = [ + pkgs.signal-desktop + ]; +} diff --git a/modules/zen-browser.nix b/modules/zen-browser.nix new file mode 100644 index 0000000..4e19097 --- /dev/null +++ b/modules/zen-browser.nix @@ -0,0 +1,10 @@ +{ + inputs, + pkgs, + ... +}: +{ + home-manager.users.kalle.home.packages = [ + inputs.zen-browser.packages.${pkgs.system}.default + ]; +} diff --git a/overlays/default.nix b/overlays/default.nix index c7e2f52..4422138 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,6 @@ -{ inputs -, ... +{ + inputs, + ... }: { @@ -8,16 +9,25 @@ rainbow-delimiters-nvim = prev.vimUtils.buildVimPlugin { name = "raindow-delimiters.nvim"; src = inputs.plugin-rainbow-delimiters-nvim; + nvimSkipModule = [ + "rainbow-delimiters.types" + "rainbow-delimiters._test.highlight" + ]; }; undotree-nvim = prev.vimUtils.buildVimPlugin { name = "undotree.nvim"; src = inputs.plugin-undotree-nvim; + nvimSkipModule = [ + "undotree" + "undotree.collector" + ]; }; harpoon1 = prev.vimUtils.buildVimPlugin { name = "harpoon"; src = inputs.plugin-harpoon1; + doCheck = false; }; }; };