mirror of
https://github.com/Jokiller230/puzzlevision.git
synced 2025-09-09 20:30:05 +00:00
Compare commits
3 commits
8ca1dc020f
...
76bdc568cd
| Author | SHA1 | Date | |
|---|---|---|---|
|
76bdc568cd | ||
|
75d45bca10 | ||
| 632d473951 |
12 changed files with 79 additions and 73 deletions
74
flake.lock
generated
74
flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743217966,
|
||||
"narHash": "sha256-S9Q/Pl0U/kdwz8LBt1JjE1Qay3CY0pk1gHHvRosWlUI=",
|
||||
"lastModified": 1745352209,
|
||||
"narHash": "sha256-u3vJEzi6zxgG59KXjMR5koERsdKT5nd1OEKCpr6zgn8=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "c41c89f69fcdc8bd78bbc95123eef280575f1df8",
|
||||
"rev": "6268e50dbb0ac9375e110560395b5dc199e4dfb8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -131,11 +131,11 @@
|
|||
"zon2nix": "zon2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743191728,
|
||||
"narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=",
|
||||
"lastModified": 1745440371,
|
||||
"narHash": "sha256-Nb6h64rKi2p6GEAnz8mxIKVDvzozndC3SB9T+vXWfL8=",
|
||||
"owner": "ghostty-org",
|
||||
"repo": "ghostty",
|
||||
"rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941",
|
||||
"rev": "4e91d11a60bf3f52a15936cef65eae7135906b28",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -146,11 +146,11 @@
|
|||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1743167577,
|
||||
"narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
|
||||
"lastModified": 1745503349,
|
||||
"narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
|
||||
"rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -167,11 +167,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743267068,
|
||||
"narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=",
|
||||
"lastModified": 1745494811,
|
||||
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b431496538b0e294fbe44a1441b24ae8195c63f0",
|
||||
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -199,18 +199,16 @@
|
|||
"nixcord": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": "nixpkgs",
|
||||
"systems": "systems_2",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743170370,
|
||||
"narHash": "sha256-v8ZdXs0fj0LG2jH0NJvfeMt0b+qJYxbN+fnto4kqdyM=",
|
||||
"lastModified": 1745526248,
|
||||
"narHash": "sha256-J5JT079hfkkKTzTaLnpKAQarZD81FKRYDoej+aQD8+g=",
|
||||
"owner": "kaylorben",
|
||||
"repo": "nixcord",
|
||||
"rev": "b969aa7b1e1925935eda22da01ffbf028c7c2a51",
|
||||
"rev": "f5720c0e0ea8ce733892af38d251b4d1bd06e78e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -221,15 +219,15 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1743076231,
|
||||
"narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1744868846,
|
||||
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6c5963357f3c1c840201eda129a99d455074db04",
|
||||
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -267,6 +265,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1745377448,
|
||||
"narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"catppuccin": "catppuccin",
|
||||
|
|
@ -275,7 +289,7 @@
|
|||
"home-manager": "home-manager",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixcord": "nixcord",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"snowfall-lib": "snowfall-lib",
|
||||
"sops-nix": "sops-nix"
|
||||
}
|
||||
|
|
@ -309,11 +323,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742700801,
|
||||
"narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
|
||||
"lastModified": 1745310711,
|
||||
"narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
|
||||
"rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -374,11 +388,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742370146,
|
||||
"narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
|
||||
"lastModified": 1744961264,
|
||||
"narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
|
||||
"rev": "8d404a69efe76146368885110f29a2ca3700bee6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
|
||||
nixcord = {
|
||||
url = "github:kaylorben/nixcord";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -86,7 +85,7 @@
|
|||
# Apply some home-manager modules globally.
|
||||
homes.modules = with inputs; [
|
||||
nix-flatpak.homeManagerModules.nix-flatpak
|
||||
catppuccin.homeManagerModules.catppuccin
|
||||
catppuccin.homeModules.catppuccin
|
||||
sops-nix.homeManagerModules.sops
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
|
|
@ -13,13 +12,9 @@
|
|||
gtk.enable = true;
|
||||
};
|
||||
|
||||
apps.nushell.enable = false;
|
||||
apps.vscodium.enable = true;
|
||||
apps.zed.enable = true;
|
||||
};
|
||||
|
||||
home.file."~/.local/share/fonts/Unknown\ Vendor/qwerasd205/AnnotationMono/AnnotationMono-VF.ttf".source = lib.snowfall.fs.get-file "resources/fonts/AnnotationMono/variable/AnnotationMono-VF.ttf";
|
||||
|
||||
home.file."~/.config/Yubico/u2f_keys".text = ''
|
||||
jo:gtKwCQKVw5O4IkWg8J8o7vHIo3hStmOqVcnmk97E335DwHnPUMIDTMnD46qEn/1tucTZlYfGABfzVVG+iYeUOA==,fVRFZb9iBiqjOXvk5Gm9ygO/O4huEUR1Uq3DGBlnS1RtqqK0shif8aOlNLkmn8Xe9+x4HYIeNEX4fc8Z7Y2Hgw==,es256,+presence
|
||||
'';
|
||||
|
|
@ -28,15 +23,6 @@
|
|||
age.keyFile = "/home/jo/sops-nix/key.txt";
|
||||
};
|
||||
|
||||
# Flatpak configuration.
|
||||
services.flatpak = {
|
||||
enable = true;
|
||||
update.auto.enable = true;
|
||||
uninstallUnmanaged = true;
|
||||
|
||||
packages = [];
|
||||
};
|
||||
|
||||
programs = {
|
||||
# TODO: look at git-sync for syncing stuff like obsidian vaults.
|
||||
git-credential-oauth.enable = true;
|
||||
|
|
@ -55,10 +41,7 @@
|
|||
# Declare user packages.
|
||||
home.packages = with pkgs; [
|
||||
### General
|
||||
qflipper
|
||||
labymod-launcher
|
||||
steam
|
||||
youtube-music
|
||||
ungoogled-chromium
|
||||
firefox
|
||||
|
||||
|
|
@ -69,10 +52,9 @@
|
|||
git
|
||||
bun
|
||||
devenv
|
||||
python39
|
||||
nixd
|
||||
bruno
|
||||
deno
|
||||
nh
|
||||
|
||||
### Work
|
||||
teams-for-linux
|
||||
|
|
@ -80,10 +62,7 @@
|
|||
|
||||
### Notes & Organisation
|
||||
obsidian
|
||||
|
||||
### Virtual Reality
|
||||
sidequest
|
||||
];
|
||||
|
||||
home.stateVersion = "24.05";
|
||||
home.stateVersion = "25.05";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ in {
|
|||
enable-blur = mkOpt bool false "Whether to enable blur-my-shell application blur.";
|
||||
};
|
||||
};
|
||||
wallpaper = mkOpt str (builtins.toString ./wallpapers/retro/snowy-map.png) "Specify the path of your prefered Gnome wallpaper.";
|
||||
wallpaper = mkOpt str (builtins.toString ./wallpapers/mountain_tower_sunset.jpg) "Specify the path of your prefered Gnome wallpaper.";
|
||||
};
|
||||
|
||||
config = mkIf osConfig.${namespace}.desktop.gnome.enable {
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1 MiB |
BIN
modules/home/desktop/gnome/wallpapers/mountain_tower_sunset.jpg
Normal file
BIN
modules/home/desktop/gnome/wallpapers/mountain_tower_sunset.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 MiB |
|
|
@ -26,9 +26,9 @@
|
|||
@define-color error_color ${config.palette.red.hex};
|
||||
@define-color error_bg_color ${config.palette.red.hex};
|
||||
@define-color error_fg_color ${config.palette.base.hex};
|
||||
@define-color window_bg_color ${config.palette.base.hex};
|
||||
@define-color window_bg_color ${config.palette.mantle.hex};
|
||||
@define-color window_fg_color ${config.palette.text.hex};
|
||||
@define-color view_bg_color ${config.palette.base.hex};
|
||||
@define-color view_bg_color ${config.palette.mantle.hex};
|
||||
@define-color view_fg_color ${config.palette.text.hex};
|
||||
@define-color headerbar_bg_color ${config.palette.mantle.hex};
|
||||
@define-color headerbar_fg_color ${config.palette.text.hex};
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
@define-color headerbar_backdrop_color @window_bg_color;
|
||||
@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color sidebar_bg_color ${config.palette.mantle.hex};
|
||||
@define-color sidebar_bg_color ${config.palette.base.hex};
|
||||
@define-color sidebar_fg_color ${config.palette.text.hex};
|
||||
@define-color sidebar_backdrop_color @window_bg_color;
|
||||
@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
@define-color secondary_sidebar_fg_color @sidebar_fg_color;
|
||||
@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
|
||||
@define-color secondary_sidebar_shade_color @sidebar_shade_color;
|
||||
@define-color card_bg_color ${config.palette.mantle.hex};
|
||||
@define-color card_bg_color ${config.palette.base.hex};
|
||||
@define-color card_fg_color ${config.palette.text.hex};
|
||||
@define-color card_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color dialog_bg_color ${config.palette.mantle.hex};
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ in {
|
|||
"/var/lib/containers/homepage/images:/app/public/images:rw"
|
||||
"/var/run/docker.sock:/var/run/docker.sock:ro" # Optional, used for docker integration.
|
||||
];
|
||||
environment = {
|
||||
"HOMEPAGE_ALLOWED_HOSTS" = "home.thevoid.cafe";
|
||||
};
|
||||
extraOptions = ["--network=proxy"];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
title: Jo's Home
|
||||
background:
|
||||
image: /images/blossoms.png
|
||||
image: https://cloud.thevoid.cafe/public.php/dav/files/efDwYjNyAcwJM5A/web/cozy_kitchen_rain_compressed.webp
|
||||
blur: md
|
||||
opacity: 45
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
vaultwarden.enable = true;
|
||||
homepage.enable = true;
|
||||
duckdns.enable = true;
|
||||
bluesky.pds.enable = true;
|
||||
bluesky.pds.enable = false;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -56,6 +56,7 @@
|
|||
systemCronJobs = [
|
||||
"*/5 * * * * cyn docker exec -u www-data nextcloud-nextcloud-1 php /var/www/html/cron.php"
|
||||
"*/15 * * * * cyn docker exec -u www-data nextcloud-nextcloud-1 php /var/www/nextcloud/occ preview:pre-generate"
|
||||
"* 3 * * * cyn cd /home/cyn/docker/compose/satisfactory && docker compose up -d --force-recreate"
|
||||
#"*/30 * * * * cyn /home/jo/tools/FediFetcher/FediFetcher.sh"
|
||||
];
|
||||
};
|
||||
|
|
@ -65,6 +66,7 @@
|
|||
users.users.cyn.isNormalUser = true;
|
||||
users.users.cyn.extraGroups = [ "dialout" "docker" ];
|
||||
|
||||
|
||||
# Configure home-manager
|
||||
home-manager = {
|
||||
backupFileExtension = "homeManagerBackup";
|
||||
|
|
@ -75,6 +77,7 @@
|
|||
### General
|
||||
nano
|
||||
vim
|
||||
git
|
||||
|
||||
## Runtimes
|
||||
nodejs_22
|
||||
|
|
|
|||
|
|
@ -8,25 +8,30 @@
|
|||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/3e3d6676-2bd6-44df-a8a7-c5e7647c4e95";
|
||||
{ device = "/dev/disk/by-uuid/5d4f9f57-085f-44a0-b987-bad24ff58769";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/1C8C-F906";
|
||||
{ device = "/dev/disk/by-uuid/8D0F-2821";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/storage" =
|
||||
{ device = "/dev/disk/by-uuid/237eb43e-1e4e-4cb1-873e-6b07f1368f4f";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/b99e9370-10f7-4589-b7a2-59a256d75926"; }
|
||||
[ { device = "/dev/disk/by-uuid/42fc926f-f066-48e8-8c07-3627b2ba3cd4"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
|
@ -34,7 +39,12 @@
|
|||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.br-32acd0b5b342.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.veth0b3552e.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.veth3873910.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.veth9323c9b.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@
|
|||
inputs.hardware.nixosModules.common-pc-laptop-ssd
|
||||
];
|
||||
|
||||
# Configure SWAP
|
||||
swapDevices = [{ device = "/swapfile"; size = 8 * 1024; }]; # 8 GB swap partition
|
||||
|
||||
# Configure Sops
|
||||
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.
|
||||
|
|
@ -63,15 +66,10 @@
|
|||
# Set trusted users (Primarily used for cachix)
|
||||
nix.settings.trusted-users = ["root" "jo"];
|
||||
|
||||
# Configure additional groups
|
||||
users.groups.www-data = {
|
||||
gid = 33;
|
||||
};
|
||||
|
||||
# Configure users.
|
||||
snowfallorg.users.jo.admin = true;
|
||||
users.users.jo.isNormalUser = true;
|
||||
users.users.jo.extraGroups = ["dialout" "docker" "www-data"];
|
||||
users.users.jo.extraGroups = ["dialout" "docker"];
|
||||
users.users.jo.hashedPasswordFile = config.sops.secrets."user/jo/password_hash".path;
|
||||
|
||||
# Configure home-manager
|
||||
|
|
@ -91,5 +89,5 @@
|
|||
gnupg
|
||||
];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.stateVersion = "25.05";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue