diff --git a/hosts/kili/configuration.nix b/hosts/kili/configuration.nix index 0387ab2..378d6d1 100644 --- a/hosts/kili/configuration.nix +++ b/hosts/kili/configuration.nix @@ -1,7 +1,6 @@ -{ - pkgs, - config, - ... +{ pkgs +, config +, ... }: { imports = [ @@ -63,25 +62,27 @@ nautilus adwaita-icon-theme - (pkgs.callPackage ( - { stdenv }: - stdenv.mkDerivation { - name = "global-cursor-theme"; - unpackPhase = "true"; - outputs = [ "out" ]; - installPhase = '' - mkdir -p $out/share/icons/default - cat << EOF > $out/share/icons/default/index.theme - [Icon Theme] - Name=Default - Comment=Default Cursor Theme - Inherits=Adwaita - EOF - ''; - } - ) { }) + (pkgs.callPackage + ( + { stdenv }: + stdenv.mkDerivation { + name = "global-cursor-theme"; + unpackPhase = "true"; + outputs = [ "out" ]; + installPhase = '' + mkdir -p $out/share/icons/default + cat << EOF > $out/share/icons/default/index.theme + [Icon Theme] + Name=Default + Comment=Default Cursor Theme + Inherits=Adwaita + EOF + ''; + } + ) + { }) - config.boot.kernelPackages.perf + perf rr ]; diff --git a/programs/fish/default.nix b/programs/fish/default.nix index d1b9428..5bc8d3d 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -20,7 +20,7 @@ inputs@{ machine, ... }: "cp-ani" = cp-media "ani" "anime"; "ragdoll" = ragdoll; "dumpasm" = "${pkgs.custom.dumpasm}/bin/dumpasm"; - "p" = builtins.trace calc calc; + "p" = calc; "s" = "systemctl"; "j" = "journalctl"; "ju" = "journalctl -u"; @@ -239,7 +239,11 @@ inputs@{ machine, ... }: setupTide = lib.hm.dag.entryAfter [ "writeBoundary" ] '' setupTide() { ${pkgs.fish}/bin/fish -c ${lib.escapeShellArg "tide configure ${ - lib.cli.toGNUCommandLineShell { } { + lib.cli.toCommandLineShell (optionName: { + option = if builtins.stringLength optionName > 1 then "--${optionName}" else "-${optionName}"; + sep = null; + explicitBool = false; + }) { auto = true; style = "Lean"; prompt_colors = "True color"; diff --git a/programs/git/default.nix b/programs/git/default.nix index 3ef0743..13c40ee 100644 --- a/programs/git/default.nix +++ b/programs/git/default.nix @@ -5,6 +5,10 @@ inputs@{ machine, ... }: inherit inputs; requirements = [ "cli" ]; home-config = _: { + home.file.".gitignore".text = '' + server\ exited\ unexpectedly + ''; + programs.git = { enable = true; signing.key = "/home/jana/.ssh/id_ed25519.pub"; diff --git a/programs/niri/default.nix b/programs/niri/default.nix index 087f962..417b4f8 100644 --- a/programs/niri/default.nix +++ b/programs/niri/default.nix @@ -21,7 +21,7 @@ inputs@{ machine, ... }: ] ++ (pkgs.lib.splitString " " cmd); - wallpaper = ("${pkgs.custom.raw-data}/pacific.png"); + wallpaper = "${pkgs.custom.raw-data}/pacific.png"; matugenSchemeType = "scheme-tonal-spot"; in { diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix index db56eaa..818421a 100644 --- a/programs/nvim/plugins.nix +++ b/programs/nvim/plugins.nix @@ -384,7 +384,7 @@ in code_action.keys = { quit = ""; }; - symbol_in_winbar.enable = false; + symbol_in_winbar.enable = true; implement.enable = true; }; }; @@ -435,8 +435,8 @@ in __unkeyed-1 = "filetype"; } ]; - lualine_y = [ { __unkeyed-1 = "progress"; } ]; - lualine_z = [ { __unkeyed-1 = "location"; } ]; + lualine_y = [{ __unkeyed-1 = "progress"; }]; + lualine_z = [{ __unkeyed-1 = "location"; }]; }; }; };