Jo/puzzlevision
1
0
Fork 0
mirror of https://github.com/Jokiller230/puzzlevision.git synced 2025-09-12 13:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: Jo:673421dec3f62fdd72f9461f4b6688ff6d4f7d7f
Branches Tags
Jo:v2
Jo:update_flake_lock_action
Jo:main
Jo:refactor/system-and-home-loading
..
compare: Jo:14135dfb9e5934cfa1b550715bb04544c3aa5af2
Branches Tags
Jo:v2
Jo:update_flake_lock_action
Jo:main
Jo:refactor/system-and-home-loading

No commits in common. "673421dec3f62fdd72f9461f4b6688ff6d4f7d7f" and "14135dfb9e5934cfa1b550715bb04544c3aa5af2" have entirely different histories.
673421dec3 ... 14135dfb9e

10 changed files with 80 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

67
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": {
"catppuccin": {
"locked": {
"lastModified": 1734734291,
"narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=",
"lastModified": 1731232837,
"narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
"owner": "catppuccin",
"repo": "nix",
"rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8",
"rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
"type": "github"
},
"original": {
@ -70,11 +70,11 @@
},
"hardware": {
"locked": {
"lastModified": 1734954597,
"narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
"lastModified": 1731403644,
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "def1d472c832d77885f174089b0d34854b007198",
"rev": "f6581f1c3b137086e42a08a906bdada63045f991",
"type": "github"
},
"original": {
@ -91,11 +91,11 @@
]
},
"locked": {
"lastModified": 1734944412,
"narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=",
"lastModified": 1731235328,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e",
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github"
},
"original": {
@ -122,11 +122,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1734820311,
"narHash": "sha256-YsLK4ZiGY5CZmmgzsfU76OHVUTDeZJgirKzNO+et0UQ=",
"lastModified": 1731245184,
"narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7e4a1594489d41bf8e16046b28e14a0e264c9baa",
"rev": "aebe249544837ce42588aa4b2e7972222ba12e8f",
"type": "github"
},
"original": {
@ -136,13 +136,29 @@
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730602179,
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"lastModified": 1733759999,
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github"
},
"original": {
@ -173,11 +189,11 @@
]
},
"locked": {
"lastModified": 1732544274,
"narHash": "sha256-qvzLIxuqukl0nxpXHEh5+iw1BLeLxYOwRC0+7cFUbPo=",
"lastModified": 1730136121,
"narHash": "sha256-tfVayj13Zw+zzOKrmJhnvBod7Hdb9ixBR6/4GUlyMA0=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "cfeacd055545ab5de0ecfd41e09324dcd8fb2bbb",
"rev": "dd348182c1a010993e68004eada86cf0341fe2c4",
"type": "github"
},
"original": {
@ -190,14 +206,15 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
]
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1734546875,
"narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"lastModified": 1731364708,
"narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"rev": "4c91d52db103e757fc25b58998b0576ae702d659",
"type": "github"
},
"original": {
@ -226,11 +243,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1734657663,
"narHash": "sha256-1Et05foPKYyWAHUftrrzWgfddnd0r0sm2WCuNeVDDkA=",
"lastModified": 1734038753,
"narHash": "sha256-v2NetNrFvObcTx5Gw0MV9leJQr0KfCLtbpC4gZaq+Tc=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "f5181bde713d1aa5c8d95d00f4f47cd937d2b3e8",
"rev": "b2a4aeaad1cdb4a0d8901313d6388a8b4bf2c59d",
"type": "github"
},
"original": {

15
flake.nix
View file

@ -43,21 +43,6 @@
};
};
nixConfig = {
extra-substituters = [
"https://nix-community.cachix.org"
"https://cache.nixos.org"
"https://devenv.cachix.org"
"https://shopware.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
"shopware.cachix.org-1:IDifwLVQaaDU2qhlPkJsWJp/Pq0PfzHPIB90hBOhL3k="
];
};
outputs = inputs:
inputs.snowfall-lib.mkFlake {
inherit inputs; # Providing flake inputs to Snowfall Lib.

29
homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix
View file

@ -2,8 +2,37 @@
pkgs,
...
}: {
home.packages = with pkgs.gnomeExtensions; [
dash-to-dock
user-themes
blur-my-shell
appindicator
unite
color-picker
clipboard-history
];
# Use `dconf watch /` to track stateful changes you are doing, then set them here.
dconf.settings = {
"org/gnome/shell" = {
favorite-apps = [
"org.gnome.Nautilus.desktop"
"obsidian.desktop"
"zen.desktop"
"phpstorm.desktop"
];
enabled-extensions = [
pkgs.gnomeExtensions.unite.extensionUuid
pkgs.gnomeExtensions.color-picker.extensionUuid
pkgs.gnomeExtensions.clipboard-history.extensionUuid
pkgs.gnomeExtensions.blur-my-shell.extensionUuid
pkgs.gnomeExtensions.user-themes.extensionUuid
pkgs.gnomeExtensions.dash-to-dock.extensionUuid
pkgs.gnomeExtensions.appindicator.extensionUuid
];
};
"org/gnome/desktop/wm/preferences" = {
workspace-names = [ "Main" ];
};

6
homes/x86_64-linux/jo@puzzlevision/default.nix
View file

@ -38,12 +38,12 @@
steam
g4music
bitwarden-desktop
youtube-music
### Development
avra
avrdude
jetbrains.phpstorm
jetbrains.pycharm-community
git
nodejs_22
bun
@ -54,6 +54,10 @@
zed-editor
bruno
### Rust development specific
rustup
gcc
### Work
teams-for-linux
enpass

40
modules/home/desktop/gnome/default.nix
View file

@ -1,40 +0,0 @@
{
lib,
pkgs,
host,
config,
osConfig,
namespace,
...
}: with lib; with lib.${namespace};
let
cfg = config.${host}.desktop.gnome;
in
{
options.${host}.desktop.gnome = with types; {
extensions = mkOption {
type = listOf package;
default = with pkgs.gnomeExtensions; [ dash-to-dock user-themes blur-my-shell appindicator unite color-picker clipboard-history ];
example = [ dash-to-dock blur-my-shell ];
description = "Specify gnome extensions to install.";
};
favorite-apps = mkOption {
type = listOf string;
default = ["org.gnome.Nautilus.desktop" "obsidian.desktop" "zen.desktop" "dev.zed.Zed.desktop"];
example = ["org.gnome.Nautilus.desktop" "obsidian.desktop"];
description = "Specify your favorite apps (sorted left to right)";
};
};
config = mkIf osConfig.${namespace}.desktop.gnome.enable {
home.packages = cfg.extensions;
dconf.settings = {
"org/gnome/shell" = {
favorite-apps = cfg.favorite-apps;
enabled-extensions = forEach cfg.extensions (x: x.extensionUuid);
disabled-extensions = []; # Make sure none of our extensions are disabled on system rebuild
};
};
};
}

6
modules/nixos/archetypes/workstation/default.nix
View file

@ -12,7 +12,6 @@ in {
config = mkIf cfg.enable {
environment.sessionVariables = {
MOZ_ENABLE_WAYLAND = "1"; # Firefox native Wayland support
NIXOS_OZONE_WL = "1"; # Native Wayland in Chromium and Electron based applications
};
# Enable modules
@ -21,7 +20,6 @@ in {
nix = {
enable = true; # Standard Nix configuration
use-lix = true;
use-nixld = true;
};
grub.enable = true; # Bootloader grub
networking.enable = true; # Networkmanager configuration
@ -34,10 +32,6 @@ in {
locale.enable = true; # Locale settings
};
tools = {
cachix.enable = true;
};
desktop.gnome.enable = true;
};
};

2
modules/nixos/common/fonts/default.nix
View file

@ -12,7 +12,7 @@ in {
enable = mkEnableOption "Enable system font management";
fonts = mkOption {
type = listOf package;
default = with pkgs; [ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji nerd-fonts.bigblue-terminal nerd-fonts.zed-mono monocraft ];
default = with pkgs; [ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji nerdfonts ];
example = [ noto-fonts noto-fonts-emoji ];
description = "Install additional font packages";
};

12
modules/nixos/security/yubikey/default.nix
View file

@ -17,7 +17,6 @@ in
example = [ "123456" "1234567" ];
description = "Register additional Yubikey IDs.";
};
enable-agent = mkEnableOption "Enable the Yubikey agent";
};
config = mkIf cfg.enable {
@ -35,16 +34,5 @@ in
login.u2fAuth = true;
sudo.u2fAuth = true;
};
services.yubikey-agent.enable = cfg.enable-agent;
programs.ssh.extraConfig = mkIf cfg.enable-agent ''
Host *
IdentityAgent /usr/local/var/run/yubikey-agent.sock
'';
environment.sessionVariables = mkIf cfg.enable-agent {
SSH_AUTH_SOCK = "/usr/local/var/run/yubikey-agent.sock";
};
};
}

17
modules/nixos/tools/cachix/default.nix
View file

@ -1,17 +0,0 @@
{
lib,
pkgs,
namespace,
config,
...
}: with lib; with lib.${namespace};
let
cfg = config.${namespace}.tools.cachix;
in {
options.${namespace}.tools.cachix = { enable = mkEnableOption "Enable the cachix binary cache service on your system."; };
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ cachix ];
};
}

8
systems/x86_64-linux/puzzlevision/default.nix
View file

@ -52,18 +52,12 @@
# Set system configuration
puzzlevision = {
archetypes.workstation.enable = true;
security.yubikey = {
enable = true;
enable-agent = true;
};
security.yubikey.enable = true;
};
# Enable flatpak support.
services.flatpak.enable = true;
# Set trusted users (Primarily used for cachix)
nix.settings.trusted-users = [ "root" "jo" ];
# Configure users.
snowfallorg.users.jo.admin = true;
users.users.jo.isNormalUser = true;