beginning of bigger restructure, m3ta-nixpkgs input

This commit is contained in:
m3tam3re
2025-10-03 19:14:37 +02:00
parent b66553888b
commit 6cd1fdd651
12 changed files with 59 additions and 157 deletions

25
flake.lock generated
View File

@@ -101,22 +101,6 @@
"type": "github" "type": "github"
} }
}, },
"dotfiles": {
"flake": false,
"locked": {
"lastModified": 1728910889,
"narHash": "sha256-B/fb+7SKVxK9j851SgR4Nljd6EtE1DzqwLh6yOvkQOY=",
"ref": "refs/heads/master",
"rev": "360c75b2cbce800ebaf9445266e2fe345bf582bf",
"revCount": 53,
"type": "git",
"url": "https://code.m3tam3re.com/m3tam3re/dotfiles.git"
},
"original": {
"type": "git",
"url": "https://code.m3tam3re.com/m3tam3re/dotfiles.git"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@@ -265,11 +249,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1759490685, "lastModified": 1759495926,
"narHash": "sha256-UbJucUVnIj0EmNHF6TaoMRRvKFk/XcwJTEKmoHj44ts=", "narHash": "sha256-FfM1dBK43RQ96J3ZZ7737VP0t0wmndvKE6N7MPf2tco=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "cb770e18c1a3c4a762ddfc733cccdcb67f409958", "rev": "e2ef49ef422ec7707b109c32349018ad4834233f",
"revCount": 3, "revCount": 1,
"type": "git", "type": "git",
"url": "https://code.m3ta.dev/m3tam3re/nixpkgs" "url": "https://code.m3ta.dev/m3tam3re/nixpkgs"
}, },
@@ -583,7 +567,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"disko": "disko", "disko": "disko",
"dotfiles": "dotfiles",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprpanel": "hyprpanel", "hyprpanel": "hyprpanel",
"m3ta-nixpkgs": "m3ta-nixpkgs", "m3ta-nixpkgs": "m3ta-nixpkgs",

View File

@@ -43,17 +43,11 @@
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
nix-ai-tools.url = "github:numtide/nix-ai-tools"; nix-ai-tools.url = "github:numtide/nix-ai-tools";
dotfiles = {
url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git";
flake = false;
};
}; };
outputs = { outputs = {
self, self,
agenix, agenix,
dotfiles,
home-manager, home-manager,
nixpkgs, nixpkgs,
m3ta-nixpkgs, m3ta-nixpkgs,

View File

@@ -26,16 +26,6 @@
enableNushellIntegration = true; enableNushellIntegration = true;
}; };
# programs.neovim = {
# enable = true;
# defaultEditor = true;
# viAlias = true;
# vimAlias = true;
# vimdiffAlias = true;
# withNodeJs = true;
# withPython3 = true;
# };
programs.bat = { programs.bat = {
enable = true; enable = true;
config = { config = {
@@ -193,6 +183,11 @@
}; };
}; };
cli.zellij-ps = {
enable = true;
projectFolders = ["/home/m3tam3re/p"];
};
home.packages = with pkgs; [ home.packages = with pkgs; [
agenix-cli agenix-cli
alejandra alejandra

View File

@@ -1,26 +0,0 @@
{
pkgs,
inputs,
...
}: {
home.file.".config/bat" = {
source = "${inputs.dotfiles}/bat";
recursive = true;
};
home.file.".config/nyxt" = {
source = "${inputs.dotfiles}/nyxt";
recursive = true;
};
# home.file.".config/hypr" = {
# source = "${inputs.dotfiles}/hypr";
# recursive = true;
# };
home.file.".config/nvim" = {
source = "${inputs.dotfiles}/nvim";
recursive = true;
};
home.file.".config/zellij" = {
source = "${inputs.dotfiles}/zellij";
recursive = true;
};
}

View File

@@ -89,27 +89,27 @@
init.defaultBranch = "master"; init.defaultBranch = "master";
}; };
}; };
programs.zellij-ps = { # programs.zellij-ps = {
enable = true; # enable = true;
projectFolders = [ # projectFolders = [
"${config.home.homeDirectory}/p/c" # "${config.home.homeDirectory}/p/c"
"${config.home.homeDirectory}/p" # "${config.home.homeDirectory}/p"
"${config.home.homeDirectory}/.config" # "${config.home.homeDirectory}/.config"
]; # ];
layout = '' # layout = ''
layout { # layout {
pane size=1 borderless=true { # pane size=1 borderless=true {
plugin location="zellij:tab-bar" # plugin location="zellij:tab-bar"
} # }
pane size="70%" command="nvim" # pane size="70%" command="nvim"
pane split_direction="vertical" { # pane split_direction="vertical" {
pane # pane
pane command="unimatrix" # pane command="unimatrix"
} # }
pane size=1 borderless=true { # pane size=1 borderless=true {
plugin location="zellij:status-bar" # plugin location="zellij:status-bar"
} # }
} # }
''; # '';
}; # };
} }

