Compare commits

..

2 commits

Author SHA1 Message Date
Evie Litherland-Smith 9e9f6dee5f Remove Ferdium
Move teams config back in-line, remove config directory
2024-09-06 14:07:46 +01:00
Evie Litherland-Smith 640341cc76 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/6e99f2a27d600612004fbd2c3282d614bfee6421?narHash=sha256-eV%2B63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi%2BM%3D' (2024-08-30)
  → 'github:nixos/nixpkgs/6f6c45b5134a8ee2e465164811e451dcb5ad86e3?narHash=sha256-tiN5Rlg/jiY0tyky%2BsoJZoRzLKbPyIdlQ77xVgREDNM%3D' (2024-09-03)
• Updated input 'plasma-manager':
    'github:nix-community/plasma-manager/5c97fe8af2a2e561f14195ed357d8c451fdbff4c?narHash=sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w%3D' (2024-08-25)
  → 'github:nix-community/plasma-manager/b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39?narHash=sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408%3D' (2024-09-05)
• Updated input 'tt-schemes':
    'github:tinted-theming/schemes/43294f13504020b879723fa7a00a0abd39b18cc3?narHash=sha256-spz4qmUaejGLB6k/RKc7k%2BunbNogedwdQv5yBoL3ThA%3D' (2024-08-28)
  → 'github:tinted-theming/schemes/992b6c372a00e284a7dc26b19a0d11b7afcba1f1?narHash=sha256-XOxESrzdIpcYMLS%2Bs4D16M4c8gAk3sLyAQUvsb%2BlQLk%3D' (2024-09-02)
2024-09-06 08:23:38 +01:00
4 changed files with 18 additions and 121 deletions

View file

@ -111,11 +111,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725001927, "lastModified": 1725407940,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -135,11 +135,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724556439, "lastModified": 1725575977,
"narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", "narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", "rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
"tt-schemes": { "tt-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724855699, "lastModified": 1725273692,
"narHash": "sha256-spz4qmUaejGLB6k/RKc7k+unbNogedwdQv5yBoL3ThA=", "narHash": "sha256-XOxESrzdIpcYMLS+s4D16M4c8gAk3sLyAQUvsb+lQLk=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "43294f13504020b879723fa7a00a0abd39b18cc3", "rev": "992b6c372a00e284a7dc26b19a0d11b7afcba1f1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,88 +0,0 @@
{
downloadFolderPath,
accentColor,
progressbarAccentColor,
}:
{
inherit downloadFolderPath accentColor progressbarAccentColor;
adaptableDarkMode = true;
alwaysShowWorkspaces = false;
autoLaunchInBackground = false;
autoLaunchOnStart = false;
autohideMenuBar = false;
automaticUpdates = false;
beta = false;
clipboardNotifications = true;
closeToSystemTray = true;
confirmOnQuit = false;
customTodoServer = "";
darkMode = false;
enableGPUAcceleration = true;
enableGlobalHideShortcut = false;
enableLongPressServiceHint = false;
enableSpellchecking = true;
enableSystemTray = true;
enableTranslator = true;
fallbackLocale = "en-US";
grayscaleServicesDim = 50;
hibernateOnStartup = true;
hibernationStrategy = 300;
hideAllServicesWorkspace = false;
hideCollapseButton = false;
hideDownloadButton = false;
hideNotificationsButton = false;
hideRecipesButton = false;
hideSettingsButton = false;
hideSplitModeButton = true;
hideWorkspacesButton = false;
iconSize = 20;
inactivityLock = 0;
isAppMuted = false;
isLockingFeatureEnabled = false;
isMenuCollapsed = false;
isTodosFeatureEnabled = true;
isTwoFactorAutoCatcherEnabled = false;
keepAllWorkspacesLoaded = false;
liftSingleInstanceLock = false;
locale = "en-US";
locked = false;
lockedPassword = "";
minimizeToSystemTray = false;
navigationBarBehaviour = "never";
navigationBarManualActive = false;
notifyTaskBarOnMessage = false;
predefinedTodoServer = "https://todoist.com/app";
privateNotifications = false;
reloadAfterResume = true;
reloadAfterResumeTime = 10;
runInBackground = true;
scheduledDNDEnabled = false;
scheduledDNDEnd = "09:00";
scheduledDNDStart = "17:00";
searchEngine = "duckDuckGo";
sentry = false;
server = "You are using Ferdium without a server";
serviceRibbonWidth = 68;
showDisabledServices = false;
showDragArea = false;
showMessageBadgeWhenMuted = true;
showServiceName = false;
sidebarServicesLocation = 0;
spellcheckerLanguage = "en-GB";
splitColumns = 2;
splitMode = false;
startMinimized = false;
translatorEngine = "LibreTranslate";
translatorLanguage = "en";
twoFactorAutoCatcherMatcher = "token, code, sms, verify";
universalDarkMode = true;
useGrayscaleServices = false;
useHorizontalStyle = false;
useSelfSignedCertificates = false;
useTouchIdToUnlock = true;
userAgentPref = "";
wakeUpHibernationSplay = true;
wakeUpHibernationStrategy = 0;
wakeUpStrategy = 300;
webRTCIPHandlingPolicy = "disable_non_proxied_udp";
}

View file

@ -1,8 +0,0 @@
{
awayOnSystemIdle = true;
closeAppOnCross = true;
followSystemTheme = true;
notificationMethod = "electron";
optInTeamsV2 = true;
spellCheckerLanguages = [ "en_GB" ];
}

View file

@ -1,9 +1,4 @@
{ { config, pkgs, ... }:
config,
pkgs,
accentColourName,
...
}:
{ {
imports = [ imports = [
./plasma/default.nix ./plasma/default.nix
@ -16,7 +11,6 @@
libreoffice-qt-fresh libreoffice-qt-fresh
krdc krdc
tokodon tokodon
ferdium
webcord webcord
signal-desktop signal-desktop
teams-for-linux teams-for-linux
@ -63,15 +57,14 @@
}; };
configFile = { configFile = {
"autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop"; "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
"autostart/ferdium.desktop".source = "${pkgs.ferdium}/share/applications/ferdium.desktop"; "teams-for-linux/config.json".text = builtins.toJSON {
"Ferdium/config/settings.json".text = builtins.toJSON ( awayOnSystemIdle = true;
import ./config/ferdium.nix { closeAppOnCross = true;
downloadFolderPath = config.xdg.userDirs.download; followSystemTheme = true;
accentColor = config.scheme.withHashtag.${accentColourName}; notificationMethod = "electron";
progressbarAccentColor = config.scheme.withHashtag.${accentColourName}; optInTeamsV2 = true;
} spellCheckerLanguages = [ "en_GB" ];
); };
"teams-for-linux/config.json".text = builtins.toJSON (import ./config/teams-for-linux.nix);
}; };
}; };
xresources.properties = with config.scheme.withHashtag; { xresources.properties = with config.scheme.withHashtag; {