diff --git a/flake.lock b/flake.lock index 4a1850f..475b2a7 100644 --- a/flake.lock +++ b/flake.lock @@ -100,7 +100,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/fh/%2A.tar.gz" } }, "firefox-addons": { diff --git a/home-manager/_mixins/desktop/jetbrains-fleet.nix b/home-manager/_mixins/desktop/jetbrains-fleet.nix new file mode 100644 index 0000000..6b178d2 --- /dev/null +++ b/home-manager/_mixins/desktop/jetbrains-fleet.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.jetbrains.fleet ]; +} diff --git a/home-manager/_mixins/emacs/burd.org b/home-manager/_mixins/emacs/burd.org index ce6660a..7a767cb 100644 --- a/home-manager/_mixins/emacs/burd.org +++ b/home-manager/_mixins/emacs/burd.org @@ -65,6 +65,7 @@ company-cmake deft dockerfile-mode + editorconfig elixir-mix elixir-mode eredis @@ -785,6 +786,14 @@ (setq-default show-trailing-whitespace t) #+end_src +*** editorconfig + EditorConfig helps maintain consistent coding styles for multiple developers + working on the same project across various editors and IDEs. + https://editorconfig.org/ + #+begin_src emacs-lisp + (require 'editorconfig) + (editorconfig-mode 1) + #+end_src *** flyspell The built-in Emacs spell checker. Turn off the welcome flag because it is annoying and breaks on quite a few systems. Specify the diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix index 1ddc3dc..9baa9cd 100644 --- a/home-manager/_mixins/users/gburd/default.nix +++ b/home-manager/_mixins/users/gburd/default.nix @@ -154,6 +154,7 @@ ripgrep tig tree + lsof unstable.flyctl unstable.minio-client unstable.element-desktop diff --git a/home-manager/_mixins/users/gburd/desktop.nix b/home-manager/_mixins/users/gburd/desktop.nix index 8359f20..382113a 100644 --- a/home-manager/_mixins/users/gburd/desktop.nix +++ b/home-manager/_mixins/users/gburd/desktop.nix @@ -11,6 +11,7 @@ with lib.hm.gvariant; ../../desktop/gnome-sound-recorder.nix ../../desktop/jetbrains-clion.nix ../../desktop/jetbrains-idea-ultimate.nix + ../../desktop/jetbrains-fleet.nix ../../desktop/meld.nix ../../desktop/protonmail-bridge.nix ../../desktop/rhythmbox.nix diff --git a/nixos/_mixins/desktop/vscode.nix b/nixos/_mixins/desktop/vscode.nix index dd4da54..1b00705 100644 --- a/nixos/_mixins/desktop/vscode.nix +++ b/nixos/_mixins/desktop/vscode.nix @@ -16,9 +16,10 @@ unstable.vscode-extensions.jnoortheen.nix-ide unstable.vscode-extensions.mads-hartmann.bash-ide-vscode unstable.vscode-extensions.ms-azuretools.vscode-docker - vscode-extensions.ms-python.python - vscode-extensions.ms-python.vscode-pylance + unstable.vscode-extensions.ms-python.python + unstable.vscode-extensions.ms-python.vscode-pylance unstable.vscode-extensions.ms-vscode.cpptools + unstable.vscode-extensions.cpptools-extension-pack unstable.vscode-extensions.ms-vsliveshare.vsliveshare unstable.vscode-extensions.redhat.vscode-yaml unstable.vscode-extensions.ryu1kn.partial-diff diff --git a/nixos/default.nix b/nixos/default.nix index 124c1be..3091303 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -82,12 +82,8 @@ in } ]; - # Only install the docs I use documentation.enable = true; - documentation.nixos.enable = false; documentation.man.enable = true; - documentation.info.enable = false; - documentation.doc.enable = false; environment = { # Eject nano and perl from the system diff --git a/nixos/floki/default.nix b/nixos/floki/default.nix index 92b7e44..c8c71f5 100644 --- a/nixos/floki/default.nix +++ b/nixos/floki/default.nix @@ -43,12 +43,20 @@ environment.systemPackages = with pkgs; [ nvtop-amd + man-pages + man-pages-posix ]; networking.hostName = "floki"; powerManagement.powertop.enable = true; powerManagement.cpuFreqGovernor = "powersave"; + documentation.nixos.enable = true; + documentation.doc.enable = false; + documentation.info.enable = true; + documentation.dev.enable = true; + documentation.man.generateCaches = true; + # Lid settings services.logind = { lidSwitch = "suspend";