Skip to content

Commit

Permalink
Merge pull request #7 from mardukpill/testing
Browse files Browse the repository at this point in the history
merge testing
  • Loading branch information
mardukpill authored Jul 21, 2024
2 parents b5b1ac6 + 6b52996 commit e2120c0
Show file tree
Hide file tree
Showing 21 changed files with 429 additions and 42 deletions.
102 changes: 91 additions & 11 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";

};

# Home manager
home-manager = {
url = "github:nix-community/home-manager";
Expand All @@ -25,14 +31,18 @@
inputs.hyprland.follows = "hyprland";
};
hyprland-contrib.url = "github:hyprwm/contrib";
# TODO

# spicetify
spicetify-nix = {
url = "github:the-argus/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
};

anyrun = {
url = "github:anyrun-org/anyrun";
inputs.nixpkgs.follows = "nixpkgs";
};

hardware.url = "github:nixos/nixos-hardware";
razer-laptop-control.url = "github:Razer-Linux/razer-laptop-control-no-dkms";

Expand Down Expand Up @@ -67,6 +77,7 @@
nixvim.homeManagerModules.nixvim
spicetify-nix.homeManagerModules.default
nix-colors.homeManagerModules.default
anyrun.homeManagerModules.default
];

systems.modules.nixos = with inputs; [ home-manager.nixosModules.home-manager ];
Expand All @@ -75,7 +86,10 @@
hardware.nixosModules.common-cpu-intel
hardware.nixosModules.common-pc-laptop
hardware.nixosModules.common-pc-laptop-ssd

razer-laptop-control.nixosModules.default

nix-index-database.nixosModules.nix-index
];

deploy = lib.mkDeploy { inherit (inputs) self; };
Expand Down
2 changes: 1 addition & 1 deletion homes/x86_64-linux/mike@blade/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ in
name = "mike";
enable = true;
};

dotties = {
cli = {
neovim = enabled;
Expand All @@ -38,7 +39,6 @@ in
keepassxc

firefox
thunderbird

playerctl

Expand Down
2 changes: 2 additions & 0 deletions modules/home/apps/alacritty/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ in
programs.alacritty = {
enable = true;
settings = {
shell.program = mkIf config.${namespace}.cli.fish.enable "${pkgs.fish}/bin/fish";

live_config_reload = true;

window.decorations = "none";
Expand Down
2 changes: 2 additions & 0 deletions modules/home/cli/fish/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ in
if command -q nix-your-shell
nix-your-shell fish | source
end
set fish_greeting
'';
plugins = [
{
Expand Down
28 changes: 28 additions & 0 deletions modules/home/cli/neovim/plugins/precognition.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ pkgs, ... }:
{
# https://github.com/khaneliman/khanelinix/blob/f7f59d409cf913dd7083acf19f8cffdec957a7bb/modules/home/programs/terminal/editors/neovim/plugins/precognition.nix
programs.nixvim = {
extraPlugins = [ pkgs.vimPlugins.precognition-nvim ];

keymaps = [
{
mode = "n";
key = "<leader>uP";
action.__raw = ''
function()
if require("precognition").toggle() then
vim.notify("precognition on")
else
vim.notify("precognition off")
end
end
'';

options = {
desc = "Precognition Toggle";
silent = true;
};
}
];
};
}
41 changes: 41 additions & 0 deletions modules/home/utility/anyrun/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
pkgs,
lib,
config,
namespace,
inputs,
...
}:
let
inherit (lib) mkEnableOption mkIf;

cfg = config.${namespace}.utility.anyrun;
in
{
options.${namespace}.utility.anyrun = {
enable = mkEnableOption "anyrun.";
};

config = mkIf cfg.enable {
programs.anyrun = {
enable = true;
config = {
plugins = with inputs.anyrun.packages.${pkgs.system}; [
applications
# kidex
rink
symbols
shell
# dictionary
# randr
];
width.fraction = 0.2;
# x.fraction = 0.1;
y.fraction = 0.2;
hidePluginInfo = true;
closeOnClick = true;
};
extraCss = builtins.readFile ./theme.css; # TODO: don't use static colors
};
};
}
Loading

0 comments on commit e2120c0

Please sign in to comment.