Sadan/dotfiles
1
1
Fork 0
mirror of https://github.com/sadan4/dotfiles.git synced 2025-06-07 13:03:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: Sadan:6da6046b739345f98891051901b4a9ea8720143a
Branches Tags
Sadan:main
Sadan:plasmaManager
Sadan:utils
Sadan:feat/fonts
Sadan:refactor
...
compare: Sadan:0e118ce557b3a4dd975574ebe79db2fe8beec73c
Branches Tags
Sadan:main
Sadan:plasmaManager
Sadan:utils
Sadan:feat/fonts
Sadan:refactor

4 commits
6da6046b73 ... 0e118ce557

Author SHA1 Message Date
sadan
0e118ce557
update aarch64 iso config 2025-05-25 22:22:20 -04:00
sadan
c3fe80b08c
dont nneed to use pinned protonn vpn anymore 2025-05-25 18:24:20 -04:00
sadan
7b8b20a853
remove useless pinned vscode 
this was fixed a while ago with
https://github.com/microsoft/vscode-js-debug/pull/2202
 2025-05-25 18:23:56 -04:00
sadan
3bca2d74df
use lazygit pr with fixed UI 
v49 added a bad UI option with no config to change it

revert to main once https://github.com/jesseduffield/lazygit/pull/4593
is merged and updated in nixpkgs

also refactors lazygit into its own module and removes the config file
 2025-05-25 18:21:28 -04:00
7 changed files with 88 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/users/homeModules/dev/ide/default.nix
View file

@ -9,12 +9,6 @@ in
home = {
packages = with pkgs; [
unstable.vscode
# pinned.vscode
# (pinned.vscode.fhsWithPackages (
# pkgs: with pkgs; [
# powershell
# ]
# ))
# codium
zed-editor
];

17
common/users/homeModules/git.nix
View file

@ -1,32 +1,21 @@
{ pkgs, config, ... }:
{ pkgs, ... }:
{
imports = [
./pinned.nix
./lazygit.nix
];
home = {
packages = with pkgs; [
git
pinned.lazygit
act
gh
];
file = {
lazygit = {
recursive = true;
source = ../../../dotfiles/lazygit;
target = "./.config/lazygit";
};
gh = {
ghcli = {
source = ../../../dotfiles/gh/config.yml;
target = "./.config/gh/config.yml";
};
};
shellAliases = {
lg = "lazygit";
};
sessionVariables = {
LG_CONFIG_FILE = "/home/${config.home.username}/.config/lazygit/tokyonight_night.conf";
};
};
programs = {
git = {

77
common/users/homeModules/lazygit.nix Normal file
View file

@ -0,0 +1,77 @@
{
pkgs,
...
}:
{
home = {
shellAliases = {
lg = "lazygit";
};
};
stylix = {
targets = {
lazygit = {
enable = false;
};
};
};
programs = {
lazygit = {
enable = true;
package = pkgs.lazygit.overrideAttrs (
_: old: {
src = pkgs.fetchFromGitHub {
owner = "jesseduffield";
repo = old.pname;
rev = "3cff48437e2d831d03be9eda03818368ab7c2a26";
hash = "sha256-OA40EgUKwNttsoSLi/xtKuEdbK0P5IKiXUGKSOk0gfE=";
};
}
);
settings = {
gui = {
showRootItemInFileTree = false;
switchTabsWithPanelJumpKeys = true;
theme = {
lightTheme = false;
activeBorderColor = [
"#ff9e64"
"bold"
];
inactiveBorderColor = [
"#27a1b9"
];
searchingActiveBorderColor = [
"#ff9e64"
"bold"
];
optionsTextColor = [
"#7aa2f7"
];
selectedLineBgColor = [
"#283457"
];
cherryPickedCommitFgColor = [
"#7aa2f7"
];
cherryPickedCommitBgColor = [
"#bb9af7"
];
markedBaseCommitFgColor = [
"#7aa2f7"
];
markedBaseCommitBgColor = [
"#e0af68"
];
unstagedChangesColor = [
"#db4b4b"
];
defaultFgColor = [
"#c0caf5"
];
};
};
};
};
};
}

7
common/users/homeModules/networking.nix
View file

@ -1,8 +1,11 @@
{pkgs, stable, ...}: {
{pkgs, ...}: {
imports = [
./pinned.nix
];
home = {
packages = with pkgs; [
parsec-bin
stable.protonvpn-gui
protonvpn-gui
insomnia
teamviewer
filezilla

18
common/users/homeModules/pinned.nix
View file

@ -17,15 +17,6 @@
{
# extend packages here
pinned = {
# 1.89.1
vscode =
(import (builtins.fetchGit {
# Descriptive name to make the store path easier to identify
name = "pinned-vscode";
url = "https://github.com/NixOS/nixpkgs/";
ref = "refs/heads/nixpkgs-unstable";
rev = "0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb";
}) defaultOpts).vscode;
vscode_neovim =
(import (builtins.fetchGit {
# Descriptive name to make the store path easier to identify
@ -53,7 +44,7 @@
rev = "336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3";
})
{
system = pkgs.system;
inherit (pkgs) system;
config = {
permittedInsecurePackages = [ "electron-19.1.9" ];
};
@ -75,13 +66,6 @@
ref = "refs/heads/nixpkgs-unstable";
rev = "05bbf675397d5366259409139039af8077d695ce";
}) defaultOpts).gdb;
# lazygit >=49 has an ugly root symbol with no config to remove it
lazygit =
(import (builtins.fetchGit {
name = "pinned-lazygit";
url = "https://github.com/NixOS/nixpkgs/";
rev = "785eec1b92a0a4b3246f1307a9325a7e5024fef5";
}) defaultOpts).lazygit;
};
}
)

27
dotfiles/lazygit/tokyonight_night.conf
View file

@ -1,27 +0,0 @@
gui:
nerdFontsVersion: "3"
theme:
activeBorderColor:
- "#ff9e64"
- "bold"
inactiveBorderColor:
- "#27a1b9"
searchingActiveBorderColor:
- "#ff9e64"
- "bold"
optionsTextColor:
- "#7aa2f7"
selectedLineBgColor:
- "#283457"
cherryPickedCommitFgColor:
- "#7aa2f7"
cherryPickedCommitBgColor:
- "#bb9af7"
markedBaseCommitFgColor:
- "#7aa2f7"
markedBaseCommitBgColor:
- "#e0af68"
unstagedChangesColor:
- "#db4b4b"
defaultFgColor:
- "#c0caf5"

4
flake.nix
View file

@ -128,8 +128,8 @@
...
}:
{
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
boot.kernelPackages = pkgs.linuxPackages_latest;
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix") ];
boot.kernelPackages = pkgs.linuxPackages_testing;
boot.supportedFilesystems = lib.mkForce [
"btrfs"
"reiserfs"