Compare commits

..

No commits in common. "dba46148fc6fd26771eac904e621f121b9d4bc06" and "5cfecf809ff7d5dd77a5a7f4becfbbbad55f65fc" have entirely different histories.

3 changed files with 160 additions and 312 deletions

View File

@ -1,103 +1,105 @@
{ pkgs, config, inputs, ... }: { pkgs, config, ... }:
let let
dotsDir = "${config.home.homeDirectory}/.dot_files/dots"; dotsDir = "${config.home.homeDirectory}/.dot_files/dots";
softLinkDots = dir: softLinkDots = dir:
(builtins.listToAttrs (map (n: { (builtins.listToAttrs (map
name = "${dir + "/" + n}"; (n: {
value = { name = "${dir + "/" + n}";
source = config.lib.file.mkOutOfStoreSymlink "${dotsDir}/${dir}/${n}"; value = {
force = true; source = config.lib.file.mkOutOfStoreSymlink "${dotsDir}/${dir}/${n}";
}; force = true;
}) };
# HACK: We don't use the absolute path in readDir to respect pure evaluation in nix flakes. })
# HACK: We don't use the absolute path in readDir to respect pure evaluation in nix flakes.
(builtins.attrNames (builtins.readDir ../dots/${dir})))); (builtins.attrNames (builtins.readDir ../dots/${dir}))));
gtkStyle = "gtk2"; gtkStyle = "gtk2";
in { in
{
programs.home-manager.enable = true; programs.home-manager.enable = true;
home = { home = {
packages = with pkgs; packages = with pkgs; [
[ bob-nvim
bob-nvim emacs-pgtk
emacs-pgtk sqlite
sqlite luajit
luajit imagemagick
imagemagick dotnet-sdk_8
dotnet-sdk_8 cargo
cargo rustc
rustc shellcheck
shellcheck openjdk
openjdk go
go nodejs
nodejs poetry
poetry python3
python3 ruby
ruby yamllint
yamllint curl
curl openssh
openssh openssl
openssl wget
wget rsync
rsync readline
readline git
git gh
gh ffmpeg
ffmpeg silicon
silicon man
man jq
jq tectonic
tectonic fzf
fzf delta
delta eza
eza nixd
nixd luajit
luajit ripgrep
ripgrep fd
fd nixfmt
nixfmt gtk2
gtk2 lxappearance
lxappearance webcord
webcord gtk-engine-murrine
gtk-engine-murrine opensnitch-ui
opensnitch-ui twitter-color-emoji
twitter-color-emoji open-sans
open-sans noto-fonts
noto-fonts fira-code
fira-code nerdfonts
nerdfonts direnv
direnv passage
passage swappy
swappy stylua
stylua typstfmt
typstfmt typst
typst hurl
hurl ] ++ [
waybar gnumake
] ++ [ ansible ansible-lint ] ++ [ cmake
# gnumake gcc
# cmake glibc
# gcc openssl.dev
# glibc glibc.static
# openssl.dev llvm
# glibc.static llvmPackages.libcxxStdenv
# llvm ];
# llvmPackages.libcxxStdenv
];
file = {
".local/" = { file =
source = ../dots/.local; {
recursive = true; ".local/" = {
force = true; source = ../dots/.local;
}; recursive = true;
".omnisharp" = { force = true;
source = ../dots/.omnisharp; };
force = true; ".omnisharp" = {
}; source = ../dots/.omnisharp;
".latexmkrc" = { force = true;
source = ../dots/.latexmkrc; };
force = true; ".latexmkrc" = {
}; source = ../dots/.latexmkrc;
} // softLinkDots ".config"; force = true;
};
} // softLinkDots ".config";
sessionVariables = { sessionVariables = {
GTK_THEME = "Kanagawa-Borderless"; GTK_THEME = "Kanagawa-Borderless";
@ -129,36 +131,42 @@ in {
}; };
}; };
gtk = let gtk =
extraGtkConfig = { let
gtk-application-prefer-dark-theme = true; extraGtkConfig = {
gtk-cursor-theme-size = 0; gtk-application-prefer-dark-theme = true;
gtk-enable-event-sounds = 1; gtk-cursor-theme-size = 0;
gtk-enable-input-feedback-sounds = 1; gtk-enable-event-sounds = 1;
gtk-xft-antialias = 1; gtk-enable-input-feedback-sounds = 1;
gtk-xft-hinting = 1; gtk-xft-antialias = 1;
gtk-xft-hintstyle = "hintfull"; gtk-xft-hinting = 1;
gtk-xft-hintstyle = "hintfull";
};
in
{
enable = true;
theme = {
name = "Kanagawa-Borderless";
package = pkgs.kanagawa-gtk-theme;
};
iconTheme = {
name = "Kanagawa";
package = pkgs.kanagawa-gtk-theme;
};
font = {
name = "Open Sans";
size = 11;
package = pkgs.open-sans;
};
gtk3.extraConfig = extraGtkConfig;
gtk4.extraConfig = extraGtkConfig;
}; };
in {
enable = true;
theme = {
name = "Kanagawa-Borderless";
package = pkgs.kanagawa-gtk-theme;
};
iconTheme = {
name = "Kanagawa";
package = pkgs.kanagawa-gtk-theme;
};
font = {
name = "Open Sans";
size = 11;
package = pkgs.open-sans;
};
gtk3.extraConfig = extraGtkConfig;
gtk4.extraConfig = extraGtkConfig;
};
services = { cliphist = { enable = true; }; }; services = {
cliphist = {
enable = true;
};
};
systemd.user = { systemd.user = {
targets.compositor = { targets.compositor = {
@ -177,7 +185,9 @@ in {
ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
}; };
Service = { ExecStart = "${pkgs.opensnitch-ui}/bin/opensnitch-ui"; }; Service = {
ExecStart = "${pkgs.opensnitch-ui}/bin/opensnitch-ui";
};
environment = { environment = {
QT_QPA_PLATFORMTHEME = "${gtkStyle}"; QT_QPA_PLATFORMTHEME = "${gtkStyle}";

211
flake.lock generated
View File

@ -22,11 +22,11 @@
"bob_2": { "bob_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706612487, "lastModified": 1705577732,
"narHash": "sha256-OTmsb1tnautQTdO/oeqbwd5MmyHbG946/kPCGSluIrM=", "narHash": "sha256-LQEoiXsrDTXOPRX8Tcqg0p58mgxJfKcjs1XFD1vNtOs=",
"owner": "MordechaiHadad", "owner": "MordechaiHadad",
"repo": "bob", "repo": "bob",
"rev": "e521723d2c084f4b610c27d79f870f83e964fe95", "rev": "b6a496f18974be5b65572fe6e23f635506f1033a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1706807251, "lastModified": 1706028863,
"narHash": "sha256-FIQFLSw/5s6Urs9RtZP7FzXCyyBCrmFEc2N0iwmgYe8=", "narHash": "sha256-7AUDN/Eo/YioUd2wbzacau5cEsEzi+MOUEQCT4vAA9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ad0b983479cb072cb0e97c9609c11d9e5aeced34", "rev": "b47e82dbcfdfa4b6ce844565707b51fde1b58988",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,58 +167,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"freetype2": {
"flake": false,
"locked": {
"lastModified": 1675923892,
"narHash": "sha256-dOm8VKYdclTLLkqWMLv7DQI0Qyjit7S4SOCszKEkG3o=",
"owner": "wez",
"repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
"type": "github"
},
"original": {
"owner": "wez",
"repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
"type": "github"
}
},
"harfbuzz": {
"flake": false,
"locked": {
"lastModified": 1677798343,
"narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=",
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc",
"type": "github"
},
"original": {
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc",
"type": "github"
}
},
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
@ -248,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706798041, "lastModified": 1706001011,
"narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,23 +209,6 @@
"type": "github" "type": "github"
} }
}, },
"libpng": {
"flake": false,
"locked": {
"lastModified": 1549245649,
"narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
},
"original": {
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
}
},
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
@ -288,11 +219,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1706140641, "lastModified": 1705963870,
"narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", "narHash": "sha256-JYBsfBcRtd+8EHxKZ24stJbhox9VogikXSR/2Y9sYXQ=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", "rev": "dc466f9a63ede5e2bbddc33688c0c972abfe9a52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,11 +242,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1706141075, "lastModified": 1705968257,
"narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", "narHash": "sha256-/xs36Kycw7qyDEST7KrUnVcMjRq3hk90gA2PbGarux0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", "rev": "ac772de590d661e08d9bdd0a2d8f15daec3b2499",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,11 +257,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706550542, "lastModified": 1705856552,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +273,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1706515015, "lastModified": 1705916986,
"narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=", "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +289,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1706006310, "lastModified": 1705883077,
"narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", "narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b43bb235efeab5324c5e486882ef46749188eee2", "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,11 +305,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1706683685, "lastModified": 1705883077,
"narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", "narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d", "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,33 +325,7 @@
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3"
"wezterm": "wezterm"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"wezterm",
"flake-utils"
],
"nixpkgs": [
"wezterm",
"nixpkgs"
]
},
"locked": {
"lastModified": 1705457855,
"narHash": "sha256-5cCHQtP/PEHK1YNTQyZN9v8ehpLTjc723ZSKAP3Tva8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a854609265af0e9f48c92e497679edf8fab9e690",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
} }
}, },
"systems": { "systems": {
@ -467,66 +372,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wezterm": {
"inputs": {
"flake-utils": "flake-utils_4",
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay",
"zlib": "zlib"
},
"locked": {
"dir": "nix",
"lastModified": 1706833122,
"narHash": "sha256-IcOZrCP7uSapBRuAYoXeXE8G9TdaSWgRM9pJkf0rkTw=",
"owner": "wez",
"repo": "wezterm",
"rev": "17dadbeb1e170dc76c97afcdeae4ed27a50e99e5",
"type": "github"
},
"original": {
"dir": "nix",
"owner": "wez",
"repo": "wezterm",
"type": "github"
}
},
"zlib": {
"flake": false,
"locked": {
"lastModified": 1484501380,
"narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
},
"original": {
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@ -13,10 +13,6 @@
}; };
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
wezterm = {
url = "github:wez/wezterm?dir=nix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs @ { home-manager, nixpkgs, ... }: outputs = inputs @ { home-manager, nixpkgs, ... }:
@ -27,11 +23,8 @@
{ {
defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux; defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
targets.genericLinux.enable = true; targets.genericLinux.enable = true;
homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration rec { homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = {
inherit inputs;
};
modules = [ modules = [
({ ({
nixpkgs.overlays = [ nixpkgs.overlays = [