chore: add TODOs and small refactor
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-01-04 03:39:14 -05:00
parent ff9e3a1eb3
commit 981c4251a6
15 changed files with 40 additions and 26 deletions

View file

@ -1,6 +1,5 @@
{
config,
lib,
home-manager,
nh,
nix-melt,
@ -58,6 +57,9 @@
};
home-manager.users = let
mainUser = config.vars.user;
mainUserConf = config.home-manager.users.${mainUser};
default = {
imports = [
# Make the vars be the same on Nix and HM
@ -79,11 +81,15 @@
++ (with config.nur.repos.rycee; [
mozilla-addons-to-nix
]);
home.stateVersion = lib.mkDefault "23.05";
};
in {
root = default;
root =
default
// {
home.stateVersion = mainUserConf.home.stateVersion;
};
# TODO: make user an array?
${config.vars.user} = default;
${mainUser} = default;
};
}

View file

@ -3,6 +3,7 @@
programs = {
starship = let
# TODO: have different colors depending on host
textColor = "#e3e5e5";
firstColor = "#bd93f9";
secondColor = "#715895";

View file

@ -21,6 +21,7 @@ autocmd FileType scss setl iskeyword+=@-@
set number
set relativenumber
" TODO: make this work for nix-on-droid
set undofile
set undodir=/home/matt/.cache/nvim/

View file

@ -3,14 +3,14 @@
pkgs,
lib,
coc-stylelintplus-flake,
tree-sitter-hypr-flake,
tree-sitter-hyprlang-flake,
...
}:
with lib; let
nvimIde = config.vars.neovimIde;
javaSdk = pkgs.temurin-bin-17;
nvim-treesitter-hypr = tree-sitter-hypr-flake.packages.${pkgs.system}.default;
nvim-treesitter-hyprlang = tree-sitter-hyprlang-flake.packages.${pkgs.system}.default;
coc-stylelintplus = coc-stylelintplus-flake.packages.${pkgs.system}.default;
in {
home = optionalAttrs nvimIde {
@ -237,7 +237,7 @@ in {
++ (with pkgs.vimPlugins; [
nvim-treesitter-context
nvim-treesitter-textobjects
nvim-treesitter-hypr
nvim-treesitter-hyprlang
{
type = "viml";
config = fileContents ./plugins/treesitter.vim;

View file

@ -25,6 +25,7 @@ in {
locateGroup
];
# TODO: add timer
systemd.services.locate = {
wantedBy = ["default.target"];
serviceConfig = {

Binary file not shown.

View file

@ -14,6 +14,7 @@ exec(`sassc ${scss} ${css}`)
const closeWinDelay = 800;;
// TODO: add OSD, workspace indicator / overview and current window indicator
export default {
style: css,

View file

@ -7,6 +7,10 @@
imports = [nms.nixosModules.default];
services = {
borgbackup.configs.mc = {
paths = ["/var/lib/minecraft"];
};
modded-minecraft-servers = {
eula = true;
user = config.vars.user;
@ -116,11 +120,5 @@
};
};
};
borgbackup.configs.mc = {
paths = [
"/var/lib/minecraft"
];
};
};
}

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -29,7 +29,7 @@ in
'';
meta = with lib; {
description = "Firefox Theme CSS to Opera GX Lovers ";
description = "Firefox Theme CSS to Opera GX Lovers";
homepage = "https://github.com/Godiesc/firefox-gx";
license = licenses.mspl;
};

View file

@ -49,10 +49,11 @@
"${pkgs.dracula-theme}/xres";
xdg.configFile = let
fontSize = lib.strings.floatToString config.vars.fontSize;
qtconf = ''
[Fonts]
fixed="Sans Serif,${lib.strings.floatToString config.vars.fontSize},-1,5,50,0,0,0,0,0"
general="Sans Serif,${lib.strings.floatToString config.vars.fontSize},-1,5,50,0,0,0,0,0"
fixed="Sans Serif,${fontSize},-1,5,50,0,0,0,0,0"
general="Sans Serif,${fontSize},-1,5,50,0,0,0,0,0"
[Appearance]
icon_theme=Flat-Remix-Violet-Dark

View file

@ -4,7 +4,6 @@
pkgs,
...
}: let
isNvidia = config.hardware.nvidia.modesetting.enable;
isTouchscreen = config.hardware.sensor.iio.enable;
in {
services.upower.enable = true;

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
# TODO: try other greeters https://git.sr.ht/~kennylevinsen/gtkgreet
programs.regreet = {
package = pkgs.greetd.regreet.overrideAttrs (self: super: rec {
version = "0.1.1-patched";

View file

@ -2,6 +2,7 @@
services = {
tailscale = {
enable = true;
# TODO: add authKeyFile to get extraUpFlags to work
extraUpFlags = [
"--login-server https://headscale.nelim.org"
"--operator=matt"
@ -9,16 +10,20 @@
};
};
home-manager.users.${config.vars.user}.programs.bash.shellAliases = {
tup = "tailscale up --login-server https://headscale.nelim.org";
home-manager.users.${config.vars.user} = let
hostName = config.vars.hostName;
in {
programs.bash.shellAliases = {
tup = "tailscale up --login-server https://headscale.nelim.org";
pc = "ssh -t matt@binto 'tmux -2u new -At ${config.vars.hostName}'";
oksys = "ssh -t matt@oksys 'tmux -2u new -At ${config.vars.hostName}'";
servivi = "ssh -t matt@servivi 'tmux -2u new -At ${config.vars.hostName}'";
pve = "ssh -t matt@pve 'tmux -2u new -At ${config.vars.hostName}'";
pc = "ssh -t matt@binto 'tmux -2u new -At ${hostName}'";
oksys = "ssh -t matt@oksys 'tmux -2u new -At ${hostName}'";
servivi = "ssh -t matt@servivi 'tmux -2u new -At ${hostName}'";
pve = "ssh -t matt@pve 'tmux -2u new -At ${hostName}'";
pod = "mosh matt@pve -- ssh -t -p 6768 matt@10.0.0.122 'tmux -2u new -At ${config.vars.hostName}'";
jelly = "mosh matt@pve -- ssh -t matt@10.0.0.123 'tmux -2u new -At ${config.vars.hostName}'";
qbit = "mosh matt@pve -- ssh -t matt@10.0.0.128 'tmux -2u new -At ${config.vars.hostName}'";
pod = "mosh matt@pve -- ssh -t -p 6768 matt@10.0.0.122 'tmux -2u new -At ${hostName}'";
jelly = "mosh matt@pve -- ssh -t matt@10.0.0.123 'tmux -2u new -At ${hostName}'";
qbit = "mosh matt@pve -- ssh -t matt@10.0.0.128 'tmux -2u new -At ${hostName}'";
};
};
}