From 9833cd25d19528a5e3ea1ed55082c67ae7fdd4af Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Fri, 3 May 2024 12:48:05 -0400 Subject: [PATCH] statix --- flake.lock | 16 +- flake.nix | 2 +- nix/home-manager/home.nix | 230 ++++++++------------ nix/home-manager/modules/packages/emacs.nix | 8 +- statix.toml | 1 + 5 files changed, 106 insertions(+), 151 deletions(-) create mode 100644 statix.toml diff --git a/flake.lock b/flake.lock index f033a65..a66a7f8 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1714390914, - "narHash": "sha256-W5DFIifCjGYJXJzLU3RpqBeqes4zrf0Sr/6rwzTygPU=", + "lastModified": 1714719003, + "narHash": "sha256-QmbW8glgZ2lk+uYEHVZiFX9Cbv4ARCX/3+6kKfsKf28=", "owner": "cachix", "repo": "devenv", - "rev": "34e6461fd76b5f51ad5f8214f5cf22c4cd7a196e", + "rev": "4d786c35280e94211b2fb7b50036cc6aeddee320", "type": "github" }, "original": { @@ -332,12 +332,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", - "revCount": 617818, + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "revCount": 619660, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.617818%2Brev-58a1abdbae3217ca6b702f03d3b35125d88a2994/018f25c6-e917-75c9-967b-ebda3b3dc4ae/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.619660%2Brev-63c3a29ca82437c87573e4c6919b09a24ea61b0f/018f3b26-5e03-7aa3-b783-09324dde70c2/source.tar.gz" }, "original": { "type": "tarball", diff --git a/flake.nix b/flake.nix index fc1077e..f8da932 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ }; outputs = { - self, nixpkgs, devenv, systems, @@ -33,6 +32,7 @@ pre-commit.hooks = { alejandra.enable = true; black.enable = true; + deadnix.enable = true; stylua.enable = true; shellcheck.enable = true; shfmt.enable = true; diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix index 753b7d0..430a591 100644 --- a/nix/home-manager/home.nix +++ b/nix/home-manager/home.nix @@ -1,163 +1,115 @@ {pkgs, ...}: let inherit (pkgs.stdenv.hostPlatform) isDarwin; in { - # Home Manager needs a bit of information about you and the paths it should - # manage. - home.username = "acicchetti"; + home = { + username = "acicchetti"; - home.homeDirectory = - if isDarwin - then "/Users/acicchetti" - else "/home/acicchetti"; + homeDirectory = + if isDarwin + then "/Users/acicchetti" + else "/home/acicchetti"; - # This value determines the Home Manager release that your configuration is - # compatible with. This helps avoid breakage when a new Home Manager release - # introduces backwards incompatible changes. - # - # You should not change this value, even if you update Home Manager. If you do - # want to update the value, then make sure to first check the Home Manager - # release notes. - home.stateVersion = "23.05"; # Please read the comment before changing. + stateVersion = "23.11"; - # The home.packages option allows you to install Nix packages into your - # environment. - home.packages = [ - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - - # # You can also create simple shell scripts directly inside your - # # configuration. For example, this adds a command 'my-hello' to your - # # environment: - # (pkgs.writeShellScriptBin "my-hello" '' - # echo "Hello, ${config.home.username}!" - # '') - ]; - - # Home Manager is pretty good at managing dotfiles. The primary way to manage - # plain files is through 'home.file'. - home.file = { - # # Building this configuration will create a copy of 'dotfiles/screenrc' in - # # the Nix store. Activating the configuration will then make '~/.screenrc' a - # # symlink to the Nix store copy. - # ".screenrc".source = dotfiles/screenrc; - - # # You can also set the file content immediately. - # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 - # ''; + sessionVariables = { + EDITOR = "nvim"; + }; }; - # You can also manage environment variables but you will have to manually - # source - # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # /etc/profiles/per-user/acicchetti/etc/profile.d/hm-session-vars.sh - # - # if you don't want to manage your shell through Home Manager. - home.sessionVariables = { - EDITOR = "nvim"; - }; + programs = { + home-manager.enable = true; - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; + aria2 = { + enable = true; + }; - programs.aria2 = { - enable = true; - }; - - programs.atuin = { - enable = true; - enableZshIntegration = true; - settings = { - enter_accept = true; - style = "compact"; - keymap_mode = "vim-insert"; - keymap_cursor = { - vim_insert = "steady-bar"; - vim_normal = "steady-block"; + atuin = { + enable = true; + enableZshIntegration = true; + settings = { + enter_accept = true; + style = "compact"; + keymap_mode = "vim-insert"; + keymap_cursor = { + vim_insert = "steady-bar"; + vim_normal = "steady-block"; + }; }; }; - }; - programs.direnv = { - enable = true; - nix-direnv.enable = true; - enableZshIntegration = true; - }; - - programs.eza = { - enable = true; - git = true; - icons = false; - enableZshIntegration = true; - }; - - programs.gh = { - enable = true; - settings = { - editor = "nvim"; - git_protocol = "ssh"; + direnv = { + enable = true; + nix-direnv.enable = true; + enableZshIntegration = true; }; - }; - programs.htop = { - enable = true; - }; + eza = { + enable = true; + git = true; + icons = false; + enableZshIntegration = true; + }; - programs.nix-index = { - enable = true; - }; - programs.nix-index-database = { - comma.enable = true; - }; - - programs.nnn = { - enable = true; - }; - - programs.skim = { - enable = true; - enableZshIntegration = false; - }; - - programs.tealdeer = { - enable = true; - }; - - programs.topgrade = { - enable = true; - settings = { - misc = { - disable = ["node" "nix" "home_manager" "gem" "ruby_gems" "cargo" "vim" "pipx" "pip3" "containers"]; - run_in_tmux = true; - display_time = true; - skip_notify = true; + gh = { + enable = true; + settings = { + editor = "nvim"; + git_protocol = "ssh"; }; - git.max_concurrency = 5; - linux.arch_package_manager = "paru"; }; - }; - programs.wezterm = { - enable = true; - enableZshIntegration = true; - extraConfig = builtins.readFile ../../wezterm/wezterm.lua; - }; + htop = { + enable = true; + }; - programs.yazi = { - enable = true; - enableZshIntegration = true; - }; + nix-index = { + enable = true; + }; + nix-index-database = { + comma.enable = true; + }; - programs.zoxide = { - enable = true; + nnn = { + enable = true; + }; + + skim = { + enable = true; + enableZshIntegration = false; + }; + + tealdeer = { + enable = true; + }; + + topgrade = { + enable = true; + settings = { + misc = { + disable = ["node" "nix" "home_manager" "gem" "ruby_gems" "cargo" "vim" "pipx" "pip3" "containers"]; + run_in_tmux = true; + display_time = true; + skip_notify = true; + }; + git.max_concurrency = 5; + linux.arch_package_manager = "paru"; + }; + }; + + wezterm = { + enable = true; + enableZshIntegration = true; + extraConfig = builtins.readFile ../../wezterm/wezterm.lua; + }; + + yazi = { + enable = true; + enableZshIntegration = true; + }; + + zoxide = { + enable = true; + }; }; imports = [ diff --git a/nix/home-manager/modules/packages/emacs.nix b/nix/home-manager/modules/packages/emacs.nix index 9278454..04b5e4c 100644 --- a/nix/home-manager/modules/packages/emacs.nix +++ b/nix/home-manager/modules/packages/emacs.nix @@ -1,5 +1,7 @@ {...}: { - home.file.".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el; - home.file.".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el; - home.file.".doom.d/packages.el".source = ../../../../emacs/emacs.doom/packages.el; + home.file = { + ".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el; + ".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el; + ".doom.d/packages.el".source = ../../../../emacs/emacs.doom/packages.el; + }; } diff --git a/statix.toml b/statix.toml new file mode 100644 index 0000000..519e4d3 --- /dev/null +++ b/statix.toml @@ -0,0 +1 @@ +disabled = ["empty_pattern"]