josh
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: josh:0ac8ea64b8c9f41a9cb55711d05eb6b6bc52382d
Branches Tags
josh:main
josh:home-manager
..
compare: josh:874f06b331f2e606d3f620dce03acd79c9fccf76
Branches Tags
josh:main
josh:home-manager

No commits in common. "0ac8ea64b8c9f41a9cb55711d05eb6b6bc52382d" and "874f06b331f2e606d3f620dce03acd79c9fccf76" have entirely different histories.
0ac8ea64b8 ... 874f06b331

10 changed files with 89 additions and 88 deletions
Show Stats Expand all files Collapse all files

104
flake.lock
View File

@ -38,11 +38,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1776754714, "lastModified": 1760703920,
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,11 +76,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1781164160, "lastModified": 1769329000,
"narHash": "sha256-dxo3aPnfaQJt9K/3NhgKfu2Q9B42z4d4Or9Izoug+68=", "narHash": "sha256-0vibWqmCsG1t4xL2euR6PScB3M4QZigB5JGl+BIH4NY=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "elephant", "repo": "elephant",
"rev": "3296842820d04d5ec774afc7528492fcbb3c01f2", "rev": "1988112d1f54dd76e8a90f551945df763586bdad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779670703, "lastModified": 1764873433,
"narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1778716662, "lastModified": 1767609335,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,18 +146,20 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.gnome.org",
"lastModified": 1767737596, "lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab"
"type": "github"
} }
}, },
"home-manager": { "home-manager": {
@ -167,11 +169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781989573, "lastModified": 1769289524,
"narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=", "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f", "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781928658, "lastModified": 1769220693,
"narHash": "sha256-E+NGWu/3TtblwLL0uYKHB7VQOcuu6nUYSHDsscTnG2s=", "narHash": "sha256-o2r6tPNQ966AjPw5QpiD0guVXm5SvkuTIbZH9vN87NE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "ff4a4123af3924ee8741902d0d0af6debdae36a9", "rev": "515d1d8491dd5be06f4db0208f096f0cedba1824",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +221,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1781577229, "lastModified": 1769018530,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -245,11 +247,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780281641, "lastModified": 1767810917,
"narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,17 +285,18 @@
], ],
"nur": "nur", "nur": "nur",
"systems": "systems_2", "systems": "systems_2",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1781997134, "lastModified": 1769202931,
"narHash": "sha256-muBZG4O/agq/ljgHr6c3AsobIWgODAS6vf50xIS7o+Q=", "narHash": "sha256-4IZuCMjlWEtS6rVXozVXaJG6QADHVncXC29PLZr6ZB4=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a6a493119e492e15874caf6f7f8c7e572e64c655", "rev": "749285c90e3e35ebe0952c86838f3089abbc7939",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,6 +351,23 @@
"type": "github" "type": "github"
} }
}, },
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -367,11 +387,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1777806186, "lastModified": 1767710407,
"narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +403,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1778379944, "lastModified": 1767489635,
"narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +419,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1778378178, "lastModified": 1767488740,
"narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "9cd816033ff969415b190722cddf134e78a5665f", "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +443,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1781164128, "lastModified": 1769093508,
"narHash": "sha256-xPcYrHdDXWykIi5/XXkLvliBArRnfzvs+atB9El1qhI=", "narHash": "sha256-ccwJ1ADGNFd5LDF2JWdfP7+f1Hs2EvJ+2o6sUOdYi7w=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "walker", "repo": "walker",
"rev": "aa1e4b7d59237e8c43dde58636bae476f23d9bfb", "rev": "e427025bdda667712b08dd56f1a0a23667f1364c",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -115,7 +115,6 @@
homeConfigurations.josh = let homeConfigurations.josh = let
profile = "desktop"; profile = "desktop";
username = "josh"; username = "josh";
gpgSigningKey = null;
in home-manager.lib.homeManagerConfiguration { in home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
@ -124,9 +123,6 @@
}; };
pkgs = pkgs; pkgs = pkgs;
modules = [ modules = [
{
modules.gpg.signingKey = gpgSigningKey;
}
./homes/josh/home.nix ./homes/josh/home.nix
stylix.homeModules.stylix stylix.homeModules.stylix
]; ];

5
homes/josh/home.nix
View File

