wip: update

This commit is contained in:
2025-10-04 05:50:18 +01:00
parent 83219fe6de
commit 79d7fa046c
13 changed files with 132 additions and 28 deletions

View File

@@ -18,6 +18,7 @@
./modules/steam/nixos.nix
./modules/hyprland/nixos.nix
./disks.nix
./overlays.nix
];
# Use the systemd-boot EFI boot loader.
@@ -154,11 +155,13 @@
pulse.enable = true;
};
programs.fish.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
# services.libinput.enable = true;
services.openssh.enable = true;
users.users.doloro = {
isNormalUser = true;
shell = pkgs.fish;
extraGroups = [ "wheel" ]; # Enable sudo for the user.
packages = with pkgs; [
tree

17
nix/flake.lock generated
View File

@@ -774,6 +774,22 @@
"type": "github"
}
},
"nixpkgs-gamescope": {
"locked": {
"lastModified": 1740963001,
"narHash": "sha256-5f2qfjJZDrNhgog+4LNeNz04qhGlSx+JnvWQXTl/uiQ=",
"owner": "Nixos",
"repo": "nixpkgs",
"rev": "8fcb6f1c4948305af52d19f887b89011ee2c080d",
"type": "github"
},
"original": {
"owner": "Nixos",
"repo": "nixpkgs",
"rev": "8fcb6f1c4948305af52d19f887b89011ee2c080d",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1759070547,
@@ -959,6 +975,7 @@
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-warez": "nix-warez",
"nixpkgs": "nixpkgs_4",
"nixpkgs-gamescope": "nixpkgs-gamescope",
"nixvim": "nixvim",
"quickshell": "quickshell",
"sops-nix": "sops-nix",

View File

@@ -37,6 +37,9 @@
# Blender-bin
url = "github:edolstra/nix-warez?dir=blender";
};
nixpkgs-gamescope = {
url = "github:Nixos/nixpkgs?rev=8fcb6f1c4948305af52d19f887b89011ee2c080d";
};
};
outputs =
inputs@{ nixpkgs, home-manager, ... }:

View File

@@ -19,6 +19,7 @@
./modules/spicetify/home.nix
./modules/obs/home.nix
./modules/blender/home.nix
./modules/fish/home.nix
./overlays.nix
];
# Home Manager needs a bit of information about you and the paths it should
@@ -52,7 +53,9 @@
pavucontrol
lazygit
btop
sops
];
# sops.age.keyFile = "/home/doloro/.config/sops/age/key.txt";
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.

View File

View File

@@ -0,0 +1,7 @@
{ ... }:
{
home.shell.enableFishIntegration = true;
programs.fish = {
# enable = true;
};
}

View File

@@ -2,11 +2,15 @@
{
imports = [
inputs.nixvim.homeModules.nixvim
./plugins
];
./plugins
];
home.packages = with pkgs; [
nixfmt
];
programs.nixvim = {
enable = true;
defaultEditor = true;
colorschemes.tokyonight.enable = true;
plugins = {
notify.enable = true;
mini-cursorword.enable = true;
@@ -17,6 +21,26 @@
lazygit.enable = true;
persisted.enable = true;
wakatime.enable = true;
treesitter = {
enable = true;
grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
bash
json
lua
make
markdown
nix
regex
toml
vim
vimdoc
xml
yaml
];
settings = {
highlight.enable = true;
};
};
};
extraPlugins = with pkgs; [
vimPlugins.mini-completion
@@ -42,6 +66,13 @@
silent = true;
};
}
{
action = "<cmd>Telescope find_files<cr>";
key = "<leader>ff";
options = {
silent = true;
};
}
{
action = "<cmd>Telescope file_browser<cr>";
key = "<leader>fv";

View File

@@ -1,24 +1,25 @@
{ ... }: {
programs.nixvim = {
plugins = {
conform-nvim = {
enable = true;
settings = {
formatters_by_ft = {
nix = [ "nixfmt" ];
rust = [ "rustfmt" ];
"_" = [
"squeeze_blanks"
"trim_whitespace"
"trim_newlines"
];
};
format_on_save = {
timeout_ms = 500;
lsp_format = "fallback";
};
};
};
};
};
{ ... }:
{
programs.nixvim = {
plugins = {
conform-nvim = {
enable = true;
settings = {
formatters_by_ft = {
nix = [ "nixfmt" ];
rust = [ "rustfmt" ];
"_" = [
"squeeze_blanks"
"trim_whitespace"
"trim_newlines"
];
};
format_on_save = {
timeout_ms = 500;
lsp_format = "fallback";
};
};
};
};
};
}

View File

@@ -16,6 +16,7 @@ in
];
config = {
stylix.enable = true;
stylix.autoEnable = false; # honestly, fuck stylix;
#stylix.targets.tmux.enable = false;
};

View File

@@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ pkgs, lib, inputs, ... }:
let
arrpc_overlay = (
self: super: {
@@ -13,7 +13,10 @@ let
});
}
);
gamescope_overlay = self: super: {
gamescope = super.callPackage "${inputs.nixpkgs-gamescope}/pkgs/by-name/ga/gamescope/package.nix" { };
};
in
{
nixpkgs.overlays = [ arrpc_overlay ];
nixpkgs.overlays = [ arrpc_overlay gamescope_overlay ];
}

