mirror of
https://github.com/Jokiller230/puzzlevision.git
synced 2025-09-11 21:30:06 +00:00
Compare commits
No commits in common. "7c225396f0b5095f647c9e2b927956de75141e8f" and "de5c068d600cace7f3bf07e3084c6bc283597c9f" have entirely different histories.
7c225396f0
...
de5c068d60
5 changed files with 46 additions and 103 deletions
14
.github/workflows/update-dependencies.yml
vendored
14
.github/workflows/update-dependencies.yml
vendored
|
@ -1,14 +0,0 @@
|
||||||
name: update-dependencies
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
schedule:
|
|
||||||
- cron: "5 * * * *" # daily at 1 am EST/2 am EDT
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update-dependencies:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- uses: DeterminateSystems/nix-installer-action@v12
|
|
||||||
- id: update
|
|
||||||
uses: DeterminateSystems/update-flake-lock@v23
|
|
36
flake.lock
generated
36
flake.lock
generated
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742599566,
|
"lastModified": 1742098205,
|
||||||
"narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=",
|
"narHash": "sha256-gCkVTohFTyq/Pi3dlUhv1uA5Kqbalf45nLmUDRluULE=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "5e303e8d7e251868fa79f83bbda69da90aa62402",
|
"rev": "d84df59c7aa29cebaff9f190d19c24e7ddacd773",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -117,11 +117,11 @@
|
||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742941134,
|
"lastModified": 1742134710,
|
||||||
"narHash": "sha256-sBbZcxiiv4BYBU/PdpqYZcG8HTu5BTMsRKqv2celzEQ=",
|
"narHash": "sha256-rFIJssnDEdaINRgg6ZApfs+2d6B0pjXMScSeRMcQJZE=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "bcff4e18f430e0e34412f631215f196c9e0c885b",
|
"rev": "c344c320eb93d800da36c035790530be0a2d618f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -132,11 +132,11 @@
|
||||||
},
|
},
|
||||||
"hardware": {
|
"hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742806253,
|
"lastModified": 1742217307,
|
||||||
"narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
|
"narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
|
"rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -153,11 +153,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742937932,
|
"lastModified": 1741955947,
|
||||||
"narHash": "sha256-OrLDssbhEZvbHMljgT2mFNWacghm2HJBDTWlqTJNhO8=",
|
"narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f565da89e759ebf57b236510aa955b8a2d41c779",
|
"rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -184,11 +184,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742800061,
|
"lastModified": 1742206328,
|
||||||
"narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
|
"narHash": "sha256-q+AQ///oMnyyFzzF4H9ShSRENt3Zsx37jTiRkLkXXE0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
|
"rev": "096478927c360bc18ea80c8274f013709cf7bdcd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -271,11 +271,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742700801,
|
"lastModified": 1742209060,
|
||||||
"narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
|
"narHash": "sha256-47/1bOPBGhmAegF06nxLN15d/MClCAkk8s/+WOhJJAM=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
|
"rev": "b33837ae3cfa012b65810891bebbee71fa4c0658",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
apps.nushell.enable = false;
|
apps.nushell.enable = false;
|
||||||
apps.vscodium.enable = true;
|
apps.vscodium.enable = true;
|
||||||
apps.zed.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file."~/.config/Yubico/u2f_keys".text = ''
|
home.file."~/.config/Yubico/u2f_keys".text = ''
|
||||||
|
|
|
@ -1,70 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
namespace,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) mkEnableOption mkIf;
|
|
||||||
cfg = config.${namespace}.apps.zed;
|
|
||||||
in {
|
|
||||||
options.${namespace}.apps.zed = {
|
|
||||||
enable = mkEnableOption "zed, the graphical editor from the future";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
sops.secrets.wakatime-cfg = {
|
|
||||||
format = "binary";
|
|
||||||
sopsFile = lib.snowfall.fs.get-file "secrets/wakatime.cfg";
|
|
||||||
path = "/home/jo/.wakatime.cfg";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
alejandra
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.zed-editor = {
|
|
||||||
enable = true;
|
|
||||||
extensions = ["nix" "catppuccin" "wakatime" "discord_presence"];
|
|
||||||
|
|
||||||
userSettings = {
|
|
||||||
icon_theme = "Catppuccin Macchiato";
|
|
||||||
theme = {
|
|
||||||
dark = "Catppuccin Macchiato (blue)";
|
|
||||||
light = "Catppuccin Macchiato (blue)";
|
|
||||||
};
|
|
||||||
|
|
||||||
### Disable telemetry
|
|
||||||
telemetry = {
|
|
||||||
metrics = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
### Disable certain AI features
|
|
||||||
features = {
|
|
||||||
copilot = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
### Language specific configurations
|
|
||||||
languages = {
|
|
||||||
### Nix language
|
|
||||||
Nix = {
|
|
||||||
language_servers = [ "nixd" "!nil" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
### LSP configurations
|
|
||||||
lsp = {
|
|
||||||
nixd = {
|
|
||||||
initialization_options = {
|
|
||||||
formatting = {
|
|
||||||
command = ["alejandra" "--quiet" "--"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
extraPackages = with pkgs; [ nixd ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -12,6 +12,34 @@
|
||||||
inputs.hardware.nixosModules.common-pc-laptop-ssd
|
inputs.hardware.nixosModules.common-pc-laptop-ssd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
mutter = prev.mutter.overrideAttrs (oldAttrs: {
|
||||||
|
# GNOME dynamic triple buffering
|
||||||
|
# See https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1441
|
||||||
|
src = final.fetchFromGitLab {
|
||||||
|
domain = "gitlab.gnome.org";
|
||||||
|
owner = "vanvugt";
|
||||||
|
repo = "mutter";
|
||||||
|
rev = "triple-buffering-v4-47";
|
||||||
|
hash = "sha256-6n5HSbocU8QDwuhBvhRuvkUE4NflUiUKE0QQ5DJEzwI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
preConfigure = let
|
||||||
|
gvdb = final.fetchFromGitLab {
|
||||||
|
domain = "gitlab.gnome.org";
|
||||||
|
owner = "GNOME";
|
||||||
|
repo = "gvdb";
|
||||||
|
rev = "2b42fc75f09dbe1cd1057580b5782b08f2dcb400";
|
||||||
|
hash = "sha256-CIdEwRbtxWCwgTb5HYHrixXi+G+qeE1APRaUeka3NWk=";
|
||||||
|
};
|
||||||
|
in ''
|
||||||
|
cp -a "${gvdb}" ./subprojects/gvdb
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# Configure Sops
|
# Configure Sops
|
||||||
sops.defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
|
sops.defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
|
||||||
sops.age.keyFile = "/var/lib/sops-nix/key.txt"; # The main AGE key is expected in this location, it is only needed for this system.
|
sops.age.keyFile = "/var/lib/sops-nix/key.txt"; # The main AGE key is expected in this location, it is only needed for this system.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue