Merge branch 'master' of github.com:starr-dusT/dotfiles

This commit is contained in:
Tyler Starr 2023-11-03 20:26:56 -07:00
commit 2735743285
4 changed files with 24 additions and 15 deletions

View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687871164, "lastModified": 1695108154,
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", "rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,11 +24,11 @@
"jovian-nixos": { "jovian-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1692160665, "lastModified": 1698485410,
"narHash": "sha256-MKjvQuArGltIhZh6m23hSdogRr8DxwGqSwt0DlTlUbc=", "narHash": "sha256-+O5Acu2n4XQnT4M25W/oH5MLqXy4pFBFhBzKBFOF7Ik=",
"ref": "development", "ref": "development",
"rev": "97662e4872b88df79e60be0c27fc277b326fd6e9", "rev": "fd7753956149d4e8b19a810eed445d1a52aecd30",
"revCount": 322, "revCount": 459,
"type": "git", "type": "git",
"url": "https://github.com/Jovian-Experiments/Jovian-NixOS" "url": "https://github.com/Jovian-Experiments/Jovian-NixOS"
}, },
@ -40,11 +40,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1688939073, "lastModified": 1698288402,
"narHash": "sha256-jYhYjeK5s6k8QS3i+ovq9VZqBJaWbxm7awTKNhHL9d0=", "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8df7a67abaf8aefc8a2839e0b48f92fdcf69a38b", "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1696879762, "lastModified": 1698318101,
"narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -68,9 +68,12 @@
# List packages installed in system profile. # List packages installed in system profile.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# One-off stable packages # One-off stable packages
firefox
google-chrome
discord
gamemode
] ++ [ ] ++ [
# One-off unstable packages # One-off unstable packages
pkgs-unstable.ungoogled-chromium
]; ];
# Enable modules # Enable modules

View File

@ -40,7 +40,7 @@
favorite-apps = [ favorite-apps = [
"steam.desktop" "steam.desktop"
"org.gnome.Console.desktop" "org.gnome.Console.desktop"
"chromium-browser.desktop" "firefox.desktop"
]; ];
}; };
}; };

View File

@ -6,9 +6,15 @@ in {
options.modules.devel.notes.enable = lib.mkEnableOption "notes"; options.modules.devel.notes.enable = lib.mkEnableOption "notes";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Needed for obsidian
nixpkgs.config.permittedInsecurePackages = [
"electron-24.8.6"
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pandoc pandoc
gollum gollum
obsidian
zk zk
# for zk # for zk