View File

@@ -221,27 +221,27 @@
}; };
}; };
}; };
programs.zellij-ps = { # programs.zellij-ps = {
enable = true; # enable = true;
projectFolders = [ # projectFolders = [
"${config.home.homeDirectory}/p/c" # "${config.home.homeDirectory}/p/c"
"${config.home.homeDirectory}/p" # "${config.home.homeDirectory}/p"
"${config.home.homeDirectory}/.config" # "${config.home.homeDirectory}/.config"
]; # ];
layout = '' # layout = ''
layout { # layout {
pane size=1 borderless=true { # pane size=1 borderless=true {
plugin location="zellij:tab-bar" # plugin location="zellij:tab-bar"
} # }
pane size="70%" command="nvim" # pane size="70%" command="nvim"
pane split_direction="vertical" { # pane split_direction="vertical" {
pane # pane
pane command="unimatrix" # pane command="unimatrix"
} # }
pane size=1 borderless=true { # pane size=1 borderless=true {
plugin location="zellij:status-bar" # plugin location="zellij:status-bar"
} # }
} # }
''; # '';
}; # };
} }

View File

@@ -6,7 +6,6 @@
with lib; { with lib; {
imports = [ imports = [
../common ../common
./dotfiles
./home.nix ./home.nix
../features/cli ../features/cli
../features/coding ../features/coding

View File

@@ -8,7 +8,6 @@ with lib; let
in { in {
imports = [ imports = [
../common ../common
./dotfiles
./home.nix ./home.nix
../features/cli ../features/cli
../features/coding ../features/coding

View File

@@ -6,7 +6,6 @@
with lib; { with lib; {
imports = [ imports = [
../common ../common
./dotfiles
./home.nix ./home.nix
../features/cli ../features/cli
../features/coding ../features/coding

View File

@@ -1,3 +1,3 @@
{ {
#zellij-ps = import ./zellij-ps.nix; #module = import ./module.nix;
} }

View File

@@ -1,44 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.programs.zellij-ps;
in {
options = {
programs.zellij-ps = {
enable = mkEnableOption "Zellij Project Selector";
projectFolders = lib.mkOption {
type = lib.types.listOf lib.types.path;
description = "List of project folders for zellij-ps.";
default = ["${config.home.homeDirectory}/projects"];
};
layout = lib.mkOption {
type = lib.types.str;
description = "Layout for zellij";
default = ''
layout {
pane size=1 borderless=true {
plugin location="zellij:tab-bar"
}
pane
pane split_direction="vertical" {
pane
pane command="htop"
}
pane size=2 borderless=true {
plugin location="zellij:status-bar"
}
}
'';
};
};
};
config = mkIf cfg.enable {
home.packages = [pkgs.zellij-ps];
home.sessionVariables.PROJECT_FOLDERS = lib.concatStringsSep ":" cfg.projectFolders;
home.file.".config/zellij/layouts/zellij-ps.kdl".text = cfg.layout;
};
}

View File

@@ -0,0 +1,3 @@
{pkgs, ...}: {
# package = pkgs.callPackage ./package {};
}