diff --git a/flake.lock b/flake.lock index 36c77c6..5601523 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719705674, - "narHash": "sha256-yq4twcOT5iBKi+rE17uB9fWUdhTPKKyeLde2m6fzVk8=", + "lastModified": 1719758387, + "narHash": "sha256-bMaI1jJNzIZar4TP/hhoPQROqqcbD6zT6O+sqIJdp8c=", "owner": "catppuccin", "repo": "nix", - "rev": "e3d54d7486445cb03f35408f412c00b49a4542b6", + "rev": "9eb0610d48dd0e1fecf772bbdacf9050d7b82d7c", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1719640067, - "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=", + "lastModified": 1719733833, + "narHash": "sha256-6h2EqZU9bL9rHlXE+2LCBgnDImejzbS+4dYsNDDFlkY=", "owner": "nix-community", "repo": "disko", - "rev": "423b86a7f756421325e71663ada79a199bf13408", + "rev": "d185770ea261fb5cf81aa5ad1791b93a7834d12c", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719684307, - "narHash": "sha256-mpBw92WX8uqxRd4UWAHg4K6r33brYqDg8cpVXzr1NnQ=", + "lastModified": 1719786368, + "narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=", "ref": "refs/heads/main", - "rev": "718afe271ecebfe6711453b9cfee90fa49a7e761", - "revCount": 4897, + "rev": "d7ea1b7785f31e9fd6477490309721a19a835592", + "revCount": 4900, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -755,6 +755,27 @@ "type": "github" } }, + "matugen": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699310205, + "narHash": "sha256-G/w5emPS6OtSwLclW1ji5dwjLec0ey06IU/Xj96W9f0=", + "owner": "InioX", + "repo": "matugen", + "rev": "ceead3ee416bffa337c5243c60d69022572a4cdf", + "type": "github" + }, + "original": { + "owner": "InioX", + "ref": "module", + "repo": "matugen", + "type": "github" + } + }, "naersk": { "inputs": { "nixpkgs": [ @@ -788,11 +809,11 @@ ] }, "locked": { - "lastModified": 1719683797, - "narHash": "sha256-sfE3ACZSo7I2ahByRsU66X+xmzAz4qSxl4IipSD7ObM=", + "lastModified": 1719764240, + "narHash": "sha256-bsZDPD08s8FKCGyy1OMMuM+cOjO1M8vPREkhgyqkRQM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "48f92fd7f42dd4b01e55dbe0baaf21c4a270a076", + "rev": "643ec69ac0cfcc1cd26523c3816fb111e5bb3a41", "type": "github" }, "original": { @@ -804,11 +825,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719676676, - "narHash": "sha256-97hP/z7sH4GUBBVi2Z7QiJsgIOO6a+AFYf4MvTU2p0Y=", + "lastModified": 1719700831, + "narHash": "sha256-d89hDFBBtuQ7rwS/Q3lKYyfE0ekVCwubMN9q1qCZ3m0=", "owner": "neovim", "repo": "neovim", - "rev": "435d0182d293e70b14a5655c976c3c6daa6ea765", + "rev": "e7020306a19a5211c834966ec067fff3b981bdb9", "type": "github" }, "original": { @@ -826,11 +847,11 @@ ] }, "locked": { - "lastModified": 1719537932, - "narHash": "sha256-miUyak3kV48UC1fP5VJWrvHPPmZU0ZdcUq4TPBnTVf4=", + "lastModified": 1719711484, + "narHash": "sha256-OLXbeoYYa+JY0ANxeDpLvhyHocPwPtq+wbUxym3pxrE=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "1dc754dd507c0507c8b4a6fbeacf8f5b8881d6d7", + "rev": "8ef126355754f88fa1c776cbb7c13a295610d4c4", "type": "github" }, "original": { @@ -940,11 +961,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719099622, - "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -1146,11 +1167,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719745305, + "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", "type": "github" }, "original": { @@ -1167,11 +1188,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1719684964, - "narHash": "sha256-749a2RzsgL6EoclRSKWH8f0AkOhPXEbboDwkD+b0GH0=", + "lastModified": 1719769335, + "narHash": "sha256-2UsgGTR8gnbSBMduHoy3pGR/vQ8Jotzt71QK7O5p2Vc=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "2f2c6689da2d67befdb360ab2d01a0033edc6748", + "rev": "be802889902ce53e769559fd48759e0b99bed8e7", "type": "github" }, "original": { @@ -1195,6 +1216,7 @@ "hyprland": "hyprland", "hyprpaper": "hyprpaper", "hyprpicker": "hyprpicker", + "matugen": "matugen", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-minecraft": "nix-minecraft", "nixd": "nixd", @@ -1258,11 +1280,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1719627476, - "narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=", + "lastModified": 1719714047, + "narHash": "sha256-MeNPopLLv63EZj5L43j4TZkmW4wj1ouoc/h/E20sl/U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f", + "rev": "cb216719ce89a43dfb3d1b86a9575e89f4b727a4", "type": "github" }, "original": { @@ -1298,11 +1320,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719268571, - "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", + "lastModified": 1719716556, + "narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", + "rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dfbf0b4..a8fd2a7 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,11 @@ catppuccin.url = "github:catppuccin/nix"; + matugen = { + url = "github:InioX/matugen/module"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + dotzsh.url = "github:number5/dotzsh"; dotzsh.flake = false; }; diff --git a/home/common.nix b/home/common.nix deleted file mode 100644 index c55142f..0000000 --- a/home/common.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: { - imports = - [ - ./i3 - ./mutablerepos.nix - ./libvirt.nix - ./apps.nix - ./polybar - ./dunst - ] - ++ (import ./programs) - ++ (import ./services); - - home = { - enableNixpkgsReleaseCheck = false; - - username = "bruce"; - homeDirectory = "/home/bruce"; - }; - - config = { - # unstablePackages = with pkgs.unstable; [ - # # Applications - # ledger-live-desktop - # #Libraries - # ffmpeg-full - # ]; - programs.home-manager.enable = true; - - mutable = { - enable = true; - - repos = { - asdf = { - branch = "v0.12.0"; - repo = "https://github.com/asdf-vm/asdf.git"; - target = "${config.home.homeDirectory}/.asdf"; - }; - - dot_nvim = { - branch = "main"; - repo = "git@github.com:number5/dot_vim.git"; - target = "${config.xdg.configHome}/nvim"; - }; - }; - }; - }; -} diff --git a/home/configurations/bruce_at_chestnut.nix b/home/configurations/bruce_at_chestnut.nix index 02b2d5f..f8a8575 100644 --- a/home/configurations/bruce_at_chestnut.nix +++ b/home/configurations/bruce_at_chestnut.nix @@ -25,7 +25,7 @@ repos = { asdf = { - branch = "v0.13.1"; + branch = "v0.14.0"; repo = "https://github.com/asdf-vm/asdf.git"; target = "${config.home.homeDirectory}/.asdf"; }; diff --git a/home/modules/home.nix b/home/modules/home.nix index cc1de7a..abd43e0 100644 --- a/home/modules/home.nix +++ b/home/modules/home.nix @@ -16,7 +16,13 @@ in { ./starship.nix ]; - home = { + home = let + cursor = { + package = pkgs.catppuccin-cursors.macchiatoTeal; + name = "catppuccin-macchiato-teal-cursors"; + size = 24; + }; + in { packages = let p = pkgs; s = self'; @@ -25,6 +31,18 @@ in { p.lefthook ]; + + pointerCursor = { + gtk.enable = true; + name = cursor.name; + package = cursor.package; + size = cursor.size; + x11 = { + defaultCursor = cursor.name; + enable = true; + }; + }; + stateVersion = "24.05"; }; } diff --git a/nixos/modules/system/misc.nix b/nixos/modules/system/misc.nix index 87517ee..c81e92d 100644 --- a/nixos/modules/system/misc.nix +++ b/nixos/modules/system/misc.nix @@ -1,11 +1,8 @@ { - config, - pkgs, - lib, ... }: { # Steam fix - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable32Bit = true; # This setups a SSH server. Very important if you're setting up a headless system. # Feel free to remove if you don't need it. diff --git a/parts/home_configs.nix b/parts/home_configs.nix index 3166b70..6ddf912 100644 --- a/parts/home_configs.nix +++ b/parts/home_configs.nix @@ -99,6 +99,7 @@ in { {systemd.user.startServices = "legacy";} inputs.sops-nix.homeManagerModules.sops inputs.catppuccin.homeManagerModules.catppuccin + inputs.matugen.nixosModules.default inputs.hyprland.homeManagerModules.default inputs.anyrun.homeManagerModules.default ]