Jo/puzzlevision
1
0
Fork 0
mirror of https://github.com/Jokiller230/puzzlevision.git synced 2025-12-19 21:58:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: Jo:c046f4ae176a5c6989212f46eda70bea6e026bda
Branches Tags
Jo:v2
Jo:update_flake_lock_action
Jo:main
Jo:refactor/system-and-home-loading
..
compare: Jo:fad807fb47ce3a4bfa592793194eb37e5b7cb78b
Branches Tags
Jo:v2
Jo:update_flake_lock_action
Jo:main
Jo:refactor/system-and-home-loading

No commits in common. "c046f4ae176a5c6989212f46eda70bea6e026bda" and "fad807fb47ce3a4bfa592793194eb37e5b7cb78b" have entirely different histories.
c046f4ae17 ... fad807fb47

10 changed files with 31 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/actions/install-lix/action.yml vendored
View file

@ -1,4 +1,4 @@
# Derived from: https://github.com/isabelroses/dotfiles/blob/d3149ba27ec531b53de9e13c815ea1741c835299/.github/actions/install-lix/action.yml :3 # Derived from: https://github.com/isabelroses/dotfiles/blob/9335e5728eaaa9bdcb0d5c3130a5d7c8dddbb6e3/.github/actions/install-lix/action.yml :3
name: Install Lix name: Install Lix
description: "Install Lix for the specified system" description: "Install Lix for the specified system"
@ -6,7 +6,7 @@ runs:
using: composite using: composite
steps: steps:
- uses: DeterminateSystems/nix-installer-action@v20 - uses: DeterminateSystems/nix-installer-action@main
with: with:
source-url: 'https://install.lix.systems/lix/lix-installer-${{ fromJSON(''{"X64":"x86_64","X86":"i686","ARM64":"aarch64","ARM":"armv7l"}'')[runner.arch] }}-${{ fromJSON(''{"Linux":"linux","macOS":"darwin","Windows":"windows"}'')[runner.os] }}' source-url: 'https://install.lix.systems/lix/lix-installer-${{ fromJSON(''{"X64":"x86_64","X86":"i686","ARM64":"aarch64","ARM":"armv7l"}'')[runner.arch] }}-${{ fromJSON(''{"Linux":"linux","macOS":"darwin","Windows":"windows"}'')[runner.os] }}'
logger: pretty logger: pretty

4
.gitignore vendored
View file

@ -10,7 +10,3 @@
### VSCode ### VSCode
/.vscode /.vscode
### User provided binaries
# Cisco Packet Tracer
/homes/x86_64-linux/*/apps/packettracer/*.deb

48
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762198582, "lastModified": 1760468693,
"narHash": "sha256-P9giW/1Crn7ekQt4YIbONJ/hKFaHkTwyhz82FCjh+OM=", "narHash": "sha256-JtXWEvA09PLiBOcNws3eUa6WSj/j1aDc1isWXka6ctk=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "08716214674ca27914daa52e6fa809cc022b581e", "rev": "2b289e5837767dd9239e4469d6ba69ca4f98038b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762040540, "lastModified": 1759362264,
"narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "0010412d62a25d959151790968765a70c436598b", "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +94,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762296971, "lastModified": 1760500983,
"narHash": "sha256-Jyv3L5rrUYpecON+9zyFz2VqgTSTsIG35fXuCyuCQv0=", "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "34fe48801d2a5301b814eaa1efb496499d06cebc", "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,11 +138,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762305918, "lastModified": 1760491287,
"narHash": "sha256-wVPT9kNpQH4PyRdhZH7oqBlBk8aoNMOYVcy4OzYBjh0=", "narHash": "sha256-BOvhD3Q9fZcxQbjz9YPdOTrWjRnyUVqW2YTFJZI8rQE=",
"owner": "kaylorben", "owner": "kaylorben",
"repo": "nixcord", "repo": "nixcord",
"rev": "9c6b54492dcee998fc5981e1a21b34b243e85d3e", "rev": "b88450ad729eed534601ff0813b3fed46dd013cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,11 +153,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762267440, "lastModified": 1760106635,
"narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +168,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1762111121, "lastModified": 1760284886,
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760998189, "lastModified": 1760393368,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762271689, "lastModified": 1760276212,
"narHash": "sha256-pzlrIfOSk0MaEYNbhQ5gDKMA7XmrcuoJaEOP/IZ/dNk=", "narHash": "sha256-7It9jBYdT8lqJLkKN+i/9RplR2Fv3F7bH02gDVlEV0o=",
"owner": "vicinaehq", "owner": "vicinaehq",
"repo": "vicinae", "repo": "vicinae",
"rev": "9f202f5d1d445558605926bfdd6e1be7b6bdb4ef", "rev": "6c583ff744ce0acf4f1af9c5f5af37057bfcde68",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
homes/x86_64-linux/jo/default.nix
View file

@ -9,8 +9,6 @@
./apps/firefox ./apps/firefox
./apps/vicinae ./apps/vicinae
./apps/packettracer ./apps/packettracer
./desktop/gnome
]; ];
puzzlevision = { puzzlevision = {
@ -63,9 +61,6 @@
git git
git-credential-oauth git-credential-oauth
attic-client attic-client
## PHP/Shopware
shopware-cli
]; ];
home.stateVersion = "25.05"; home.stateVersion = "25.05";

4
homes/x86_64-linux/jo/desktop/gnome/default.nix
View file

@ -1,4 +0,0 @@
{ ... }:
{
puzzlevision.desktop.gnome.wallpaper = ../wallpapers/macchiato-waves.jpg;
}

BIN
homes/x86_64-linux/jo/desktop/wallpapers/macchiato-waves.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 MiB

21
modules/home/apps/zed/default.nix
View file

@ -58,7 +58,7 @@ in
}; };
hard_tabs = true; hard_tabs = true;
tab_size = 4; tab_size = 2;
soft_wrap = "preferred_line_length"; soft_wrap = "preferred_line_length";
### Language specific configurations ### Language specific configurations
@ -74,20 +74,6 @@ in
arguments = [ "--quiet" ]; arguments = [ "--quiet" ];
}; };
}; };
tab_size = 2;
};
PHP = {
language_servers = [
"phpactor"
"!intelephense"
"!tailwind-language-server"
];
formatter = {
external = {
command = "pretty-php";
};
};
}; };
}; };
@ -140,11 +126,6 @@ in
### Python ### Python
python3Packages.python-lsp-server python3Packages.python-lsp-server
### PHP
php
phpPackages.composer
pretty-php
]; ];
}; };
}; };

4
modules/nixos/system/fonts/default.nix
View file

@ -28,13 +28,13 @@ in
nerd-fonts.zed-mono nerd-fonts.zed-mono
monocraft monocraft
noto-fonts-color-emoji noto-fonts-emoji
material-icons material-icons
material-design-icons material-design-icons
]; ];
example = [ example = [
noto-fonts noto-fonts
noto-fonts-color-emoji noto-fonts-emoji
]; ];
description = "Install additional font packages"; description = "Install additional font packages";
}; };

2
systems/x86_64-nixos/puzzlevision/default.nix
View file

@ -22,7 +22,7 @@
}; };
archetypes.laptop.enable = true; archetypes.laptop.enable = true;
system.kernel.version = "linuxPackages_6_17"; system.kernel.version = "linuxPackages_6_16";
}; };
boot = { boot = {

2
systems/x86_64-nixos/puzzlevision/hardware.nix
View file

@ -35,7 +35,7 @@
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-ocl intel-ocl
intel-media-driver intel-media-driver
libva-vdpau-driver vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
]; ];
}; };