34
nix/secrets/meow.yaml Normal file
View File

@@ -0,0 +1,34 @@
hello: ENC[AES256_GCM,data:JOf6mEYrkFHUBP8NCgyptjlcmr6VgtwmTiCLQq2WP6w/op4ECrE4idWsRlPkiA==,iv:R/mcdk9EjdmDdk4tGSDwfJmYVUcunEQUEkkJSg72KQQ=,tag:QILXRM7SAkFphqozfIPzkw==,type:str]
example_key: ENC[AES256_GCM,data:tmOq0hbbnnCqPtRa+/A=,iv:15INNYh6bJQbk2+uZ0SF/GW745BHF7nQQjygy6UWAbU=,tag:tjayudlabN7FkHvLe0K3eA==,type:str]
#ENC[AES256_GCM,data:vZ36NjLcCUEfRU4Fm8lUxw==,iv:eQYTrekfzSW6NlBIv3if8w7uyBXQswX1gaM/rnI7vIY=,tag:397BOrmwoXF8EVZY+yrCMg==,type:comment]
example_array:
- ENC[AES256_GCM,data:PvfR/DrlYPd+DSI+454=,iv:24kewXfEk0mJRJLKbh5zSY92DKaNDey+H5XySp4DOU4=,tag:B2RyvSwKy1ryXI28tnzTRw==,type:str]
- ENC[AES256_GCM,data:eUxdfJrfLRit/JKLD0I=,iv:CFIAXxhNjRTfziyvp132BXpIz3Ida7BauwbrVg0kMyA=,tag:x1Ee6HSBo9eHHag2kZur+g==,type:str]
example_number: ENC[AES256_GCM,data:xr8sJuGGBGUOtA==,iv:G7ROCw394BeEAe/pVgWquoanQH9uka5rBa12yaBBWYI=,tag:DQWdE/MSuqC873mfBoG0cw==,type:float]
example_booleans:
- ENC[AES256_GCM,data:c859ug==,iv:S8XOJKkxDkzZ1l4GtHtnWQjE4/9hPg1OF63QBd7dW4g=,tag:gD5jqtdIDCSwDYMq0qgugw==,type:bool]
- ENC[AES256_GCM,data:U9CA3bg=,iv:wJUdNBi/mnwV1ceE6WNuI4TCVHJmI5Er1gtAs0zkJNY=,tag:PGjiLAPoJi50Rr+QKQBprQ==,type:bool]
sops:
age:
- recipient: age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5NHJORkdLREdOelFGblo5
MUJzWjlmdXY5Q2FBM1FuNXlGZTBGekkzVEhnCmU2VVZtSWtuS0NwOUZ6VmRPOE1s
S25KalAwVnBWMVB5dmM4cm1DOERqOW8KLS0tIGFXeUtvNG5jSVV3T0lqdWtlc2U0
eEpBMm9OT0VZRGF3b28yOW5NdE1WRmMK1RQL/H263BbmgLhFx9ZnGKSk49pVW29u
ad5cU8gHTAUxKaue5uO2yTMfOO7Xb/FRFc0NfPo5Gtv6VVjMZ40hdg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaVEZvQjBwV2pQcTI2MWtk
Yzh0eU9oNzBOb3FWcnRXT3JGWXRweEdxVUNZCnFQaHMzNzVYQTl4bUdhVW1DdHVa
aytEN1g1NHdJNm9CdGZpc0xZY1NldU0KLS0tIGZHb2hLaTIrN2ZLM25LRHhKeTdV
WUVOL25USWtjcWZPajd1aHBOVk81TEUKnrHLe/XjE3mYS38+Fmv8vUtH1SGzgnSp
aPJ+fBSRCHNGNobZo2nQAbgmu7S55nHSnRcyVNUe0nT6gZhlQAShEw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-10-03T12:42:01Z"
mac: ENC[AES256_GCM,data:n8oRT2LS3T52NWl3dHse1kFdsbaZlCSyg3a7FcPYsdIVAUPPYMYBDi26wgkx0n5/5nFZ1pvSp2/2O91Z8P/b8C+X3Rg2tOVprKJDdX5qeUycrit/kuMXTHVSHvnLQiBdsPDpqgORtQCXCDo+lqgVOPmI3A60/Pf7offve5b/1kY=,iv:VN7+0Azr0ro5dLnTQYFKuYtTDUZoc80uXjFiVtHpENQ=,tag:+Jiohkn2NQPYLJjdeOqC9g==,type:str]
unencrypted_suffix: _unencrypted
version: 3.10.2