@ -1,13 +1,12 @@
{ {
config, config,
gpgSigningKey,
lib, lib,
pkgs, pkgs,
profile, profile,
... ...
}: }:
with lib; with lib;
let gpgCfg = config.modules.gpg;
in
{ {
imports = [ imports = [
../../modules/homes ../../modules/homes
@ -35,7 +34,7 @@ in
name = "Joshua Yuen"; name = "Joshua Yuen";
email = "joshuayuen99@gmail.com"; email = "joshuayuen99@gmail.com";
# We need to do this to pass through the (optional) signing key from the hosts/* file # We need to do this to pass through the (optional) signing key from the hosts/* file
signingkey = mkIf (gpgCfg.signingKey != null) gpgCfg.signingKey; signingkey = if gpgSigningKey != "" then gpgSigningKey else config.modules.gpg.signingKey;
}; };
commit.gpgsign = true; commit.gpgsign = true;
init.defaultBranch = "main"; init.defaultBranch = "main";

1
modules/core/boot.nix
View File

@ -6,7 +6,6 @@
boot = { boot = {
loader.systemd-boot = { loader.systemd-boot = {
enable = true; enable = true;
configurationLimit = 10;
consoleMode = config.system.systemdBootConsoleMode; consoleMode = config.system.systemdBootConsoleMode;
}; };
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;

1
modules/core/gdm.nix
View File

@ -11,6 +11,7 @@ in
config = mkIf (cfg.displayManager == "gdm") { config = mkIf (cfg.displayManager == "gdm") {
services.displayManager.gdm = { services.displayManager.gdm = {
enable = true; enable = true;
wayland = true;
}; };
}; };
} }

2
modules/core/user.nix
View File

@ -24,10 +24,10 @@ in
profile profile
username username
; ;
gpgSigningKey = config.modules.gpg.signingKey;
}; };
users.${username} = { users.${username} = {
imports = [ ../../homes/${username}/home.nix ]; imports = [ ../../homes/${username}/home.nix ];
modules.gpg.signingKey = config.modules.gpg.signingKey;
}; };
}; };

2
modules/homes/firefox.nix
View File

@ -1,5 +1,4 @@
{ {
config,
pkgs, pkgs,
username, username,
... ...
@ -8,7 +7,6 @@
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox; package = pkgs.firefox;
configPath = "${config.xdg.configHome}/mozilla/firefox";
policies = { policies = {
# Updates & Background Services # Updates & Background Services

5
modules/homes/gpg.nix
View File

@ -25,11 +25,6 @@ in
programs = { programs = {
gpg = { gpg = {
enable = true; enable = true;
settings = {
default-key = mkIf (cfg.signingKey != null) cfg.signingKey;
trusted-key = mkIf (cfg.signingKey != null) cfg.signingKey;
};
}; };
}; };
}; };

49
modules/homes/vscodium.nix
View File

@ -3,35 +3,28 @@
... ...
}: }:
{ {
programs.vscodium = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
profiles.default = { profiles.default.extensions =
extensions = with pkgs.vscode-extensions;
with pkgs.vscode-extensions; with pkgs.vscode-marketplace;
with pkgs.vscode-marketplace; [
[ amazonwebservices.aws-toolkit-vscode
amazonwebservices.aws-toolkit-vscode arrterian.nix-env-selector
arrterian.nix-env-selector christian-kohler.path-intellisense
christian-kohler.path-intellisense eamodio.gitlens
eamodio.gitlens esbenp.prettier-vscode
esbenp.prettier-vscode jnoortheen.nix-ide
jnoortheen.nix-ide leonardssh.vscord
leonardssh.vscord mkhl.direnv
mkhl.direnv ms-python.debugpy
ms-python.debugpy ms-python.python
ms-python.python opentofu.vscode-opentofu
opentofu.vscode-opentofu redhat.ansible
redhat.ansible redhat.vscode-yaml
redhat.vscode-yaml rvest.vs-code-prettier-eslint
rvest.vs-code-prettier-eslint vscodevim.vim
vscodevim.vim ];
];
userSettings = {
"editor.stickyScroll.maxLineCount" = 10;
"vim.smartRelativeLine" = true;
};
};
}; };
} }

4
modules/options/gpg.nix
View File

@ -11,8 +11,8 @@ with lib;
}; };
signingKey = mkOption { signingKey = mkOption {
type = types.nullOr types.str; type = types.str;
default = null; default = "";
description = "The key ID to sign with for git"; description = "The key ID to sign with for git";
}; };
}; };