diff --git a/flake.lock b/flake.lock index ccb2dfa..6292148 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1697723594, - "narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", + "lastModified": 1698429334, + "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", + "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1698250431, - "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698266953, - "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=", + "lastModified": 1699155732, + "narHash": "sha256-Wg4RmOGUEO4YCF0fEc/qiQ/3+BGC/f0qywIE8xEkIpY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c", + "rev": "15492ddc2974ba426ea7e17116ea7aa44fc96dcd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b4c24d7..d0bbf6d 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ config.allowBroken = false; config.permittedInsecurePackages = [ "libgcrypt-1.8.10" + "libxls-1.6.2" ]; overlays = import ./overlays.nix; system = "x86_64-linux"; diff --git a/maddie/macos/iterm2.nix b/maddie/macos/iterm2.nix new file mode 100644 index 0000000..44dbc1f --- /dev/null +++ b/maddie/macos/iterm2.nix @@ -0,0 +1,510 @@ +{ config, username, ... }: + +{ + targets.darwin.defaults."com.googlecode.iterm2" = { + "PreventEscapeSequenceFromClearingHistory" = 0; + "NoSyncHaveExplainedHowToAddTouchbarControls" = 1; + "NoSyncTipsDisabled" = 1; + "SoundForEsc" = 0; + "VisualIndicatorForEsc" = 0; + "Custom Color Presets" = { + "One Dark" = { + "Ansi 0 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.168627455830574"; + "Color Space" = "sRGB"; + "Green Component" = "0.1450980454683304"; + "Red Component" = "0.1294117718935013"; + }; + "Ansi 1 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4588235318660736"; + "Color Space" = "sRGB"; + "Green Component" = "0.4235294163227081"; + "Red Component" = "0.8784313797950745"; + }; + "Ansi 10 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4745098054409027"; + "Color Space" = "sRGB"; + "Green Component" = "0.7647058963775635"; + "Red Component" = "0.5960784554481506"; + }; + "Ansi 11 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4823529422283173"; + "Color Space" = "sRGB"; + "Green Component" = "0.7529411911964417"; + "Red Component" = "0.8980392217636108"; + }; + "Ansi 12 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.9372549057006836"; + "Color Space" = "sRGB"; + "Green Component" = "0.686274528503418"; + "Red Component" = "0.3803921639919281"; + }; + "Ansi 13 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.8666666746139526"; + "Color Space" = "sRGB"; + "Green Component" = "0.4705882370471954"; + "Red Component" = "0.7764706015586853"; + }; + "Ansi 14 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7607843279838562"; + "Color Space" = "sRGB"; + "Green Component" = "0.7137255072593689"; + "Red Component" = "0.3372549116611481"; + }; + "Ansi 15 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Ansi 2 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4745098054409027"; + "Color Space" = "sRGB"; + "Green Component" = "0.7647058963775635"; + "Red Component" = "0.5960784554481506"; + }; + "Ansi 3 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4823529422283173"; + "Color Space" = "sRGB"; + "Green Component" = "0.7529411911964417"; + "Red Component" = "0.8980392217636108"; + }; + "Ansi 4 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.9372549057006836"; + "Color Space" = "sRGB"; + "Green Component" = "0.686274528503418"; + "Red Component" = "0.3803921639919281"; + }; + "Ansi 5 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.8666666746139526"; + "Color Space" = "sRGB"; + "Green Component" = "0.4705882370471954"; + "Red Component" = "0.7764706015586853"; + }; + "Ansi 6 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7607843279838562"; + "Color Space" = "sRGB"; + "Green Component" = "0.7137255072593689"; + "Red Component" = "0.3372549116611481"; + }; + "Ansi 7 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Ansi 8 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4627451002597809"; + "Color Space" = "sRGB"; + "Green Component" = "0.4627451002597809"; + "Red Component" = "0.4627451002597809"; + }; + "Ansi 9 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4588235318660736"; + "Color Space" = "sRGB"; + "Green Component" = "0.4235294163227081"; + "Red Component" = "0.8784313797950745"; + }; + "Background Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.168627455830574"; + "Color Space" = "sRGB"; + "Green Component" = "0.1450980454683304"; + "Red Component" = "0.1294117718935013"; + }; + "Badge Color" = { + "Alpha Component" = "0.5"; + "Blue Component" = "0.4588235318660736"; + "Color Space" = "sRGB"; + "Green Component" = "0.4235294163227081"; + "Red Component" = "0.8784313797950745"; + }; + "Bold Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Cursor Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Cursor Guide Color" = { + "Alpha Component" = "0.1764705882352941"; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Cursor Text Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Foreground Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Link Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.9372549057006836"; + "Color Space" = "sRGB"; + "Green Component" = "0.686274528503418"; + "Red Component" = "0.3803921639919281"; + }; + "Selected Text Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Selection Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.2666666805744171"; + "Color Space" = "sRGB"; + "Green Component" = "0.2196078449487686"; + "Red Component" = "0.196078434586525"; + }; + }; + }; + "Default Bookmark Guid" = "B038731D-3A7A-44EC-A1C5-8777EB3270A7"; + GlobalTouchBarMap = { + "touchbar:0C8EAB5C-C453-4AEA-9DA6-05D596F01730" = { + Action = 12; + Label = "❄️"; + Text = "nix shell\\n"; + Version = 1; + }; + "touchbar:2DDE7A3B-26B0-4748-AED2-A453238DFF5C" = { + Action = 12; + Label = "🗑️"; + Text = "clear\\n"; + Version = 1; + }; + "touchbar:5527C3C6-A03F-4CA5-B7C1-A9B52CC89BED" = { + Action = 12; + Label = "⬆️"; + Text = "git push\\n"; + Version = 1; + }; + "touchbar:A34F65B2-B5FE-4B8F-904C-BFF3D76D352F" = { + Action = 12; + Label = "✍️"; + Text = "git add .; git commit\\n"; + Version = 1; + }; + "touchbar:B8063C42-FFC8-4735-9A1B-7B5F4D477D90" = { + Action = 12; + Label = "🧐"; + Text = "git status\\n"; + Version = 1; + }; + "touchbar:E6F32724-CABD-4079-BC0E-95C2BB50BEB7" = { + Action = 12; + Label = "⬇️"; + Text = "git pull\\n"; + Version = 1; + }; + "NSTouchBarConfig: full screen" = { + CurrentItems = [ + "touchbar:B8063C42-FFC8-4735-9A1B-7B5F4D477D90/v0" + "touchbar:A34F65B2-B5FE-4B8F-904C-BFF3D76D352F/v0" + "touchbar:5527C3C6-A03F-4CA5-B7C1-A9B52CC89BED/v0" + "touchbar:E6F32724-CABD-4079-BC0E-95C2BB50BEB7/v0" + "NSTouchBarItemIdentifierFlexibleSpace" + "touchbar:0C8EAB5C-C453-4AEA-9DA6-05D596F01730/v0" + "touchbar:2DDE7A3B-26B0-4748-AED2-A453238DFF5C/v0" + "NSTouchBarItemIdentifierOtherItemsProxy" + ]; + DefaultItems = [ + "iTermTouchBarIdentifierManPage" + "iTermTouchBarIdentifierColorPreset" + "iTermTouchBarIdentifierFunctionKeys" + "NSTouchBarItemIdentifierFlexibleSpace" + "NSTouchBarItemIdentifierOtherItemsProxy" + "iTermTouchBarIdentifierAddMark" + "iTermTouchBarIdentifierPreviousMark" + "iTermTouchBarIdentifierNextMark" + ]; + }; + "NSTouchBarConfig: regular" = { + CurrentItems = [ + "touchbar:B8063C42-FFC8-4735-9A1B-7B5F4D477D90/v0" + "touchbar:A34F65B2-B5FE-4B8F-904C-BFF3D76D352F/v0" + "touchbar:5527C3C6-A03F-4CA5-B7C1-A9B52CC89BED/v0" + "touchbar:E6F32724-CABD-4079-BC0E-95C2BB50BEB7/v0" + "NSTouchBarItemIdentifierFlexibleSpace" + "touchbar:0C8EAB5C-C453-4AEA-9DA6-05D596F01730/v0" + "touchbar:2DDE7A3B-26B0-4748-AED2-A453238DFF5C/v0" + "NSTouchBarItemIdentifierOtherItemsProxy" + ]; + DefaultItems = [ + "iTermTouchBarIdentifierManPage" + "iTermTouchBarIdentifierColorPreset" + "iTermTouchBarIdentifierFunctionKeys" + "NSTouchBarItemIdentifierFlexibleSpace" + "NSTouchBarItemIdentifierOtherItemsProxy" + "iTermTouchBarIdentifierAddMark" + "iTermTouchBarIdentifierPreviousMark" + "iTermTouchBarIdentifierNextMark" + ]; + }; + "New Bookmarks" = [{ + "Ansi 0 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.168627455830574"; + "Color Space" = "sRGB"; + "Green Component" = "0.1450980454683304"; + "Red Component" = "0.1294117718935013"; + }; + "Ansi 1 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4588235318660736"; + "Color Space" = "sRGB"; + "Green Component" = "0.4235294163227081"; + "Red Component" = "0.8784313797950745"; + }; + "Ansi 10 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4745098054409027"; + "Color Space" = "sRGB"; + "Green Component" = "0.7647058963775635"; + "Red Component" = "0.5960784554481506"; + }; + "Ansi 11 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4823529422283173"; + "Color Space" = "sRGB"; + "Green Component" = "0.7529411911964417"; + "Red Component" = "0.8980392217636108"; + }; + "Ansi 12 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.9372549057006836"; + "Color Space" = "sRGB"; + "Green Component" = "0.686274528503418"; + "Red Component" = "0.3803921639919281"; + }; + "Ansi 13 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.8666666746139526"; + "Color Space" = "sRGB"; + "Green Component" = "0.4705882370471954"; + "Red Component" = "0.7764706015586853"; + }; + "Ansi 14 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7607843279838562"; + "Color Space" = "sRGB"; + "Green Component" = "0.7137255072593689"; + "Red Component" = "0.3372549116611481"; + }; + "Ansi 15 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Ansi 2 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4745098054409027"; + "Color Space" = "sRGB"; + "Green Component" = "0.7647058963775635"; + "Red Component" = "0.5960784554481506"; + }; + "Ansi 3 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4823529422283173"; + "Color Space" = "sRGB"; + "Green Component" = "0.7529411911964417"; + "Red Component" = "0.8980392217636108"; + }; + "Ansi 4 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.9372549057006836"; + "Color Space" = "sRGB"; + "Green Component" = "0.686274528503418"; + "Red Component" = "0.3803921639919281"; + }; + "Ansi 5 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.8666666746139526"; + "Color Space" = "sRGB"; + "Green Component" = "0.4705882370471954"; + "Red Component" = "0.7764706015586853"; + }; + "Ansi 6 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7607843279838562"; + "Color Space" = "sRGB"; + "Green Component" = "0.7137255072593689"; + "Red Component" = "0.3372549116611481"; + }; + "Ansi 7 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Ansi 8 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4627451002597809"; + "Color Space" = "sRGB"; + "Green Component" = "0.4627451002597809"; + "Red Component" = "0.4627451002597809"; + }; + "Ansi 9 Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.4588235318660736"; + "Color Space" = "sRGB"; + "Green Component" = "0.4235294163227081"; + "Red Component" = "0.8784313797950745"; + }; + "BM Growl" = 1; + "Background Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.168627455830574"; + "Color Space" = "sRGB"; + "Green Component" = "0.1450980454683304"; + "Red Component" = "0.1294117718935013"; + }; + "Background Image Location" = ""; + "Badge Color" = { + "Alpha Component" = "0.5"; + "Blue Component" = "0.4588235318660736"; + "Color Space" = "sRGB"; + "Green Component" = "0.4235294163227081"; + "Red Component" = "0.8784313797950745"; + }; + "Blinking Cursor" = 0; + Blur = 1; + "Blur Radius" = "49.63241356382979"; + "Bold Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Character Encoding" = 4; + "Close Sessions On End" = 1; + Columns = 80; + Command = ""; + "Cursor Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Cursor Guide Color" = { + "Alpha Component" = "0.1764705882352941"; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Cursor Text Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Cursor Type" = 1; + "Custom Command" = "No"; + "Custom Directory" = "No"; + "Default Bookmark" = "No"; + "Description" = "Default"; + "Disable Window Resizing" = 1; + "Flashing Bell" = 0; + "Foreground Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Guid" = "B038731D-3A7A-44EC-A1C5-8777EB3270A7"; + "Horizontal Spacing" = 1; + "Icon" = 0; + "Idle Code" = 0; + "Link Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.9372549057006836"; + "Color Space" = "sRGB"; + "Green Component" = "0.686274528503418"; + "Red Component" = "0.3803921639919281"; + }; + "Mouse Reporting" = 1; + "Name" = "Default"; + "Non Ascii Font" = "Monaco 12"; + "Non-ASCII Anti Aliased" = 1; + "Normal Font" = "JetBrainsMonoNerdFontComplete-Regular 12"; + "Option Key Sends" = 0; + "Prompt Before Closing 2" = 0; + "Right Option Key Sends" = 0; + "Rows" = 25; + "Screen" = "-1"; + "Scrollback Lines" = 1000; + "Selected Text Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.7490196228027344"; + "Color Space" = "sRGB"; + "Green Component" = "0.6980392336845398"; + "Red Component" = "0.6705882549285889"; + }; + "Selection Color" = { + "Alpha Component" = 1; + "Blue Component" = "0.2666666805744171"; + "Color Space" = "sRGB"; + "Green Component" = "0.2196078449487686"; + "Red Component" = "0.196078434586525"; + }; + "Send Code When Idle" = 0; + "Shortcut" = ""; + "Silence Bell" = 1; + "Sync Title" = 0; + "Terminal Type" = "xterm-256color"; + "Transparency" = "0.3756482712765958"; + "Unlimited Scrollback" = 0; + "Use Bold Font" = 1; + "Use Bright Bold" = 1; + "Use Italic Font" = 1; + "Use Non-ASCII Font" = 0; + "Vertical Spacing" = 1; + "Visual Bell" = 1; + "Window Type" = 0; + "Working Directory" = "/Users/${username}"; + }]; + }; + }; +} diff --git a/maddie/macos/ssh.nix b/maddie/macos/ssh.nix index db7df0a..ce604c6 100644 --- a/maddie/macos/ssh.nix +++ b/maddie/macos/ssh.nix @@ -1,9 +1,9 @@ -{ config, ... }: +{ config, username, ... }: { # Use Secretive as the ssh IdentityAgent on all hosts programs.ssh.extraConfig = '' Host * - IdentityAgent /Users/maddie/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh + IdentityAgent /Users/${username}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh ''; } diff --git a/maddie/macos/tower.nix b/maddie/macos/tower.nix new file mode 100644 index 0000000..d32da96 --- /dev/null +++ b/maddie/macos/tower.nix @@ -0,0 +1,33 @@ +{ config, ... }: + +{ + targets.darwin.defaults."com.fournova.Tower3" = { + "GTUserDefaultsAppAppearance" = 0; + "GTUserDefaultsAutoFetchTimeInterval" = 0; + "GTUserDefaultsBodyLineWrappingMode" = "soft"; + "GTUserDefaultsCommitOptionSignOff" = 0; + "GTUserDefaultsDarkTheme" = "Default"; + "GTUserDefaultsDefaultTerminalApplication" = "com.googlecode.iterm2"; + "GTUserDefaultsDetailHeaderExpanded" = 1; + "GTUserDefaultsDialogueOptionPullUseRebase" = 0; + "GTUserDefaultsDiffWarningThreshold" = 20000; + "GTUserDefaultsGettingStartedPassed" = 1; + "GTUserDefaultsGitBinary" = "/usr/bin/git"; + "GTUserDefaultsHideWindowTitle" = 0; + "GTUserDefaultsHistoryVerifiesGPGSignatures" = 1; + "GTUserDefaultsHistoryVerifiesGPGSignaturesInitialActivation" = 1; + "GTUserDefaultsLastApplicationVersion" = 351; + "GTUserDefaultsLightTheme" = "Default"; + "GTUserDefaultsMigrationsAzureDevOpsServerHostURLMigration" = 1; + "GTUserDefaultsMigrationsCommitViewSizeMigration" = 1; + "GTUserDefaultsRepositoryFinderInitialized" = 1; + "GTUserDefaultsUpdatesReleaseChannel" = "stable"; + "GTUserDefaultsUpdatesReleaseChannelReset" = 1; + "GTUserDefaultsUserProfilesInitialized" = 1; + "MSAppCenter310AppCenterUserDefaultsMigratedKey" = 1; + "MSAppCenter310CrashesUserDefaultsMigratedKey" = 1; + "NSNavLastRootDirectory" = "~/Documents/Education/Notes"; + "NSNavPanelExpandedSizeForOpenMode" = "{800, 611}"; + "NSNavPanelMediaBrowserTypeForOpenModeKey" = 1; + }; +} diff --git a/maddie/nixos/messaging.nix b/maddie/nixos/messaging.nix index a75e89c..271c3b4 100644 --- a/maddie/nixos/messaging.nix +++ b/maddie/nixos/messaging.nix @@ -4,6 +4,7 @@ home.packages = with pkgs; [ element-desktop # Matrix client signal-desktop # Signal client + cinny-desktop # Pretty matrix client discord-canary # Discord client ripcord # Better discord client nheko # Better matrix client diff --git a/maddie/nixos/minecraft.nix b/maddie/nixos/minecraft.nix index b92549e..8614dd9 100644 --- a/maddie/nixos/minecraft.nix +++ b/maddie/nixos/minecraft.nix @@ -4,6 +4,6 @@ home.packages = with pkgs; [ prismlauncher # Minecraft launcher minecraft # Actual minecraft - jdk # Needed for running minecraft servers + /*jdk # Needed for running minecraft servers */ ]; } diff --git a/systems/mdesktop/nix-ld.nix b/systems/mdesktop/nix-ld.nix new file mode 100644 index 0000000..b5d5b9f --- /dev/null +++ b/systems/mdesktop/nix-ld.nix @@ -0,0 +1,5 @@ +{ config, ... }: + +{ + programs.nix-ld.enable = true; +} diff --git a/systems/mdesktop/nvidia.nix b/systems/mdesktop/nvidia.nix index ebde31b..14bfe78 100644 --- a/systems/mdesktop/nvidia.nix +++ b/systems/mdesktop/nvidia.nix @@ -9,6 +9,11 @@ hardware.nvidia.modesetting.enable = false; services.xserver.videoDrivers = [ "nvidia" ]; + # Fix tauri applications with nvidia drivers + environment.sessionVariables = { + "WEBKIT_DISABLE_COMPOSITING_MODE" = "1"; + }; + hardware.opengl.extraPackages = [ (pkgs.runCommand "nvidia-icd" { } '' mkdir -p $out/share/vulkan/icd.d diff --git a/systems/mmacbookpro/dock.nix b/systems/mmacbookpro/dock.nix index 2db85de..1d37ba9 100644 --- a/systems/mmacbookpro/dock.nix +++ b/systems/mmacbookpro/dock.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, username, ... }: { system.defaults = { @@ -40,12 +40,12 @@ # Folders { - path = "/Users/maddie/Documents/"; + path = "/Users/${username}/Documents/"; section = "others"; options = "--sort name --display folder"; } { - path = "/Users/maddie/Downloads/"; + path = "/Users/${username}/Downloads/"; section = "others"; options = "--sort dateadded"; }