matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: add TODOs and small refactor

Browse source
This commit is contained in:
matt1432 2024-01-04 03:39:14 -05:00
parent ff9e3a1eb3
commit 981c4251a6
15 changed files with 86 additions and 71 deletions
common
default.nix
home
bash
default.nix
neovim
base.vimdefault.nix
modules
locate.nix
pkgs/discommit
flake.nix
devices
binto/config/ags
config.js
servivi/modules
minecraft.nix
flake.lockflake.nix
home
firefox/firefox-gx
default.nix
theme.nix
modules
ags
default.nix
greetd
regreet.nix
tailscale.nix

14
common/default.nix
View file

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

1
common/home/bash/default.nix
View file

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

1
common/home/neovim/base.vim
View file

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

6
common/home/neovim/default.nix
View file

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

1
common/modules/locate.nix
View file

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

1
common/pkgs/discommit/flake.nix
View file

@ -1,4 +1,5 @@
{ {
# TODO: make this into a public github action
#inputs.main.url = "path:../../../"; #inputs.main.url = "path:../../../";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

1
devices/binto/config/ags/config.js
View file

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

10
devices/servivi/modules/minecraft.nix
View file

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

86
flake.lock generated
View file

@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704100519, "lastModified": 1704311514,
"narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e91c5df192395753d8e6d55a0352109cb559790", "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703648064, "lastModified": 1704291781,
"narHash": "sha256-c4bkc1HnLiFQrwBu5WTKLFY03f9D6Ia61aRmIGW55eU=", "narHash": "sha256-JnGzF3Kg8PCy6ikueuPUJcRPvJ6NX/RS2BQSingmPpo=",
"owner": "horriblename", "owner": "horriblename",
"repo": "hyprgrass", "repo": "hyprgrass",
"rev": "0165a9ed8679f3f2c62cc868bdaf620e4520d504", "rev": "fcec290e69f37f4f0168067d2fa923d1367672cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,11 +522,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704158651, "lastModified": 1704326664,
"narHash": "sha256-3UrlhjAx2VyHuEOnwiayDiZZaxgorMRwGS3eXHGgC3A=", "narHash": "sha256-rOW2dxVgtq/Kl8pI03t38J0oNqWvoDAvBQXIiJnvvIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "769cdb1452374fc21a06cc3e79e23c1975a16fa5", "rev": "506c5a80c5a57b27dd51f4e4693d3153d1d7ae42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,11 +545,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1704143030, "lastModified": 1704319795,
"narHash": "sha256-xVS+iRIl/+m+nO9zmU7BFGrPITdeLY38x7xNVlLUaUY=", "narHash": "sha256-BTcQFrHaGroPO+jqcSYNnbaUpxWRKB1TX5cUNIB1+N8=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "4ee656e4f35766bef4e27c5afbfa8e3d8d74a76c", "rev": "bdfea2a8919963dfe24052635883f0213cff83e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,11 +627,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1704158066, "lastModified": 1704244428,
"narHash": "sha256-o2Jv3xF08/iNK1hTZxMifjlMEkln+exst3QsV+wF6b0=", "narHash": "sha256-n3KZlxx1QS3919I1O77OhBouUeetlLpmQQcIx3dqAso=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "6c44aa8bde2c48c99d354cac2e6a62a2395f43f2", "rev": "bd7442917422de061bcf61323b07abbb93bdb766",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -687,11 +687,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1704173129, "lastModified": 1704257488,
"narHash": "sha256-OOyzYAZv+TlZ1VfJu2k05716zsPcI8QPf95VY71cRd0=", "narHash": "sha256-/E8uvru4AR9BYagoNGN5x4Hcw2XIKDuPny7RvbQ6SOA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-melt", "repo": "nix-melt",
"rev": "d72b599b42583476551ef91345c488d6a0f5008c", "rev": "8cbfedb4721bf5aa5b53f4fd44207e89abda8deb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -815,11 +815,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1704201485, "lastModified": 1704330409,
"narHash": "sha256-pFDUR45wmq1HehY3WlJOJydFkLOzKC2pWqvMykLj2Qk=", "narHash": "sha256-msr/ZbWUZBG4WZIybCC0sZJmdkJJLDbCB4uZG4lNFbE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "b0c06873775fe978bd9384ab14c24903bde92e74", "rev": "6c542fbd24f9115eda6d7e33392f64aa95021eda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -862,11 +862,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1703961334, "lastModified": 1704194953,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -894,11 +894,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1703961334, "lastModified": 1704194953,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -994,11 +994,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1704239045, "lastModified": 1704351172,
"narHash": "sha256-aNz5++TgVZtd8ToaSNGdaOxZW1MPB1Pv6ATz7vUh2r4=", "narHash": "sha256-TuFs+wAtTtRj867Cj0C0sGhZ7mlDqg/khVWOR0xvKm8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "aec84dd179f5624519bb6de40a851bc478d95087", "rev": "1914d8460594a7b4abc194d834ceeeac1cadf029",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1012,11 +1012,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1704231800, "lastModified": 1704257598,
"narHash": "sha256-erVAVc74jmelovyxqjqUS8pDEF772uL7t05vrt4dkYw=", "narHash": "sha256-VZCs9oQ4s00DuaiRIZAf7mtTXvOuXKvC6oh5ggHeArs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nurl", "repo": "nurl",
"rev": "b3d3c5b1a24c0102c32c73dade7107161f0271d4", "rev": "e6da68b0c2139d4fb2ce6b43d03b930cd745706f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1061,11 +1061,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1704243381, "lastModified": 1704317084,
"narHash": "sha256-7rD3sSXUXi5dluc6VhdIiIPRWYRRTr7efUfaNyEqFQ8=", "narHash": "sha256-LnfR4OHDhRlU5pGBeq95IimEbQUTjE2wPT7LOs20DzU=",
"owner": "plymouth", "owner": "plymouth",
"repo": "plymouth", "repo": "plymouth",
"rev": "38964e5eafdfc7d8eccf29aa65056f303cad0b25", "rev": "65dbf4ecc7f5de59ee8ff3ade8b6c91ee9b50037",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -1159,7 +1159,7 @@
"spotifywm-src": "spotifywm-src", "spotifywm-src": "spotifywm-src",
"touch-gestures-src": "touch-gestures-src", "touch-gestures-src": "touch-gestures-src",
"trash-d-src": "trash-d-src", "trash-d-src": "trash-d-src",
"tree-sitter-hypr-flake": "tree-sitter-hypr-flake", "tree-sitter-hyprlang-flake": "tree-sitter-hyprlang-flake",
"xresources-theme-src": "xresources-theme-src" "xresources-theme-src": "xresources-theme-src"
} }
}, },
@ -1344,7 +1344,7 @@
"type": "github" "type": "github"
} }
}, },
"tree-sitter-hypr-flake": { "tree-sitter-hyprlang-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
@ -1352,16 +1352,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700978179, "lastModified": 1704349181,
"narHash": "sha256-P3ZiIurixNdBqKJrsmFibmScnwD0pjhljLo4L8BLtws=", "narHash": "sha256-Fdq9ZbXy1kPeZCtaY1m1NIHM6OScnueYVzBZSJgdStw=",
"owner": "luckasRanarison", "owner": "luckasRanarison",
"repo": "tree-sitter-hypr", "repo": "tree-sitter-hyprlang",
"rev": "da3c1d780c8e04446722ece04beadb6a44eb442d", "rev": "9bd008f08ffbfb94146ce9d4f31002de66f0e627",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "luckasRanarison", "owner": "luckasRanarison",
"repo": "tree-sitter-hypr", "repo": "tree-sitter-hyprlang",
"type": "github" "type": "github"
} }
}, },

4
flake.nix
View file

@ -208,10 +208,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
tree-sitter-hypr-flake = { tree-sitter-hyprlang-flake = {
type = "github"; type = "github";
owner = "luckasRanarison"; owner = "luckasRanarison";
repo = "tree-sitter-hypr"; repo = "tree-sitter-hyprlang";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

2
home/firefox/firefox-gx/default.nix
View file

@ -29,7 +29,7 @@ in
''; '';
meta = with lib; { 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"; homepage = "https://github.com/Godiesc/firefox-gx";
license = licenses.mspl; license = licenses.mspl;
}; };

5
home/theme.nix
View file

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

1
modules/ags/default.nix
View file

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

1
modules/greetd/regreet.nix
View file

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

23
modules/tailscale.nix
View file

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