diff --git a/flake.lock b/flake.lock index ad750ca..3feec8e 100644 --- a/flake.lock +++ b/flake.lock @@ -22,32 +22,32 @@ ] }, "locked": { - "lastModified": 1685599623, - "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "lastModified": 1689134369, + "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", "owner": "nix-community", "repo": "home-manager", - "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "master", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1685865905, - "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=", + "lastModified": 1689192006, + "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7", + "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index aa43be7..84de2d1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,10 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # TODO_: Add any other flake you might need diff --git a/home-manager/home.nix b/home-manager/home.nix index ea87b56..76a6b33 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -63,11 +63,14 @@ pulseaudio discord cargo + go cmake pkg-config fontconfig + vmware-workstation jetbrains.datagrip - firefox + jetbrains.goland + jetbrains.webstorm dig python3 ansible @@ -75,6 +78,9 @@ exa bat cryptomator + fd + kodi + nmap ]; services.nextcloud-client = { diff --git a/nixos/modules/i3.nix b/nixos/modules/i3.nix index 4b307f8..fd7059a 100644 --- a/nixos/modules/i3.nix +++ b/nixos/modules/i3.nix @@ -34,4 +34,8 @@ # nvidia-drm.modeset=1 is required for some wayland compositors, e.g. sway hardware.nvidia.modesetting.enable = true; + + fonts.fonts = with pkgs; [ + (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; }) +]; } diff --git a/package-configs/kitty/kitty.conf b/package-configs/kitty/kitty.conf index b27ee11..048872a 100644 --- a/package-configs/kitty/kitty.conf +++ b/package-configs/kitty/kitty.conf @@ -6,9 +6,6 @@ enable_audio_bell no map f9 close_other_windows_in_tab -font_family JetBrains Mono Regular Nerd Font Complete Mono -bold_font JetBrains Mono Bold Nerd Font Complete Mono -italic_font JetBrains Mono Italic Nerd Font Complete Mono -bold_italic_font JetBrains Mono Bold Italic Nerd Font Complete Mono +font_family JetBrainsMono Nerd Font font_size 12.0