muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2026-03-09 03:53:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: muon:fa308b408daa054011b5194e0365c983c2352258
Branches Tags
muon:main
muon:homelab
muon:vps
muon:container
muon:fresh
muon:i3
muon:hyprland
muon:refactor
muon:legacy
..
compare: muon:60d60bcaa2ac51537553ac112a1d96b13a3a8359
Branches Tags
muon:main
muon:homelab
muon:vps
muon:container
muon:fresh
muon:i3
muon:hyprland
muon:refactor
muon:legacy

No commits in common. "fa308b408daa054011b5194e0365c983c2352258" and "60d60bcaa2ac51537553ac112a1d96b13a3a8359" have entirely different histories.
fa308b408d ... 60d60bcaa2

8 changed files with 37 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

66
flake.lock generated
View file

@ -139,11 +139,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769996383, "lastModified": 1760948891,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772516620, "lastModified": 1771188132,
"narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=", "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9", "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +275,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772330611, "lastModified": 1771102945,
"narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -309,11 +309,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1770419553, "lastModified": 1758834834,
"narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -330,16 +330,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768214250, "lastModified": 1765720983,
"narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
"owner": "feel-co", "owner": "feel-co",
"repo": "ndg", "repo": "ndg",
"rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "feel-co", "owner": "feel-co",
"ref": "refs/tags/v2.6.0",
"repo": "ndg", "repo": "ndg",
"type": "github" "type": "github"
} }
@ -471,11 +470,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1772433332, "lastModified": 1771008912,
"narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,15 +537,16 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1772483693, "lastModified": 1767628834,
"narHash": "sha256-sOq/GUSR0uw1eQla0Wc5BKztPqBJBj3khd/GhaVg4xU=", "narHash": "sha256-qiPFYDicHq4/ji0/9QxVM8hhjspsJrYcMR/S3zKlfjQ=",
"owner": "NotAShelf", "owner": "thamenato",
"repo": "nvf", "repo": "nvf",
"rev": "750dbfaf6eb62db8e67afc03a3ae3078bfd8f098", "rev": "7161c8d857cf7c641433cc750a1a3666f82a3ff0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NotAShelf", "owner": "thamenato",
"ref": "fix-nvim-treesitter",
"repo": "nvf", "repo": "nvf",
"type": "github" "type": "github"
} }
@ -573,11 +573,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772495394, "lastModified": 1771166946,
"narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +626,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1772296853, "lastModified": 1770914701,
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "rev": "db03fed72e5ca02be34e1d24789345a943329738",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -794,11 +794,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772517053, "lastModified": 1771222275,
"narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=", "narHash": "sha256-df+Un2QnDj95MQxmsnopCtSy/meWO2RDHuMGAqq3nlc=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "32e9673aee2ae994ced561247918952398a3e933", "rev": "a20f5d0c6454b5b24a497afb280427c9af33a0be",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -14,7 +14,8 @@
nix-alien.url = "github:thiagokokada/nix-alien"; nix-alien.url = "github:thiagokokada/nix-alien";
nvf = { nvf = {
url = "github:NotAShelf/nvf"; # url = "github:NotAShelf/nvf";
url = "github:thamenato/nvf/fix-nvim-treesitter";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

3
hosts/murk/home.nix
View file

@ -19,13 +19,11 @@ in {
mods.terminal.emulator.enable = true; mods.terminal.emulator.enable = true;
mods.terminal.development.enable = true; mods.terminal.development.enable = true;
mods.terminal.tools.enable = true; mods.terminal.tools.enable = true;
mods.terminal.gh.enable = true;
mods.terminal.hr.enable = true; mods.terminal.hr.enable = true;
mods.desktop.development.enable = true; mods.desktop.development.enable = true;
mods.desktop.productivity.enable = false; mods.desktop.productivity.enable = false;
mods.zen.enable = true; mods.zen.enable = true;
mods.obsidian.enable = true; mods.obsidian.enable = true;
mods.octo.enable = true;
mods.theme.slideshow = true; mods.theme.slideshow = true;
home.packages = with pkgs; home.packages = with pkgs;
@ -46,6 +44,7 @@ in {
go go
rainfrog rainfrog
tealdeer tealdeer
gh
(callPackage ./packages/mender-cli.nix {}) (callPackage ./packages/mender-cli.nix {})
] ]
# Non-free </3 # Non-free </3

3
hosts/musk/home.nix
View file

@ -17,12 +17,10 @@ in {
mods.terminal.emulator.enable = true; mods.terminal.emulator.enable = true;
mods.terminal.development.enable = true; mods.terminal.development.enable = true;
mods.terminal.tools.enable = true; mods.terminal.tools.enable = true;
mods.terminal.gh.enable = true;
mods.terminal.hr.enable = true; mods.terminal.hr.enable = true;
mods.desktop.development.enable = true; mods.desktop.development.enable = true;
mods.desktop.productivity.enable = false; mods.desktop.productivity.enable = false;
mods.zen.enable = true; mods.zen.enable = true;
mods.octo.enable = true;
home.packages = with pkgs; home.packages = with pkgs;
[ [
@ -42,6 +40,7 @@ in {
go go
rainfrog rainfrog
tealdeer tealdeer
gh
(callPackage ./packages/mender-cli.nix {}) (callPackage ./packages/mender-cli.nix {})
] ]
# Non-free </3 # Non-free </3

1
modules/home/terminal/default.nix
View file

@ -14,7 +14,6 @@
./nvim ./nvim
./zellij ./zellij
./opencode ./opencode
./gh.nix
]; ];
config = lib.mkIf osConfig.mods.desktop.enable { config = lib.mkIf osConfig.mods.desktop.enable {

30
modules/home/terminal/gh.nix
View file

@ -1,30 +0,0 @@
{
pkgs,
lib,
config,
...
}: {
options.mods.terminal.gh.enable = lib.mkEnableOption "enables gh and gh-dash";
config = lib.mkIf config.mods.terminal.gh.enable {
programs.gh = {
enable = true;
extensions = [pkgs.gh-dash];
};
programs.gh-dash = {
enable = true;
settings = {
keybindings = {
prs = [
{
key = "C";
command = "nvim -c 'Octo pr edit {{.PrNumber}}'";
description = "Open PR in Octo.nvim";
}
];
};
};
};
};
}

9
modules/home/terminal/nvim/default.nix
View file

@ -23,7 +23,6 @@ in {
imports = [ imports = [
inputs.nvf.homeManagerModules.default inputs.nvf.homeManagerModules.default
./obsidian.nix ./obsidian.nix
./octo.nix
]; ];
config = lib.mkIf config.mods.nvim.enable { config = lib.mkIf config.mods.nvim.enable {
@ -61,13 +60,6 @@ in {
action = "<cmd>lua vim.lsp.buf.definition()<CR>"; action = "<cmd>lua vim.lsp.buf.definition()<CR>";
desc = "Go to Definition"; desc = "Go to Definition";
} }
{
key = "<C-k>";
mode = ["n"];
action = "<cmd>FzfLua combine pickers=keymaps;commands<CR>";
silent = true;
desc = "FzfLua keymaps and commands";
}
]; ];
languages = { languages = {
@ -101,7 +93,6 @@ in {
statusline.lualine.enable = true; statusline.lualine.enable = true;
telescope.enable = true; telescope.enable = true;
fzf-lua.enable = true;
autocomplete.nvim-cmp.enable = true; autocomplete.nvim-cmp.enable = true;
autopairs.nvim-autopairs.enable = true; autopairs.nvim-autopairs.enable = true;
tabline.nvimBufferline.enable = true; tabline.nvimBufferline.enable = true;

54
modules/home/terminal/nvim/octo.nix
View file

@ -1,54 +0,0 @@
{
pkgs,
lib,
config,
...
}: {
options.mods.octo.enable =
lib.mkEnableOption "enables octo";
config = lib.mkIf config.mods.octo.enable {
programs.nvf.settings.vim.lazy.plugins."octo.nvim" = {
package = pkgs.vimPlugins.octo-nvim;
setupModule = "octo";
setupOpts = {
picker = "telescope";
enable_builtin = true;
};
cmd = ["Octo"];
keys = [
{
key = "<leader>oi";
mode = "n";
action = "<CMD>Octo issue list<CR>";
desc = "List GitHub Issues";
}
{
key = "<leader>op";
mode = "n";
action = "<CMD>Octo pr list<CR>";
desc = "List GitHub PullRequests";
}
{
key = "<leader>od";
mode = "n";
action = "<CMD>Octo discussion list<CR>";
desc = "List GitHub Discussions";
}
{
key = "<leader>on";
mode = "n";
action = "<CMD>Octo notification list<CR>";
desc = "List GitHub Notifications";
}
{
key = "<leader>os";
mode = "n";
action = "function() require('octo.utils').create_base_search_command { include_current_repo = true } end";
lua = true;
desc = "Search GitHub";
}
];
};
};
}